Changeset 429 for trunk/server/source3/rpc_client/cli_pipe.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (16 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpc_client/cli_pipe.c (modified) (4 diffs)

trunk/server/source3/rpc_client/cli_pipe.c

@@ -3032 +3032 @@
 }
 
+
+
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli,
                                 unsigned int timeout)
 {
-        struct cli_state *cli;
-
-        if (rpc_cli->transport->transport == NCACN_NP) {
-                cli = rpc_pipe_np_smb_conn(rpc_cli);
-                if (cli == NULL) {
-                        return 0;
-                }
-                return cli_set_timeout(cli, timeout);
-        }
-
-        if (rpc_cli->transport->transport == NCACN_IP_TCP ||
-            rpc_cli->transport->transport == NCALRPC) {
-                return rpccli_set_sock_timeout(rpc_cli, timeout);
-        }
-
-        if (rpc_cli->transport->transport == NCACN_INTERNAL) {
-                cli = rpc_pipe_smbd_smb_conn(rpc_cli);
-                if (!cli) {
-                        return 0;
-                }
-                return cli_set_timeout(cli, timeout);
-        }
-
-        return 0;
+        unsigned int old;
+
+        if (rpc_cli->transport == NULL) {
+                return RPCCLI_DEFAULT_TIMEOUT;
+        }
+
+        if (rpc_cli->transport->set_timeout == NULL) {
+                return RPCCLI_DEFAULT_TIMEOUT;
+        }
+
+        old = rpc_cli->transport->set_timeout(rpc_cli->transport->priv, timeout);
+        if (old == 0) {
+                return RPCCLI_DEFAULT_TIMEOUT;
+        }
+
+        return old;
+}
+
+bool rpccli_is_connected(struct rpc_pipe_client *rpc_cli)
+{
+        if (rpc_cli == NULL) {
+                return false;
+        }
+
+        if (rpc_cli->transport == NULL) {
+                return false;
+        }
+
+        return rpc_cli->transport->is_connected(rpc_cli->transport->priv);
 }
 
@@ -3563 +3570 @@
 }
 
-static int rpc_pipe_client_np_destructor(struct rpc_pipe_client *p)
-{
+struct rpc_pipe_client_np_ref {
         struct cli_state *cli;
-
-        cli = rpc_pipe_np_smb_conn(p);
-        if (cli != NULL) {
-                DLIST_REMOVE(cli->pipe_list, p);
-        }
+        struct rpc_pipe_client *pipe;
+};
+
+static int rpc_pipe_client_np_ref_destructor(struct rpc_pipe_client_np_ref *np_ref)
+{
+        DLIST_REMOVE(np_ref->cli->pipe_list, np_ref->pipe);
         return 0;
 }
@@ -3593 +3600 @@
         struct rpc_pipe_client *result;
         NTSTATUS status;
+
 
         /* sanity check to protect against crashes */
@@ -3631 +3639 @@
         result->transport->transport = NCACN_NP;
 
-        DLIST_ADD(cli->pipe_list, result);
-        talloc_set_destructor(result, rpc_pipe_client_np_destructor);
+        np_ref = talloc(result->transport, struct rpc_pipe_client_np_ref);
+        if (np_ref == NULL) {
+                TALLOC_FREE(result);
+                return NT_STATUS_NO_MEMORY;
+        }
+        np_ref->cli = cli;
+        np_ref->pipe = result;
+
+        DLIST_ADD(np_ref->cli->pipe_list, np_ref->pipe);
+        talloc_set_destructor(np_ref, rpc_pipe_client_np_ref_destructor);
 
         *presult = result;