mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
net_bsd.c, net_dgrm.h, net_loop.c, net_loop.h, net_sdl.c, net_win.c: more trivialities.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@217 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
7951b78a96
commit
1f5cc564e8
6 changed files with 190 additions and 189 deletions
104
Quake/net_bsd.c
104
Quake/net_bsd.c
|
@ -23,43 +23,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "quakedef.h"
|
||||
#include "net_defs.h"
|
||||
|
||||
#include "net_loop.h"
|
||||
#include "net_dgrm.h"
|
||||
#include "net_loop.h"
|
||||
|
||||
net_driver_t net_drivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
}
|
||||
,
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
},
|
||||
|
||||
{
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -70,27 +70,27 @@ int net_numdrivers = 2;
|
|||
net_landriver_t net_landrivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"UDP",
|
||||
false,
|
||||
0,
|
||||
UDP_Init,
|
||||
UDP_Shutdown,
|
||||
UDP_Listen,
|
||||
UDP_OpenSocket,
|
||||
UDP_CloseSocket,
|
||||
UDP_Connect,
|
||||
UDP_CheckNewConnections,
|
||||
UDP_Read,
|
||||
UDP_Write,
|
||||
UDP_Broadcast,
|
||||
UDP_AddrToString,
|
||||
UDP_StringToAddr,
|
||||
UDP_GetSocketAddr,
|
||||
UDP_GetNameFromAddr,
|
||||
UDP_GetAddrFromName,
|
||||
UDP_AddrCompare,
|
||||
UDP_GetSocketPort,
|
||||
UDP_SetSocketPort
|
||||
"UDP",
|
||||
false,
|
||||
0,
|
||||
UDP_Init,
|
||||
UDP_Shutdown,
|
||||
UDP_Listen,
|
||||
UDP_OpenSocket,
|
||||
UDP_CloseSocket,
|
||||
UDP_Connect,
|
||||
UDP_CheckNewConnections,
|
||||
UDP_Read,
|
||||
UDP_Write,
|
||||
UDP_Broadcast,
|
||||
UDP_AddrToString,
|
||||
UDP_StringToAddr,
|
||||
UDP_GetSocketAddr,
|
||||
UDP_GetNameFromAddr,
|
||||
UDP_GetAddrFromName,
|
||||
UDP_AddrCompare,
|
||||
UDP_GetSocketPort,
|
||||
UDP_SetSocketPort
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -24,12 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
// net_dgrm.h
|
||||
|
||||
|
||||
int Datagram_Init (void);
|
||||
void Datagram_Listen (qboolean state);
|
||||
void Datagram_SearchForHosts (qboolean xmit);
|
||||
qsocket_t *Datagram_Connect (char *host);
|
||||
qsocket_t *Datagram_CheckNewConnections (void);
|
||||
qsocket_t *Datagram_CheckNewConnections (void);
|
||||
int Datagram_GetMessage (qsocket_t *sock);
|
||||
int Datagram_SendMessage (qsocket_t *sock, sizebuf_t *data);
|
||||
int Datagram_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data);
|
||||
|
|
|
@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
// net_loop.c
|
||||
|
||||
#include "arch_def.h"
|
||||
|
@ -26,9 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "net_defs.h"
|
||||
#include "net_loop.h"
|
||||
|
||||
qboolean localconnectpending = false;
|
||||
qsocket_t *loop_client = NULL;
|
||||
qsocket_t *loop_server = NULL;
|
||||
static qboolean localconnectpending = false;
|
||||
static qsocket_t *loop_client = NULL;
|
||||
static qsocket_t *loop_server = NULL;
|
||||
|
||||
int Loop_Init (void)
|
||||
{
|
||||
|
@ -146,7 +147,7 @@ int Loop_GetMessage (qsocket_t *sock)
|
|||
sock->receiveMessageLength -= length;
|
||||
|
||||
if (sock->receiveMessageLength)
|
||||
memmove(sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength);
|
||||
memmove (sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength);
|
||||
|
||||
if (sock->driverdata && ret == 1)
|
||||
((qsocket_t *)sock->driverdata)->canSend = true;
|
||||
|
@ -166,7 +167,7 @@ int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data)
|
|||
bufferLength = &((qsocket_t *)sock->driverdata)->receiveMessageLength;
|
||||
|
||||
if ((*bufferLength + data->cursize + 4) > NET_MAXMESSAGE)
|
||||
Sys_Error("Loop_SendMessage: overflow\n");
|
||||
Sys_Error("Loop_SendMessage: overflow");
|
||||
|
||||
buffer = ((qsocket_t *)sock->driverdata)->receiveMessage + *bufferLength;
|
||||
|
||||
|
@ -247,3 +248,4 @@ void Loop_Close (qsocket_t *sock)
|
|||
else
|
||||
loop_server = NULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
int Loop_Init (void);
|
||||
void Loop_Listen (qboolean state);
|
||||
void Loop_SearchForHosts (qboolean xmit);
|
||||
qsocket_t *Loop_Connect (char *host);
|
||||
qsocket_t *Loop_CheckNewConnections (void);
|
||||
qsocket_t *Loop_Connect (char *host);
|
||||
qsocket_t *Loop_CheckNewConnections (void);
|
||||
int Loop_GetMessage (qsocket_t *sock);
|
||||
int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data);
|
||||
int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data);
|
||||
|
|
106
Quake/net_sdl.c
106
Quake/net_sdl.c
|
@ -25,74 +25,74 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "quakedef.h"
|
||||
#include "net_defs.h"
|
||||
|
||||
#include "net_loop.h"
|
||||
#include "net_dgrm.h"
|
||||
#include "net_sdlnet.h"
|
||||
#include "net_loop.h"
|
||||
|
||||
net_driver_t net_drivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
}
|
||||
,
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
},
|
||||
|
||||
{
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
}
|
||||
};
|
||||
|
||||
int net_numdrivers = 2;
|
||||
|
||||
#include "net_sdlnet.h"
|
||||
|
||||
net_landriver_t net_landrivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"UDP",
|
||||
false,
|
||||
0,
|
||||
SDLN_Init,
|
||||
SDLN_Shutdown,
|
||||
SDLN_Listen,
|
||||
SDLN_OpenSocket,
|
||||
SDLN_CloseSocket,
|
||||
SDLN_Connect,
|
||||
SDLN_CheckNewConnections,
|
||||
SDLN_Read,
|
||||
SDLN_Write,
|
||||
SDLN_Broadcast,
|
||||
SDLN_AddrToString,
|
||||
SDLN_StringToAddr,
|
||||
SDLN_GetSocketAddr,
|
||||
SDLN_GetNameFromAddr,
|
||||
SDLN_GetAddrFromName,
|
||||
SDLN_AddrCompare,
|
||||
SDLN_GetSocketPort,
|
||||
SDLN_SetSocketPort
|
||||
"UDP",
|
||||
false,
|
||||
0,
|
||||
SDLN_Init,
|
||||
SDLN_Shutdown,
|
||||
SDLN_Listen,
|
||||
SDLN_OpenSocket,
|
||||
SDLN_CloseSocket,
|
||||
SDLN_Connect,
|
||||
SDLN_CheckNewConnections,
|
||||
SDLN_Read,
|
||||
SDLN_Write,
|
||||
SDLN_Broadcast,
|
||||
SDLN_AddrToString,
|
||||
SDLN_StringToAddr,
|
||||
SDLN_GetSocketAddr,
|
||||
SDLN_GetNameFromAddr,
|
||||
SDLN_GetAddrFromName,
|
||||
SDLN_AddrCompare,
|
||||
SDLN_GetSocketPort,
|
||||
SDLN_SetSocketPort
|
||||
}
|
||||
};
|
||||
|
||||
|
|
150
Quake/net_win.c
150
Quake/net_win.c
|
@ -24,43 +24,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "quakedef.h"
|
||||
#include "net_defs.h"
|
||||
|
||||
#include "net_loop.h"
|
||||
#include "net_dgrm.h"
|
||||
#include "net_loop.h"
|
||||
|
||||
net_driver_t net_drivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
}
|
||||
,
|
||||
"Loopback",
|
||||
false,
|
||||
Loop_Init,
|
||||
Loop_Listen,
|
||||
Loop_SearchForHosts,
|
||||
Loop_Connect,
|
||||
Loop_CheckNewConnections,
|
||||
Loop_GetMessage,
|
||||
Loop_SendMessage,
|
||||
Loop_SendUnreliableMessage,
|
||||
Loop_CanSendMessage,
|
||||
Loop_CanSendUnreliableMessage,
|
||||
Loop_Close,
|
||||
Loop_Shutdown
|
||||
},
|
||||
|
||||
{
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
"Datagram",
|
||||
false,
|
||||
Datagram_Init,
|
||||
Datagram_Listen,
|
||||
Datagram_SearchForHosts,
|
||||
Datagram_Connect,
|
||||
Datagram_CheckNewConnections,
|
||||
Datagram_GetMessage,
|
||||
Datagram_SendMessage,
|
||||
Datagram_SendUnreliableMessage,
|
||||
Datagram_CanSendMessage,
|
||||
Datagram_CanSendUnreliableMessage,
|
||||
Datagram_Close,
|
||||
Datagram_Shutdown
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -73,52 +73,52 @@ int net_numdrivers = 2;
|
|||
net_landriver_t net_landrivers[MAX_NET_DRIVERS] =
|
||||
{
|
||||
{
|
||||
"Winsock TCPIP",
|
||||
false,
|
||||
0,
|
||||
WINS_Init,
|
||||
WINS_Shutdown,
|
||||
WINS_Listen,
|
||||
WINS_OpenSocket,
|
||||
WINS_CloseSocket,
|
||||
WINS_Connect,
|
||||
WINS_CheckNewConnections,
|
||||
WINS_Read,
|
||||
WINS_Write,
|
||||
WINS_Broadcast,
|
||||
WINS_AddrToString,
|
||||
WINS_StringToAddr,
|
||||
WINS_GetSocketAddr,
|
||||
WINS_GetNameFromAddr,
|
||||
WINS_GetAddrFromName,
|
||||
WINS_AddrCompare,
|
||||
WINS_GetSocketPort,
|
||||
WINS_SetSocketPort
|
||||
"Winsock TCPIP",
|
||||
false,
|
||||
0,
|
||||
WINS_Init,
|
||||
WINS_Shutdown,
|
||||
WINS_Listen,
|
||||
WINS_OpenSocket,
|
||||
WINS_CloseSocket,
|
||||
WINS_Connect,
|
||||
WINS_CheckNewConnections,
|
||||
WINS_Read,
|
||||
WINS_Write,
|
||||
WINS_Broadcast,
|
||||
WINS_AddrToString,
|
||||
WINS_StringToAddr,
|
||||
WINS_GetSocketAddr,
|
||||
WINS_GetNameFromAddr,
|
||||
WINS_GetAddrFromName,
|
||||
WINS_AddrCompare,
|
||||
WINS_GetSocketPort,
|
||||
WINS_SetSocketPort
|
||||
},
|
||||
{
|
||||
"Winsock IPX",
|
||||
false,
|
||||
0,
|
||||
WIPX_Init,
|
||||
WIPX_Shutdown,
|
||||
WIPX_Listen,
|
||||
WIPX_OpenSocket,
|
||||
WIPX_CloseSocket,
|
||||
WIPX_Connect,
|
||||
WIPX_CheckNewConnections,
|
||||
WIPX_Read,
|
||||
WIPX_Write,
|
||||
WIPX_Broadcast,
|
||||
WIPX_AddrToString,
|
||||
WIPX_StringToAddr,
|
||||
WIPX_GetSocketAddr,
|
||||
WIPX_GetNameFromAddr,
|
||||
WIPX_GetAddrFromName,
|
||||
WIPX_AddrCompare,
|
||||
WIPX_GetSocketPort,
|
||||
WIPX_SetSocketPort
|
||||
}
|
||||
|
||||
{
|
||||
"Winsock IPX",
|
||||
false,
|
||||
0,
|
||||
WIPX_Init,
|
||||
WIPX_Shutdown,
|
||||
WIPX_Listen,
|
||||
WIPX_OpenSocket,
|
||||
WIPX_CloseSocket,
|
||||
WIPX_Connect,
|
||||
WIPX_CheckNewConnections,
|
||||
WIPX_Read,
|
||||
WIPX_Write,
|
||||
WIPX_Broadcast,
|
||||
WIPX_AddrToString,
|
||||
WIPX_StringToAddr,
|
||||
WIPX_GetSocketAddr,
|
||||
WIPX_GetNameFromAddr,
|
||||
WIPX_GetAddrFromName,
|
||||
WIPX_AddrCompare,
|
||||
WIPX_GetSocketPort,
|
||||
WIPX_SetSocketPort
|
||||
}
|
||||
};
|
||||
|
||||
int net_numlandrivers = 2;
|
||||
|
|
Loading…
Reference in a new issue