[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/kmldonkey/libkmldonkey
From:       Petter E. Stokke <gibreel () gibreel ! net>
Date:       2003-09-10 16:39:58
[Download RAW message or body]

CVS commit by pstokke: 

Reverted to the libc way of converting IP addresses. The direct approach
started having endianness issues.


  M +9 -6      donkeymessage.cpp   1.3


--- kdeextragear-2/kmldonkey/libkmldonkey/donkeymessage.cpp  #1.2:1.3
@@ -25,4 +25,8 @@
 #include <stdio.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <kdebug.h>
 #include <qtextcodec.h>
@@ -219,14 +223,13 @@ double DonkeyMessage::readFloat()
 QString DonkeyMessage::readIPAddress()
 {
+/*
     QString address = QString::number(readInt8()) + "."
         + QString::number(readInt8()) + "."
         + QString::number(readInt8()) + "."
         + QString::number(readInt8());
-    /*
+*/
       struct in_addr in;
       in.s_addr = readInt32();
-      address = inet_ntoa(in);
-    */
-    return address;
+    return QString(inet_ntoa(in));
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]