ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-12 23:44:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Merge win_net.c and unix_net.c

Browse source 
+ Move win32/win_net.c to qcommon/net_ip.c and make it portable
  + Remove unix_net.c, but incorporate its revision history into win_net.c
  + Remove all IPX support -- this remains compatible with existing mods
  + This change also inadvertently gets us SOCKS support on non-Windows
    platforms
This commit is contained in:
Tim Angus 2007-08-28 16:42:13 +00:00
parent a2d413428a
commit 0b3a077e15
10 changed files with 359 additions and 1027 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -828,6 +828,7 @@ release:
targets: makedirs tools targets: makedirs tools
@echo "" @echo ""
@echo "Building ioquake3 in $(B):" @echo "Building ioquake3 in $(B):"
@echo " PLATFORM: $(PLATFORM)"
@echo " ARCH: $(ARCH)" @echo " ARCH: $(ARCH)"
@echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)" @echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
@echo " COMPILE_ARCH: $(COMPILE_ARCH)" @echo " COMPILE_ARCH: $(COMPILE_ARCH)"
@ -924,6 +925,7 @@ Q3OBJ = \
$(B)/client/md5.o \ $(B)/client/md5.o \
$(B)/client/msg.o \ $(B)/client/msg.o \
$(B)/client/net_chan.o \ $(B)/client/net_chan.o \
$(B)/client/net_ip.o \
$(B)/client/huffman.o \ $(B)/client/huffman.o \
\ \
$(B)/client/snd_adpcm.o \ $(B)/client/snd_adpcm.o \
@ -1084,7 +1086,6 @@ ifeq ($(PLATFORM),mingw32)
$(B)/client/win_glimp.o \ $(B)/client/win_glimp.o \
$(B)/client/win_input.o \ $(B)/client/win_input.o \
$(B)/client/win_main.o \ $(B)/client/win_main.o \
$(B)/client/win_net.o \
$(B)/client/win_qgl.o \ $(B)/client/win_qgl.o \
$(B)/client/win_shared.o \ $(B)/client/win_shared.o \
$(B)/client/win_snd.o \ $(B)/client/win_snd.o \
@ -1094,7 +1095,6 @@ ifeq ($(PLATFORM),mingw32)
else else
Q3OBJ += \ Q3OBJ += \
$(B)/client/unix_main.o \ $(B)/client/unix_main.o \
$(B)/client/unix_net.o \
$(B)/client/unix_shared.o \ $(B)/client/unix_shared.o \
$(B)/client/linux_signals.o \ $(B)/client/linux_signals.o \
$(B)/client/linux_qgl.o \ $(B)/client/linux_qgl.o \
@ -1167,6 +1167,7 @@ Q3DOBJ = \
$(B)/ded/md4.o \ $(B)/ded/md4.o \
$(B)/ded/msg.o \ $(B)/ded/msg.o \
$(B)/ded/net_chan.o \ $(B)/ded/net_chan.o \
$(B)/ded/net_ip.o \
$(B)/ded/huffman.o \ $(B)/ded/huffman.o \
\ \
$(B)/ded/q_math.o \ $(B)/ded/q_math.o \
@ -1207,7 +1208,6 @@ Q3DOBJ = \
\ \
$(B)/ded/linux_signals.o \ $(B)/ded/linux_signals.o \
$(B)/ded/unix_main.o \ $(B)/ded/unix_main.o \
$(B)/ded/unix_net.o \
$(B)/ded/unix_shared.o \ $(B)/ded/unix_shared.o \
\ \
$(B)/ded/null_client.o \ $(B)/ded/null_client.o \

1
TODO
View file

@ -19,7 +19,6 @@ MacOS X
For 1.35+: For 1.35+:
* IPv6 support * IPv6 support
* merge unix_net.c and win_net.c
* Replace windows DirectX backend with SDL * Replace windows DirectX backend with SDL
* Graphical "ioquake3" watermark in videos, optional, on by default * Graphical "ioquake3" watermark in videos, optional, on by default
* Gamma stuff while recording videos. * Gamma stuff while recording videos.

9
code/client/cl_main.c
View file

@ -2867,12 +2867,6 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
type = 1; type = 1;
break; break;
case NA_IPX:
case NA_BROADCAST_IPX:
str = "ipx";
type = 2;
break;
default: default:
str = "???"; str = "???";
type = 0; type = 0;
@ -3160,9 +3154,6 @@ void CL_LocalServers_f( void ) {
to.type = NA_BROADCAST; to.type = NA_BROADCAST;
NET_SendPacket( NS_CLIENT, strlen( message ), message, to ); NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
to.type = NA_BROADCAST_IPX;
NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
} }
} }
} }

1
code/q3_ui/ui_servers2.c
View file

@ -142,7 +142,6 @@ static char* gamenames[] = {
static char* netnames[] = { static char* netnames[] = {
"???", "???",
"UDP", "UDP",
"IPX",
NULL NULL
}; };

19
code/qcommon/net_chan.c
View file

@ -482,14 +482,6 @@ qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b)
return qfalse; return qfalse;
} }
if (a.type == NA_IPX)
{
if ((memcmp(a.ipx, b.ipx, 10) == 0))
return qtrue;
return qfalse;
}
Com_Printf ("NET_CompareBaseAdr: bad address type\n"); Com_Printf ("NET_CompareBaseAdr: bad address type\n");
return qfalse; return qfalse;
} }
@ -505,10 +497,6 @@ const char *NET_AdrToString (netadr_t a)
} else if (a.type == NA_IP) { } else if (a.type == NA_IP) {
Com_sprintf (s, sizeof(s), "%i.%i.%i.%i:%hu", Com_sprintf (s, sizeof(s), "%i.%i.%i.%i:%hu",
a.ip[0], a.ip[1], a.ip[2], a.ip[3], BigShort(a.port)); a.ip[0], a.ip[1], a.ip[2], a.ip[3], BigShort(a.port));
} else {
Com_sprintf (s, sizeof(s), "%02x%02x%02x%02x.%02x%02x%02x%02x%02x%02x:%hu",
a.ipx[0], a.ipx[1], a.ipx[2], a.ipx[3], a.ipx[4], a.ipx[5], a.ipx[6], a.ipx[7], a.ipx[8], a.ipx[9],
BigShort(a.port));
} }
return s; return s;
@ -530,13 +518,6 @@ qboolean NET_CompareAdr (netadr_t a, netadr_t b)
return qfalse; return qfalse;
} }
if (a.type == NA_IPX)
{
if ((memcmp(a.ipx, b.ipx, 10) == 0) && a.port == b.port)
return qtrue;
return qfalse;
}
Com_Printf ("NET_CompareAdr: bad address type\n"); Com_Printf ("NET_CompareAdr: bad address type\n");
return qfalse; return qfalse;
} }

489
code/win32/win_net.c → code/qcommon/net_ip.c
View file

@ -19,19 +19,63 @@ along with Quake III Arena source code; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
// net_wins.c
#include "../qcommon/q_shared.h" #include "../qcommon/q_shared.h"
#include "../qcommon/qcommon.h" #include "../qcommon/qcommon.h"
#include "win_local.h"
#ifdef _WIN32
#include <winsock.h>
typedef int socklen_t;
#define EAGAIN WSAEWOULDBLOCK
#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#define ECONNRESET WSAECONNRESET
#define socketError WSAGetLastError( )
static WSADATA winsockdata; static WSADATA winsockdata;
static qboolean winsockInitialized = qfalse; static qboolean winsockInitialized = qfalse;
#else
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
// needed for socklen_t on OSX 10.2
# define _BSD_SOCKLEN_T_
#endif
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
#include <netinet/in.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#ifdef MACOS_X
#include <sys/sockio.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h> // for 'struct sockaddr_dl'
#endif
#ifdef __sun
#include <sys/filio.h>
#endif
typedef int SOCKET;
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define closesocket close
#define ioctlsocket ioctl
#define socketError errno
#endif
static qboolean usingSocks = qfalse; static qboolean usingSocks = qfalse;
static qboolean networkingEnabled = qfalse; static qboolean networkingEnabled = qfalse;
static cvar_t *net_noudp; static cvar_t *net_noudp;
static cvar_t *net_noipx;
static cvar_t *net_socksEnabled; static cvar_t *net_socksEnabled;
static cvar_t *net_socksServer; static cvar_t *net_socksServer;
@ -42,7 +86,6 @@ static struct sockaddr socksRelayAddr;
static SOCKET ip_socket; static SOCKET ip_socket;
static SOCKET socks_socket; static SOCKET socks_socket;
static SOCKET ipx_socket;
#define MAX_IPS 16 #define MAX_IPS 16
static int numIP; static int numIP;
@ -57,10 +100,9 @@ NET_ErrorString
==================== ====================
*/ */
char *NET_ErrorString( void ) { char *NET_ErrorString( void ) {
int code; #ifdef _WIN32
//FIXME: replace with FormatMessage?
code = WSAGetLastError(); switch( socketError ) {
switch( code ) {
case WSAEINTR: return "WSAEINTR"; case WSAEINTR: return "WSAEINTR";
case WSAEBADF: return "WSAEBADF"; case WSAEBADF: return "WSAEBADF";
case WSAEACCES: return "WSAEACCES"; case WSAEACCES: return "WSAEACCES";
@ -107,9 +149,12 @@ char *NET_ErrorString( void ) {
case WSANO_DATA: return "WSANO_DATA"; case WSANO_DATA: return "WSANO_DATA";
default: return "NO ERROR"; default: return "NO ERROR";
} }
#else
return strerror (errno);
#endif
} }
void NetadrToSockadr( netadr_t *a, struct sockaddr *s ) { static void NetadrToSockadr( netadr_t *a, struct sockaddr *s ) {
memset( s, 0, sizeof(*s) ); memset( s, 0, sizeof(*s) );
if( a->type == NA_BROADCAST ) { if( a->type == NA_BROADCAST ) {
@ -122,75 +167,28 @@ void NetadrToSockadr( netadr_t *a, struct sockaddr *s ) {
((struct sockaddr_in *)s)->sin_addr.s_addr = *(int *)&a->ip; ((struct sockaddr_in *)s)->sin_addr.s_addr = *(int *)&a->ip;
((struct sockaddr_in *)s)->sin_port = a->port; ((struct sockaddr_in *)s)->sin_port = a->port;
} }
else if( a->type == NA_IPX ) {
((struct sockaddr_ipx *)s)->sa_family = AF_IPX;
memcpy( ((struct sockaddr_ipx *)s)->sa_netnum, &a->ipx[0], 4 );
memcpy( ((struct sockaddr_ipx *)s)->sa_nodenum, &a->ipx[4], 6 );
((struct sockaddr_ipx *)s)->sa_socket = a->port;
}
else if( a->type == NA_BROADCAST_IPX ) {
((struct sockaddr_ipx *)s)->sa_family = AF_IPX;
memset( ((struct sockaddr_ipx *)s)->sa_netnum, 0, 4 );
memset( ((struct sockaddr_ipx *)s)->sa_nodenum, 0xff, 6 );
((struct sockaddr_ipx *)s)->sa_socket = a->port;
}
} }
void SockadrToNetadr( struct sockaddr *s, netadr_t *a ) { static void SockadrToNetadr( struct sockaddr *s, netadr_t *a ) {
if (s->sa_family == AF_INET) { if (s->sa_family == AF_INET) {
a->type = NA_IP; a->type = NA_IP;
*(int *)&a->ip = ((struct sockaddr_in *)s)->sin_addr.s_addr; *(int *)&a->ip = ((struct sockaddr_in *)s)->sin_addr.s_addr;
a->port = ((struct sockaddr_in *)s)->sin_port; a->port = ((struct sockaddr_in *)s)->sin_port;
} }
else if( s->sa_family == AF_IPX ) {
a->type = NA_IPX;
memcpy( &a->ipx[0], ((struct sockaddr_ipx *)s)->sa_netnum, 4 );
memcpy( &a->ipx[4], ((struct sockaddr_ipx *)s)->sa_nodenum, 6 );
a->port = ((struct sockaddr_ipx *)s)->sa_socket;
}
} }
/* /*
============= =============
Sys_StringToAdr Sys_StringToSockaddr
idnewt
192.246.40.70
12121212.121212121212
============= =============
*/ */
#define DO(src,dest) \ static qboolean Sys_StringToSockaddr( const char *s, struct sockaddr *sadr ) {
copy[0] = s[src]; \
copy[1] = s[src + 1]; \
sscanf (copy, "%x", &val); \
((struct sockaddr_ipx *)sadr)->dest = val
qboolean Sys_StringToSockaddr( const char *s, struct sockaddr *sadr ) {
struct hostent *h; struct hostent *h;
int val;
char copy[MAX_STRING_CHARS];
memset( sadr, 0, sizeof( *sadr ) ); memset( sadr, 0, sizeof( *sadr ) );
// check for an IPX address
if( ( strlen( s ) == 21 ) && ( s[8] == '.' ) ) {
((struct sockaddr_ipx *)sadr)->sa_family = AF_IPX;
((struct sockaddr_ipx *)sadr)->sa_socket = 0;
copy[2] = 0;
DO(0, sa_netnum[0]);
DO(2, sa_netnum[1]);
DO(4, sa_netnum[2]);
DO(6, sa_netnum[3]);
DO(9, sa_nodenum[0]);
DO(11, sa_nodenum[1]);
DO(13, sa_nodenum[2]);
DO(15, sa_nodenum[3]);
DO(17, sa_nodenum[4]);
DO(19, sa_nodenum[5]);
}
else {
((struct sockaddr_in *)sadr)->sin_family = AF_INET; ((struct sockaddr_in *)sadr)->sin_family = AF_INET;
((struct sockaddr_in *)sadr)->sin_port = 0; ((struct sockaddr_in *)sadr)->sin_port = 0;
@ -202,19 +200,13 @@ qboolean Sys_StringToSockaddr( const char *s, struct sockaddr *sadr ) {
} }
*(int *)&((struct sockaddr_in *)sadr)->sin_addr = *(int *)h->h_addr_list[0]; *(int *)&((struct sockaddr_in *)sadr)->sin_addr = *(int *)h->h_addr_list[0];
} }
}
return qtrue; return qtrue;
} }
#undef DO
/* /*
============= =============
Sys_StringToAdr Sys_StringToAdr
idnewt
192.246.40.70
============= =============
*/ */
qboolean Sys_StringToAdr( const char *s, netadr_t *a ) { qboolean Sys_StringToAdr( const char *s, netadr_t *a ) {
@ -237,49 +229,41 @@ Sys_GetPacket
Never called by the game logic, just the system event queing Never called by the game logic, just the system event queing
================== ==================
*/ */
#ifdef _DEBUG
int recvfromCount; int recvfromCount;
#endif
qboolean Sys_GetPacket( netadr_t *net_from, msg_t *net_message ) { qboolean Sys_GetPacket( netadr_t *net_from, msg_t *net_message ) {
int ret; int ret;
struct sockaddr from; struct sockaddr from;
int fromlen; socklen_t fromlen;
int net_socket;
int protocol;
int err; int err;
for( protocol = 0 ; protocol < 2 ; protocol++ ) { if( !ip_socket ) {
if( protocol == 0 ) { return qfalse;
net_socket = ip_socket;
}
else {
net_socket = ipx_socket;
}
if( !net_socket ) {
continue;
} }
fromlen = sizeof(from); fromlen = sizeof(from);
#ifdef _DEBUG
recvfromCount++; // performance check recvfromCount++; // performance check
ret = recvfrom( net_socket, net_message->data, net_message->maxsize, 0, (struct sockaddr *)&from, &fromlen ); #endif
ret = recvfrom( ip_socket, net_message->data, net_message->maxsize, 0, (struct sockaddr *)&from, &fromlen );
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
err = WSAGetLastError(); err = socketError;
if( err == WSAEWOULDBLOCK || err == WSAECONNRESET ) { if( err == EAGAIN || err == ECONNRESET ) {
continue; return qfalse;
} }
Com_Printf( "NET_GetPacket: %s\n", NET_ErrorString() ); Com_Printf( "NET_GetPacket: %s\n", NET_ErrorString() );
continue; return qfalse;
} }
if ( net_socket == ip_socket ) {
memset( ((struct sockaddr_in *)&from)->sin_zero, 0, 8 ); memset( ((struct sockaddr_in *)&from)->sin_zero, 0, 8 );
}
if ( usingSocks && net_socket == ip_socket && memcmp( &from, &socksRelayAddr, fromlen ) == 0 ) { if ( usingSocks && memcmp( &from, &socksRelayAddr, fromlen ) == 0 ) {
if ( ret < 10 || net_message->data[0] != 0 || net_message->data[1] != 0 || net_message->data[2] != 0 || net_message->data[3] != 1 ) { if ( ret < 10 || net_message->data[0] != 0 || net_message->data[1] != 0 || net_message->data[2] != 0 || net_message->data[3] != 1 ) {
continue; return qfalse;
} }
net_from->type = NA_IP; net_from->type = NA_IP;
net_from->ip[0] = net_message->data[4]; net_from->ip[0] = net_message->data[4];
@ -296,16 +280,13 @@ qboolean Sys_GetPacket( netadr_t *net_from, msg_t *net_message ) {
if( ret == net_message->maxsize ) { if( ret == net_message->maxsize ) {
Com_Printf( "Oversize packet from %s\n", NET_AdrToString (*net_from) ); Com_Printf( "Oversize packet from %s\n", NET_AdrToString (*net_from) );
continue; return qfalse;
} }
net_message->cursize = ret; net_message->cursize = ret;
return qtrue; return qtrue;
} }
return qfalse;
}
//============================================================================= //=============================================================================
static char socksBuf[4096]; static char socksBuf[4096];
@ -318,26 +299,13 @@ Sys_SendPacket
void Sys_SendPacket( int length, const void *data, netadr_t to ) { void Sys_SendPacket( int length, const void *data, netadr_t to ) {
int ret; int ret;
struct sockaddr addr; struct sockaddr addr;
SOCKET net_socket;
if( to.type == NA_BROADCAST ) { if( to.type != NA_BROADCAST && to.type != NA_IP ) {
net_socket = ip_socket;
}
else if( to.type == NA_IP ) {
net_socket = ip_socket;
}
else if( to.type == NA_IPX ) {
net_socket = ipx_socket;
}
else if( to.type == NA_BROADCAST_IPX ) {
net_socket = ipx_socket;
}
else {
Com_Error( ERR_FATAL, "Sys_SendPacket: bad address type" ); Com_Error( ERR_FATAL, "Sys_SendPacket: bad address type" );
return; return;
} }
if( !net_socket ) { if( !ip_socket ) {
return; return;
} }
@ -351,21 +319,21 @@ void Sys_SendPacket( int length, const void *data, netadr_t to ) {
*(int *)&socksBuf[4] = ((struct sockaddr_in *)&addr)->sin_addr.s_addr; *(int *)&socksBuf[4] = ((struct sockaddr_in *)&addr)->sin_addr.s_addr;
*(short *)&socksBuf[8] = ((struct sockaddr_in *)&addr)->sin_port; *(short *)&socksBuf[8] = ((struct sockaddr_in *)&addr)->sin_port;
memcpy( &socksBuf[10], data, length ); memcpy( &socksBuf[10], data, length );
ret = sendto( net_socket, socksBuf, length+10, 0, &socksRelayAddr, sizeof(socksRelayAddr) ); ret = sendto( ip_socket, socksBuf, length+10, 0, &socksRelayAddr, sizeof(socksRelayAddr) );
} }
else { else {
ret = sendto( net_socket, data, length, 0, &addr, sizeof(addr) ); ret = sendto( ip_socket, data, length, 0, &addr, sizeof(addr) );
} }
if( ret == SOCKET_ERROR ) { if( ret == SOCKET_ERROR ) {
int err = WSAGetLastError(); int err = socketError;
// wouldblock is silent // wouldblock is silent
if( err == WSAEWOULDBLOCK ) { if( err == EAGAIN ) {
return; return;
} }
// some PPP links do not allow broadcasts and return an error // some PPP links do not allow broadcasts and return an error
if( ( err == WSAEADDRNOTAVAIL ) && ( ( to.type == NA_BROADCAST ) || ( to.type == NA_BROADCAST_IPX ) ) ) { if( ( err == EADDRNOTAVAIL ) && ( ( to.type == NA_BROADCAST ) ) ) {
return; return;
} }
@ -390,16 +358,24 @@ qboolean Sys_IsLANAddress( netadr_t adr ) {
return qtrue; return qtrue;
} }
if( adr.type == NA_IPX ) {
return qtrue;
}
if( adr.type != NA_IP ) { if( adr.type != NA_IP ) {
return qfalse; return qfalse;
} }
// RFC1918:
// 10.0.0.0 - 10.255.255.255 (10/8 prefix)
// 172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
// 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
if(adr.ip[0] == 10)
return qtrue;
if(adr.ip[0] == 172 && (adr.ip[1]&0xf0) == 16)
return qtrue;
if(adr.ip[0] == 192 && adr.ip[1] == 168)
return qtrue;
// choose which comparison to use based on the class of the address being tested // choose which comparison to use based on the class of the address being tested
// any local adresses of a different class than the address being tested will fail based on the first byte // any local adresses of a different class than the address being tested will fail based on the first byte
// FIXME tma 28/08/07 Try and make this work for arbitrary subnet masks somehow
if( adr.ip[0] == 127 && adr.ip[1] == 0 && adr.ip[2] == 0 && adr.ip[3] == 1 ) { if( adr.ip[0] == 127 && adr.ip[1] == 0 && adr.ip[2] == 0 && adr.ip[3] == 1 ) {
return qtrue; return qtrue;
@ -412,7 +388,7 @@ qboolean Sys_IsLANAddress( netadr_t adr ) {
return qtrue; return qtrue;
} }
} }
// the RFC1918 class a block will pass the above test
return qfalse; return qfalse;
} }
@ -422,10 +398,6 @@ qboolean Sys_IsLANAddress( netadr_t adr ) {
if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] ) { if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] ) {
return qtrue; return qtrue;
} }
// also check against the RFC1918 class b blocks
if( adr.ip[0] == 172 && localIP[i][0] == 172 && (adr.ip[1] & 0xf0) == 16 && (localIP[i][1] & 0xf0) == 16 ) {
return qtrue;
}
} }
return qfalse; return qfalse;
} }
@ -435,10 +407,6 @@ qboolean Sys_IsLANAddress( netadr_t adr ) {
if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] && adr.ip[2] == localIP[i][2] ) { if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] && adr.ip[2] == localIP[i][2] ) {
return qtrue; return qtrue;
} }
// also check against the RFC1918 class c blocks
if( adr.ip[0] == 192 && localIP[i][0] == 192 && adr.ip[1] == 168 && localIP[i][1] == 168 ) {
return qtrue;
}
} }
return qfalse; return qfalse;
} }
@ -480,8 +448,8 @@ int NET_IPSocket( char *net_interface, int port ) {
} }
if( ( newsocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == INVALID_SOCKET ) { if( ( newsocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == INVALID_SOCKET ) {
err = WSAGetLastError(); err = socketError;
if( err != WSAEAFNOSUPPORT ) { if( err != EAFNOSUPPORT ) {
Com_Printf( "WARNING: UDP_OpenSocket: socket: %s\n", NET_ErrorString() ); Com_Printf( "WARNING: UDP_OpenSocket: socket: %s\n", NET_ErrorString() );
} }
return 0; return 0;
@ -543,14 +511,14 @@ void NET_OpenSocks( int port ) {
Com_Printf( "Opening connection to SOCKS server.\n" ); Com_Printf( "Opening connection to SOCKS server.\n" );
if ( ( socks_socket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ) ) == INVALID_SOCKET ) { if ( ( socks_socket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ) ) == INVALID_SOCKET ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "WARNING: NET_OpenSocks: socket: %s\n", NET_ErrorString() ); Com_Printf( "WARNING: NET_OpenSocks: socket: %s\n", NET_ErrorString() );
return; return;
} }
h = gethostbyname( net_socksServer->string ); h = gethostbyname( net_socksServer->string );
if ( h == NULL ) { if ( h == NULL ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "WARNING: NET_OpenSocks: gethostbyname: %s\n", NET_ErrorString() ); Com_Printf( "WARNING: NET_OpenSocks: gethostbyname: %s\n", NET_ErrorString() );
return; return;
} }
@ -563,7 +531,7 @@ void NET_OpenSocks( int port ) {
address.sin_port = htons( (short)net_socksPort->integer ); address.sin_port = htons( (short)net_socksPort->integer );
if ( connect( socks_socket, (struct sockaddr *)&address, sizeof( address ) ) == SOCKET_ERROR ) { if ( connect( socks_socket, (struct sockaddr *)&address, sizeof( address ) ) == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: connect: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: connect: %s\n", NET_ErrorString() );
return; return;
} }
@ -591,7 +559,7 @@ void NET_OpenSocks( int port ) {
buf[2] = 2; // method #2 - method id #02: username/password buf[2] = 2; // method #2 - method id #02: username/password
} }
if ( send( socks_socket, buf, len, 0 ) == SOCKET_ERROR ) { if ( send( socks_socket, buf, len, 0 ) == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
return; return;
} }
@ -599,7 +567,7 @@ void NET_OpenSocks( int port ) {
// get the response // get the response
len = recv( socks_socket, buf, 64, 0 ); len = recv( socks_socket, buf, 64, 0 );
if ( len == SOCKET_ERROR ) { if ( len == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
return; return;
} }
@ -638,7 +606,7 @@ void NET_OpenSocks( int port ) {
// send it // send it
if ( send( socks_socket, buf, 3 + ulen + plen, 0 ) == SOCKET_ERROR ) { if ( send( socks_socket, buf, 3 + ulen + plen, 0 ) == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
return; return;
} }
@ -646,7 +614,7 @@ void NET_OpenSocks( int port ) {
// get the response // get the response
len = recv( socks_socket, buf, 64, 0 ); len = recv( socks_socket, buf, 64, 0 );
if ( len == SOCKET_ERROR ) { if ( len == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
return; return;
} }
@ -668,7 +636,7 @@ void NET_OpenSocks( int port ) {
*(int *)&buf[4] = INADDR_ANY; *(int *)&buf[4] = INADDR_ANY;
*(short *)&buf[8] = htons( (short)port ); // port *(short *)&buf[8] = htons( (short)port ); // port
if ( send( socks_socket, buf, 10, 0 ) == SOCKET_ERROR ) { if ( send( socks_socket, buf, 10, 0 ) == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
return; return;
} }
@ -676,7 +644,7 @@ void NET_OpenSocks( int port ) {
// get the response // get the response
len = recv( socks_socket, buf, 64, 0 ); len = recv( socks_socket, buf, 64, 0 );
if( len == SOCKET_ERROR ) { if( len == SOCKET_ERROR ) {
err = WSAGetLastError(); err = socketError;
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() ); Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
return; return;
} }
@ -707,6 +675,122 @@ void NET_OpenSocks( int port ) {
NET_GetLocalAddress NET_GetLocalAddress
===================== =====================
*/ */
#ifdef MACOS_X
// Don't do a forward mapping from the hostname of the machine to the IP.
// The reason is that we might have obtained an IP address from DHCP and
// there might not be any name registered for the machine. On Mac OS X,
// the machine name defaults to 'localhost' and NetInfo has 127.0.0.1
// listed for this name. Instead, we want to get a list of all the IP
// network interfaces on the machine. This code adapted from
// OmniNetworking.
#ifdef _SIZEOF_ADDR_IFREQ
// tjw: OSX 10.4 does not have sa_len
#define IFR_NEXT(ifr) \
((struct ifreq *) ((char *) ifr + _SIZEOF_ADDR_IFREQ(*ifr)))
#else
// tjw: assume that once upon a time some version did have sa_len
#define IFR_NEXT(ifr) \
((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
MAX(0, (int) (ifr)->ifr_addr.sa_len - (int) sizeof((ifr)->ifr_addr))))
#endif
void NET_GetLocalAddress( void ) {
struct ifreq requestBuffer[MAX_IPS], *linkInterface, *inetInterface;
struct ifconf ifc;
struct ifreq ifr;
struct sockaddr_dl *sdl;
int interfaceSocket;
int family;
// Set this early so we can just return if there is an error
numIP = 0;
ifc.ifc_len = sizeof(requestBuffer);
ifc.ifc_buf = (caddr_t)requestBuffer;
// Since we get at this info via an ioctl, we need a temporary little socket.
// This will only get AF_INET interfaces, but we probably don't care about
// anything else. If we do end up caring later, we should add a
// ONAddressFamily and at a -interfaces method to it.
family = AF_INET;
if ((interfaceSocket = socket(family, SOCK_DGRAM, 0)) < 0) {
Com_Printf("NET_GetLocalAddress: Unable to create temporary socket, errno = %d\n", errno);
return;
}
if (ioctl(interfaceSocket, SIOCGIFCONF, &ifc) != 0) {
Com_Printf("NET_GetLocalAddress: Unable to get list of network interfaces, errno = %d\n", errno);
return;
}
linkInterface = (struct ifreq *) ifc.ifc_buf;
while ((char *) linkInterface < &ifc.ifc_buf[ifc.ifc_len]) {
unsigned int nameLength;
// The ioctl returns both the entries having the address (AF_INET)
// and the link layer entries (AF_LINK). The AF_LINK entry has the
// link layer address which contains the interface type. This is the
// only way I can see to get this information. We cannot assume that
// we will get bot an AF_LINK and AF_INET entry since the interface
// may not be configured. For example, if you have a 10Mb port on
// the motherboard and a 100Mb card, you may not configure the
// motherboard port.
// For each AF_LINK entry...
if (linkInterface->ifr_addr.sa_family == AF_LINK) {
// if there is a matching AF_INET entry
inetInterface = (struct ifreq *) ifc.ifc_buf;
while ((char *) inetInterface < &ifc.ifc_buf[ifc.ifc_len]) {
if (inetInterface->ifr_addr.sa_family == AF_INET &&
!strncmp(inetInterface->ifr_name, linkInterface->ifr_name,
sizeof(linkInterface->ifr_name))) {
for (nameLength = 0; nameLength < IFNAMSIZ; nameLength++)
if (!linkInterface->ifr_name[nameLength])
break;
sdl = (struct sockaddr_dl *)&linkInterface->ifr_addr;
// Skip loopback interfaces
if (sdl->sdl_type != IFT_LOOP) {
// Get the local interface address
strncpy(ifr.ifr_name, inetInterface->ifr_name, sizeof(ifr.ifr_name));
if (ioctl(interfaceSocket, OSIOCGIFADDR, (caddr_t)&ifr) < 0) {
Com_Printf("NET_GetLocalAddress: Unable to get local address "
"for interface '%s', errno = %d\n", inetInterface->ifr_name, errno);
} else {
struct sockaddr_in *sin;
int ip;
sin = (struct sockaddr_in *)&ifr.ifr_addr;
ip = ntohl(sin->sin_addr.s_addr);
localIP[ numIP ][0] = (ip >> 24) & 0xff;
localIP[ numIP ][1] = (ip >> 16) & 0xff;
localIP[ numIP ][2] = (ip >> 8) & 0xff;
localIP[ numIP ][3] = (ip >> 0) & 0xff;
Com_Printf( "IP: %i.%i.%i.%i (%s)\n",
localIP[ numIP ][0], localIP[ numIP ][1],
localIP[ numIP ][2], localIP[ numIP ][3],
inetInterface->ifr_name);
numIP++;
}
}
// We will assume that there is only one AF_INET entry per AF_LINK entry.
// What happens when we have an interface that has multiple IP addresses, or
// can that even happen?
// break;
}
inetInterface = IFR_NEXT(inetInterface);
}
}
linkInterface = IFR_NEXT(linkInterface);
}
close(interfaceSocket);
}
#else
void NET_GetLocalAddress( void ) { void NET_GetLocalAddress( void ) {
char hostname[256]; char hostname[256];
struct hostent *hostInfo; struct hostent *hostInfo;
@ -716,13 +800,13 @@ void NET_GetLocalAddress( void ) {
int n; int n;
if( gethostname( hostname, 256 ) == SOCKET_ERROR ) { if( gethostname( hostname, 256 ) == SOCKET_ERROR ) {
error = WSAGetLastError(); error = socketError;
return; return;
} }
hostInfo = gethostbyname( hostname ); hostInfo = gethostbyname( hostname );
if( !hostInfo ) { if( !hostInfo ) {
error = WSAGetLastError(); error = socketError;
return; return;
} }
@ -747,6 +831,7 @@ void NET_GetLocalAddress( void ) {
numIP++; numIP++;
} }
} }
#endif
/* /*
==================== ====================
@ -779,71 +864,6 @@ void NET_OpenIP( void ) {
} }
/*
====================
NET_IPXSocket
====================
*/
int NET_IPXSocket( int port ) {
SOCKET newsocket;
struct sockaddr_ipx address;
int _true = 1;
int err;
if( ( newsocket = socket( AF_IPX, SOCK_DGRAM, NSPROTO_IPX ) ) == INVALID_SOCKET ) {
err = WSAGetLastError();
if (err != WSAEAFNOSUPPORT) {
Com_Printf( "WARNING: IPX_Socket: socket: %s\n", NET_ErrorString() );
}
return 0;
}
// make it non-blocking
if( ioctlsocket( newsocket, FIONBIO, (u_long *)&_true ) == SOCKET_ERROR ) {
Com_Printf( "WARNING: IPX_Socket: ioctl FIONBIO: %s\n", NET_ErrorString() );
return 0;
}
// make it broadcast capable
if( setsockopt( newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&_true, sizeof( _true ) ) == SOCKET_ERROR ) {
Com_Printf( "WARNING: IPX_Socket: setsockopt SO_BROADCAST: %s\n", NET_ErrorString() );
return 0;
}
address.sa_family = AF_IPX;
memset( address.sa_netnum, 0, 4 );
memset( address.sa_nodenum, 0, 6 );
if( port == PORT_ANY ) {
address.sa_socket = 0;
}
else {
address.sa_socket = htons( (short)port );
}
if( bind( newsocket, (void *)&address, sizeof(address) ) == SOCKET_ERROR ) {
Com_Printf( "WARNING: IPX_Socket: bind: %s\n", NET_ErrorString() );
closesocket( newsocket );
return 0;
}
return newsocket;
}
/*
====================
NET_OpenIPX
====================
*/
void NET_OpenIPX( void ) {
int port;
port = Cvar_Get( "net_port", va( "%i", PORT_SERVER ), CVAR_LATCH )->integer;
ipx_socket = NET_IPXSocket( port );
}
//=================================================================== //===================================================================
@ -862,11 +882,6 @@ static qboolean NET_GetCvars( void ) {
} }
net_noudp = Cvar_Get( "net_noudp", "0", CVAR_LATCH | CVAR_ARCHIVE ); net_noudp = Cvar_Get( "net_noudp", "0", CVAR_LATCH | CVAR_ARCHIVE );
if( net_noipx && net_noipx->modified ) {
modified = qtrue;
}
net_noipx = Cvar_Get( "net_noipx", "0", CVAR_LATCH | CVAR_ARCHIVE );
if( net_socksEnabled && net_socksEnabled->modified ) { if( net_socksEnabled && net_socksEnabled->modified ) {
modified = qtrue; modified = qtrue;
@ -911,7 +926,7 @@ void NET_Config( qboolean enableNetworking ) {
// get any latched changes to cvars // get any latched changes to cvars
modified = NET_GetCvars(); modified = NET_GetCvars();
if( net_noudp->integer && net_noipx->integer ) { if( net_noudp->integer ) {
enableNetworking = qfalse; enableNetworking = qfalse;
} }
@ -952,20 +967,12 @@ void NET_Config( qboolean enableNetworking ) {
closesocket( socks_socket ); closesocket( socks_socket );
socks_socket = 0; socks_socket = 0;
} }
if ( ipx_socket && ipx_socket != INVALID_SOCKET ) {
closesocket( ipx_socket );
ipx_socket = 0;
}
} }
if( start ) { if( start ) {
if (! net_noudp->integer ) { if (! net_noudp->integer ) {
NET_OpenIP(); NET_OpenIP();
} }
if (! net_noipx->integer ) {
NET_OpenIPX();
}
} }
} }
@ -976,6 +983,7 @@ NET_Init
==================== ====================
*/ */
void NET_Init( void ) { void NET_Init( void ) {
#ifdef _WIN32
int r; int r;
r = WSAStartup( MAKEWORD( 1, 1 ), &winsockdata ); r = WSAStartup( MAKEWORD( 1, 1 ), &winsockdata );
@ -986,11 +994,11 @@ void NET_Init( void ) {
winsockInitialized = qtrue; winsockInitialized = qtrue;
Com_Printf( "Winsock Initialized\n" ); Com_Printf( "Winsock Initialized\n" );
#endif
// this is really just to get the cvars registered // this is really just to get the cvars registered
NET_GetCvars(); NET_GetCvars();
//FIXME testing!
NET_Config( qtrue ); NET_Config( qtrue );
} }
@ -1001,12 +1009,16 @@ NET_Shutdown
==================== ====================
*/ */
void NET_Shutdown( void ) { void NET_Shutdown( void ) {
if ( !winsockInitialized ) { if ( !networkingEnabled ) {
return; return;
} }
NET_Config( qfalse ); NET_Config( qfalse );
#ifdef _WIN32
WSACleanup(); WSACleanup();
winsockInitialized = qfalse; winsockInitialized = qfalse;
#endif
} }
@ -1014,10 +1026,49 @@ void NET_Shutdown( void ) {
==================== ====================
NET_Sleep NET_Sleep
sleeps msec or until net socket is ready Sleeps msec or until net socket is ready
==================== ====================
*/ */
void NET_Sleep( int msec ) { void NET_Sleep( int msec ) {
struct timeval timeout;
fd_set fdset;
#ifndef _WIN32 //FIXME
extern qboolean stdin_active;
#endif
int highestfd = 0;
if (!com_dedicated->integer)
return; // we're not a server, just run full speed
FD_ZERO(&fdset);
#ifndef _WIN32 //FIXME
if (stdin_active)
{
FD_SET(0, &fdset); // stdin is processed too
highestfd = 1;
}
#endif
if(ip_socket)
{
FD_SET(ip_socket, &fdset); // network socket
if(ip_socket >= highestfd)
highestfd = ip_socket + 1;
}
if(highestfd)
{
if(msec >= 0)
{
timeout.tv_sec = msec/1000;
timeout.tv_usec = (msec%1000)*1000;
select(highestfd, &fdset, NULL, NULL, &timeout);
}
else
{
// Block indefinitely
select(highestfd, &fdset, NULL, NULL, NULL);
}
}
} }

5
code/qcommon/qcommon.h
View file

@ -136,9 +136,7 @@ typedef enum {
NA_BAD, // an address lookup failed NA_BAD, // an address lookup failed
NA_LOOPBACK, NA_LOOPBACK,
NA_BROADCAST, NA_BROADCAST,
NA_IP, NA_IP
NA_IPX,
NA_BROADCAST_IPX
} netadrtype_t; } netadrtype_t;
typedef enum { typedef enum {
@ -150,7 +148,6 @@ typedef struct {
netadrtype_t type; netadrtype_t type;
byte ip[4]; byte ip[4];
byte ipx[10];
unsigned short port; unsigned short port;
} netadr_t; } netadr_t;

1
code/ui/ui_main.c
View file

@ -116,7 +116,6 @@ static const int numSortKeys = sizeof(sortKeys) / sizeof(const char*);
static char* netnames[] = { static char* netnames[] = {
"???", "???",
"UDP", "UDP",
"IPX",
NULL NULL
}; };

683
code/unix/unix_net.c
View file

@ -1,683 +0,0 @@
/*
===========================================================================
Copyright (C) 1999-2005 Id Software, Inc.
This file is part of Quake III Arena source code.
Quake III Arena source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Quake III Arena source code; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
// unix_net.c
#include "../qcommon/q_shared.h"
#include "../qcommon/qcommon.h"
#include <unistd.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
// needed for socket_t on OSX 10.2
#define _BSD_SOCKLEN_T_
#endif
#include <sys/socket.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h> // bk001204
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <errno.h>
#ifdef MACOS_X
#import <sys/sockio.h>
#import <net/if.h>
#import <net/if_types.h>
#import <arpa/inet.h> // for inet_ntoa()
#import <net/if_dl.h> // for 'struct sockaddr_dl'
#endif
#ifdef __sun
#include <sys/filio.h>
#endif
static cvar_t *noudp;
netadr_t net_local_adr;
int ip_socket;
int ipx_socket;
#define MAX_IPS 16
static int numIP;
static byte localIP[MAX_IPS][4];
int NET_Socket (char *net_interface, int port);
char *NET_ErrorString (void);
//=============================================================================
void NetadrToSockadr (netadr_t *a, struct sockaddr_in *s)
{
memset (s, 0, sizeof(*s));
if (a->type == NA_BROADCAST)
{
s->sin_family = AF_INET;
s->sin_port = a->port;
*(int *)&s->sin_addr = -1;
}
else if (a->type == NA_IP)
{
s->sin_family = AF_INET;
*(int *)&s->sin_addr = *(int *)&a->ip;
s->sin_port = a->port;
}
}
void SockadrToNetadr (struct sockaddr_in *s, netadr_t *a)
{
*(int *)&a->ip = *(int *)&s->sin_addr;
a->port = s->sin_port;
a->type = NA_IP;
}
char *NET_BaseAdrToString (netadr_t a)
{
static char s[64];
Com_sprintf (s, sizeof(s), "%i.%i.%i.%i", a.ip[0], a.ip[1], a.ip[2], a.ip[3]);
return s;
}
/*
=============
Sys_StringToAdr
idnewt
192.246.40.70
=============
*/
qboolean Sys_StringToSockaddr (const char *s, struct sockaddr *sadr)
{
struct hostent *h;
//char *colon; // bk001204 - unused
memset (sadr, 0, sizeof(*sadr));
((struct sockaddr_in *)sadr)->sin_family = AF_INET;
((struct sockaddr_in *)sadr)->sin_port = 0;
if ( s[0] >= '0' && s[0] <= '9')
{
*(int *)&((struct sockaddr_in *)sadr)->sin_addr = inet_addr(s);
}
else
{
if (! (h = gethostbyname(s)) )
return qfalse;
*(int *)&((struct sockaddr_in *)sadr)->sin_addr = *(int *)h->h_addr_list[0];
}
return qtrue;
}
/*
=============
Sys_StringToAdr
localhost
idnewt
idnewt:28000
192.246.40.70
192.246.40.70:28000
=============
*/
qboolean Sys_StringToAdr (const char *s, netadr_t *a)
{
struct sockaddr_in sadr;
if (!Sys_StringToSockaddr (s, (struct sockaddr *)&sadr))
return qfalse;
SockadrToNetadr (&sadr, a);
return qtrue;
}
//=============================================================================
qboolean Sys_GetPacket (netadr_t *net_from, msg_t *net_message)
{
int ret;
struct sockaddr_in from;
socklen_t fromlen;
int net_socket;
int protocol;
int err;
for (protocol = 0 ; protocol < 2 ; protocol++)
{
if (protocol == 0)
net_socket = ip_socket;
else
net_socket = ipx_socket;
if (!net_socket)
continue;
fromlen = sizeof(from);
ret = recvfrom (net_socket, net_message->data, net_message->maxsize
, 0, (struct sockaddr *)&from, &fromlen);
SockadrToNetadr (&from, net_from);
// bk000305: was missing
net_message->readcount = 0;
if (ret == -1)
{
err = errno;
if (err == EWOULDBLOCK || err == ECONNREFUSED)
continue;
Com_Printf ("NET_GetPacket: %s from %s\n", NET_ErrorString(),
NET_AdrToString(*net_from));
continue;
}
if (ret == net_message->maxsize)
{
Com_Printf ("Oversize packet from %s\n", NET_AdrToString (*net_from));
continue;
}
net_message->cursize = ret;
return qtrue;
}
return qfalse;
}
//=============================================================================
void Sys_SendPacket( int length, const void *data, netadr_t to )
{
int ret;
struct sockaddr_in addr;
int net_socket;
if (to.type == NA_BROADCAST)
{
net_socket = ip_socket;
}
else if (to.type == NA_IP)
{
net_socket = ip_socket;
}
else if (to.type == NA_IPX)
{
net_socket = ipx_socket;
}
else if (to.type == NA_BROADCAST_IPX)
{
net_socket = ipx_socket;
}
else {
Com_Error (ERR_FATAL, "NET_SendPacket: bad address type");
return;
}
if (!net_socket)
return;
NetadrToSockadr (&to, &addr);
ret = sendto (net_socket, data, length, 0, (struct sockaddr *)&addr, sizeof(addr) );
if (ret == -1)
{
Com_Printf ("NET_SendPacket ERROR: %s to %s\n", NET_ErrorString(),
NET_AdrToString (to));
}
}
//=============================================================================
/*
==================
Sys_IsLANAddress
LAN clients will have their rate var ignored
==================
*/
qboolean Sys_IsLANAddress (netadr_t adr) {
int i;
if( adr.type == NA_LOOPBACK ) {
return qtrue;
}
if( adr.type == NA_IPX ) {
return qtrue;
}
if( adr.type != NA_IP ) {
return qfalse;
}
// RFC1918:
// 10.0.0.0 - 10.255.255.255 (10/8 prefix)
// 172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
// 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
if(adr.ip[0] == 10)
return qtrue;
if(adr.ip[0] == 172 && (adr.ip[1]&0xf0) == 16)
return qtrue;
if(adr.ip[0] == 192 && adr.ip[1] == 168)
return qtrue;
// the checks below are bogus, aren't they? -- ln
// choose which comparison to use based on the class of the address being tested
// any local adresses of a different class than the address being tested will fail based on the first byte
// Class A
if( (adr.ip[0] & 0x80) == 0x00 ) {
for ( i = 0 ; i < numIP ; i++ ) {
if( adr.ip[0] == localIP[i][0] ) {
return qtrue;
}
}
// the RFC1918 class a block will pass the above test
return qfalse;
}
// Class B
if( (adr.ip[0] & 0xc0) == 0x80 ) {
for ( i = 0 ; i < numIP ; i++ ) {
if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] ) {
return qtrue;
}
// also check against the RFC1918 class b blocks
if( adr.ip[0] == 172 && localIP[i][0] == 172 && (adr.ip[1] & 0xf0) == 16 && (localIP[i][1] & 0xf0) == 16 ) {
return qtrue;
}
}
return qfalse;
}
// Class C
for ( i = 0 ; i < numIP ; i++ ) {
if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] && adr.ip[2] == localIP[i][2] ) {
return qtrue;
}
// also check against the RFC1918 class c blocks
if( adr.ip[0] == 192 && localIP[i][0] == 192 && adr.ip[1] == 168 && localIP[i][1] == 168 ) {
return qtrue;
}
}
return qfalse;
}
/*
==================
Sys_ShowIP
==================
*/
void Sys_ShowIP(void) {
int i;
for (i = 0; i < numIP; i++) {
Com_Printf( "IP: %i.%i.%i.%i\n", localIP[i][0], localIP[i][1], localIP[i][2], localIP[i][3] );
}
}
/*
=====================
NET_GetLocalAddress
=====================
*/
#ifdef MACOS_X
// Don't do a forward mapping from the hostname of the machine to the IP.
// The reason is that we might have obtained an IP address from DHCP and
// there might not be any name registered for the machine. On Mac OS X,
// the machine name defaults to 'localhost' and NetInfo has 127.0.0.1
// listed for this name. Instead, we want to get a list of all the IP
// network interfaces on the machine. This code adapted from
// OmniNetworking.
#ifdef _SIZEOF_ADDR_IFREQ
// tjw: OSX 10.4 does not have sa_len
#define IFR_NEXT(ifr) \
((struct ifreq *) ((char *) ifr + _SIZEOF_ADDR_IFREQ(*ifr)))
#else
// tjw: assume that once upon a time some version did have sa_len
#define IFR_NEXT(ifr) \
((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
MAX(0, (int) (ifr)->ifr_addr.sa_len - (int) sizeof((ifr)->ifr_addr))))
#endif
void NET_GetLocalAddress( void ) {
struct ifreq requestBuffer[MAX_IPS], *linkInterface, *inetInterface;
struct ifconf ifc;
struct ifreq ifr;
struct sockaddr_dl *sdl;
int interfaceSocket;
int family;
// Set this early so we can just return if there is an error
numIP = 0;
ifc.ifc_len = sizeof(requestBuffer);
ifc.ifc_buf = (caddr_t)requestBuffer;
// Since we get at this info via an ioctl, we need a temporary little socket.
// This will only get AF_INET interfaces, but we probably don't care about
// anything else. If we do end up caring later, we should add a
// ONAddressFamily and at a -interfaces method to it.
family = AF_INET;
if ((interfaceSocket = socket(family, SOCK_DGRAM, 0)) < 0) {
Com_Printf("NET_GetLocalAddress: Unable to create temporary socket, errno = %d\n", errno);
return;
}
if (ioctl(interfaceSocket, SIOCGIFCONF, &ifc) != 0) {
Com_Printf("NET_GetLocalAddress: Unable to get list of network interfaces, errno = %d\n", errno);
return;
}
linkInterface = (struct ifreq *) ifc.ifc_buf;
while ((char *) linkInterface < &ifc.ifc_buf[ifc.ifc_len]) {
unsigned int nameLength;
// The ioctl returns both the entries having the address (AF_INET)
// and the link layer entries (AF_LINK). The AF_LINK entry has the
// link layer address which contains the interface type. This is the
// only way I can see to get this information. We cannot assume that
// we will get bot an AF_LINK and AF_INET entry since the interface
// may not be configured. For example, if you have a 10Mb port on
// the motherboard and a 100Mb card, you may not configure the
// motherboard port.
// For each AF_LINK entry...
if (linkInterface->ifr_addr.sa_family == AF_LINK) {
// if there is a matching AF_INET entry
inetInterface = (struct ifreq *) ifc.ifc_buf;
while ((char *) inetInterface < &ifc.ifc_buf[ifc.ifc_len]) {
if (inetInterface->ifr_addr.sa_family == AF_INET &&
!strncmp(inetInterface->ifr_name, linkInterface->ifr_name,
sizeof(linkInterface->ifr_name))) {
for (nameLength = 0; nameLength < IFNAMSIZ; nameLength++)
if (!linkInterface->ifr_name[nameLength])
break;
sdl = (struct sockaddr_dl *)&linkInterface->ifr_addr;
// Skip loopback interfaces
if (sdl->sdl_type != IFT_LOOP) {
// Get the local interface address
strncpy(ifr.ifr_name, inetInterface->ifr_name, sizeof(ifr.ifr_name));
if (ioctl(interfaceSocket, OSIOCGIFADDR, (caddr_t)&ifr) < 0) {
Com_Printf("NET_GetLocalAddress: Unable to get local address "
"for interface '%s', errno = %d\n", inetInterface->ifr_name, errno);
} else {
struct sockaddr_in *sin;
int ip;
sin = (struct sockaddr_in *)&ifr.ifr_addr;
ip = ntohl(sin->sin_addr.s_addr);
localIP[ numIP ][0] = (ip >> 24) & 0xff;
localIP[ numIP ][1] = (ip >> 16) & 0xff;
localIP[ numIP ][2] = (ip >> 8) & 0xff;
localIP[ numIP ][3] = (ip >> 0) & 0xff;
Com_Printf( "IP: %i.%i.%i.%i (%s)\n",
localIP[ numIP ][0], localIP[ numIP ][1],
localIP[ numIP ][2], localIP[ numIP ][3],
inetInterface->ifr_name);
numIP++;
}
}
// We will assume that there is only one AF_INET entry per AF_LINK entry.
// What happens when we have an interface that has multiple IP addresses, or
// can that even happen?
// break;
}
inetInterface = IFR_NEXT(inetInterface);
}
}
linkInterface = IFR_NEXT(linkInterface);
}
close(interfaceSocket);
}
#else
void NET_GetLocalAddress( void ) {
char hostname[256];
struct hostent *hostInfo;
// int error; // bk001204 - unused
char *p;
int ip;
int n;
if ( gethostname( hostname, 256 ) == -1 ) {
return;
}
hostInfo = gethostbyname( hostname );
if ( !hostInfo ) {
return;
}
Com_Printf( "Hostname: %s\n", hostInfo->h_name );
n = 0;
while( ( p = hostInfo->h_aliases[n++] ) != NULL ) {
Com_Printf( "Alias: %s\n", p );
}
if ( hostInfo->h_addrtype != AF_INET ) {
return;
}
numIP = 0;
while( ( p = hostInfo->h_addr_list[numIP++] ) != NULL && numIP < MAX_IPS ) {
ip = ntohl( *(int *)p );
localIP[ numIP ][0] = p[0];
localIP[ numIP ][1] = p[1];
localIP[ numIP ][2] = p[2];
localIP[ numIP ][3] = p[3];
Com_Printf( "IP: %i.%i.%i.%i\n", ( ip >> 24 ) & 0xff, ( ip >> 16 ) & 0xff, ( ip >> 8 ) & 0xff, ip & 0xff );
}
}
#endif
/*
====================
NET_OpenIP
====================
*/
// bk001204 - prototype needed
int NET_IPSocket (char *net_interface, int port);
void NET_OpenIP (void)
{
cvar_t *ip;
int port;
int i;
ip = Cvar_Get ("net_ip", "localhost", 0);
port = Cvar_Get("net_port", va("%i", PORT_SERVER), 0)->value;
for ( i = 0 ; i < 10 ; i++ ) {
ip_socket = NET_IPSocket (ip->string, port + i);
if ( ip_socket ) {
Cvar_SetValue( "net_port", port + i );
NET_GetLocalAddress();
return;
}
}
Com_Error (ERR_FATAL, "Couldn't allocate IP port");
}
/*
====================
NET_Init
====================
*/
void NET_Init (void)
{
noudp = Cvar_Get ("net_noudp", "0", 0);
// open sockets
if (! noudp->value) {
NET_OpenIP ();
}
}
/*
====================
NET_IPSocket
====================
*/
int NET_IPSocket (char *net_interface, int port)
{
int newsocket;
struct sockaddr_in address;
qboolean _qtrue = qtrue;
int i = 1;
if ( net_interface ) {
Com_Printf("Opening IP socket: %s:%i\n", net_interface, port );
} else {
Com_Printf("Opening IP socket: localhost:%i\n", port );
}
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
{
Com_Printf ("ERROR: UDP_OpenSocket: socket: %s", NET_ErrorString());
return 0;
}
// make it non-blocking
if (ioctl (newsocket, FIONBIO, &_qtrue) == -1)
{
Com_Printf ("ERROR: UDP_OpenSocket: ioctl FIONBIO:%s\n", NET_ErrorString());
return 0;
}
// make it broadcast capable
if (setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) == -1)
{
Com_Printf ("ERROR: UDP_OpenSocket: setsockopt SO_BROADCAST:%s\n", NET_ErrorString());
return 0;
}
if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost"))
address.sin_addr.s_addr = INADDR_ANY;
else
Sys_StringToSockaddr (net_interface, (struct sockaddr *)&address);
if (port == PORT_ANY)
address.sin_port = 0;
else
address.sin_port = htons((short)port);
address.sin_family = AF_INET;
if( bind (newsocket, (void *)&address, sizeof(address)) == -1)
{
Com_Printf ("ERROR: UDP_OpenSocket: bind: %s\n", NET_ErrorString());
close (newsocket);
return 0;
}
return newsocket;
}
/*
====================
NET_Shutdown
====================
*/
void NET_Shutdown (void)
{
if (ip_socket) {
close(ip_socket);
ip_socket = 0;
}
}
/*
====================
NET_ErrorString
====================
*/
char *NET_ErrorString (void)
{
int code;
code = errno;
return strerror (code);
}
// sleeps msec or until net socket is ready
void NET_Sleep(int msec)
{
struct timeval timeout;
fd_set fdset;
extern qboolean stdin_active;
int highestfd = 0;
if (!com_dedicated->integer)
return; // we're not a server, just run full speed
FD_ZERO(&fdset);
if (stdin_active)
{
FD_SET(0, &fdset); // stdin is processed too
highestfd = 1;
}
if(ip_socket)
{
FD_SET(ip_socket, &fdset); // network socket
if(ip_socket >= highestfd)
highestfd = ip_socket + 1;
}
if(highestfd)
{
if(msec >= 0)
{
timeout.tv_sec = msec/1000;
timeout.tv_usec = (msec%1000)*1000;
select(highestfd, &fdset, NULL, NULL, &timeout);
}
else
{
// Block indefinitely
select(highestfd, &fdset, NULL, NULL, NULL);
}
}
}

2
code/win32/win_local.h
View file

@ -35,8 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <dinput.h> #include <dinput.h>
#include <dsound.h> #include <dsound.h>
#include <winsock.h>
#include <wsipx.h>
#include <shlobj.h> #include <shlobj.h>
void IN_MouseEvent (int mstate); void IN_MouseEvent (int mstate);