--- libaitrpc/src/aitrpc.c	2012/03/15 01:55:33	1.5
+++ libaitrpc/src/aitrpc.c	2012/05/16 07:24:08	1.5.6.7
@@ -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.5.6.7 2012/05/16 07:24:08 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,76 @@ 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;
+}
+
+/*
+ * rpc_register_srvServices() - Register internal service functions
+ *
+ * @srv = RPC server instance
+ * return: -1 error or 0 ok
+ */
+int
+rpc_register_srvServices(rpc_srv_t * __restrict srv)
+{
+	if (!srv)
+		return -1;
+
+	if (rpc_srv_registerCall(srv, CALL_SRVSHUTDOWN_ID, CALL_SRVSHUTDOWN, 0) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS_ID, CALL_SRVCLIENTS, 1) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS_ID, CALL_SRVSESSIONS, 4) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVCALLS_ID, CALL_SRVCALLS, 1) < 1)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * rpc_register_blobServices() - Register internal service functions
+ *
+ * @srv = RPC server instance
+ * return: -1 error or 0 ok
+ */
+int
+rpc_register_blobServices(rpc_srv_t * __restrict srv)
+{
+	if (!srv)
+		return -1;
+
+	if (rpc_srv_registerCall(srv, CALL_BLOBSHUTDOWN_ID, CALL_BLOBSHUTDOWN, 0) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS_ID, CALL_BLOBCLIENTS, 1) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_BLOBVARS_ID, CALL_BLOBVARS, 1) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_BLOBSTATE_ID, CALL_BLOBSTATE, 0) < 1)
+		return -1;
 
 	return 0;
 }