diff options
Diffstat (limited to 'src/Net/IPAddress.h')
-rw-r--r-- | src/Net/IPAddress.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Net/IPAddress.h b/src/Net/IPAddress.h index b0fad45..78b41dd 100644 --- a/src/Net/IPAddress.h +++ b/src/Net/IPAddress.h @@ -30,19 +30,19 @@ namespace Net { class IPAddress { private: - unsigned int addr; - unsigned short port; + uint32_t addr; + uint16_t port; struct sockaddr_in sa; public: // TODO Default port - IPAddress(unsigned short port0 = 6666) : addr(INADDR_ANY), port(port0) { + IPAddress(uint16_t port0 = 6666) : addr(INADDR_ANY), port(port0) { sa.sin_family = AF_INET; sa.sin_port = htons(port); sa.sin_addr.s_addr = INADDR_ANY; } - IPAddress(unsigned int address, unsigned short port0) : addr(address), port(port0) { + IPAddress(uint32_t address, uint16_t port0) : addr(address), port(port0) { sa.sin_family = AF_INET; sa.sin_port = htons(port); sa.sin_addr.s_addr = htonl(addr); @@ -77,7 +77,7 @@ class IPAddress { addr = ntohl(sa.sin_addr.s_addr); } - IPAddress(const std::string &address, unsigned short port0) throw(InvalidAddressException) : port(port0) { + IPAddress(const std::string &address, uint16_t port0) throw(InvalidAddressException) : port(port0) { sa.sin_family = AF_INET; sa.sin_port = htons(port); @@ -92,18 +92,18 @@ class IPAddress { addr = ntohl(sa.sin_addr.s_addr); } - unsigned int getAddress() const {return addr;} - unsigned short getPort() const {return port;} + uint32_t getAddress() const {return addr;} + uint16_t getPort() const {return port;} std::string getAddressString() const { char buf[INET_ADDRSTRLEN]; - unsigned int address = htonl(addr); + uint32_t address = htonl(addr); inet_ntop(AF_INET, &address, buf, sizeof(buf)); return std::string(buf); } - struct sockaddr* getSockAddr() {return reinterpret_cast<struct sockaddr*>(&sa);} + struct sockaddr* getSockAddr() {return (struct sockaddr*)&sa;} socklen_t getSockAddrLength() const {return sizeof(sa);} }; |