Changeset 24

Timestamp:

Mar 26, 2007, 4:46:41 PM (18 years ago)

Author:

Yuri Dario

Message:

More debugging informations on request.

Location:

trunk/samba/source/ndpsmb

Files:

• ndpsmb.c (modified) (1 diff)
• smbwrp.c (modified) (37 diffs)

trunk/samba/source/ndpsmb/ndpsmb.c

@@ +1 @@
+//YD enable following line to get logging to disk
+//#define DEBUG
 #define NDPL_LARGEFILES
 #define INCL_LONGLONG

trunk/samba/source/ndpsmb/smbwrp.c

@@ -307 +307 @@
         zero_ip(&ip);
 
-        DEBUG(1,("Connecting to \\\\%s:%s@%s:%s\\%s. Master %s:%d\n", srv->username, srv->password, workgroup, server, share, srv->master, srv->ifmastergroup));
+        debuglocal(1,"Connecting to \\\\%s:%s@%s:%s\\%s. Master %s:%d\n", srv->username, srv->password, workgroup, server, share, srv->master, srv->ifmastergroup);
 
         if (!*server) {
@@ -363 +363 @@
         }
 
-        DEBUG(4,(" session request ok\n"));
+        debuglocal(4," session request ok\n");
 
         if (!cli_negprot(c)) {
@@ -370 +370 @@
         }
 
-        DEBUG(4,(" session setuping for <%s>/<%s> %d in <%s> %08x %08x %08x\n", srv->username, srv->password, strlen(srv->password), workgroup, c->protocol, c->sec_mode, c->capabilities));
+        debuglocal(4," session setuping for <%s>/<%s> %d in <%s> %08x %08x %08x\n", srv->username, srv->password, strlen(srv->password), workgroup, c->protocol, c->sec_mode, c->capabilities);
 
         if (!NT_STATUS_IS_OK(cli_session_setup(c, srv->username, 
@@ -376 +376 @@
                                srv->password, strlen(srv->password),
                                workgroup))) {
-                DEBUG(4,("%s/%s login failed\n", srv->username, srv->password));
+                debuglocal(4,"%s/%s login failed\n", srv->username, srv->password);
                 /* try an anonymous login if it failed */
                 if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 1,"", 0, workgroup))) {
-                        DEBUG(4,("Anonymous login failed"));
+                        debuglocal(4,"Anonymous login failed");
                         cli_shutdown(c);
                         return 6;
@@ -385 +385 @@
         }
 
-        DEBUG(4,(" session setup ok. Sending tconx <%s> <%s> %d\n", share, srv->password, strlen(srv->password)));
+        debuglocal(4," session setup ok. Sending tconx <%s> <%s> %d\n", share, srv->password, strlen(srv->password));
 
         if (!cli_send_tconX(c, share, "?????",
@@ -393 +393 @@
         }
 
-        DEBUG(4,(" tconx ok. cli caps %08x\n", c->capabilities));
+        debuglocal(4," tconx ok. cli caps %08x\n", c->capabilities);
 
         // copy back cli_state
@@ -432 +432 @@
         }
 
-        DEBUG(4,("cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode));
+        debuglocal(4,"cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
         file->fd = cli_open(cli, file->fname, file->openmode, file->denymode);
         if (file->fd == -1)
@@ -443 +443 @@
                 file->mtime = time(NULL);
                 t = get_time_zone(file->mtime);
-                DEBUG(4,("cli_open mtime %lu %lu\n", file->mtime, t));
+                debuglocal(4,"cli_open mtime %lu %lu\n", file->mtime, t);
                 file->mtime -= t;
         }
@@ -489 +489 @@
         
         *result = 0;
-//DEBUG(1,("Write %x %d %lld %d", cli, file->fd, file->offset, count));
+//debuglocal(1,("Write %x %d %lld %d", cli, file->fd, file->offset, count));
         ret = cli_write(cli, file->fd, 0, buf, file->offset, count);
         if (ret == -1) 
@@ -521 +521 @@
         if (file->openattr || file->mtime)
         {
-                DEBUG(4,("Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime + get_time_zone(file->mtime)));
+                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime + get_time_zone(file->mtime));
                 if (!cli_setatr(cli, file->fname, file->openattr, file->mtime + get_time_zone(file->mtime))) 
                 {
-                        DEBUG(4,("Set attr on close failed %d\n", os2cli_errno(cli)));
+                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
                         //rc = os2cli_errno(cli);
                 }       
@@ -579 +579 @@
         }
 
-        DEBUG(4,("cli_setnewfileszie(%s) %lld\n", file->fname, newsize));
+        debuglocal(4,"cli_setnewfileszie(%s) %lld\n", file->fname, newsize);
         if (!cli_setfilenewsize(cli, file->fd, newsize))
         {
@@ -595 +595 @@
                 file->openmode &= ~(O_CREAT | O_EXCL);
                 file->openmode |= O_TRUNC;
-                DEBUG(4,("cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode));
+                debuglocal(4,"cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
                 file->fd = cli_open(cli, file->fname, file->openmode, file->denymode);
                 if (file->fd == -1)
@@ -615 +615 @@
         }
 
-        DEBUG(1,("Rename <%s> -> <%s>\n", oldname, newname));
+        debuglocal(1,"Rename <%s> -> <%s>\n", oldname, newname);
         //cli_unlink(cli, newname);
 //      if (!cli_rename(cli, oldname, newname) && !cli_ntrename(cli, oldname, newname)) 
@@ -636 +636 @@
         }
 
-DEBUG(4,("Setting on <%s> attr %04x, time %lu/%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime)));
+debuglocal(4,"Setting on <%s> attr %04x, time %lu/%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime));
         if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : get_time_zone(finfo->mtime)))
                 && !cli_setatr(cli, finfo->fname, finfo->attr, 0)) 
@@ -686 +686 @@
         }
 
-        DEBUG(4,("lseek %d %lld %lld\n", whence, offset, file->offset));
+        debuglocal(4,"lseek %d %lld %lld\n", whence, offset, file->offset);
 
         switch (whence) {
@@ -731 +731 @@
                 return EINVAL;
         }
-        DEBUG(4,("getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname));
+        debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
         if (!(cli->capabilities & CAP_NOPATHINFO2) &&
                 cli_qpathinfo3(cli, finfo->fname, (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime, NULL,
@@ -737 +737 @@
         {
                 finfo->attr &= 0x7F;
-//DEBUG(2,("gotattr %08x <%s>\n", finfo->attr, finfo->fname));
+//debuglocal(2,("gotattr %08x <%s>\n", finfo->attr, finfo->fname));
 //              finfo->ctime -= get_time_zone(finfo->ctime);
 //              finfo->atime -= get_time_zone(finfo->atime);
@@ -743 +743 @@
                 return 0;
         }
-//DEBUG(2,("getattr rc1 %d\n", os2cli_errno(cli)));
+//debuglocal(2,("getattr rc1 %d\n", os2cli_errno(cli)));
 
         /* if this is NT then don't bother with the getatr */
@@ -761 +761 @@
         if (cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, (size_t *)&finfo->size, (time_t *)&finfo->mtime)) 
         {
-//DEBUG(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
+//debuglocal(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
                 finfo->mtime -= get_time_zone(finfo->mtime);
                 finfo->atime = finfo->mtime;
@@ -822 +822 @@
                 if (st->add_dir_entry)
                 {
-DEBUG(8,("adding <%s> %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen));
+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);
@@ -1029 +1029 @@
         }
         
-        DEBUG(1,("Unknown long filename format %d\n",level));
+        debuglocal(1,"Unknown long filename format %d\n",level);
         return (size_t)IVAL(base,0);
 }
@@ -1072 +1072 @@
         info_level = (cli->capabilities&CAP_NT_SMBS)?260:2;
 
-        DEBUG(4,("list_files level %d. mask <%s>\n", info_level, mask));
+        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
 
         /* when getting a directory listing from a 2k dfs root share, 
@@ -1085 +1085 @@
                 loop_count++;
                 if (loop_count > 200) {
-                        DEBUG(0,("Error: Looping in FIND_NEXT??\n"));
+                        debuglocal(0,"Error: Looping in FIND_NEXT??\n");
                         break;
                 }
@@ -1167 +1167 @@
                                 // we have tried query ea size, but now will try without ea size
                                 info_level = 1;
-                                DEBUG(4,("list_files fallback to level %d\n", info_level));
+                                debuglocal(4,"list_files fallback to level %d\n", info_level);
                                 continue;
                         }
@@ -1190 +1190 @@
                         //ff_lastname = SVAL(p,6);
                 }
-                DEBUG(4,("list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First));
+                debuglocal(4,"list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First);
 
                 if (ff_searchcount == 0) {
@@ -1213 +1213 @@
 
                         if (!First && *mask && strcsequal(finfo.fname, mask)) {
-                                DEBUG(0,("Error: Looping in FIND_NEXT as name %s has already been seen?\n",
-                                        finfo.fname));
+                                debuglocal(0,"Error: Looping in FIND_NEXT as name %s has already been seen?\n",
+                                        finfo.fname);
                                 ff_eos = 1;
                                 break;
@@ -1231 +1231 @@
 
                 if (!dirlist) {
-                        DEBUG(0,("cli_list_new: Failed to expand dirlist\n"));
+                        debuglocal(0,"cli_list_new: Failed to expand dirlist\n");
                         SAFE_FREE(rdata);
                         SAFE_FREE(rparam);
@@ -1245 +1245 @@
                 SAFE_FREE(rparam);
 
-                DEBUG(3,("received %d entries (eos=%d)\n",
-                         ff_searchcount,ff_eos));
+                debuglocal(3,"received %d entries (eos=%d)\n",
+                         ff_searchcount,ff_eos);
 
                 if (ff_searchcount > 0)
@@ -1284 +1284 @@
                 return EINVAL;
         }
-        DEBUG(1,("Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev));
+        debuglocal(1,"Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
         if (*srv->workgroup == 0 && *srv->server_name == 0) 
         {
@@ -1468 +1468 @@
                 if (!cli_get_ea_list_fnum(cli, file->fd, mem_ctx, &num_eas, &ea_list)) 
                 {
-                        DEBUG(4,("ea_get_fnum list failed - %s\n", cli_errstr(cli)));
+                        debuglocal(4,"ea_get_fnum list failed - %s\n", cli_errstr(cli));
                         talloc_destroy(mem_ctx);
                         return os2cli_errno(cli);
@@ -1477 +1477 @@
                 if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) 
                 {
-                        DEBUG(4,("ea_get_file list failed - %s\n", cli_errstr(cli)));
+                        debuglocal(4,"ea_get_file list failed - %s\n", cli_errstr(cli));
                         talloc_destroy(mem_ctx);
                         return os2cli_errno(cli);
@@ -1483 +1483 @@
         }
 
-        DEBUG(4,("num_eas = %d\n", num_eas));
+        debuglocal(4,"num_eas = %d\n", num_eas);
 
         // we will count that os/2 max EA size for file is 64kb
@@ -1490 +1490 @@
         {
                 int namelen = strlen(ea_list[i].name);
-                DEBUG(4, ("%d Got EA <%s> with namelen %d, size %d. Gross %d. Buf %d\n", i, ea_list[i].name, namelen, ea_list[i].value.length, gotsize, size));
+                debuglocal(4, "%d Got EA <%s> with namelen %d, size %d. Gross %d. Buf %d\n", i, ea_list[i].name, namelen, ea_list[i].value.length, gotsize, size);
                 if (namelen > 0xFF || ea_list[i].value.length > 0xFFFF)
                 {
-                        DEBUG(4, ("Skip EA <%s> with namelen %d, size %d\n", ea_list[i].name, namelen, ea_list[i].value.length));
+                        debuglocal(4, "Skip EA <%s> with namelen %d, size %d\n", ea_list[i].name, namelen, ea_list[i].value.length);
                         continue;
                 }
@@ -1510 +1510 @@
         }
         pfealist->cbList = gotsize;
-        DEBUG(4,("ret size = %d\n", gotsize));
+        debuglocal(4,"ret size = %d\n", gotsize);
 
         talloc_destroy(mem_ctx);
@@ -1526 +1526 @@
         }
 
-        DEBUG(4,("EALIst for <%s>\n", fname));
+        debuglocal(4,"EALIst for <%s>\n", fname);
         return unilistea(cli, fname, NULL, buffer, size);
 }
@@ -1540 +1540 @@
         }
 
-        DEBUG(4,("FEALIst for <%s>/%d\n", file->fname, file->fd));
+        debuglocal(4,"FEALIst for <%s>/%d\n", file->fname, file->fd);
         return unilistea(cli, NULL, file, buffer, size);
 }
@@ -1558 +1558 @@
         if (!cli_dskattr(cli, &bsize, &total, &avail)) 
         {
-                DEBUG(4,("Error in dskattr: %s\n",cli_errstr(cli)));
+                debuglocal(4,"Error in dskattr: %s\n",cli_errstr(cli));
                 return os2cli_errno(cli);
         }
 
-        DEBUG(4,("\n\t\t%d blocks of size %d. %d blocks available\n",
-                 total, bsize, avail));
+        debuglocal(4,"\n\t\t%d blocks of size %d. %d blocks available\n",
+                 total, bsize, avail);
 
         // YD currently Samba return it in MB!