--- libaitrpc/src/aitrpc.c	2012/05/15 16:06:13	1.5.6.2
+++ libaitrpc/src/aitrpc.c	2012/05/16 07:20:44	1.5.6.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.5.6.2 2012/05/15 16:06:13 misho Exp $
+* $Id: aitrpc.c,v 1.5.6.6 2012/05/16 07:20:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -98,7 +98,7 @@ 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;
@@ -118,9 +118,8 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *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 = htons(s->sess_process);
+	p->sess_process = s->sess_process;
 
 	return 0;
 }
@@ -137,10 +136,14 @@ rpc_register_srvServices(rpc_srv_t * __restrict srv)
 	if (!srv)
 		return -1;
 
-	rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 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;
 }