[BACK]Return to aitrpc.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

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

version 1.4, 2011/11/03 15:32:21 version 1.5.6.4, 2012/05/15 22:47:10
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 48  SUCH DAMAGE. Line 48  SUCH DAMAGE.
   
 #pragma GCC visibility push(hidden)  #pragma GCC visibility push(hidden)
   
 // ------------------------------------------------  
   
 int rpc_Errno;  int rpc_Errno;
 char rpc_Error[STRSIZ];  char rpc_Error[STRSIZ];
   
Line 82  rpc_SetErr(int eno, char *estr, ...) Line 80  rpc_SetErr(int eno, char *estr, ...)
         va_end(lst);          va_end(lst);
 }  }
   
 // ------------------------------------------------------------  
   
 /*  /*
 * rpc_chkPktSession() Check session in RPC packet * rpc_chkPktSession() - Check RPC session
  *
  * @p = packet session   * @p = packet session
  * @s = active session   * @s = active session
 * return: -1 error or 0 ok * return: -1, 1, 2, 3 are errors or 0 ok
  */   */
 inline int  inline int
 rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
 {  {
         assert(p && s);  
         if (!p || !s)          if (!p || !s)
                 return -1;                  return -1;
   
Line 101  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) Line 98  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
                 return 1;                  return 1;
         if (ntohl(p->sess_program) != s->sess_program)          if (ntohl(p->sess_program) != s->sess_program)
                 return 2;                  return 2;
        if (ntohl(p->sess_process) != s->sess_process)        if (p->sess_process != s->sess_process)
                 return 3;                  return 3;
   
         return 0;          return 0;
 }  }
   
 /*  /*
 * rpc_addPktSession() Add session into RPC packet * rpc_addPktSession() - Prepare session into network format
  *
  * @p = packet session   * @p = packet session
 * @s = active session * @s = host session
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
 inline int  inline int
 rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)  rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
 {  {
         assert(p && s);  
         if (!p || !s)          if (!p || !s)
                 return -1;                  return -1;
   
         p->sess_version = s->sess_version;          p->sess_version = s->sess_version;
         p->sess_program = htonl(s->sess_program);          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;
 
         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;          return 0;
 }  }
Removed from v.1.4  
changed lines
  Added in v.1.5.6.4

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