--- libaitrpc/src/aitrpc.c 2011/11/03 15:32:21 1.4 +++ libaitrpc/src/aitrpc.c 2012/05/19 00:29:50 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.4 2011/11/03 15:32:21 misho Exp $ +* $Id: aitrpc.c,v 1.6 2012/05/19 00:29:50 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -48,8 +48,6 @@ SUCH DAMAGE. #pragma GCC visibility push(hidden) -// ------------------------------------------------ - int rpc_Errno; char rpc_Error[STRSIZ]; @@ -82,18 +80,17 @@ rpc_SetErr(int eno, char *estr, ...) va_end(lst); } -// ------------------------------------------------------------ /* - * rpc_chkPktSession() Check session in RPC packet + * rpc_chkPktSession() - Check RPC session + * * @p = packet session * @s = active session - * return: -1 error or 0 ok + * return: -1, 1, 2, 3 are errors or 0 ok */ inline int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) { - assert(p && s); if (!p || !s) return -1; @@ -101,28 +98,28 @@ rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) return 1; if (ntohl(p->sess_program) != s->sess_program) return 2; - if (ntohl(p->sess_process) != s->sess_process) + if (p->sess_process != s->sess_process) return 3; return 0; } /* - * rpc_addPktSession() Add session into RPC packet + * rpc_addPktSession() - Prepare session into network format + * * @p = packet session - * @s = active session + * @s = host session * return: -1 error or 0 ok */ inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s) { - assert(p && s); if (!p || !s) return -1; p->sess_version = s->sess_version; p->sess_program = htonl(s->sess_program); - p->sess_process = htonl(s->sess_process); + p->sess_process = s->sess_process; return 0; }