libaitrpc/src/aitrpc.c - diff

Return to aitrpc.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/aitrpc.c between versions 1.1.1.1.2.1 and 1.5.6.4

-version 1.1.1.1.2.1, 2010/06/18 13:36:01
+version 1.5.6.4, 2012/05/15 22:47:10
  Line 5
  * $Author$
  * $Id$
  *
-*************************************************************************/
+**************************************************************************
-#include "global.h"
+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>
-#pragma GCC visibility push(hidden)
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+        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:
+. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+. 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.
+. 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.
+. 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.
-pthread_mutex_t rpc_mtx;
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
-int rpc_Kill;
+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];
- Line 48  rpc_SetErr(int eno, char *estr, ...)
+ Line 80  rpc_SetErr(int eno, char *estr, ...)
          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 (ntohl(p->sess_program) != s->sess_program)
+                 return 2;
+         if (p->sess_process != s->sess_process)
+                 return 3;
+         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_program = htonl(s->sess_program);
+         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;
+         rpc_srv_registerCall(srv, crcFletcher16((u_short*) CALL_SRVSHUTDOWN,
+                                 strlen(CALL_SRVSHUTDOWN) / 2), CALL_SRVSHUTDOWN, 0);
+         rpc_srv_registerCall(srv, crcFletcher16((u_short*) CALL_SRVCLIENTS,
+                                 strlen(CALL_SRVCLIENTS) / 2), CALL_SRVCLIENTS, 1);
+         rpc_srv_registerCall(srv, crcFletcher16((u_short*) CALL_SRVSESSIONS,
+                                 strlen(CALL_SRVSESSIONS) / 2), CALL_SRVSESSIONS, 4);
+         rpc_srv_registerCall(srv, crcFletcher16((u_short*) CALL_SRVCALLS,
+                                 strlen(CALL_SRVCALLS) / 2), CALL_SRVCALLS, 1);
+         return 0;
+ }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.1
changed lines
	Added in v.1.5.6.4