mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 13:50:43 +02:00
Code Issues Projects Releases Wiki Activity

...dumb

Browse Source
This commit is contained in:
Titus Tscharntke
2010-02-28 11:40:52 +00:00
parent ee8805ca3f
commit 775386190a
4 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/platform/posix/socket.h
View File

@@ -38,8 +38,7 @@ private:
public: public:
Ip(); Ip();
Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, 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(const string& ipString); Ip(const string& ipString);
unsigned char getByte(int byteIndex) {return bytes[byteIndex];} unsigned char getByte(int byteIndex) {return bytes[byteIndex];}

3
source/shared_lib/include/platform/win32/socket.h
View File

@@ -32,8 +32,7 @@ private:
public: public:
Ip(); Ip();
Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned char byte3, 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(const string& ipString); Ip(const string& ipString);
unsigned char getByte(int byteIndex) {return bytes[byteIndex];} unsigned char getByte(int byteIndex) {return bytes[byteIndex];}

13
source/shared_lib/sources/platform/posix/socket.cpp
View File

@@ -39,22 +39,13 @@ Ip::Ip(){
bytes[1]= 0; bytes[1]= 0;
bytes[2]= 0; bytes[2]= 0;
bytes[3]= 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, 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){
bytes[0]= byte0; bytes[0]= byte0;
bytes[1]= byte1; bytes[1]= byte1;
bytes[2]= byte2; bytes[2]= byte2;
bytes[3]= byte3; 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 offset= 0;
int byteIndex= 0; int byteIndex= 0;
for(byteIndex= 0; byteIndex<8; ++byteIndex){ for(byteIndex= 0; byteIndex<4; ++byteIndex){
int dotPos= ipString.find_first_of('.', offset); int dotPos= ipString.find_first_of('.', offset);
bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str()); bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str());

16
source/shared_lib/sources/platform/win32/socket.cpp
View File

@@ -165,29 +165,20 @@ Ip::Ip(){
bytes[1]= 0; bytes[1]= 0;
bytes[2]= 0; bytes[2]= 0;
bytes[3]= 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, 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){
bytes[0]= byte0; bytes[0]= byte0;
bytes[1]= byte1; bytes[1]= byte1;
bytes[2]= byte2; bytes[2]= byte2;
bytes[3]= byte3; bytes[3]= byte3;
bytes[4]= byte4;
bytes[5]= byte5;
bytes[6]= byte6;
bytes[7]= byte7;
} }
Ip::Ip(const string& ipString){ Ip::Ip(const string& ipString){
int offset= 0; int offset= 0;
int byteIndex= 0; int byteIndex= 0;
for(byteIndex= 0; byteIndex<8; ++byteIndex){ for(byteIndex= 0; byteIndex<4; ++byteIndex){
int dotPos= ipString.find_first_of('.', offset); int dotPos= ipString.find_first_of('.', offset);
bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str()); bytes[byteIndex]= atoi(ipString.substr(offset, dotPos-offset).c_str());
@@ -196,8 +187,7 @@ Ip::Ip(const string& ipString){
} }
string Ip::getString() const{ string Ip::getString() const{
return intToStr(bytes[0]) + "." + intToStr(bytes[1]) + "." + intToStr(bytes[2]) + "." + intToStr(bytes[3]) 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]);
} }
// ===================================================== // =====================================================