Attachment 10309 Details for Bug 33242

[patch] new version of the patch

kdenetwork-3.0.3-lanbrowser.patch (text/plain), 16.46 KB, created by Olaf Kirch on 2002-08-30 22:44:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Kirch

Created: 2002-08-30 22:44:25 UTC

Size: 16.46 KB

patch

obsolete

>--- kdenetwork-3.0.3/lanbrowsing/kio_lan/kio_lan.cpp.lanbrowser	Thu Jan  3 21:34:12 2002
>+++ kdenetwork-3.0.3/lanbrowsing/kio_lan/kio_lan.cpp	Thu Aug 29 12:24:46 2002
>@@ -129,96 +129,105 @@
>    return 0;
> };
> 
>-int LANProtocol::lanReadDataFromServer()
>+// The next two functions should probably go into some common
>+// class, because they're also needed by lisa
>+int
>+LANProtocol::commonReadDataFromServer(int fd, char **bufp)
> {
>-   kdDebug(7101)<<"LANProtocol::lanReadDataFromServer() host: "<<m_currentHost<<" port: "<<m_port<<endl;
>-   connectToHost(m_currentHost.latin1(), m_port);
>-   kdDebug(7101)<<"LANProtocol::lanReadDataFromServer() connected"<<endl;
>-
>    int receivedBytes(0);
>    char* receiveBuffer(0);
>-   char tmpBuf[64*1024];
>-   int bytesRead(0);
>-   do
>-   {
>-      fd_set tmpFDs;
>-      FD_ZERO(&tmpFDs);
>-      FD_SET(m_iSock,&tmpFDs);
>+
>+   *bufp = NULL;
>+   while (1) {
>+      fd_set rset;
>       timeval tv;
>+
>+      FD_ZERO(&rset);
>+      FD_SET(fd, &rset);
>       tv.tv_sec = 1;
>       tv.tv_usec = 0;
>-      select(m_iSock+1,&tmpFDs,0,0,&tv);
>-      if (FD_ISSET(m_iSock,&tmpFDs))
>-      {
>-         bytesRead=read(tmpBuf,64*1024);
>+      select(fd+1, &rset, 0, 0, &tv);
>+      if (FD_ISSET(fd, &rset)) {
>+	 char tmpBuf[4096];
>+         int bytesRead;
>+	 
>+	 bytesRead = ::read(fd, tmpBuf, sizeof(tmpBuf));
>          kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: read "<<bytesRead<<" bytes"<<endl;
> 
>-         if (bytesRead>0)
>-         {
>-            char *newBuf=new char[receivedBytes+bytesRead];
>-            if (receiveBuffer!=0) memcpy(newBuf,receiveBuffer,receivedBytes);
>-            memcpy(newBuf+receivedBytes,tmpBuf,bytesRead);
>-            receivedBytes+=bytesRead;
>-            if (receiveBuffer!=0) delete [] receiveBuffer;
>-            receiveBuffer=newBuf;
>-         };
>-      };
>-   } while (bytesRead>0);
>-   closeDescriptor();
>-   if ((bytesRead<0) || (receivedBytes<4))
>-   {
>-      delete [] receiveBuffer;
>-      error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost));
>-      return 0;
>-   };
>+	 if (bytesRead < 0) {
>+	    if (receiveBuffer)
>+	       delete [] receiveBuffer;
>+	    return -1;
>+	 }
>+
>+         if (bytesRead == 0)
>+	    break;
>+
>+         char *newBuf = new char[receivedBytes + bytesRead];
>+         if (receiveBuffer!=0)
>+	   memcpy(newBuf, receiveBuffer, receivedBytes);
>+         memcpy(newBuf + receivedBytes, tmpBuf, bytesRead);
>+         if (receiveBuffer!=0)
>+	   delete [] receiveBuffer;
>+         receiveBuffer = newBuf;
>+         receivedBytes += bytesRead;
>+      }
>+   }
> 
>-   UDSEntry entry;
>+   *bufp = receiveBuffer;
>+   return receivedBytes;
>+}
>+
>+// Data sent by the server contains several lines separated by NUL
>+// characters. Each of this lines is newline terminated.
>+int
>+LANProtocol::commonParseData(const char *data, size_t len, UDSEntry &entry)
>+{
>+   const char *endOfData = data + len;
>+   unsigned long hostAddress;
>+   QString hostName;
> 
>-   char *currentBuf=receiveBuffer;
>-   int bytesLeft=receivedBytes;
>-   int tmpIP;
>-   //this should be large enough for a name
>-   char tmpName[1024];
>-   //this should be large enough for the hostname
>-   char tmpHostname[512];
>-   while (bytesLeft>0)
>-   {
>-      if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0))
>-      {
>-         delete [] receiveBuffer;
>-         error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost));
>+   while (data < endOfData) {
>+      char *nextLine;
>+
>+      if (!(nextLine = (char *) memchr(data, 0, endOfData - data)))
>          return 0;
>-      };
>-      kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: processing "<<currentBuf;
>-      sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName);
>-      //since we check for 0 and \n with memchr() we can be sure
>-      //at this point that tmpBuf is correctly terminated
>-      int length=strlen(currentBuf)+1;
>-      bytesLeft-=length;
>-      currentBuf+=length;
>-      if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1)))
>-      {
>+
>+      // We now know it's NUL terminated so we can treat it like any other
>+      // string
>+      kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: processing "<<data;
>+
>+      QString line(data);
>+      int idx;
>+
>+      data = nextLine + 1;
>+      if ((idx = line.find(' ')) < 0)
>+          continue;
>+      hostAddress = line.left(idx).toULong();
>+      line.remove(0, idx+1);
>+
>+      if ((idx = line.find('\n')) < 0 || idx > 512)
>+          continue;
>+      line.truncate(idx);
>+      hostName = line;
>+
>+      if (data >= endOfData
>+       && hostName.contains("succeeded")
>+       && (hostAddress == 0 || hostAddress == 1)) {
>          kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: succeeded"<<endl;
>-      }
>-      else
>-      {
>-         kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
>+      } else {
>+         kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<hostName<<" with ip: "<<hostAddress<<endl;
>          UDSAtom atom;
> 
>          atom.m_uds = KIO::UDS_NAME;
>-         if (m_shortHostnames)
>-         {
>-            if (inet_addr(tmpName)!=-1)
>-               atom.m_str=tmpName;
>-            else
>-            {
>-               sscanf(tmpName,"%[^.]",tmpHostname);
>-               kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: Hostname of " << tmpName <<  " is " << tmpHostname << "\n";
>-               atom.m_str = tmpHostname;
>-            };
>-         }
>-         else
>-            atom.m_str = tmpName;
>+
>+	 // Remove eveything after the first dot it user
>+	 // requested short hostnames
>+         if (m_shortHostnames
>+          && inet_addr(hostName.ascii()) == -1
>+	  && (idx = hostName.find('.')) > 0)
>+	    hostName.truncate(idx);
>+         atom.m_str = hostName;
> 
>          entry.append( atom );
>          atom.m_uds = KIO::UDS_SIZE;
>@@ -232,9 +241,38 @@
>          atom.m_long = S_IFDIR; // it is always a directory
>          entry.append( atom );
>          listEntry(entry,false);
>-      };
>+      }
>+   }
>+
>+   return 1;
>+}
>+
>+int LANProtocol::lanReadDataFromServer()
>+{
>+   kdDebug(7101)<<"LANProtocol::lanReadDataFromServer() host: "<<m_currentHost<<" port: "<<m_port<<endl;
>+   connectToHost(m_currentHost.latin1(), m_port);
>+   kdDebug(7101)<<"LANProtocol::lanReadDataFromServer() connected"<<endl;
>+
>+   int receivedBytes(0);
>+   char* receiveBuffer(0);
>+
>+   receivedBytes = commonReadDataFromServer(m_iSock, &receiveBuffer);
>+   closeDescriptor();
>+
>+   if (receivedBytes < 4)
>+   {
>+      error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost));
>+      return 0;
>    };
> 
>+   UDSEntry entry;
>+
>+   if (!commonParseData(receiveBuffer, receivedBytes, entry)) {
>+      delete [] receiveBuffer;
>+      error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost));
>+      return 0;
>+   }
>+
>    listEntry( entry, true ); // ready
>    delete [] receiveBuffer;
>    return 1;
>@@ -248,6 +286,10 @@
>    sockaddr_un addr;
>    memset((char*)&addr,0,sizeof(addr));
>    addr.sun_family=AF_LOCAL;
>+
>+   // XXX This is not a good idea. Please use the standard
>+   // KDE socket locations for this; connecting to
>+   // /tmp/whatnot is insecure.   --okir
>    QCString socketname="/tmp/resLisa-";
> 
>    struct passwd *user = getpwuid( getuid() );
>@@ -302,37 +344,11 @@
> 
>    int receivedBytes(0);
>    char* receiveBuffer(0);
>-   char tmpBuf[64*1024];
>-   int bytesRead(0);
>-   do
>-   {
>-      fd_set tmpFDs;
>-      FD_ZERO(&tmpFDs);
>-      FD_SET(sockFD,&tmpFDs);
>-      timeval tv;
>-      tv.tv_sec = 1;
>-      tv.tv_usec = 0;
>-      select(sockFD+1,&tmpFDs,0,0,&tv);
>-      if (FD_ISSET(sockFD,&tmpFDs))
>-      {
>-         bytesRead=::read(sockFD,tmpBuf,64*1024);
>-         kdDebug(7101)<<"RLANProtocol::readDataFromServer: read "<<bytesRead<<" bytes"<<endl;
> 
>-         if (bytesRead>0)
>-         {
>-            char *newBuf=new char[receivedBytes+bytesRead];
>-            if (receiveBuffer!=0) memcpy(newBuf,receiveBuffer,receivedBytes);
>-            memcpy(newBuf+receivedBytes,tmpBuf,bytesRead);
>-            receivedBytes+=bytesRead;
>-            if (receiveBuffer!=0) delete [] receiveBuffer;
>-            receiveBuffer=newBuf;
>-         };
>-      };
>-   } while (bytesRead>0);
>+   receivedBytes = commonReadDataFromServer(sockFD, &receiveBuffer);
>    ::close(sockFD);
> 
>-
>-   if ((bytesRead<0) || (receivedBytes<4))
>+   if (receivedBytes < 4)
>    {
>       delete [] receiveBuffer;
>       error(ERR_CANNOT_OPEN_FOR_READING,socketname);
>@@ -342,65 +358,11 @@
> 
>    UDSEntry entry;
> 
>-   char *currentBuf=receiveBuffer;
>-   int bytesLeft=receivedBytes;
>-   int tmpIP;
>-   //this should be large enough for a name
>-   char tmpName[1024];
>-   //this should be large enough for the hostname
>-   char tmpHostname[512];
>-   while (bytesLeft>0)
>-   {
>-      if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0))
>-      {
>-         delete [] receiveBuffer;
>-         error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(socketname));
>-         return 0;
>-      };
>-      kdDebug(7101)<<"RLANProtocol::readDataFromServer: processing "<<currentBuf;
>-      sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName);
>-      //since we check for 0 and \n with memchr() we can be sure
>-      //at this point that tmpBuf is correctly terminated
>-      int length=strlen(currentBuf)+1;
>-      bytesLeft-=length;
>-      currentBuf+=length;
>-      if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1)))
>-      {
>-         kdDebug(7101)<<"RLANProtocol::readDataFromServer: succeeded"<<endl;
>-      }
>-      else
>-      {
>-         kdDebug(7101)<<"RLANProtocol::readDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
>-         UDSAtom atom;
>-
>-         atom.m_uds = KIO::UDS_NAME;
>-         if (m_shortHostnames)
>-         {
>-            if (inet_addr(tmpName)!=-1)
>-               atom.m_str=tmpName;
>-            else
>-            {
>-               sscanf(tmpName,"%[^.]",tmpHostname);
>-               kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: Hostname of " << tmpName <<  " is " << tmpHostname << "\n";
>-               atom.m_str = tmpHostname;
>-            };
>-         }
>-         else
>-            atom.m_str = tmpName;
>-         entry.append( atom );
>-         atom.m_uds = KIO::UDS_SIZE;
>-         atom.m_long = 1024;
>-         entry.append(atom);
>-         atom.m_uds = KIO::UDS_ACCESS;
>-         atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
>-         //atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
>-         entry.append(atom);
>-         atom.m_uds = KIO::UDS_FILE_TYPE;
>-         atom.m_long = S_IFDIR; // it is always a directory
>-         entry.append( atom );
>-         listEntry(entry,false);
>-      };
>-   };
>+   if (!commonParseData(receiveBuffer, receivedBytes, entry)) {
>+      delete [] receiveBuffer;
>+      error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(socketname));
>+      return 0;
>+   }
> 
>    listEntry( entry, true ); // ready
>    delete [] receiveBuffer;
>@@ -436,7 +398,7 @@
>          delete hostInfo;
>          return 0;
>       }
>-      memcpy(&ip, hp->h_addr, hp->h_length);
>+      memcpy(&ip, hp->h_addr, sizeof(ip));
> 
>       for (int i=0; i<KIOLAN_MAX; i++)
>       {
>--- kdenetwork-3.0.3/lanbrowsing/kio_lan/kio_lan.h.lanbrowser	Thu Jan  3 21:34:12 2002
>+++ kdenetwork-3.0.3/lanbrowsing/kio_lan/kio_lan.h	Thu Aug 29 12:24:17 2002
>@@ -69,6 +69,8 @@
>       int readDataFromServer();
>       int lanReadDataFromServer();
>       int rlanReadDataFromServer();
>+      int commonReadDataFromServer(int fd, char **bufp);
>+      int commonParseData(const char *data, size_t len, KIO::UDSEntry &entry);
>       int checkHost(const QString& host);
>       int checkPort(int _port, in_addr ip);
>       QString m_currentHost;
>--- kdenetwork-3.0.3/lanbrowsing/lisa/mystring.h.lanbrowser	Thu Feb 15 01:33:33 2001
>+++ kdenetwork-3.0.3/lanbrowsing/lisa/mystring.h	Wed Aug 28 13:04:52 2002
>@@ -5,6 +5,7 @@
> #include <string.h>
> #include <strings.h>
> #include <stdio.h>
>+#include <stdarg.h>
> 
> class MyString: public std::string
> {
>@@ -33,6 +34,16 @@
>       /*void setNum(int value) {char c[15]; bzero(c,15); sprintf(c,"%d",value); (*this)=c;};
>       void setNum(double value) {char c[25]; bzero(c,25); sprintf(c,"%g",value); (*this)=c;};
>       void simplifyWhiteSpace();*/
>+      void sprintf(const char *fmt, ...)
>+      {
>+      	char temp[1024];
>+	va_list(ap);
>+
>+	va_start(ap, fmt);
>+	vsnprintf(temp, sizeof(temp), fmt, ap);
>+	(*this) = temp;
>+	va_end(ap);
>+      }
> };
> 
> //taken from Qt/QCString
>--- kdenetwork-3.0.3/lanbrowsing/lisa/netmanager.cpp.lanbrowser	Sat Feb  2 23:27:59 2002
>+++ kdenetwork-3.0.3/lanbrowsing/lisa/netmanager.cpp	Wed Aug 28 13:03:06 2002
>@@ -597,16 +597,18 @@
> 
> int NetManager::writeDataToFD(int fd, int serverServer)
> {
>+   MyString buffer;
>+   const char *currentBuf;
>+   int length;
>+
>    mgetDebug()<<" NetManager::writeDataToFD fd="<<fd<<std::endl;
>    m_serveCount++;
>-   char buffer[1024];
>    
>-   int length;
>    for (Node* tmpNode=hostList->first(); tmpNode!=0; tmpNode=hostList->next())
>    {
>-      sprintf(buffer,"%u %s\n",tmpNode->ip,tmpNode->name.left(1000).c_str());
>-      length=strlen(buffer)+1;
>-      const char *currentBuf=buffer;
>+      buffer.sprintf("%u %s\n", tmpNode->ip, tmpNode->name.data());
>+      currentBuf = buffer.data();
>+      length = strlen(currentBuf)+1;	// include NUL byte
>       //make sure that everything is written
>       while (length>0)
>       {
>@@ -622,9 +624,9 @@
>       };
>    };
>    //and a last line
>-   sprintf(buffer,"%d succeeded\n",serverServer);
>-   length=strlen(buffer)+1;
>-   const char *currentBuf=buffer;
>+   buffer.sprintf("%d succeeded\n",serverServer);
>+   currentBuf=buffer.data();
>+   length=strlen(currentBuf)+1;
>    //make sure that everything is written
>    while (length>0)
>    {
>@@ -663,17 +665,18 @@
>    if (m_receiveBuffer==0) return 0;
>    SimpleList<Node> *newNodes=new SimpleList<Node>;
> 
>-   char *tmpBuf=m_receiveBuffer;
>-   int bytesLeft=m_receivedBytes;
>-   int tmpIP;
>-   mgetDebug()<<"m_receivedBytes: "<<m_receivedBytes<<" bytesLeft: "<<bytesLeft<<std::endl;
>-   //this should be large enough for a name
>-   //and the stuff which is inserted into the buffer
>-   //comes only from ourselves
>-   char tmpName[1024*4];
>-   while (bytesLeft>0)
>+   char *tmpBuf = m_receiveBuffer;
>+   char *endOfBuf = m_receiveBuffer + m_receivedBytes;
>+   const char *tmpName;
>+   unsigned long tmpIP;
>+   mgetDebug()<<"m_receivedBytes: "<<m_receivedBytes << std::endl;
>+
>+   // Do not trust any data we receive from remote.
>+   while (tmpBuf < endOfBuf)
>    {
>-      if ((memchr(tmpBuf,0,bytesLeft)==0) || (memchr(tmpBuf,int('\n'),bytesLeft)==0))
>+      char *nextLine;
>+
>+      if (!(nextLine = (char *) memchr(tmpBuf, 0, endOfBuf - tmpBuf)))
>       {
>          delete newNodes;
>          hostList->clear();
>@@ -686,15 +689,26 @@
>          m_isBeingScanned=0;
>          return 0;
>       };
>+
>       //mgetDebug()<<"NetManager::processScanResults: processing -"<<tmpBuf;
>-      sscanf(tmpBuf,"%u %s\n",&tmpIP,tmpName);
>-      //since we check for 0 and \n with memchr() we can be sure
>-      //at this point that tmpBuf is correctly terminated
>-      int length=strlen(tmpBuf)+1;
>-      bytesLeft-=length;
>-      tmpBuf+=length;
>-      mgetDebug()<<"length: "<<length<<" bytesLeft: "<<bytesLeft<<std::endl;
>-      if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1)))
>+      MyString line(tmpBuf), tok;
>+      int idx;
>+
>+      // Advance buffer pointer
>+      tmpBuf = nextLine + 1;
>+
>+      if ((idx = line.find(' ')) < 0)
>+         continue;
>+      tmpIP = strtoul(line.left(idx).data(), NULL, 0);
>+      line.erase(0, idx+1);
>+
>+      // Skip extremely long host names */
>+      if ((idx = line.find('\n')) < 0 || idx > 512)
>+         continue;
>+      line = line.left(idx);
>+      tmpName = line.data();
>+
>+      if (tmpBuf == endOfBuf && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1)))
>       {
>          mgetDebug()<<"NetManager::processScanResults: succeeded :-)"<<std::endl;
>          delete hostList;
>--- kdenetwork-3.0.3/lanbrowsing/lisa/netscanner.cpp.lanbrowser	Sat Feb  2 23:27:59 2002
>+++ kdenetwork-3.0.3/lanbrowsing/lisa/netscanner.cpp	Wed Aug 28 12:18:36 2002
>@@ -133,7 +133,7 @@
>       {
>          if ((m_strictMode) && (hostsAdded>=STRICTMODEMAXHOSTS))
>             break;
>-         memcpy(&server_addr, hp->h_addr, hp->h_length);
>+         memcpy(&server_addr, hp->h_addr, sizeof(server_addr));
>          char *ip=inet_ntoa(server_addr);
>          mgetDebug()<<"NetScanner::configure(): looking up "<<nextName<<" gives -"<<ip<<"-"<<std::endl;
>          ipRangeStr=ipRangeStr+ip+';';

Actions: View | Diff

Attachments on bug 33242: 10231 | 10303 | 10309