Diff for /libaitrpc/src/aitrpc.c between versions 1.6 and 1.10

version 1.6, 2012/05/19 00:29:50 version 1.10, 2013/05/30 09:22:01
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 51  SUCH DAMAGE. Line 51  SUCH DAMAGE.
 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
inline intint
 rpc_GetErrno()  rpc_GetErrno()
 {  {
         return rpc_Errno;          return rpc_Errno;
 }  }
   
 // rpc_GetError() Get error text of last operation  // rpc_GetError() Get error text of last operation
inline const char *const char *
 rpc_GetError()  rpc_GetError()
 {  {
         return rpc_Error;          return rpc_Error;
 }  }
   
 // rpc_SetErr() Set error to variables for internal use!!!  // rpc_SetErr() Set error to variables for internal use!!!
inline voidvoid
 rpc_SetErr(int eno, char *estr, ...)  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);
 }  }
   
Line 88  rpc_SetErr(int eno, char *estr, ...) Line 107  rpc_SetErr(int eno, char *estr, ...)
  * @s = active session   * @s = active session
  * return: -1, 1, 2, 3 are errors or 0 ok   * return: -1, 1, 2, 3 are errors or 0 ok
  */   */
inline intint
 rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
 {  {
         if (!p || !s)          if (!p || !s)
Line 96  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) Line 115  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
   
         if (p->sess_version != s->sess_version)          if (p->sess_version != s->sess_version)
                 return 1;                  return 1;
        if (ntohl(p->sess_program) != s->sess_program)        if (p->sess_instance != s->sess_instance)
                 return 2;                  return 2;
         if (p->sess_process != s->sess_process)  
                 return 3;  
   
         return 0;          return 0;
 }  }
Line 111  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) Line 128  rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
  * @s = host session   * @s = host session
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
inline intint
 rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)  rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *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_instance = s->sess_instance;
        p->sess_process = s->sess_process; 
   
         return 0;          return 0;
 }  }

Removed from v.1.6  
changed lines
  Added in v.1.10


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