[BACK]Return to cli.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/cli.c between versions 1.28 and 1.29

version 1.28, 2020/06/25 19:11:00 version 1.29, 2024/03/20 17:32:31
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 - 2019Copyright 2004 - 2024
         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 417  rpc_pkt_Receive(int sock, int type, sockaddr_t * __res Line 417  rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
  * @sess = RPC session info   * @sess = RPC session info
  * @tag = Function tag for execution   * @tag = Function tag for execution
  * @vars = Function argument array of values, may be NULL   * @vars = Function argument array of values, may be NULL
 * @noreply = We not want RPC reply * @noreply = >0 We not want RPC reply, -1 IPC request with reply
  * @nocrc = Without CRC calculation   * @nocrc = Without CRC calculation
  * @seq = Sign packet with seq.no   * @seq = Sign packet with seq.no
  * return: -1 error or != -1 prepared bytes into packet   * return: -1 error or != -1 prepared bytes into packet
Line 453  rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t Line 453  rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
                 rpc->call_argc = (u_char) array_Size(vars);                  rpc->call_argc = (u_char) array_Size(vars);
   
         /* set reply */          /* set reply */
        rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY);        rpc->call_req.flags = (uint64_t) htonl((noreply > 0) ? RPC_NOREPLY : RPC_REPLY);
   
         if (array_Size(vars)) {          if (array_Size(vars)) {
                 /* marshaling variables */                  /* marshaling variables */
Line 467  rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t Line 467  rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
   
         /* total packet length */          /* total packet length */
         rpc->call_len = htonl(len);          rpc->call_len = htonl(len);
        rpc->call_io = RPC_REQ;        rpc->call_io = (noreply == -1) ? RPC_IPC : RPC_REQ;
   
         /* sign packet */          /* sign packet */
         rpc->call_seq = htonl(seq);          rpc->call_seq = htonl(seq);
Line 564  rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t  Line 564  rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
  * 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 * @noreply = >0 We not want RPC reply, -1 IPC request with reply
  * @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()
Line 596  rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short  Line 596  rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
         if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa,           if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, 
                                         &cli->cli_buf, wlen)) == -1)                                          &cli->cli_buf, wlen)) == -1)
                 return -1;                  return -1;
        if (!wlen)      /* closed rpc connection */        if (!wlen)              /* closed rpc connection */
                 return 1;                  return 1;
   
        if (noreply)       /* we not want reply */        if (noreply > 0)       /* we not want reply */
                 return 0;                  return 0;
   
         if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa,           if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, 
Removed from v.1.28  
changed lines
  Added in v.1.29

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