Changeset 180 for branches/client-1.5/src

Timestamp:

Apr 30, 2009, 10:45:50 AM (16 years ago)

Author:

Yuri Dario

Message:

Enable reconnection on level change, fixes ticket:66.

File:

• branches/client-1.5/src/ndpsmb.c (modified) (2 diffs)

branches/client-1.5/src/ndpsmb.c

@@ -598 +598 @@
         rootlevel = pRes->rootlevel;
         if (*path == '\\') path++;
-#if 0 // FIXME
+
         if (rootlevel < 3)
         {
                 char * p;
+                // flag: 1 parameters changed, reconnection required, 0 do nothing
                 int newlevel = 0;
-                smbwrp_server * tmp = (smbwrp_server *)pConn->mem;
-                MemCpy(tmp, &pConn->srv, sizeof(pConn->srv));
+                // use a temporary resource to test disconnection/reconnection
+                Resource tmpRes;
+                // copy exising data
+                memcpy( &tmpRes, pRes, sizeof( tmpRes));
+                // pointer to new connection fields
+                smbwrp_server * tmp = &tmpRes.srv;
                 if (rootlevel == 0)
                 {
@@ -657 +662 @@
                 if (newlevel)
                 {
-                        // reconnect to server here
-                        unsigned long action;
-                        smb_request req = {0};
-                        smb_response resp = {0};
-
-                        req.request = SMBREQ_DISCONNECT;
-                        req.param = pConn->mem;
-                        req.length = 0;
-                        req.paramlen = 0;
-
-                        rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
-
-                        req.request = SMBREQ_CONNECT;
-                        req.param = pConn->mem;
-                        req.length = pRes->memlen;
-                        req.paramlen = sizeof(pConn->srv);
-
-                        rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
-                        if (rc || action < sizeof(resp) || resp.rc)
+                        // reconnect to server here, first test new connection
+                        cli_state* tmp_cli = NULL;
+                        rc = smbwrp_connect( &tmpRes, &tmp_cli);
+                        if (!rc) 
                         {
-                                APIRET rc2;
-                                rc = rc ? rc : (resp.rc ? resp.rc : ERROR_INVALID_PARAMETER);
-                                MemCpy(tmp, &pRes->srv, sizeof(pRes->srv));
-                                rc2 = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
-                                // TODO: what to do if the reconnect will fail ?
+                                // new connection is ok, disconnect old one
+                                cli_state* cli = pConn->cli;
+                                smbwrp_disconnect( pRes, cli);
+                                // save tmp data structure
+                                memcpy( pRes, &tmpRes, sizeof( tmpRes));
+                                // save new connection handle
+                                pConn->cli = tmp_cli;
                         }
-                        else
-                        {
-                                MemCpy(&pConn->srv, tmp, sizeof(pConn->srv));
-                        }
-                }
-        }
-#endif
+                }
+        }
+
         StrCpy(result, "\\");
         StrNCat(result, path, CCHMAXPATH);