--- libaitrpc/src/aitrpc.c	2012/03/15 01:55:33	1.5
+++ libaitrpc/src/aitrpc.c	2013/03/07 23:10:50	1.8
@@ -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.8 2013/03/07 23:10: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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -48,11 +48,28 @@ SUCH DAMAGE.
 
 #pragma GCC visibility push(hidden)
 
-// ------------------------------------------------
-
 int rpc_Errno;
 char rpc_Error[STRSIZ];
 
+inline int
+rpc_funcs_cmp(struct tagRPCFunc *a, struct tagRPCFunc *b)
+{
+	int ret;
+
+	assert(a && b);
+
+	ret = AIT_KEY(&a->func_name) - AIT_KEY(&b->func_name);
+
+	if (ret < 0)
+		return -1;
+	else if (ret > 0)
+		return 1;
+
+	return ret;
+}
+
+AVL_GENERATE(tagRPCFuncs, tagRPCFunc, func_node, rpc_funcs_cmp);
+
 #pragma GCC visibility pop
 
 // rpc_GetErrno() Get error code of last operation
@@ -76,25 +93,23 @@ 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);
 }
 
-// ------------------------------------------------------------
 
 /*
- * 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 +117,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;
 }