Changeset 39383

Timestamp:

11/26/16 15:06:24 (7 years ago)

Author:

Stephan

Message:

tryfix allow smbclient connect to smb version >1 (only mipsel)

File:

• titan/plugins/networkbrowser/networkbrowser.h (modified) (57 diffs)

titan/plugins/networkbrowser/networkbrowser.h

@@ -6 +6 @@
 /* Licence: This file is subject to the terms and conditions of the       */
 /*          GNU General Public License version 2.                         */
-/**************************************************************************/    
+/**************************************************************************/
 
 #ifndef NETWORKBROWSER_H
@@ -15 +15 @@
 struct networkbrowser
 {
-        //mode 0 = cifs 
+        //mode 0 = cifs
         //mode 1 = nfs
         //mode 2 = ftp
@@ -53 +53 @@
 {
         if(node == NULL) return;
-        
+
         debug(70, "mode: %s", node->mode);
         debug(70, "sharename: %s", node->sharename);
@@ -82 +82 @@
 {
         if(node == NULL) return;
-        
+
         free(node->mode); node->mode = NULL;
         free(node->sharename); node->sharename = NULL;
@@ -152 +152 @@
         char* tmpstr = NULL;
 
-        newnode = (struct networkbrowser*)malloc(sizeof(struct networkbrowser));        
+        newnode = (struct networkbrowser*)malloc(sizeof(struct networkbrowser));
         if(newnode == NULL)
         {
@@ -191 +191 @@
                 }
                 memset(newnode->dns, 0, 256);
-        
+
                 newnode->sharedir = malloc(256);
                 if(newnode->sharedir == NULL)
@@ -381 +381 @@
                                 #ifdef MIPSEL
                                         ret = sscanf(line, "%s\t-fstype=cifs,%[^,],iocharset=utf8,rsize=%[^,],wsize=%[^,],%*s\t://%[^/]/%s", newnode->sharename, newnode->options, newnode->rsize, newnode->wsize, newnode->ip, newnode->sharedir);
-                                #else                                   
+                                #else
                                         ret = sscanf(line, "%s\t-fstype=cifs,%[^,],rsize=%[^,],wsize=%[^,],%*s\t://%[^/]/%s", newnode->sharename, newnode->options, newnode->rsize, newnode->wsize, newnode->ip, newnode->sharedir);
                                 #endif
@@ -404 +404 @@
                                 {
                                         treffer = 6;
-                                #ifdef MIPSEL   
+                                #ifdef MIPSEL
                                         ret = sscanf(line, "%s\t-fstype=cifs,%[^,],iocharset=utf8,rsize=%[^,],wsize=%[^,],%*s\t://%[^/]/%s", newnode->sharename, newnode->options, newnode->rsize, newnode->wsize, newnode->dns, newnode->sharedir);
                                 #else
@@ -417 +417 @@
                                 #ifdef MIPSEL
                                         ret = sscanf(line, "%s\t-fstype=cifs,%[^,],iocharset=utf8,rsize=%[^,],wsize=%[^,],user=%[^,],pass=%s\t://%[^/]/%s", newnode->sharename, newnode->options, newnode->rsize, newnode->wsize, newnode->username, newnode->password, newnode->dns, newnode->sharedir);
-                                #else   
+                                #else
                                         ret = sscanf(line, "%s\t-fstype=cifs,%[^,],rsize=%[^,],wsize=%[^,],user=%[^,],pass=%s\t://%[^/]/%s", newnode->sharename, newnode->options, newnode->rsize, newnode->wsize, newnode->username, newnode->password, newnode->dns, newnode->sharedir);
                                 #endif
@@ -516 +516 @@
                         else
                                 treffer = 0;
-       
+
                         if(newnode->ftpport != NULL)
                         {
@@ -524 +524 @@
                                         tmpstr[0] = '\0';
                                         free(newnode->sharedir);
-                                        newnode->sharedir = ostrcat(tmpstr + 1, NULL, 0, 0);               
+                                        newnode->sharedir = ostrcat(tmpstr + 1, NULL, 0, 0);
                                 }
                         }
@@ -552 +552 @@
                 }
         }
-        
+
         if(last == NULL)
         {
@@ -573 +573 @@
 
         newnode->next = node;
-        
+
         return newnode;
 }
@@ -580 +580 @@
 {
         if(node == NULL) return;
-        
+
         if(node->mode == NULL || node->mode[0] == '\0') node->mode = ostrcat(node->mode, "0", 1, 0);
         if(node->sharename == NULL || node->sharename[0] == '\0') node->sharename = ostrcat(node->sharename, "SHARENAME", 1, 0);
@@ -621 +621 @@
                 if(ostrcmp(node->mode, "0") == 0)
                 {
-                        
-                        #ifdef MIPSEL                           
-                                savesettings = ostrcat(savesettings, "\t-fstype=cifs,rw,iocharset=utf8,rsize=", 1, 0);
-                        #else   
+
+                        #ifdef MIPSEL
+                                savesettings = ostrcat(savesettings, "\t-fstype=cifs,vers=2.0,rw,iocharset=utf8,rsize=", 1, 0);
+                        #else
                                 savesettings = ostrcat(savesettings, "\t-fstype=cifs,rw,rsize=", 1, 0);
-                        #endif  
-                        
+                        #endif
+
                         savesettings = ostrcat(savesettings, node->rsize, 1, 0);
                         savesettings = ostrcat(savesettings, ",wsize=", 1, 0);
                         savesettings = ostrcat(savesettings, node->wsize, 1, 0);
-                        
+
                         if(ostrcmp(node->userauth, "1") == 0)
                         {
-                                savesettings = ostrcat(savesettings, ",user=", 1, 0); 
+                                savesettings = ostrcat(savesettings, ",user=", 1, 0);
                                 savesettings = ostrcat(savesettings, node->username, 1, 0);
                                 savesettings = ostrcat(savesettings, ",pass=", 1, 0);
@@ -640 +640 @@
                         }
                         else
-                                savesettings = ostrcat(savesettings, ",user=,pass=", 1, 0); 
-                        
+                                savesettings = ostrcat(savesettings, ",user=,pass=", 1, 0);
+
                         savesettings = ostrcat(savesettings, "\t://", 1, 0);
                         if(ostrcmp(node->usedns, "1") == 0)
@@ -664 +664 @@
                         savesettings = ostrcat(savesettings, ",wsize=", 1, 0);
                         savesettings = ostrcat(savesettings, node->wsize, 1, 0);
-                        savesettings = ostrcat(savesettings, ",", 1, 0); 
+                        savesettings = ostrcat(savesettings, ",", 1, 0);
                         savesettings = ostrcat(savesettings, node->protocol, 1, 0);
                         savesettings = ostrcat(savesettings, "\t", 1, 0);
@@ -733 +733 @@
                                 free(tmpstr); tmpstr = NULL;
                         }
-                        
+
                         savesettings = ostrcat(savesettings, "\\:", 1, 0);
 
@@ -744 +744 @@
                                 node->sharedir = string_replace_all("//", "", node->sharedir, 1);
                                 if(!ostrncmp("/", node->sharedir, 1))
-                                        savesettings = ostrcat(savesettings, "/", 1, 0);                                
+                                        savesettings = ostrcat(savesettings, "/", 1, 0);
                                 else
                                         savesettings = ostrcat(savesettings, "//", 1, 0);
@@ -753 +753 @@
                         savesettings = ostrcat(savesettings, "\n", 1, 0);
                 }
-                
+
                 node = node->next;
         }
@@ -762 +762 @@
                 struct skin* blackscreen = getscreen("blackscreen");
                 drawscreen(blackscreen, 0, 0);
-                drawscreen(loadmediadb, 0, 0);  
+                drawscreen(loadmediadb, 0, 0);
 
                 writesys(getconfig("automiscfile", NULL), savesettings, 0);
@@ -837 +837 @@
                         if(fileline[strlen(fileline) - 1] == '\r')
                                 fileline[strlen(fileline) - 1] = '\0';
-        
+
                         linecount++;
-                
+
                         if(fileline != NULL)
                                 addnetworkbrowser(fileline, linecount, NULL);
@@ -874 +874 @@
                 return;
         }
-        
+
         s = ostrcat(s, tmpstr, 1, 0);
         free(tmpstr); tmpstr = NULL;
@@ -880 +880 @@
         s = ostrcat(s, "/24", 1, 0);
         debug(70, "start scanning: %s", s);
-        
+
         nInfo = newNetInfo();
         netzInfo(s, nInfo);
-        
+
         for(i = 0; i < 256; i++)
         {
@@ -919 +919 @@
 
         if(s == NULL || r == NULL || u == NULL || p == NULL || mlist == NULL) return;
-        
+
         sInfo = newShareInfo();
         smbInfo(s, r, u, p, sInfo);
-        
+
         for (i = 0; i < 128; i++)
         {
@@ -940 +940 @@
                         debug(70, "rech: %s", r);
                         debug(70, "rechip: %s", s);
-                        debug(70, "----------------------------------------------------------", sInfo[i].sharename);                    
+                        debug(70, "----------------------------------------------------------", sInfo[i].sharename);
                         tmpstr = ostrcat(tmpstr , "(cifs) ", 1, 0);
                         tmpstr = ostrcat(tmpstr , strstrip(s), 1, 0);
@@ -996 +996 @@
                 debug(70, "%s", tmpstr2);
                 debug(70, "----------------------");
-                                
+
                 free(tmpstr1), tmpstr1 = NULL;
 
@@ -1005 +1005 @@
                         cmd = ostrcat(cmd , r, 1, 0);
                         debug(70, "cmd: %s", cmd);
-        
+
                         tmpstr1 = command(cmd);
                         debug(70, "------ result 3 ------");
@@ -1033 +1033 @@
                                         textbox(_("Message"), _("Anonymous login Access Denied !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 5, 0);
                         }
-                        
+
                         free(tmpstr1), tmpstr1 = NULL;
                 }
@@ -1046 +1046 @@
                         else if(ostrstr(tmpstr2, "Anonymous login successful") != NULL)
                                 textbox(_("Message"), _("Anonymous login successful"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 5, 0);
-                                        
+
                         char* tmpstr3 = ostrcat("\t", tmpstr2, 0, 0);
 
@@ -1072 +1072 @@
 
                                         char* tmpstr4 = ostrcat(ret1[j].part, NULL, 0, 0);
-                                        
+
                                         strstrip(tmpstr4);
                                         char* tmpstr5 = ostrcat(tmpstr4 + 15, NULL, 0, 0);
@@ -1080 +1080 @@
                                         char* tmpstr6 = string_resub("\t", tmpstr5, ret1[j].part, 0);
 
-                                        stringreplacechar(tmpstr5, ' ', '\0');                                                                  
+                                        stringreplacechar(tmpstr5, ' ', '\0');
 
                                         debug(70, "----------------------------------------------------------", sInfo[i].sharename);
@@ -1089 +1089 @@
                                         debug(70, "rechip: %s", s);
                                         debug(70, "----------------------------------------------------------", sInfo[i].sharename);
-                                                
+
                                         tmpstr = ostrcat(tmpstr , "(cifs) ", 1, 0);
                                         tmpstr = ostrcat(tmpstr , strstrip(s), 1, 0);
                                         tmpstr = ostrcat(tmpstr , ": /", 1, 0);
                                         tmpstr = ostrcat(tmpstr , strstrip(tmpstr6), 1, 0);
-                                        free(tmpstr5), tmpstr5 = NULL;  
+                                        free(tmpstr5), tmpstr5 = NULL;
                                         free(tmpstr7), tmpstr7 = NULL;
 /*
@@ -1132 +1132 @@
 
         if(s == NULL || r == NULL || mlist == NULL) return;
-        
+
         nfsInfo = newNfsInfo();
         err = showNfsShare(s, nfsInfo);
-        
+
         if (err == 0)
         {
@@ -1178 +1178 @@
         struct skin* load = getscreen("loading");
         struct inetwork *net = inetwork;
-        
+
         status.hangtime = 99999;
         changetitle(net_scan, _("Scanning Network Shares, please wait !!"));
@@ -1223 +1223 @@
                 debug(70, "pass: %s",pass);
 
-                getnetworkbrowser_cifs(&mlist1, mbox->param, mbox->param1, user, pass);         
+                getnetworkbrowser_cifs(&mlist1, mbox->param, mbox->param1, user, pass);
                 getnetworkbrowser_nfs(&mlist1, mbox->param, mbox->param1);
                 clearscreen(load);
@@ -1313 +1313 @@
         struct skin* blackscreen = getscreen("blackscreen");
         drawscreen(blackscreen, 0, 0);
-        drawscreen(loadmediadb, 0, 0);  
+        drawscreen(loadmediadb, 0, 0);
 
         unlink("/media/hdd");
@@ -1379 +1379 @@
                 skin_proxypass->hidden = YES;
                 skin_ftpport->hidden = YES;
-                skin_userauth->hidden = NO;             
+                skin_userauth->hidden = NO;
                 skin_proxyauth->hidden = YES;
                 skin_useproxy->hidden = YES;
@@ -1394 +1394 @@
                 {
                         skin_dns->hidden = NO;
-                        skin_ip->hidden = YES;          
+                        skin_ip->hidden = YES;
                 }
 
@@ -1445 +1445 @@
                 {
                         skin_dns->hidden = NO;
-                        skin_ip->hidden = YES;          
+                        skin_ip->hidden = YES;
                 }
         }
@@ -1457 +1457 @@
                 if(titletext != status.skinerr) changetext(titletext, tmpstr);
                 free(tmpstr); tmpstr = NULL;
-                
+
                 skin_protocol->hidden = YES;
                 skin_rsize->hidden = YES;
@@ -1468 +1468 @@
                 skin_sharedir->hidden = NO;
                 skin_usedns->hidden = NO;
-                
+
                 if(ostrcmp(node->userauth, "0") == 0)
                 {
@@ -1479 +1479 @@
                         skin_password->hidden = NO;
                 }
-                
+
                 if(ostrcmp(node->usessl, "0") == 0)
                         skin_ssl->hidden = YES;
@@ -1519 +1519 @@
                 {
                         skin_dns->hidden = NO;
-                        skin_ip->hidden = YES;          
+                        skin_ip->hidden = YES;
                 }
         }
@@ -1568 +1568 @@
         }
         if(node == NULL) return;
-        
+
         if(newnode == 0)
                 b3->hidden = NO;
@@ -1578 +1578 @@
         debugnetworkbrowser(node);
         debug(70, "--------------------");
-        
+
         addchoicebox(skin_mode, "0", _("cifs"));
         addchoicebox(skin_mode, "1", _("nfs"));
@@ -1648 +1648 @@
         {
                 tmpstr = ostrcat(tmpstr, "1", 1, 0);
-                node->userauth = ostrcat(tmpstr, NULL, 0, 0); 
+                node->userauth = ostrcat(tmpstr, NULL, 0, 0);
         }
         addchoicebox(skin_userauth, "0", _("no"));
@@ -1654 +1654 @@
         setchoiceboxselection(skin_userauth, tmpstr);
         free(tmpstr); tmpstr = NULL;
-        
+
         addchoicebox(skin_proxyauth, "0", _("no"));
         addchoicebox(skin_proxyauth, "1", _("yes"));
@@ -1676 +1676 @@
         changemask(skin_proxypass, "abcdefghijklmnopqrstuvwxyz");
         changeinput(skin_proxypass, node->proxypass);
-                
+
         changemask(skin_username, "abcdefghijklmnopqrstuvwxyz");
         changeinput(skin_username, node->username);
@@ -1686 +1686 @@
                 tmpstr = ostrcat(tmpstr, "1", 1, 0);
 
-//      if(ostrcmp(node->sharedir, "Aufnahme") == 0 || ostrcmp(node->sharedir, "record") == 0)  
+//      if(ostrcmp(node->sharedir, "Aufnahme") == 0 || ostrcmp(node->sharedir, "record") == 0)
 //      {
 //              addchoicebox(skin_hddreplacement, "1", _("yes"));
@@ -1753 +1753 @@
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
-                
+
                 if(newnode == 0 && rcret == getrcconfigint("rcred", NULL) && checknetworkbrowserexist(node) == 0)
                 {
@@ -1832 +1832 @@
         if(pass == NULL)
                 pass = ostrcat("pass", NULL, 0, 0);
-                                        
+
         changemask(username, "abcdefghijklmnopqrstuvwxyz");
         changeinput(username, user);
         free(user), user = NULL;
-        
+
         changemask(password, "abcdefghijklmnopqrstuvwxyz");
         changeinput(password, pass);
@@ -1870 +1870 @@
         struct menulist* mlist = NULL, *mbox = NULL;
         char* tmpstr = NULL, *tmppic = NULL;
-        
+
         status.hangtime = 99999;
 
@@ -1876 +1876 @@
         freenetworkbrowser(); networkbrowser = NULL;
         readnetworkbrowser(getconfig("automiscfile", NULL), 0);
-        
+
         node = networkbrowser;
         while(node != NULL)
@@ -1907 +1907 @@
                 tmpstr = ostrcat(tmpstr, node->sharedir, 1, 0);
                 tmpstr = ostrcat(tmpstr, ")", 1, 0);
-        
+
                 struct menulist* tmpmlist = addmenulist(&mlist, tmpstr, NULL, tmppic, 0, 0);
                 if(tmpmlist != NULL) tmpmlist->param = (char*)node;
@@ -1914 +1914 @@
                 node = node->next;
         }
-        
+
         mbox = menulistboxext(mlist, "networkbrowser", _("Networkbrowser - show Shares"), _("Choose your Shares from the following list"), "%pluginpath%/networkbrowser/skin/", NULL, 1, &rcret, 0);
 
@@ -1940 +1940 @@
                 goto start;
         }
-        
+
         if(mbox != NULL)
         {