Changeset 69

Timestamp:

Sep 11, 2007, 5:28:57 PM (18 years ago)

Author:

Yuri Dario

Message:

Use cli structure directly, avoid duplicating memory and fixes disconnect.

Location:

trunk/samba/source/ndpsmb

Files:

• smbcd.c (modified) (8 diffs)
• smbwrp.c (modified) (3 diffs)
• smbwrp.h (modified) (1 diff)

trunk/samba/source/ndpsmb/smbcd.c

@@ -292 +292 @@
 
 // rc = 0 - continue, rc = 1 - quit with response
-int processrequest(HPIPE pipe, cli_state * cli, unsigned long * reconnect, smbwrp_server * srv, smb_request *req, smb_response *res)
+int processrequest(HPIPE pipe, cli_state ** _cli, unsigned long * reconnect, smbwrp_server * srv, smb_request *req, smb_response *res)
 {
         int rc = 0;
         int callrc = 0;
         char * data;
-        if (!pipe || !cli || !reconnect || !srv || !req || !req->param || req->paramlen > req->length || !res)
+        cli_state * cli = *_cli;
+
+        if (!pipe || !*cli || !reconnect || !srv || !req || !req->param || req->paramlen > req->length || !res)
         {
                 debuglocal(0,"invalid structures\n");   
@@ -308 +310 @@
         {
                 debuglocal(1,"Reconnecting to last server requested\n");
-                res->rc = smbwrp_connect(srv, cli);
+                res->rc = smbwrp_connect(srv, _cli);
                 if (res->rc)
                 {
@@ -341 +343 @@
                                 break;
                         }
-                        res->rc = smbwrp_connect((smbwrp_server *)req->param, cli);
+                        res->rc = smbwrp_connect((smbwrp_server *)req->param, _cli);
                         if (!res->rc)
                         {
@@ -354 +356 @@
                 case SMBREQ_DISCONNECT :
                 {
-                        smbwrp_disconnect(cli);
+                        smbwrp_disconnect(_cli);
                 } break;
                 case SMBREQ_OPEN :
@@ -691 +693 @@
         unsigned long reconnect = 0;
         unsigned long action;
-        cli_state * cli;
+        cli_state * cli = 0;
 
         if (!arg)
@@ -699 +701 @@
         }
         pipe = (HPIPE)arg;
-        cli = (cli_state *)calloc(smbwrp_getclisize(), 1);
-        if (!cli)
-        {
-                debuglocal(0,"Not enough memory to initialize client structure\n");
-                DosDisConnectNPipe(pipe);
-                DosClose(pipe);
-                return;
-        }
+
         debuglocal(0,"opening client pipe %d\n", pipe);
         for (;;)
@@ -718 +713 @@
                 // rc = 0 - continue, rc = 1 - quit with response
                 memset(&resp, 0, sizeof(resp));
-                rc = processrequest(pipe, cli, &reconnect, &srv, &req, &resp);
+                rc = processrequest(pipe, &cli, &reconnect, &srv, &req, &resp);
                 if (rc < 2)
                 {
@@ -735 +730 @@
                 // no delay shown while using FOC.
                 DosSleep(0);
-                if (req.request == SMBREQ_DISCONNECT)
-                {
-                        /* The cli structure was deallocated. Reallocate it. */
-                        cli = (cli_state *)calloc(smbwrp_getclisize(), 1);
-                        if (!cli)
-                        {
-                                debuglocal(0,"Not enough memory to initialize client structure\n");
-                                break;
-                        }
-                }
         }
         debuglocal(0,"closing client pipe %d\n", pipe);

trunk/samba/source/ndpsmb/smbwrp.c

@@ -373 +373 @@
 return a connection to a server
 *******************************************************/
-int _System smbwrp_connect(smbwrp_server * srv, struct cli_state * cli)
+int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli)
 {
         char * server = srv->server_name;
@@ -476 +476 @@
 
         // copy back cli_state
-        memcpy( cli, c, sizeof( struct cli_state));
+        *cli = c;
 
 //      srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
@@ -486 +486 @@
 close a connection to a server
 *******************************************************/
-void _System smbwrp_disconnect(cli_state * cli)
+void _System smbwrp_disconnect(struct cli_state ** cli)
 {
         if (cli)
         {
-                cli_shutdown(cli);
+                // this call will free all buffers, close handles and free cli mem
+                cli_shutdown(*cli);
+                // set to zero because no longer valid
+                *cli = 0;
         }
 }

trunk/samba/source/ndpsmb/smbwrp.h

@@ -121 +121 @@
 int _System smbwrp_getclisize(void);
 int _System smbwrp_init(void);
-int _System smbwrp_connect(smbwrp_server * srv, cli_state * c);
-void _System smbwrp_disconnect(cli_state * cli);
+int _System smbwrp_connect(smbwrp_server * srv, cli_state ** c);
+void _System smbwrp_disconnect(cli_state ** cli);
 int _System smbwrp_open(cli_state * cli, smbwrp_file * file);
 int _System smbwrp_read(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result);