izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use s_addr as parameter name. Fixes compiling with Solaris.

Browse Source 
Signed-off-by: Timo Sirainen <tss@iki.fi>
This commit is contained in:
Timo Sirainen
2012-08-11 23:12:31 +03:00
committed by Keith Winstein
parent 0c5307f345
commit 620152261e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/network.cc
+2 -2
View File
@@ -211,11 +211,11 @@ Connection::Connection( const char *desired_ip, const char *desired_port ) /* se
throw NetworkException( "Could not bind", errno ); throw NetworkException( "Could not bind", errno );
} }
bool Connection::try_bind( int socket, uint32_t s_addr, int port ) bool Connection::try_bind( int socket, uint32_t addr, int port )
{ {
struct sockaddr_in local_addr; struct sockaddr_in local_addr;
local_addr.sin_family = AF_INET; local_addr.sin_family = AF_INET;
local_addr.sin_addr.s_addr = s_addr; local_addr.sin_addr.s_addr = addr;
int search_low = PORT_RANGE_LOW, search_high = PORT_RANGE_HIGH; int search_low = PORT_RANGE_LOW, search_high = PORT_RANGE_HIGH;
src/network/network.h
+1 -1
View File
@@ -91,7 +91,7 @@ namespace Network {
static const int PORT_RANGE_LOW = 60001; static const int PORT_RANGE_LOW = 60001;
static const int PORT_RANGE_HIGH = 60999; static const int PORT_RANGE_HIGH = 60999;
static bool try_bind( int socket, uint32_t s_addr, int port ); static bool try_bind( int socket, uint32_t addr, int port );
int sock; int sock;
bool has_remote_addr; bool has_remote_addr;