Changeset 1227d46e2e899fdfcbfdd42812374171f137adc8

Timestamp:

27/01/05 16:44:34 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1106840674 +0000

git-parent:

[4bc98f0e636c218fdfae184a7be04618fb5e244e]

git-author:

Gildas Bazin <gbazin@videolan.org> 1106840674 +0000

Message:

* modules/access/smb.c: win32 implementation which doesn't depend on libsmbclient + proper URI parsing.

Files:

• configure.ac (modified) (1 diff)
• modules/access/smb.c (modified) (7 diffs)

configure.ac

@@ -978 +978 @@
-    VLC_ADD_PLUGINS([screensaver])
-else
-
-
+
-    VLC_ADD_LDFLAGS([dmo],[-lole32])
-fi

modules/access/smb.c

@@ -30 +30 @@
-#include <vlc/input.h>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -88 +104 @@
-};
-
+#ifdef WIN32
+static void Win32AddConnection( access_t *, char *, char *, char *, char * );
+#endif
+
-void smb_auth( const char *srv, const char *shr, char *wg, int wglen,
-               char *un, int unlen, char *pw, int pwlen )
@@ -102 +122 @@
-    access_sys_t *p_sys;
-    struct stat  filestat;
-
+
+
-    int          i_ret;
-
@@ -112 +133 @@
-#endif
-
+    /* Parse input URI
+     * [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
+
+    psz_path = strchr( p_access->psz_path, '/' );
+    if( !psz_path )
+    {
+        msg_Err( p_access, "invalid SMB URI: smb://%s", psz_path );
+        return VLC_EGENERIC;
+    }
+    else
+    {
+        char *psz_tmp = strdup( p_access->psz_path );
+        char *psz_parser;
+
+        psz_tmp[ psz_path - p_access->psz_path ] = 0;
+        psz_path = p_access->psz_path;
+        psz_parser = strchr( psz_tmp, '@' );
+        if( psz_parser )
+        {
+            /* User info is there */
+            *psz_parser = 0;
+            psz_path = p_access->psz_path + (psz_parser - psz_tmp) + 1;
+
+            psz_parser = strchr( psz_tmp, ':' );
+            if( psz_parser )
+            {
+                /* Password found */
+                psz_pwd = strdup( psz_parser+1 );
+                *psz_parser = 0;
+            }
+
+            psz_parser = strchr( psz_tmp, ';' );
+            if( psz_parser )
+            {
+                /* Domain found */
+                *psz_parser = 0; psz_parser++;
+                psz_domain = strdup( psz_tmp );
+            }
+            else psz_parser = psz_tmp;
+
+            psz_user = strdup( psz_parser );
+        }
+
+        free( psz_tmp );
+    }
+
-    /* Build an SMB URI
-     * smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */
-
-
+if( !psz_user ) 
-    if( psz_user && !*psz_user ) { free( psz_user ); psz_user = 0; }
-
+if( !psz_pwd ) 
-    if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
-
+if(!psz_domain) 
-    if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
-
-
-
+
+
+
+
+
-    if( psz_user )
-        asprintf( &psz_uri, "smb://%s%s%s%s%s@%s",
-                  psz_domain ? psz_domain : "", psz_domain ? ";" : "",
-                  psz_user, psz_pwd ? ":" : "",
-_access->p
+
-    else
-
+
+
-
-    if( psz_user ) free( psz_user );
@@ -169 +240 @@
-
-#else
+
+#ifndef WIN32
-    if( smbc_init( smb_auth, 1 ) )
-    {
@@ -174 +247 @@
-        return VLC_EGENERIC;
-    }
+#endif
-
-    if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
@@ -347 +421 @@
-    return VLC_SUCCESS;
-}
+
+#ifdef WIN32
+static void Win32AddConnection( access_t *p_access, char *psz_path,
+                                char *psz_user, char *psz_pwd,
+                                char *psz_domain )
+{
+    DWORD (*OurWNetAddConnection2)( LPNETRESOURCE, LPCTSTR, LPCTSTR, DWORD );
+    char psz_remote[MAX_PATH], psz_server[MAX_PATH], psz_share[MAX_PATH];
+    NETRESOURCE net_resource;
+    DWORD i_result;
+    char *psz_parser;
+
+    HINSTANCE hdll = LoadLibrary(_T("MPR.DLL"));
+    if( !hdll )
+    {
+        msg_Warn( p_access, "couldn't load mpr.dll" );
+        return;
+    }
+
+    OurWNetAddConnection2 =
+      (void *)GetProcAddress( hdll, _T("WNetAddConnection2A") );
+    if( !OurWNetAddConnection2 )
+    {
+        msg_Warn( p_access, "couldn't find WNetAddConnection2 in mpr.dll" );
+        return;
+    }
+
+    memset( &net_resource, 0, sizeof(net_resource) );
+    net_resource.dwType = RESOURCETYPE_DISK;
+
+    /* Find out server and share names */
+    psz_server[0] = psz_share[0] = 0;
+    psz_parser = strchr( psz_path, '/' );
+    if( psz_parser )
+    {
+        char *psz_parser2;
+        strncat( psz_server, psz_path, psz_parser - psz_path );
+        psz_parser2 = strchr( psz_parser+1, '/' );
+        if( psz_parser2 )
+            strncat( psz_share, psz_parser+1, psz_parser2 - psz_parser -1 );
+    }
+    else strncat( psz_server, psz_path, MAX_PATH );
+
+    sprintf( psz_remote, "\\\\%s\\%s", psz_server, psz_share );
+    net_resource.lpRemoteName = psz_remote;
+
+    i_result = OurWNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 );
+
+    if( i_result != NO_ERROR )
+    {
+        msg_Dbg( p_access, "connected to %s", psz_remote );
+    }
+    else if( i_result != ERROR_ALREADY_ASSIGNED && 
+             i_result != ERROR_DEVICE_ALREADY_REMEMBERED )
+    {
+        msg_Dbg( p_access, "already connected to %s", psz_remote );
+    }
+    else
+    {
+        msg_Dbg( p_access, "failed to connect to %s", psz_remote );
+    }
+
+    FreeLibrary( hdll );
+}
+#endif // WIN32