--- libaitrpc/src/aitrpc.c	2010/06/18 01:48:06	1.1
+++ libaitrpc/src/aitrpc.c	2013/04/02 15:50:14	1.9
@@ -3,19 +3,73 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.1 2010/06/18 01:48:06 misho Exp $
+* $Id: aitrpc.c,v 1.9 2013/04/02 15:50:14 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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, 2013
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
 #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
@@ -39,11 +93,49 @@ 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 RPC session
+ *
+ * @p = packet session
+ * @s = active session
+ * return: -1, 1, 2, 3 are errors or 0 ok
+ */
+inline int
+rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
+{
+	if (!p || !s)
+		return -1;
+
+	if (p->sess_version != s->sess_version)
+		return 1;
+	if (p->sess_instance != s->sess_instance)
+		return 2;
+
+	return 0;
+}
+
+/*
+ * rpc_addPktSession() - Prepare session into network format
+ *
+ * @p = packet session
+ * @s = host session
+ * return: -1 error or 0 ok
+ */
+inline int
+rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
+{
+	if (!p || !s)
+		return -1;
+
+	p->sess_version = s->sess_version;
+	p->sess_instance = s->sess_instance;
+
+	return 0;
+}