From f2a9185cc03e307e804bd9850e5de2e17b240a16 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sun, 14 Feb 2010 08:28:40 +0000 Subject: [PATCH] Rename connection_addr -> peer_addr (thanks again eclipse) --- Src/Network.cpp | 4 ++-- Src/Network.h | 2 +- Src/NetworkUnix.h | 2 +- Src/NetworkWii.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/Network.cpp b/Src/Network.cpp index ceec6a7..1406ab6 100644 --- a/Src/Network.cpp +++ b/Src/Network.cpp @@ -616,7 +616,7 @@ bool Network::SendUpdate() ssize_t v; v = this->SendTo((void*)p, this->sock, - size_to_send, &this->connection_addr); + size_to_send, &this->peer_addr); if (v < 0 || (size_t)v != size_to_send) return false; cur_sz += size_to_send; @@ -1137,7 +1137,7 @@ bool Network::SelectPeer(const char *hostname, uint16_t port, uint32_t server_id } this->SelectPeer(server_id); - this->InitSockaddr(&this->connection_addr, hostname, port); + this->InitSockaddr(&this->peer_addr, hostname, port); this->peer_selected = 1; return true; diff --git a/Src/Network.h b/Src/Network.h index 9700797..c9da837 100644 --- a/Src/Network.h +++ b/Src/Network.h @@ -388,7 +388,7 @@ protected: /* Connection to the peer */ int peer_selected; int sock; - struct sockaddr_in connection_addr; + struct sockaddr_in peer_addr; const char *connection_error_message; diff --git a/Src/NetworkUnix.h b/Src/NetworkUnix.h index b807acd..bbc8380 100644 --- a/Src/NetworkUnix.h +++ b/Src/NetworkUnix.h @@ -48,7 +48,7 @@ bool Network::InitSocket(const char *remote_host, int port) set_sock_opts(this->sock); /* Connect to the server. */ - this->InitSockaddr(&this->connection_addr, remote_host, port); + this->InitSockaddr(&this->peer_addr, remote_host, port); return true; } diff --git a/Src/NetworkWii.h b/Src/NetworkWii.h index 7e003c7..acda53f 100644 --- a/Src/NetworkWii.h +++ b/Src/NetworkWii.h @@ -46,7 +46,7 @@ bool Network::InitSocket(const char *remote_host, int port) set_sock_opts(this->sock); /* Setup the socket address */ - this->InitSockaddr(&this->connection_addr, remote_host, port); + this->InitSockaddr(&this->peer_addr, remote_host, port); return true; }