qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-22 03:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged net_wins.c with net_udp.c.

Browse source
This commit is contained in:
Marcus Sundberg 2000-05-20 00:04:33 +00:00
parent ea61fa1d09
commit e8cf54f5f3
7 changed files with 108 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/makefile.winc
View file

@ -85,7 +85,7 @@ CL_platform=\
sys_win.obj \
cl_sys_win.obj \
cd_win.obj \
net_wins.obj
net_udp.obj
CL_asm=\
# cl_math.asm \

2
source/makefile.wingl
View file

@ -68,7 +68,7 @@ CL_platform=\
sys_win.obj \
cl_sys_win.obj \
cd_win.obj \
net_wins.obj
net_udp.obj
CL_asm=\
sys_wina.obj

2
source/makefile.wins
View file

@ -35,7 +35,7 @@ SV_sources=\
sv_user.obj \
sv_ccmds.obj \
world.obj \
net_wins.obj \
net_udp.obj \
sv_sys_win.obj \
sys_win.obj \
sv_cvar.obj

132
source/net_udp.c
View file

@ -4,6 +4,7 @@
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -32,40 +33,64 @@
#include "sys.h"
#include "quakedef.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <arpa/inet.h>
#include <stdio.h>
#include <errno.h>
#if defined(sun)
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef sun
#include <sys/filio.h>
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#ifdef _WIN32
# include <winquake.h>
# undef EWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#ifdef NeXT
#include <libc.h>
#endif
#ifndef MAXHOSTNAMELEN
# define MAXHOSTNAMELEN 512
#endif
netadr_t net_local_adr;
netadr_t net_from;
sizebuf_t net_message;
int net_socket; // non blocking, for receives
int net_send_socket; // blocking, for sends
int net_socket;
#define MAX_UDP_PACKET 8192
#define MAX_UDP_PACKET (MAX_MSGLEN*2)
byte net_message_buffer[MAX_UDP_PACKET];
int gethostname (char *, int);
int close (int);
#ifdef _WIN32
extern qboolean is_server;
WSADATA winsockdata;
#endif
//=============================================================================
@ -170,6 +195,9 @@ qboolean NET_StringToAdr (char *s, netadr_t *a)
qboolean NET_IsClientLegal(netadr_t *adr)
{
#if 0
struct sockaddr_in sadr;
int newsocket;
if (adr->ip[0] == 127)
return false; // no local connections period
@ -203,18 +231,35 @@ qboolean NET_GetPacket (void)
int fromlen;
fromlen = sizeof(from);
ret = recvfrom (net_socket, net_message_buffer, sizeof(net_message_buffer), 0, (struct sockaddr *)&from, &fromlen);
ret = recvfrom(net_socket, net_message_buffer, sizeof(net_message_buffer),
0, (struct sockaddr *)&from, &fromlen);
SockadrToNetadr(&from, &net_from);
if (ret == -1) {
if (errno == EWOULDBLOCK)
#ifdef _WIN32
int err = WSAGetLastError();
if (err == WSAEMSGSIZE) {
Con_Printf ("Warning: Oversize packet from %s\n",
NET_AdrToString (net_from));
return false;
if (errno == ECONNREFUSED)
return false;
Sys_Printf ("NET_GetPacket: %s\n", strerror(errno));
}
#else /* _WIN32 */
int err = errno;
if (err == ECONNREFUSED) return false;
#endif /* _WIN32 */
if (err == EWOULDBLOCK) return false;
Sys_Printf ("NET_GetPacket: %s\n", strerror(err));
return false;
}
net_message.cursize = ret;
SockadrToNetadr (&from, &net_from);
if (ret == sizeof(net_message_buffer)) {
Con_Printf ("Oversize packet from %s\n",
NET_AdrToString (net_from));
return false;
}
return ret;
}
@ -230,10 +275,20 @@ void NET_SendPacket (int length, void *data, netadr_t to)
ret = sendto (net_socket, data, length, 0, (struct sockaddr *)&addr, sizeof(addr) );
if (ret == -1) {
if (errno == EWOULDBLOCK)
return;
if (errno == ECONNREFUSED)
return;
#ifdef _WIN32
int err = WSAGetLastError();
if (err == WSAEADDRNOTAVAIL) {
if (is_server) Con_DPrintf("NET_SendPacket Warning: %i\n", err);
else Con_Printf ("NET_SendPacket ERROR: %i\n", err);
}
#else /* _WIN32 */
int err = errno;
if (err == ECONNREFUSED) return;
#endif /* _WIN32 */
if (err == EWOULDBLOCK) return;
Sys_Printf ("NET_SendPacket: %s\n", strerror(errno));
}
}
@ -244,12 +299,17 @@ int UDP_OpenSocket (int port)
{
int newsocket;
struct sockaddr_in address;
qboolean _true = true;
#ifdef _WIN32
#define ioctl ioctlsocket
unsigned long _true = true;
#else
int _true = 1;
#endif
int i;
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
Sys_Error ("UDP_OpenSocket: socket:", strerror(errno));
if (ioctl (newsocket, FIONBIO, (char *)&_true) == -1)
if (ioctl (newsocket, FIONBIO, &_true) == -1)
Sys_Error ("UDP_OpenSocket: ioctl FIONBIO:", strerror(errno));
address.sin_family = AF_INET;
//ZOID -- check for interface binding option
@ -295,6 +355,16 @@ NET_Init
*/
void NET_Init (int port)
{
#ifdef _WIN32
WORD wVersionRequested;
int r;
wVersionRequested = MAKEWORD(1, 1);
r = WSAStartup(MAKEWORD(1, 1), &winsockdata);
if (r)
Sys_Error ("Winsock initialization failed.");
#endif /* _WIN32 */
//
// open the single socket to be used for all communications
//
@ -321,6 +391,10 @@ NET_Shutdown
*/
void NET_Shutdown (void)
{
#ifdef _WIN32
closesocket(net_socket);
WSACleanup();
#else
close (net_socket);
#endif
}

340
source/net_wins.c
View file

@ -1,340 +0,0 @@
/*
net_wins.c
(description)
Copyright (C) 1996-1997 Id Software, Inc.
This program 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.
This program 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 this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "quakedef.h"
#include <windows.h>
#include <sys.h>
//#include "winquake.h"
netadr_t net_local_adr;
netadr_t net_from;
sizebuf_t net_message;
int net_socket;
#define MAX_UDP_PACKET (MAX_MSGLEN*2) // one more than msg + header
byte net_message_buffer[MAX_UDP_PACKET];
WSADATA winsockdata;
//=============================================================================
void NetadrToSockadr (netadr_t *a, struct sockaddr_in *s)
{
memset (s, 0, sizeof(*s));
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;
}
qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b)
{
if (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2] && a.ip[3] == b.ip[3])
return true;
return false;
}
qboolean NET_CompareAdr (netadr_t a, netadr_t b)
{
if (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2] && a.ip[3] == b.ip[3] && a.port == b.port)
return true;
return false;
}
char *NET_AdrToString (netadr_t a)
{
static char s[64];
sprintf (s, "%i.%i.%i.%i:%i", a.ip[0], a.ip[1], a.ip[2], a.ip[3], ntohs(a.port));
return s;
}
char *NET_BaseAdrToString (netadr_t a)
{
static char s[64];
sprintf (s, "%i.%i.%i.%i", a.ip[0], a.ip[1], a.ip[2], a.ip[3]);
return s;
}
/*
=============
NET_StringToAdr
idnewt
idnewt:28000
192.246.40.70
192.246.40.70:28000
=============
*/
qboolean NET_StringToAdr (char *s, netadr_t *a)
{
struct hostent *h;
struct sockaddr_in sadr;
char *colon;
char copy[128];
memset (&sadr, 0, sizeof(sadr));
sadr.sin_family = AF_INET;
sadr.sin_port = 0;
strcpy (copy, s);
// strip off a trailing :port if present
for (colon = copy ; *colon ; colon++)
if (*colon == ':')
{
*colon = 0;
sadr.sin_port = htons((short)atoi(colon+1));
}
if (copy[0] >= '0' && copy[0] <= '9')
{
*(int *)&sadr.sin_addr = inet_addr(copy);
}
else
{
if ((h = gethostbyname(copy)) == 0)
return 0;
*(int *)&sadr.sin_addr = *(int *)h->h_addr_list[0];
}
SockadrToNetadr (&sadr, a);
return true;
}
// Returns true if we can't bind the address locally--in other words,
// the IP is NOT one of our interfaces.
qboolean NET_IsClientLegal(netadr_t *adr)
{
#if 0
struct sockaddr_in sadr;
int newsocket;
if (adr->ip[0] == 127)
return false; // no local connections period
NetadrToSockadr (adr, &sadr);
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
Sys_Error ("NET_IsClientLegal: socket:", strerror(errno));
sadr.sin_port = 0;
if( bind (newsocket, (void *)&sadr, sizeof(sadr)) == -1)
{
// It is not a local address
close(newsocket);
return true;
}
close(newsocket);
return false;
#else
return true;
#endif
}
//=============================================================================
qboolean NET_GetPacket (void)
{
int ret;
struct sockaddr_in from;
int fromlen;
fromlen = sizeof(from);
ret = recvfrom (net_socket, (char *)net_message_buffer, sizeof(net_message_buffer), 0, (struct sockaddr *)&from, &fromlen);
SockadrToNetadr (&from, &net_from);
if (ret == -1)
{
int wserrno = WSAGetLastError();
if (wserrno == WSAEWOULDBLOCK)
return false;
if (wserrno == WSAEMSGSIZE) {
Con_Printf ("Warning: Oversize packet from %s\n",
NET_AdrToString (net_from));
return false;
}
Sys_Error ("NET_GetPacket: %s", strerror(wserrno));
}
net_message.cursize = ret;
if (ret == sizeof(net_message_buffer) )
{
Con_Printf ("Oversize packet from %s\n", NET_AdrToString (net_from));
return false;
}
return ret;
}
//=============================================================================
extern qboolean is_server;
void NET_SendPacket (int length, void *data, netadr_t to)
{
int ret;
struct sockaddr_in addr;
NetadrToSockadr (&to, &addr);
ret = sendto (net_socket, data, length, 0, (struct sockaddr *)&addr, sizeof(addr) );
if (ret == -1)
{
int err = WSAGetLastError();
// wouldblock is silent
if (err == WSAEWOULDBLOCK)
return;
if (err == WSAEADDRNOTAVAIL && is_server)
Con_DPrintf("NET_SendPacket Warning: %i\n", err);
else
Con_Printf ("NET_SendPacket ERROR: %i\n", errno);
}
}
//=============================================================================
int UDP_OpenSocket (int port)
{
int newsocket;
struct sockaddr_in address;
unsigned long _true = true;
int i;
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
Sys_Error ("UDP_OpenSocket: socket:", strerror(errno));
if (ioctlsocket (newsocket, FIONBIO, &_true) == -1)
Sys_Error ("UDP_OpenSocket: ioctl FIONBIO:", strerror(errno));
address.sin_family = AF_INET;
//ZOID -- check for interface binding option
if ((i = COM_CheckParm("-ip")) != 0 && i < com_argc) {
address.sin_addr.s_addr = inet_addr(com_argv[i+1]);
Con_Printf("Binding to IP Interface Address of %s\n",
inet_ntoa(address.sin_addr));
} else
address.sin_addr.s_addr = INADDR_ANY;
if (port == PORT_ANY)
address.sin_port = 0;
else
address.sin_port = htons((short)port);
if( bind (newsocket, (void *)&address, sizeof(address)) == -1)
Sys_Error ("UDP_OpenSocket: bind: %s", strerror(errno));
return newsocket;
}
void NET_GetLocalAddress (void)
{
char buff[512];
struct sockaddr_in address;
int namelen;
gethostname(buff, 512);
buff[512-1] = 0;
NET_StringToAdr (buff, &net_local_adr);
namelen = sizeof(address);
if (getsockname (net_socket, (struct sockaddr *)&address, &namelen) == -1)
Sys_Error ("NET_Init: getsockname:", strerror(errno));
net_local_adr.port = address.sin_port;
Con_Printf("IP address %s\n", NET_AdrToString (net_local_adr) );
}
/*
====================
NET_Init
====================
*/
void NET_Init (int port)
{
WORD wVersionRequested;
int r;
wVersionRequested = MAKEWORD(1, 1);
r = WSAStartup (MAKEWORD(1, 1), &winsockdata);
if (r)
Sys_Error ("Winsock initialization failed.");
//
// open the single socket to be used for all communications
//
net_socket = UDP_OpenSocket (port);
//
// init the message buffer
//
net_message.maxsize = sizeof(net_message_buffer);
net_message.data = net_message_buffer;
//
// determine my name & address
//
NET_GetLocalAddress ();
Con_Printf("UDP Initialized\n");
}
/*
====================
NET_Shutdown
====================
*/
void NET_Shutdown (void)
{
closesocket (net_socket);
WSACleanup ();
}

2
source/qw_client.dsp
View file

@ -828,7 +828,7 @@ SOURCE=.\net_com.c
# End Source File
# Begin Source File
SOURCE=.\net_wins.c
SOURCE=.\net_udp.c
# End Source File
# Begin Source File

2
source/qw_server.dsp
View file

@ -123,7 +123,7 @@ SOURCE=.\net_com.c
# End Source File
# Begin Source File
SOURCE=.\net_wins.c
SOURCE=.\net_udp.c
# End Source File
# Begin Source File