[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.5.2.4 and 1.6.2.2

version 1.5.2.4, 2012/03/13 17:10:13 version 1.6.2.2, 2012/03/29 00:40:59
Line 86  SUCH DAMAGE. Line 86  SUCH DAMAGE.
   
 typedef enum {  typedef enum {
         disable, enable, running, kill,         /* for blob.state */          disable, enable, running, kill,         /* for blob.state */
        ok, error,                               /* for blob reply */        ok, error, no,                               /* for blob reply */
         get, set, unset                         /* for blob request */          get, set, unset                         /* for blob request */
 } cmd_type_t;  } cmd_type_t;
   
Line 140  typedef struct tagRPCFunc { Line 140  typedef struct tagRPCFunc {
 struct tagRPCCall {  struct tagRPCCall {
         rpc_sess_t      call_session;          rpc_sess_t      call_session;
   
           uint16_t        call_len;
   
         uint16_t        call_tag;          uint16_t        call_tag;
         uint32_t        call_hash;          uint32_t        call_hash;
         uint16_t        call_argc;          uint16_t        call_argc;
Line 165  struct tagBLOBHdr { Line 167  struct tagBLOBHdr {
         uint32_t        hdr_var;          uint32_t        hdr_var;
         uint32_t        hdr_len;          uint32_t        hdr_len;
         uint32_t        hdr_ret;          uint32_t        hdr_ret;
           uint16_t        hdr_crc;
           uint8_t         hdr_pad;
 } __packed;  } __packed;
   
 /* Network RPC client & server elements */  /* Network RPC client & server elements */
Line 204  typedef struct { Line 208  typedef struct {
   
         struct {          struct {
                 cmd_type_t      state;          // BLOB server state: ==0 disable | !=0 enable                  cmd_type_t      state;          // BLOB server state: ==0 disable | !=0 enable
                char            *dir;                ait_val_t        dir;
   
                 rpc_cli_t       server;         // BLOB server socket                  rpc_cli_t       server;         // BLOB server socket
                 rpc_cli_t       *clients;       // connected blob client sockets                  rpc_cli_t       *clients;       // connected blob client sockets
Line 496  int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va Line 500  int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va
  * @data = BLOB data, must be free after use!   * @data = BLOB data, must be free after use!
  * return: -1 error, 0 ok, >0 remote error   * return: -1 error, 0 ok, >0 remote error
  */   */
inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data);inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 
                 void ** __restrict data);
   
   
   /*
    * rpc_calcHashes() - Calculate hashes for RPC call
    *
    * @func = function
    * @csModule = Module name, if NULL self binary
    * @csFunc = Function name
    * return: -1 error or 0 ok
    */
   int rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc);
   
   
 /* RPC Client side functions */  /* RPC Client side functions */
   
 /*  /*
Line 508  inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, Line 523  inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * @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)   * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
    * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout
  * @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, int netBuf, rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned int ProcID, int netBuf, 
                u_short family, const char *csHost, u_short Port);                unsigned char Timeout, unsigned short family, 
                 const char *csHost, unsigned 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 526  void rpc_cli_closeClient(rpc_cli_t * __restrict cli); Line 543  void rpc_cli_closeClient(rpc_cli_t * __restrict cli);
  * rpc_cli_execCall() - Execute RPC call   * rpc_cli_execCall() - Execute RPC call
  *   *
  * @cli = RPC Client session   * @cli = RPC Client session
    * @noreply = We not want RPC reply
  * @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_vars = IN RPC call array of rpc values   * @in_vars = IN RPC call array of rpc values
  * @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 with 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 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, 
                 array_t * __restrict in_vars, array_t ** __restrict out_vars);                  array_t * __restrict in_vars, array_t ** __restrict out_vars);
   
   
Removed from v.1.5.2.4  
changed lines
  Added in v.1.6.2.2

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