Attachment #10303 for bug #33242

View | Details | Raw Unified | Return to bug 33242
Collapse All | Expand All




   return 0;
};

// 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);

   *bufp = NULL;
   while (1) {
      fd_set rset;
      fd_set tmpFDs;
      FD_ZERO(&tmpFDs);
      FD_SET(m_iSock,&tmpFDs);
      timeval tv;

      FD_ZERO(&rset);
      FD_SET(fd, &rset);
      tv.tv_sec = 1;
      tv.tv_usec = 0;
      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) {
	    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;
      }
   }

   *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;

   while (data < endOfData) {
      char *nextLine;

      if (!(nextLine = (char *) memchr(data, 0, endOfData - data)))
   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));
         return 0;

      // 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: "<<hostName<<" with ip: "<<hostAddress<<endl;
      {
         kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
         UDSAtom atom;

         atom.m_uds = KIO::UDS_NAME;

	 // 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;
               atom.m_str = tmpHostname;
            };
         }
         else
            atom.m_str = tmpName;

         entry.append( atom );
         atom.m_uds = KIO::UDS_SIZE;

         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;

   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() );


   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;

   receivedBytes = commonReadDataFromServer(sockFD, &receiveBuffer);
         {
            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);
   ::close(sockFD);

   if (receivedBytes < 4)
   if ((bytesRead<0) || (receivedBytes<4))
   {
      delete [] receiveBuffer;
      error(ERR_CANNOT_OPEN_FOR_READING,socketname);


   UDSEntry entry;

   if (!commonParseData(receiveBuffer, receivedBytes, entry)) {
      delete [] receiveBuffer;
      error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(socketname));
      return 0;
   }
   //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);
      };
   };

   listEntry( entry, true ); // ready
   delete [] receiveBuffer;

         delete hostInfo;
         return 0;
      }
      memcpy(&ip, hp->h_addr, sizeof(ip));

      for (int i=0; i<KIOLAN_MAX; i++)
      {

Lines 69-74 Link Here

(-)kdenetwork-3.0.3/lanbrowsing/kio_lan/kio_lan.h.lanbrowser (+2 lines)
69	int readDataFromServer();	69	int readDataFromServer();
70	int lanReadDataFromServer();	70	int lanReadDataFromServer();
71	int rlanReadDataFromServer();	71	int rlanReadDataFromServer();
		72	int commonReadDataFromServer(int fd, char **bufp);
		73	int commonParseData(const char *data, size_t len, KIO::UDSEntry &entry);
72	int checkHost(const QString& host);	74	int checkHost(const QString& host);
73	int checkPort(int _port, in_addr ip);	75	int checkPort(int _port, in_addr ip);
74	QString m_currentHost;	76	QString m_currentHost;




#include <string.h>
#include <strings.h>
#include <stdio.h>
#include <stdarg.h>

class MyString: public std::string
{

      /*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);
	va_end(ap);
      }
};

//taken from Qt/QCString





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())
   {
      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)
      {

      };
   };
   //and a last line
   buffer.sprintf("%d succeeded\n",serverServer);
   currentBuf=buffer.data();
   length=strlen(currentBuf)+1;
   //make sure that everything is written
   while (length>0)
   {

   if (m_receiveBuffer==0) return 0;
   SimpleList<Node> *newNodes=new SimpleList<Node>;

   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)
   while (bytesLeft>0)
   {
      char *nextLine;

      if (!(nextLine = (char *) memchr(tmpBuf, 0, endOfBuf - tmpBuf)))
      {
         delete newNodes;
         hostList->clear();

         m_isBeingScanned=0;
         return 0;
      };

      //mgetDebug()<<"NetManager::processScanResults: processing -"<<tmpBuf;
      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;

Lines 133-139 Link Here

(-)kdenetwork-3.0.3/lanbrowsing/lisa/netscanner.cpp.lanbrowser (-1 / +1 lines)
133	{	133	{
134	if ((m_strictMode) && (hostsAdded>=STRICTMODEMAXHOSTS))	134	if ((m_strictMode) && (hostsAdded>=STRICTMODEMAXHOSTS))
135	break;	135	break;
136	memcpy(&server_addr, hp->h_addr, hp->h_length);	136	memcpy(&server_addr, hp->h_addr, sizeof(server_addr));
137	char *ip=inet_ntoa(server_addr);	137	char *ip=inet_ntoa(server_addr);
138	mgetDebug()<<"NetScanner::configure(): looking up "<<nextName<<" gives -"<<ip<<"-"<<std::endl;	138	mgetDebug()<<"NetScanner::configure(): looking up "<<nextName<<" gives -"<<ip<<"-"<<std::endl;
139	ipRangeStr=ipRangeStr+ip+';';	139	ipRangeStr=ipRangeStr+ip+';';

Return to bug 33242

Lines 597-612 Link Here

(-)kdenetwork-3.0.3/lanbrowsing/lisa/netmanager.cpp.lanbrowser (-26 / +40 lines)
597		597
598	int NetManager::writeDataToFD(int fd, int serverServer)	598	int NetManager::writeDataToFD(int fd, int serverServer)
599	{	599	{
		600	MyString buffer;
		601	const char *currentBuf;
		602	int length;
		603
600	mgetDebug()<<" NetManager::writeDataToFD fd="<<fd<<std::endl;	604	mgetDebug()<<" NetManager::writeDataToFD fd="<<fd<<std::endl;
601	m_serveCount++;	605	m_serveCount++;
602	char buffer[1024];
603		606
604	int length;
605	for (Node* tmpNode=hostList->first(); tmpNode!=0; tmpNode=hostList->next())	607	for (Node* tmpNode=hostList->first(); tmpNode!=0; tmpNode=hostList->next())
606	{	608	{
607	sprintf(buffer,"%u %s\n",tmpNode->ip,tmpNode->name.left(1000).c_str());	609	buffer.sprintf("%u %s\n", tmpNode->ip, tmpNode->name.data());
608	length=strlen(buffer)+1;	610	currentBuf = buffer.data();
609	const char *currentBuf=buffer;	611	length = strlen(currentBuf)+1; // include NUL byte
610	//make sure that everything is written	612	//make sure that everything is written
611	while (length>0)	613	while (length>0)
612	{	614	{
Lines 622-630 Link Here
622	};	624	};
623	};	625	};
624	//and a last line	626	//and a last line
625	sprintf(buffer,"%d succeeded\n",serverServer);	627	buffer.sprintf("%d succeeded\n",serverServer);
626	length=strlen(buffer)+1;	628	currentBuf=buffer.data();
627	const char *currentBuf=buffer;	629	length=strlen(currentBuf)+1;
628	//make sure that everything is written	630	//make sure that everything is written
629	while (length>0)	631	while (length>0)
630	{	632	{
Lines 663-679 Link Here
663	if (m_receiveBuffer==0) return 0;	665	if (m_receiveBuffer==0) return 0;
664	SimpleList<Node> *newNodes=new SimpleList<Node>;	666	SimpleList<Node> *newNodes=new SimpleList<Node>;
665		667
666	char *tmpBuf=m_receiveBuffer;	668	char *tmpBuf = m_receiveBuffer;
667	int bytesLeft=m_receivedBytes;	669	char *endOfBuf = m_receiveBuffer + m_receivedBytes;
668	int tmpIP;	670	const char *tmpName;
669	mgetDebug()<<"m_receivedBytes: "<<m_receivedBytes<<" bytesLeft: "<<bytesLeft<<std::endl;	671	unsigned long tmpIP;
670	//this should be large enough for a name	672	mgetDebug()<<"m_receivedBytes: "<<m_receivedBytes << std::endl;
671	//and the stuff which is inserted into the buffer	673
672	//comes only from ourselves	674	// Do not trust any data we receive from remote.
673	char tmpName[1024*4];	675	while (tmpBuf < endOfBuf)
674	while (bytesLeft>0)
675	{	676	{
676	if ((memchr(tmpBuf,0,bytesLeft)==0) \|\| (memchr(tmpBuf,int('\n'),bytesLeft)==0))	677	char *nextLine;
		678
		679	if (!(nextLine = (char *) memchr(tmpBuf, 0, endOfBuf - tmpBuf)))
677	{	680	{
678	delete newNodes;	681	delete newNodes;
679	hostList->clear();	682	hostList->clear();
Lines 686-700 Link Here
686	m_isBeingScanned=0;	689	m_isBeingScanned=0;
687	return 0;	690	return 0;
688	};	691	};
		692
689	//mgetDebug()<<"NetManager::processScanResults: processing -"<<tmpBuf;	693	//mgetDebug()<<"NetManager::processScanResults: processing -"<<tmpBuf;
690	sscanf(tmpBuf,"%u %s\n",&tmpIP,tmpName);	694	MyString line(tmpBuf), tok;
691	//since we check for 0 and \n with memchr() we can be sure	695	int idx;
692	//at this point that tmpBuf is correctly terminated	696
693	int length=strlen(tmpBuf)+1;	697	// Advance buffer pointer
694	bytesLeft-=length;	698	tmpBuf = nextLine + 1;
695	tmpBuf+=length;	699
696	mgetDebug()<<"length: "<<length<<" bytesLeft: "<<bytesLeft<<std::endl;	700	if ((idx = line.find(' ')) < 0)
697	if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) \|\|(tmpIP==1)))	701	continue;
		702	tmpIP = strtoul(line.left(idx).data(), NULL, 0);
		703	line.erase(0, idx+1);
		704
		705	// Skip extremely long host names */
		706	if ((idx = line.find('\n')) < 0 \|\| idx > 512)
		707	continue;
		708	line = line.left(idx);
		709	tmpName = line.data();
		710
		711	if (tmpBuf == endOfBuf && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) \|\|(tmpIP==1)))
698	{	712	{
699	mgetDebug()<<"NetManager::processScanResults: succeeded :-)"<<std::endl;	713	mgetDebug()<<"NetManager::processScanResults: succeeded :-)"<<std::endl;
700	delete hostList;	714	delete hostList;

Lines 5-10 Link Here

(-)kdenetwork-3.0.3/lanbrowsing/lisa/mystring.h.lanbrowser (+10 lines)
5	#include <string.h>	5	#include <string.h>
6	#include <strings.h>	6	#include <strings.h>
7	#include <stdio.h>	7	#include <stdio.h>
		8	#include <stdarg.h>
8		9
9	class MyString: public std::string	10	class MyString: public std::string
10	{	11	{
Lines 33-38 Link Here
33	/void setNum(int value) {char c[15]; bzero(c,15); sprintf(c,"%d",value); (this)=c;};	34	/void setNum(int value) {char c[15]; bzero(c,15); sprintf(c,"%d",value); (this)=c;};
34	void setNum(double value) {char c[25]; bzero(c,25); sprintf(c,"%g",value); (*this)=c;};	35	void setNum(double value) {char c[25]; bzero(c,25); sprintf(c,"%g",value); (*this)=c;};
35	void simplifyWhiteSpace();*/	36	void simplifyWhiteSpace();*/
		37	void sprintf(const char *fmt, ...)
		38	{
		39	char temp[1024];
		40	va_list(ap);
		41
		42	va_start(ap, fmt);
		43	vsnprintf(temp, sizeof(temp), fmt, ap);
		44	va_end(ap);
		45	}
36	};	46	};
37		47
38	//taken from Qt/QCString	48	//taken from Qt/QCString