[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.19.2.1 and 1.24.2.4

version 1.19.2.1, 2013/09/05 00:27:09 version 1.24.2.4, 2014/11/26 00:49:46
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, 2012, 2013Copyright 2004 - 2014
         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 247  typedef struct { Line 247  typedef struct {
  */   */
 typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *);  typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *);
   
   #define RPC_CALL_DEFINE(x)      int (x)(rpc_cli_t*, struct tagRPCCall*, array_t*)
   #define RPC_CALL_ARGS(arg1, arg2, arg3) rpc_cli_t* arg1, struct tagRPCCall* arg2, array_t* arg3
   #define RPC_CALL_STDARGS        RPC_CALL_ARGS(cli, rpc, iv)
   
   
 /* ----------------------------------------------------------------------- */  /* ----------------------------------------------------------------------- */
   
 /* Error support functions */  /* Error support functions */
Line 270  void rpc_SetErr(int eno, char *estr, ...); Line 274  void rpc_SetErr(int eno, char *estr, ...);
  * @sa = check client address, if you use udp protocol   * @sa = check client address, if you use udp protocol
  * @buf = buffer   * @buf = buffer
  * @blen = buffer length   * @blen = buffer length
 * return: -1 error or >-1 readed bytes into buffer * return: -1 error, 0 EOF or or >0 readed bytes into buffer
  */   */
 ssize_t rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa,   ssize_t rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, 
                 unsigned char * __restrict buf, size_t blen);                  unsigned char * __restrict buf, size_t blen);
Line 283  ssize_t rpc_Read(int sock, int type, int flags, sockad Line 287  ssize_t rpc_Read(int sock, int type, int flags, sockad
  * @sa = send to client address, if you use udp protocol   * @sa = send to client address, if you use udp protocol
  * @buf = buffer   * @buf = buffer
  * @blen = buffer length   * @blen = buffer length
 * return: -1 error or >-1 written bytes into buffer * return: -1 error, 0 EOF or >0 written bytes into buffer
  */   */
 ssize_t rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa,   ssize_t rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa, 
                 unsigned char * __restrict buf, size_t blen);                  unsigned char * __restrict buf, size_t blen);
Line 365  int rpc_srv_loopServer(rpc_srv_t * __restrict srv); Line 369  int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
                                                         else \                                                          else \
                                                                 pthread_detach((_srv)->srv_tid); \                                                                  pthread_detach((_srv)->srv_tid); \
                                                 } } while (0)                                                  } } while (0)
   #define rpc_srv_killServer(_srv)        (assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1)
   
 /*  /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server   * rpc_srv_initBLOBServer() - Init & create BLOB Server
Line 399  int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) Line 404  int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
                                         } while (0)                                          } while (0)
   
 /*  /*
    * rpc_srv_initServer2() - Init & create layer2 RPC Server
    *
    * @InstID = Instance for authentication & recognition
    * @concurentClients = Concurent clients at same time to this server
    * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
    * @csIface = Interface name for bind server, if NULL first interface on host
    * return: NULL == error or !=NULL bind and created RPC server instance
    */
   rpc_srv_t *rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, 
                   const char *csIface);
   #define rpc_srv_endServer2(x)   rpc_srv_endServer((x))
   /*
    * rpc_srv_loopServer2() - Execute Main layer2 server loop and wait for clients requests
    *
    * @srv = RPC Server instance
    * return: -1 error or 0 ok, infinite loop ...
    */
   int rpc_srv_loopServer2(rpc_srv_t * __restrict srv);
   
   /*
  * rpc_srv_registerCall() - Register call to RPC server   * rpc_srv_registerCall() - Register call to RPC server
  *   *
  * @srv = RPC Server instance   * @srv = RPC Server instance
Line 569  int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_va Line 594  int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_va
 rpc_cli_t *rpc_cli_openClient(unsigned char InstID, int netBuf,   rpc_cli_t *rpc_cli_openClient(unsigned char InstID, int netBuf, 
                 const char *csHost, unsigned short Port, int proto);                  const char *csHost, unsigned short Port, int proto);
 /*  /*
    * rpc_cli_reconnectClient() - Reconnecting client to RPC server
    *
    * @cli = RPC Client session
    * return: -1 error or 0 ok
    */
   int rpc_cli_reconnectClient(rpc_cli_t * __restrict cli);
   /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources   * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *   *
  * @cli = RPC Client session   * @cli = RPC Client session
Line 583  void rpc_cli_closeClient(rpc_cli_t ** __restrict cli); Line 615  void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
  * @sa = Server address   * @sa = Server address
  * @pkt = RPC packet   * @pkt = RPC packet
  * @len = Length of packet   * @len = Length of packet
 * return: -1 error or !=-1 sended bytes * return: -1 error, 0  EOF or >0 sended bytes
  */   */
 int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa,   int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, 
                 ait_val_t * __restrict pkt, int len);                  ait_val_t * __restrict pkt, int len);
Line 594  int rpc_pkt_Send(int sock, int type, sockaddr_t * __re Line 626  int rpc_pkt_Send(int sock, int type, sockaddr_t * __re
  * @type = Type of socket   * @type = Type of socket
  * @sa = Server address   * @sa = Server address
  * @pkt = RPC packet   * @pkt = RPC packet
 * return: -1 error or !=-1 sended bytes * return: -1 error, 0 EOF or >0 received bytes
  */   */
 int rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa,   int rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, 
                 ait_val_t * __restrict pkt);                  ait_val_t * __restrict pkt);
Line 615  int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_se Line 647  int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_se
  * rpc_pkt_Replay() - Decode RPC Replay packet   * rpc_pkt_Replay() - Decode RPC Replay packet
  *   *
  * @pkt = Packet buffer   * @pkt = Packet buffer
 * @sess = RPC session info * @sess = RPC session info, if =NULL don't check session
  * @tag = Function tag   * @tag = Function tag
  * @vars = Function argument array of values, may be NULL   * @vars = Function argument array of values, may be NULL
  * @nocrc = Without CRC calculation   * @nocrc = Without CRC calculation
Line 631  int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_ses Line 663  int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_ses
  * @tag = Function tag for execution   * @tag = Function tag for execution
  * @in_vars = IN function argument array of values, may be NULL   * @in_vars = IN function argument array of values, may be NULL
  * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()   * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()
 * return: -1 error or != -1 ok result * return: -1 error, 0 ok result or 1 closed rpc connection
  */   */
 int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag,   int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag, 
                 array_t * __restrict in_vars, array_t ** __restrict out_vars);                  array_t * __restrict in_vars, array_t ** __restrict out_vars);
Line 666  rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri Line 698  rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri
  * return: none   * return: none
  */   */
 void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli);  void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli);
   
   
   /*
    * rpc_cli_openClient2() - Connect to layer2 RPC Server
    *
    * @InstID = InstID for RPC session request
    * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
    * @csIface = Interface name for bind client, if NULL first interface on host
    * @csHost = Host ethernet address
    * return: NULL == error or !=NULL connection to RPC server established
    */
   rpc_cli_t *rpc_cli_openClient2(u_char InstID, int netBuf, 
                   const char *csIface, const char *csHost);
   /*
    * rpc_cli_closeClient2() - Close layer2 connection to RPC server and free resources
    *
    * @cli = RPC Client session
    * return: none
    */
   void rpc_cli_closeClient2(rpc_cli_t ** __restrict cli);
   
   
 #endif  #endif
Removed from v.1.19.2.1  
changed lines
  Added in v.1.24.2.4

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