Diff for /libaitrpc/src/cli.c between versions 1.9.2.10 and 1.9.2.13

version 1.9.2.10, 2012/05/17 15:14:16 version 1.9.2.13, 2012/05/17 21:14:13
Line 136  rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) Line 136  rpc_cli_closeBLOBClient(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 (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @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
Line 151  rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne Line 151  rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
                 return NULL;                  return NULL;
         if (!Port)          if (!Port)
                 Port = RPC_DEFPORT;                  Port = RPC_DEFPORT;
        if (!netBuf)        if (netBuf < RPC_MIN_BUFSIZ)
                 netBuf = BUFSIZ;                  netBuf = BUFSIZ;
           else
                   netBuf = io_align(netBuf, 1);   /* align netBuf length */
   
 #ifdef HAVE_SRANDOMDEV  #ifdef HAVE_SRANDOMDEV
         srandomdev();          srandomdev();
Line 286  rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short  Line 288  rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
         rpc->call_crc ^= rpc->call_crc;          rpc->call_crc ^= rpc->call_crc;
         rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));          rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
   
           pfd.fd = cli->cli_sock;
           pfd.events = POLLOUT;
           if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
                           pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
                   if (ret)
                           LOGERR;
                   else
                           rpc_SetErr(ETIMEDOUT, "Timeout, no ready to send");
   
                   return -1;
           }
         if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {          if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
                 LOGERR;                  LOGERR;
                 return -1;                  return -1;

Removed from v.1.9.2.10  
changed lines
  Added in v.1.9.2.13


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