diff --git a/source/shared_lib/include/platform/posix/socket.h b/source/shared_lib/include/platform/posix/socket.h index 6cdcc5b2..9fbdecd0 100644 --- a/source/shared_lib/include/platform/posix/socket.h +++ b/source/shared_lib/include/platform/posix/socket.h @@ -38,8 +38,7 @@ private: public: Ip(); - Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, - unsigned char byte4, unsigned char byte5, unsigned char byte6, unsigned char byte7); + Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3); Ip(const string& ipString); unsigned char getByte(int byteIndex) {return bytes[byteIndex];} diff --git a/source/shared_lib/include/platform/win32/socket.h b/source/shared_lib/include/platform/win32/socket.h index eea863b4..8278ddb8 100644 --- a/source/shared_lib/include/platform/win32/socket.h +++ b/source/shared_lib/include/platform/win32/socket.h @@ -32,8 +32,7 @@ private: public: Ip(); - Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, - unsigned char byte4, unsigned char byte5, unsigned char byte6, unsigned char byte7); + Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3); Ip(const string& ipString); unsigned char getByte(int byteIndex) {return bytes[byteIndex];} diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index 12234f23..8191ad6a 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -39,22 +39,13 @@ Ip::Ip(){ bytes[1]= 0; bytes[2]= 0; bytes[3]= 0; - bytes[4]= 0; - bytes[5]= 0; - bytes[6]= 0; - bytes[7]= 0; } -Ip::Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, - unsigned char byte4, unsigned char byte5, unsigned char byte6, unsigned char byte7){ +Ip::Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3){ bytes[0]= byte0; bytes[1]= byte1; bytes[2]= byte2; bytes[3]= byte3; - bytes[4]= byte4; - bytes[5]= byte5; - bytes[6]= byte6; - bytes[7]= byte7; } @@ -62,7 +53,7 @@ Ip::Ip(const string& ipString){ int offset= 0; int byteIndex= 0; - for(byteIndex= 0; byteIndex<8; ++byteIndex){ + for(byteIndex= 0; byteIndex<4; ++byteIndex){ int dotPos= ipString.find_first_of('.', offset); bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str()); diff --git a/source/shared_lib/sources/platform/win32/socket.cpp b/source/shared_lib/sources/platform/win32/socket.cpp index 693c5e03..97633a7c 100644 --- a/source/shared_lib/sources/platform/win32/socket.cpp +++ b/source/shared_lib/sources/platform/win32/socket.cpp @@ -165,29 +165,20 @@ Ip::Ip(){ bytes[1]= 0; bytes[2]= 0; bytes[3]= 0; - bytes[4]= 4; - bytes[5]= 5; - bytes[6]= 6; - bytes[7]= 7; } -Ip::Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, - unsigned char byte4, unsigned char byte5, unsigned char byte6, unsigned char byte7){ +Ip::Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3){ bytes[0]= byte0; bytes[1]= byte1; bytes[2]= byte2; bytes[3]= byte3; - bytes[4]= byte4; - bytes[5]= byte5; - bytes[6]= byte6; - bytes[7]= byte7; } Ip::Ip(const string& ipString){ int offset= 0; int byteIndex= 0; - for(byteIndex= 0; byteIndex<8; ++byteIndex){ + for(byteIndex= 0; byteIndex<4; ++byteIndex){ int dotPos= ipString.find_first_of('.', offset); bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str()); @@ -196,8 +187,7 @@ Ip::Ip(const string& ipString){ } string Ip::getString() const{ - return intToStr(bytes[0]) + "." + intToStr(bytes[1]) + "." + intToStr(bytes[2]) + "." + intToStr(bytes[3]) - + "." +intToStr(bytes[4]) + "." + intToStr(bytes[5]) + "." + intToStr(bytes[6]) + "." + intToStr(bytes[7]); + return intToStr(bytes[0]) + "." + intToStr(bytes[1]) + "." + intToStr(bytes[2]) + "." + intToStr(bytes[3]); } // =====================================================