diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-08 19:43:28 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-09 19:29:31 -0700 |
| commit | a5861a4c81bb616b7fba2028cf9ee31f890357c5 (patch) | |
| tree | 0a7aedad97d70b6194eb57a7de39857d015685a3 /src/common/socket.cpp | |
| parent | 367e76ba89bde0e3fb6c4ae0e64cd3927e0db2f2 (diff) | |
| download | tmwa-a5861a4c81bb616b7fba2028cf9ee31f890357c5.tar.gz tmwa-a5861a4c81bb616b7fba2028cf9ee31f890357c5.tar.bz2 tmwa-a5861a4c81bb616b7fba2028cf9ee31f890357c5.tar.xz tmwa-a5861a4c81bb616b7fba2028cf9ee31f890357c5.zip | |
Use IP4 classes and rename conf variables
Diffstat (limited to 'src/common/socket.cpp')
| -rw-r--r-- | src/common/socket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 4655d1d..c7e6ed2 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -174,7 +174,7 @@ void connect_client(int listen_fd) session[fd]->func_recv = recv_to_fifo; session[fd]->func_send = send_from_fifo; session[fd]->func_parse = default_func_parse; - session[fd]->client_addr = client_address; + session[fd]->client_ip = IP4Address(client_address.sin_addr); session[fd]->created = TimeT::now(); session[fd]->connected = 0; } @@ -240,7 +240,7 @@ int make_listen_port(uint16_t port) return fd; } -int make_connection(uint32_t ip, uint16_t port) +int make_connection(IP4Address ip, uint16_t port) { struct sockaddr_in server_address; int fd = socket(AF_INET, SOCK_STREAM, 0); @@ -264,7 +264,7 @@ int make_connection(uint32_t ip, uint16_t port) setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof yes); server_address.sin_family = AF_INET; - server_address.sin_addr.s_addr = ip; + server_address.sin_addr = in_addr(ip); #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" #if __GNUC__ > 4 || __GNUC_MINOR__ >= 8 |