--- libaitrpc/src/aitrpc.c 2012/11/13 09:22:10 1.7 +++ libaitrpc/src/aitrpc.c 2013/05/30 09:22:01 1.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.7 2012/11/13 09:22:10 misho Exp $ +* $Id: aitrpc.c,v 1.10 2013/05/30 09:22:01 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -73,29 +73,29 @@ AVL_GENERATE(tagRPCFuncs, tagRPCFunc, func_node, rpc_f #pragma GCC visibility pop // rpc_GetErrno() Get error code of last operation -inline int +int rpc_GetErrno() { return rpc_Errno; } // rpc_GetError() Get error text of last operation -inline const char * +const char * rpc_GetError() { return rpc_Error; } // rpc_SetErr() Set error to variables for internal use!!! -inline void +void rpc_SetErr(int eno, char *estr, ...) { va_list lst; rpc_Errno = eno; - memset(rpc_Error, 0, STRSIZ); + memset(rpc_Error, 0, sizeof rpc_Error); va_start(lst, estr); - vsnprintf(rpc_Error, STRSIZ, estr, lst); + vsnprintf(rpc_Error, sizeof rpc_Error, estr, lst); va_end(lst); } @@ -107,7 +107,7 @@ rpc_SetErr(int eno, char *estr, ...) * @s = active session * return: -1, 1, 2, 3 are errors or 0 ok */ -inline int +int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) { if (!p || !s) @@ -115,10 +115,8 @@ rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) if (p->sess_version != s->sess_version) return 1; - if (ntohl(p->sess_program) != s->sess_program) + if (p->sess_instance != s->sess_instance) return 2; - if (p->sess_process != s->sess_process) - return 3; return 0; } @@ -130,15 +128,14 @@ rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) * @s = host session * return: -1 error or 0 ok */ -inline int +int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s) { if (!p || !s) return -1; p->sess_version = s->sess_version; - p->sess_program = htonl(s->sess_program); - p->sess_process = s->sess_process; + p->sess_instance = s->sess_instance; return 0; }