Changeset 933 for branches/client-3.0/src

Timestamp:

Jul 26, 2016, 11:47:31 AM (9 years ago)

Author:

Paul Smedley

Message:

Introduce smb_echo, used to confirm server connection is still active before trying a connection

Location:

branches/client-3.0/src

Files:

• ndpsmb.c (modified) (1 diff)
• smbwrp.c (modified) (1 diff)
• smbwrp.h (modified) (1 diff)

branches/client-3.0/src/ndpsmb.c

@@ -1188 +1188 @@
                 debuglocal(9,"NdpFindStart: dir [%s], dir_mask [%s], mask [%s], szPath [%s]\n",
                         state.dir, state.dir_mask, state.mask, state.fullpath);
+
+                /* use cli_echo to check the connection is alive - if not, reconnect */
+                rc = smbwrp_echo(pConn->cli);
+                if (rc) 
+                {
+                debuglocal(4,"NdpFindStart, smbwrp_echo rc = %d, reconnecting.....\n",rc);
+                        int rcCon = smbwrp_connect( pRes, &pConn->cli);
+                        if (rcCon)
+                                return ERROR_PATH_NOT_FOUND;
+                }
                 rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
                 // we need to handle reconnection also here, because NdpQueryPathInfo 

branches/client-3.0/src/smbwrp.c

@@ -1221 +1221 @@
 }
 
+/***************************************************** 
+Send an echo to the server to confirm it is still alive
+*******************************************************/
+int _System smbwrp_echo(cli_state * cli)
+{
+        debuglocal(4," smbwrp_echo\n");
+        unsigned char garbage[16];
+        NTSTATUS status;
+        if (!cli)
+        {
+                return maperror(EINVAL);
+        }
+        /* Ping the server to keep the connection alive using SMBecho. */
+        memset(garbage, 0xf0, sizeof(garbage));
+        unsigned int old_timeout = cli->timeout;
+        cli->timeout = 2000;// we don't want to wait 20 seconds
+        status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
+        cli->timeout = old_timeout; // reset back to previous value
+        if (NT_STATUS_IS_OK(status)) {
+                return 0;
+        } else {
+                return -1;
+        }
+}

branches/client-3.0/src/smbwrp.h

@@ -197 +197 @@
 int _System smbwrp_flistea(cli_state * cli, smbwrp_file *file, void * buffer, unsigned long size);
 int _System smbwrp_dskattr(cli_state * cli, FSALLOCATE *pfsa);
+int _System smbwrp_echo(cli_state * cli);
 
 /* Directory cache helpers. */