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

Diff for /libaitrpc/inc/aitrpc.h between versions 1.3.2.2 and 1.3.2.4

version 1.3.2.2, 2011/08/30 09:07:55 version 1.3.2.4, 2011/08/31 17:11:58
Line 119  typedef struct tagRPCFunc { Line 119  typedef struct tagRPCFunc {
         int8_t                  func_file[MAXPATHLEN];          int8_t                  func_file[MAXPATHLEN];
         int8_t                  func_name[UCHAR_MAX + 1];          int8_t                  func_name[UCHAR_MAX + 1];
   
        int8_t                  func_args;        uint16_t                func_args;
        ait_val_t               *func_vars;        array_t                  *func_vars;
   
         void                    *func_parent;          void                    *func_parent;
         struct tagRPCFunc       *func_next;          struct tagRPCFunc       *func_next;
Line 133  struct tagRPCCall { Line 133  struct tagRPCCall {
         rpc_sess_t      call_session;          rpc_sess_t      call_session;
         uint16_t        call_tag;          uint16_t        call_tag;
         uint32_t        call_hash;          uint32_t        call_hash;
        uint8_t             call_argc;        uint16_t        call_argc;
 } __packed;  } __packed;
   
 /* Network RPC packet - Server response */  /* Network RPC packet - Server response */
Line 144  struct tagRPCRet { Line 144  struct tagRPCRet {
         uint32_t        ret_hash;          uint32_t        ret_hash;
         int32_t         ret_retcode;          int32_t         ret_retcode;
         int32_t         ret_errno;          int32_t         ret_errno;
        uint8_t             ret_argc;        uint16_t        ret_argc;
 } __packed;  } __packed;
   
 /* Network BLOB packet - Header */  /* Network BLOB packet - Header */
Line 165  typedef struct { Line 165  typedef struct {
         pthread_t       cli_tid;        // TID of thread          pthread_t       cli_tid;        // TID of thread
   
         void            *cli_parent;    // pointer to parent rpc_srv_t for server or to rpc_sess_t for client          void            *cli_parent;    // pointer to parent rpc_srv_t for server or to rpc_sess_t for client
           int             cli_netbuf;     // size of network buffer size
 } rpc_cli_t;  } rpc_cli_t;
   
   
Line 212  typedef struct { Line 213  typedef struct {
  * @arg3 = input array with values from RPC call execution request   * @arg3 = input array with values from RPC call execution request
  * return: -1 error or >-1 success execution   * return: -1 error or >-1 success execution
  */   */
typedef int (*rpc_callback_t)(rpc_func_t *, int, ait_val_t *);typedef int (*rpc_callback_t)(rpc_func_t *, int, array_t *);
   
   
 // -----------------------------------------------------------------------  // -----------------------------------------------------------------------
Line 232  inline const char *rpc_GetError(); Line 233  inline const char *rpc_GetError();
  * @regProgID = ProgramID for authentication & recognition   * @regProgID = ProgramID for authentication & recognition
  * @regProcID = ProcessID for authentication & recognition   * @regProcID = ProcessID for authentication & recognition
  * @concurentClients = Concurent clients at same time to this server   * @concurentClients = Concurent clients at same time to this server
 * @netBuf = Network buffer length, if =0 == BUFSIZ * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
  * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL   * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL
  * @csHost = Host name or address for bind server, if NULL any address   * @csHost = Host name or address for bind server, if NULL any address
  * @Port = Port for bind server, if Port == 0 default port is selected   * @Port = Port for bind server, if Port == 0 default port is selected
Line 283  int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) Line 284  int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
  * return: -1 error or 0 register ok   * return: -1 error or 0 register ok
  */   */
 int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc,   int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, 
                unsigned char args);                unsigned short args);
 /*  /*
  * rpc_srv_unregisterCall() Unregister call from RPC server   * rpc_srv_unregisterCall() Unregister call from RPC server
  * @srv = RPC Server instance   * @srv = RPC Server instance
Line 312  inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restr Line 313  inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restr
  * rpc_srv_execCall() Execute registered call from RPC server   * rpc_srv_execCall() Execute registered call from RPC server
  * @call = Register RPC call   * @call = Register RPC call
  * @rpc = IN RPC call structure   * @rpc = IN RPC call structure
 * @args = IN RPC call array of rpc values * @args = IN RPC calling arguments from RPC client
  * return: -1 error, !=-1 ok   * return: -1 error, !=-1 ok
  */   */
 int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc,   int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
                ait_val_t * __restrict args);                array_t * __restrict args);
   
   
 /*  /*
Line 326  int rpc_srv_execCall(rpc_func_t * __restrict call, str Line 327  int rpc_srv_execCall(rpc_func_t * __restrict call, str
  * @varnum = Number of return variables   * @varnum = Number of return variables
  * return: NULL error, !=NULL array with return values for RPC call with varnum items   * return: NULL error, !=NULL array with return values for RPC call with varnum items
  */   */
inline ait_val_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum);inline array_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum);
 /*  /*
  * rpc_srv_allocVars() Allocate array for call variables,    * rpc_srv_allocVars() Allocate array for call variables, 
                                 if already allocated memory for RPC call reallocate used space                                  if already allocated memory for RPC call reallocate used space
Line 348  inline int rpc_srv_zeroVars(rpc_func_t * __restrict ca Line 349  inline int rpc_srv_zeroVars(rpc_func_t * __restrict ca
  * @newvars = New allocated variables array, must be free after use   * @newvars = New allocated variables array, must be free after use
  * return: -1 error, !=-1 Returned number of copied RPC variables   * return: -1 error, !=-1 Returned number of copied RPC variables
  */   */
inline int rpc_srv_copyVars(rpc_func_t * __restrict call, ait_val_t ** __restrict newvars);inline int rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars);
 /*  /*
  * rpc_srv_getVars() Get variables array for RPC call   * rpc_srv_getVars() Get variables array for RPC call
  * @call = RPC function call   * @call = RPC function call
  * @vars = Returned variables array, may be NULL   * @vars = Returned variables array, may be NULL
  * return: -1 error, !=-1 Number of returned variables   * return: -1 error, !=-1 Number of returned variables
  */   */
inline int rpc_srv_getVars(rpc_func_t * __restrict call, ait_val_t ** __restrict vars);inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars);
   
   
 /*  /*
Line 423  int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_b Line 424  int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_b
  */   */
 int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob);  int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob);
   
   /* CLIENT part of functions */
   
 /*  /*
  * rpc_cli_sendBLOB() Send BLOB to server   * rpc_cli_sendBLOB() Send BLOB to server
  * @cli = Client instance   * @cli = Client instance
Line 463  inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, Line 466  inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * rpc_cli_openClient() Connect to RPC Server   * rpc_cli_openClient() Connect to RPC Server
  * @ProgID = ProgramID for RPC session request   * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request   * @ProcID = ProcessID for RPC session request
    * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
  * @family = Family socket type, AF_INET or AF_INET6   * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server   * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected   * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established   * return: NULL == error or !=NULL connection to RPC server established
  */   */
rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, 
                 u_short family, const char *csHost, u_short Port);                  u_short family, const char *csHost, u_short Port);
 /*  /*
  * rpc_cli_closeClient() Close connection to RPC server and free resources   * rpc_cli_closeClient() Close connection to RPC server and free resources
Line 481  void rpc_cli_closeClient(rpc_cli_t * __restrict cli); Line 485  void rpc_cli_closeClient(rpc_cli_t * __restrict cli);
  * @cli = RPC Client session   * @cli = RPC Client session
  * @csModule = Module name, if NULL self binary   * @csModule = Module name, if NULL self binary
  * @csFunc = Function name for execute   * @csFunc = Function name for execute
  * @in_argc = IN count of arguments  
  * @in_vars = IN RPC call array of rpc values   * @in_vars = IN RPC call array of rpc values
 * @out_argc = OUT returned count of arguments * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()
 * @out_vars = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals()) 
  * return: -1 error or != -1 ok result   * return: -1 error or != -1 ok result
  */   */
int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, int in_argc, int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, 
                ait_val_t * __restrict in_vars, int *out_argc, ait_val_t ** __restrict out_vars);                array_t * __restrict in_vars, array_t ** __restrict out_vars);
 /*  /*
  * rpc_cli_freeVals() Free ait_val_t array returned from RPC call   * rpc_cli_freeVals() Free ait_val_t array returned from RPC call
 * @args = Number of arguments in array * @vars = Variable array
 * @vars = Value elements 
  * return: none   * return: none
  */   */
inline void rpc_cli_freeVals(int args, ait_val_t * __restrict vars);inline void rpc_cli_freeVals(array_t ** __restrict vars);
 /*
  * rpc_cli_allocVals() Allocate ait_val_t array for RPC call
  * @args = Number of arguments
  * return: =NULL error or !=NULL allocated array
  */
 inline array_t *rpc_cli_allocVals(unsigned short args);
   
   
 /*  /*
Removed from v.1.3.2.2  
changed lines
  Added in v.1.3.2.4

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