SMB preparatory work

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Bill Medland (billmedland@mercuryspeed.com)
A little SMB preparatory work:
Don't publish internal information.
Add a function for detecting UNC names.
Account for the fact that NT allows either separator character.

Index: smb.h
===================================================================
RCS file: /home/wine/wine/files/smb.h,v
retrieving revision 1.4
diff -u -r1.4 smb.h
--- smb.h	27 Aug 2002 01:13:59 -0000	1.4
+++ smb.h	20 Jun 2003 20:09:02 -0000
@@ -19,81 +19,8 @@
 #ifndef __INC_SMB__
 #define __INC_SMB__
 
-#define NBR_ADDWORD(p,word) { (p)[1] = (word & 0xff); (p)[0] = ((word)>>8)&0xff; }
-#define NBR_GETWORD(p) ( (((p)[0])<<8) | ((p)[1]) )
-
-#define SMB_ADDWORD(p,word) { (p)[0] = (word & 0xff); (p)[1] = ((word)>>8)&0xff; }
-#define SMB_GETWORD(p) ( (((p)[1])<<8) | ((p)[0]) )
-#define SMB_ADDDWORD(p,w) { (p)[3]=((w)>>24)&0xff; (p)[2]=((w)>>16)&0xff; (p)[1]=((w)>>8)&0xff; (p)[0]=(w)&0xff; }
-#define SMB_GETDWORD(p) ( (((p)[3])<<24) | (((p)[2])<<16) | (((p)[1])<<8) | ((p)[0]) )
-
-#define SMB_COM_CREATE_DIRECTORY       0x00
-#define SMB_COM_DELETE_DIRECTORY       0x01
-#define SMB_COM_OPEN                   0x02
-#define SMB_COM_CREATE                 0x03
-#define SMB_COM_CLOSE                  0x04
-#define SMB_COM_FLUSH                  0x05
-#define SMB_COM_DELETE                 0x06
-#define SMB_COM_RENAME                 0x07
-#define SMB_COM_QUERY_INFORMATION      0x08
-#define SMB_COM_SET_INFORMATION        0x09
-#define SMB_COM_READ                   0x0A
-#define SMB_COM_WRITE                  0x0B
-#define SMB_COM_LOCK_BYTE_RANGE        0x0C
-#define SMB_COM_UNLOCK_BYTE_RANGE      0x0D
-#define SMB_COM_CREATE_TEMPORARY       0x0E
-#define SMB_COM_CREATE_NEW             0x0F
-#define SMB_COM_CHECK_DIRECTORY        0x10
-#define SMB_COM_PROCESS_EXIT           0x11
-#define SMB_COM_SEEK                   0x12
-#define SMB_COM_LOCK_AND_READ          0x13
-#define SMB_COM_WRITE_AND_UNLOCK       0x14
-#define SMB_COM_READ_RAW               0x1A
-#define SMB_COM_READ_MPX               0x1B
-#define SMB_COM_READ_MPX_SECONDARY     0x1C
-#define SMB_COM_WRITE_RAW              0x1D
-#define SMB_COM_WRITE_MPX              0x1E
-#define SMB_COM_WRITE_COMPLETE         0x20
-#define SMB_COM_SET_INFORMATION2       0x22
-#define SMB_COM_QUERY_INFORMATION2     0x23
-#define SMB_COM_LOCKING_ANDX           0x24
-#define SMB_COM_TRANSACTION            0x25
-#define SMB_COM_TRANSACTION_SECONDARY  0x26
-#define SMB_COM_IOCTL                  0x27
-#define SMB_COM_IOCTL_SECONDARY        0x28
-#define SMB_COM_COPY                   0x29
-#define SMB_COM_MOVE                   0x2A
-#define SMB_COM_ECHO                   0x2B
-#define SMB_COM_WRITE_AND_CLOSE        0x2C
-#define SMB_COM_OPEN_ANDX              0x2D
-#define SMB_COM_READ_ANDX              0x2E
-#define SMB_COM_WRITE_ANDX             0x2F
-#define SMB_COM_CLOSE_AND_TREE_DISC    0x31
-#define SMB_COM_TRANSACTION2           0x32
-#define SMB_COM_TRANSACTION2_SECONDARY 0x33
-#define SMB_COM_FIND_CLOSE2            0x34
-#define SMB_COM_FIND_NOTIFY_CLOSE      0x35
-#define SMB_COM_TREE_CONNECT           0x70
-#define SMB_COM_TREE_DISCONNECT        0x71
-#define SMB_COM_NEGOTIATE              0x72
-#define SMB_COM_SESSION_SETUP_ANDX     0x73
-#define SMB_COM_LOGOFF_ANDX            0x74
-#define SMB_COM_TREE_CONNECT_ANDX      0x75
-#define SMB_COM_QUERY_INFORMATION_DISK 0x80
-#define SMB_COM_SEARCH                 0x81
-#define SMB_COM_FIND                   0x82
-#define SMB_COM_FIND_UNIQUE            0x83
-#define SMB_COM_NT_TRANSACT            0xA0
-#define SMB_COM_NT_TRANSACT_SECONDARY  0xA1
-#define SMB_COM_NT_CREATE_ANDX         0xA2
-#define SMB_COM_NT_CANCEL              0xA4
-#define SMB_COM_OPEN_PRINT_FILE        0xC0
-#define SMB_COM_WRITE_PRINT_FILE       0xC1
-#define SMB_COM_CLOSE_PRINT_FILE       0xC2
-#define SMB_COM_GET_PRINT_QUEUE        0xC3
-
-#define TRANS2_FIND_FIRST2             0x01
-#define TRANS2_FIND_NEXT2              0x02
+extern inline int SMB_isSepW (WCHAR c) {return (c == '\\' || c == '/');}
+extern inline int SMB_isUNCW (LPCWSTR filename) {return (filename && SMB_isSepW (filename[0]) && SMB_isSepW (filename[1]));}
 
 extern BOOL WINAPI SMB_ReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED lpOverlapped);
 extern HANDLE WINAPI SMB_CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
Index: smb.c
===================================================================
RCS file: /home/wine/wine/files/smb.c,v
retrieving revision 1.18
diff -u -r1.18 smb.c
--- smb.c	18 Jun 2003 19:45:22 -0000	1.18
+++ smb.c	20 Jun 2003 20:09:02 -0000
@@ -113,9 +113,93 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(file);
 
+#define NBR_ADDWORD(p,word) { (p)[1] = (word & 0xff); (p)[0] = ((word)>>8)&0xff; }
+#define NBR_GETWORD(p) ( (((p)[0])<<8) | ((p)[1]) )
+
+#define SMB_ADDWORD(p,word) { (p)[0] = (word & 0xff); (p)[1] = ((word)>>8)&0xff; }
+#define SMB_GETWORD(p) ( (((p)[1])<<8) | ((p)[0]) )
+#define SMB_ADDDWORD(p,w) { (p)[3]=((w)>>24)&0xff; (p)[2]=((w)>>16)&0xff; (p)[1]=((w)>>8)&0xff; (p)[0]=(w)&0xff; }
+#define SMB_GETDWORD(p) ( (((p)[3])<<24) | (((p)[2])<<16) | (((p)[1])<<8) | ((p)[0]) )
+
+#define SMB_COM_CREATE_DIRECTORY       0x00
+#define SMB_COM_DELETE_DIRECTORY       0x01
+#define SMB_COM_OPEN                   0x02
+#define SMB_COM_CREATE                 0x03
+#define SMB_COM_CLOSE                  0x04
+#define SMB_COM_FLUSH                  0x05
+#define SMB_COM_DELETE                 0x06
+#define SMB_COM_RENAME                 0x07
+#define SMB_COM_QUERY_INFORMATION      0x08
+#define SMB_COM_SET_INFORMATION        0x09
+#define SMB_COM_READ                   0x0A
+#define SMB_COM_WRITE                  0x0B
+#define SMB_COM_LOCK_BYTE_RANGE        0x0C
+#define SMB_COM_UNLOCK_BYTE_RANGE      0x0D
+#define SMB_COM_CREATE_TEMPORARY       0x0E
+#define SMB_COM_CREATE_NEW             0x0F
+#define SMB_COM_CHECK_DIRECTORY        0x10
+#define SMB_COM_PROCESS_EXIT           0x11
+#define SMB_COM_SEEK                   0x12
+#define SMB_COM_LOCK_AND_READ          0x13
+#define SMB_COM_WRITE_AND_UNLOCK       0x14
+#define SMB_COM_READ_RAW               0x1A
+#define SMB_COM_READ_MPX               0x1B
+#define SMB_COM_READ_MPX_SECONDARY     0x1C
+#define SMB_COM_WRITE_RAW              0x1D
+#define SMB_COM_WRITE_MPX              0x1E
+#define SMB_COM_WRITE_COMPLETE         0x20
+#define SMB_COM_SET_INFORMATION2       0x22
+#define SMB_COM_QUERY_INFORMATION2     0x23
+#define SMB_COM_LOCKING_ANDX           0x24
+#define SMB_COM_TRANSACTION            0x25
+#define SMB_COM_TRANSACTION_SECONDARY  0x26
+#define SMB_COM_IOCTL                  0x27
+#define SMB_COM_IOCTL_SECONDARY        0x28
+#define SMB_COM_COPY                   0x29
+#define SMB_COM_MOVE                   0x2A
+#define SMB_COM_ECHO                   0x2B
+#define SMB_COM_WRITE_AND_CLOSE        0x2C
+#define SMB_COM_OPEN_ANDX              0x2D
+#define SMB_COM_READ_ANDX              0x2E
+#define SMB_COM_WRITE_ANDX             0x2F
+#define SMB_COM_CLOSE_AND_TREE_DISC    0x31
+#define SMB_COM_TRANSACTION2           0x32
+#define SMB_COM_TRANSACTION2_SECONDARY 0x33
+#define SMB_COM_FIND_CLOSE2            0x34
+#define SMB_COM_FIND_NOTIFY_CLOSE      0x35
+#define SMB_COM_TREE_CONNECT           0x70
+#define SMB_COM_TREE_DISCONNECT        0x71
+#define SMB_COM_NEGOTIATE              0x72
+#define SMB_COM_SESSION_SETUP_ANDX     0x73
+#define SMB_COM_LOGOFF_ANDX            0x74
+#define SMB_COM_TREE_CONNECT_ANDX      0x75
+#define SMB_COM_QUERY_INFORMATION_DISK 0x80
+#define SMB_COM_SEARCH                 0x81
+#define SMB_COM_FIND                   0x82
+#define SMB_COM_FIND_UNIQUE            0x83
+#define SMB_COM_NT_TRANSACT            0xA0
+#define SMB_COM_NT_TRANSACT_SECONDARY  0xA1
+#define SMB_COM_NT_CREATE_ANDX         0xA2
+#define SMB_COM_NT_CANCEL              0xA4
+#define SMB_COM_OPEN_PRINT_FILE        0xC0
+#define SMB_COM_WRITE_PRINT_FILE       0xC1
+#define SMB_COM_CLOSE_PRINT_FILE       0xC2
+#define SMB_COM_GET_PRINT_QUEUE        0xC3
+
+#define TRANS2_FIND_FIRST2             0x01
+#define TRANS2_FIND_NEXT2              0x02
+
 #define MAX_HOST_NAME 15
 #define NB_TIMEOUT 10000
 
+/* We only need the A versions locally currently */
+static inline int SMB_isSepA (CHAR c) {return (c == '\\' || c == '/');}
+static inline int SMB_isUNCA (LPCSTR filename) {return (filename && SMB_isSepW (filename[0]) && SMB_isSepW (filename[1]));}
+static inline CHAR *SMB_nextSepA (CHAR *s) {while (*s && !SMB_isSepA (*s)) s++; return (*s? s : 0);}
+/* NB SM_nextSepA cannot return const CHAR * since it is going to be used for
+ * replacing separators with null characters
+ */
+
 USHORT SMB_MultiplexId = 0;
 
 struct NB_Buffer
@@ -182,21 +266,18 @@
 
     TRACE("%s\n",unc);
 
-    p = strchr(unc,'\\');
-    if(!p)
-        return FALSE;
-    p = strchr(p+1,'\\');
-    if(!p)
+    if (!SMB_isUNCA (unc))
         return FALSE;
-    *hostname=++p;
+    p = unc + 2;
+    *hostname=p;
 
-    p = strchr(p,'\\');
+    p = SMB_nextSepA (p);
     if(!p)
         return FALSE;
     *p=0;
     *share = ++p;
 
-    p = strchr(p,'\\');
+    p = SMB_nextSepA (p);
     if(!p)
         return FALSE;
     *p=0;
@@ -1211,7 +1292,7 @@
     struct SMB_Trans2Info send, recv;
     SMB_DIR *smbdir = NULL;
 
-    TRACE("patern = %s\n",filename);
+    TRACE("pattern = %s\n",filename);
 
     if(!SMB_SetupFindFirst(&send, filename))
         return FALSE;

-- 
Bill Medland
mailto:billmedland@mercuryspeed.com
http://webhome.idirect.com/~kbmed



[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux