Changeset 145 for branches/client-1.5/src/smbwrp.c

Timestamp:

Aug 16, 2008, 12:11:48 PM (17 years ago)

Author:

Yuri Dario

Message:

Merged daemon code, now the plugin calls directly samba client library (still using smbrp code).

File:

• branches/client-1.5/src/smbwrp.c (modified) (8 diffs)

branches/client-1.5/src/smbwrp.c

@@ -377 +377 @@
 return a connection to a server
 *******************************************************/
-int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli, int krb5support)
-{
+int _System smbwrp_connect( Resource* pRes, cli_state ** cli)
+{
+        smbwrp_server * srv = &pRes->srv;
         char * server = srv->server_name;
         char * share = *(srv->share_name) ? srv->share_name : "IPC$";
@@ -440 +441 @@
         }
 
-        if (krb5support == 1){
-        debuglocal(1,"Kerberos support enabled\n");
-                c->use_kerberos = True;}
+        if (pRes->krb5support == 1)
+        {
+            debuglocal(1,"Kerberos support enabled\n");
+            c->use_kerberos = True;
+        }
 
         if (!cli_session_request(c, &calling, &called)) {
@@ -492 +495 @@
         debuglocal(4," tconx ok. cli caps %08x\n", c->capabilities);
 
-        // copy back cli_state
+        // save cli_state pointer
         *cli = c;
 
-//      srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
-
         return 0;
 }
@@ -503 +504 @@
 close a connection to a server
 *******************************************************/
-void _System smbwrp_disconnect(struct cli_state ** cli)
-{
-        if (cli)
+void _System smbwrp_disconnect( Resource* pRes, cli_state * cli)
+{
+        if (pRes && 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;
+                cli_shutdown( cli);
         }
 }
@@ -933 +932 @@
 
 // =============================DIRECTORY ROUTINES============================
-
+                                                                                                                
 /***************************************************** 
 add a entry to a directory listing
@@ -942 +941 @@
         {
                 filelist_state * st  = (filelist_state *)state;
-                if (st->add_dir_entry)
-                {
-debuglocal(8,"adding <%s> %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen);
-                        memcpy(&st->finfo, finfo, sizeof(st->finfo));
-                        st->add_dir_entry(state);
-                }
-        }
-}
-
-#if 0
-static void smbwrp_dir_add_old(struct file_info *finfo, const char *mask, void *state)
-{
-        if (state && finfo)
-        {
-                filelist_state * st  = (filelist_state *)state;
-                if (st->add_dir_entry)
-                {
-                        strncpy(st->finfo.fname, finfo->name, sizeof(st->finfo.fname) - 1);
-                        st->finfo.size = finfo->size;
-                        st->finfo.easize = -1;
-                        st->finfo.attr = finfo->mode;
-                        st->finfo.ctime = finfo->ctime_ts.tv_sec - get_time_zone(finfo->ctime_ts.tv_sec);
-                        st->finfo.mtime = finfo->mtime_ts.tv_sec - get_time_zone(finfo->mtime_ts.tv_sec);
-                        st->finfo.atime = finfo->atime_ts.tv_sec - get_time_zone(finfo->atime_ts.tv_sec);
-                        st->add_dir_entry(state);
-                }
-        }
-}
-#endif
+                char fullname[ _MAX_PATH];
+                debuglocal(8,"adding <%s> %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen);
+                memcpy(&st->finfo, finfo, sizeof(st->finfo));
+                StrCpy(fullname, st->dir);
+                StrCat(fullname, finfo->fname);
+                StrCpy(st->finfo.fname, fullname);
+                getfindinfoL( st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
+        }
+}
 
 static void smbwrp_special_add(const char * name, void * state)
@@ -1470 +1449 @@
                              smbwrp_dir_add, state) < 0) 
 #endif
-                {
+                {                                                                              
                         return os2cli_errno(cli);
                 }
-        }
+        }                                                                                                                                                
 
         return 0;
@@ -1719 +1698 @@
         return 0;
 }
+
+
+char * getlastslash(char * path)
+{
+        char * p;
+        if (!path)
+        {
+                return NULL;
+        }
+        for (p = path + strlen(path) - 1; p >= path; p--)
+        {
+                if (*p == '\\' || *p == '/')
+                {
+                        return p;
+                }
+        }
+        return NULL;
+}
+