--- libaitrpc/src/aitrpc.c	2012/03/15 01:55:33	1.5
+++ libaitrpc/src/aitrpc.c	2012/05/19 00:29:50	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.5 2012/03/15 01:55:33 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
@@ -48,8 +48,6 @@ SUCH DAMAGE.
 
 #pragma GCC visibility push(hidden)
 
-// ------------------------------------------------
-
 int rpc_Errno;
 char rpc_Error[STRSIZ];
 
@@ -82,19 +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;
 
@@ -102,30 +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_timeout = s->sess_timeout;
 	p->sess_program = htonl(s->sess_program);
-	p->sess_process = htonl(s->sess_process);
+	p->sess_process = s->sess_process;
 
 	return 0;
 }