[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.5 and 1.8

version 1.5, 2012/03/15 01:55:33 version 1.8, 2013/03/07 23:10:50
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, 2011, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         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];
   
   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  #pragma GCC visibility pop
   
 // rpc_GetErrno() Get error code of last operation  // rpc_GetErrno() Get error code of last operation
Line 76  rpc_SetErr(int eno, char *estr, ...) Line 93  rpc_SetErr(int eno, char *estr, ...)
         va_list lst;          va_list lst;
   
         rpc_Errno = eno;          rpc_Errno = eno;
        memset(rpc_Error, 0, STRSIZ);        memset(rpc_Error, 0, sizeof rpc_Error);
         va_start(lst, estr);          va_start(lst, estr);
        vsnprintf(rpc_Error, STRSIZ, estr, lst);        vsnprintf(rpc_Error, sizeof rpc_Error, estr, lst);
         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 102  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) Line 117  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_timeout = s->sess_timeout;  
         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;          return 0;
 }  }
Removed from v.1.5  
changed lines
  Added in v.1.8

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