mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-14 17:01:07 +00:00
Remove select-related testing functions
This commit is contained in:
parent
fafa522c50
commit
ac802318f9
3 changed files with 4 additions and 89 deletions
|
@ -67,8 +67,6 @@ INT16 hardware_MAXPACKETLENGTH;
|
||||||
|
|
||||||
boolean (*I_NetGet)(void) = NULL;
|
boolean (*I_NetGet)(void) = NULL;
|
||||||
void (*I_NetSend)(void) = NULL;
|
void (*I_NetSend)(void) = NULL;
|
||||||
boolean (*I_NetCanSend)(void) = NULL;
|
|
||||||
boolean (*I_NetCanGet)(void) = NULL;
|
|
||||||
void (*I_NetCloseSocket)(void) = NULL;
|
void (*I_NetCloseSocket)(void) = NULL;
|
||||||
void (*I_NetFreeNodenum)(INT32 nodenum) = NULL;
|
void (*I_NetFreeNodenum)(INT32 nodenum) = NULL;
|
||||||
SINT8 (*I_NetMakeNodewPort)(const char *address, const char* port) = NULL;
|
SINT8 (*I_NetMakeNodewPort)(const char *address, const char* port) = NULL;
|
||||||
|
@ -993,15 +991,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
|
||||||
netbuffer->ackreturn = 0;
|
netbuffer->ackreturn = 0;
|
||||||
if (reliable)
|
if (reliable)
|
||||||
{
|
{
|
||||||
if (I_NetCanSend && !I_NetCanSend())
|
if (!GetFreeAcknum(&netbuffer->ack, false))
|
||||||
{
|
|
||||||
if (netbuffer->packettype < PT_CANFAIL)
|
|
||||||
GetFreeAcknum(&netbuffer->ack, true);
|
|
||||||
|
|
||||||
DEBFILE("HSendPacket: Out of bandwidth\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else if (!GetFreeAcknum(&netbuffer->ack, false))
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1205,7 +1195,6 @@ boolean D_CheckNetGame(void)
|
||||||
|
|
||||||
I_NetGet = Internal_Get;
|
I_NetGet = Internal_Get;
|
||||||
I_NetSend = Internal_Send;
|
I_NetSend = Internal_Send;
|
||||||
I_NetCanSend = NULL;
|
|
||||||
I_NetCloseSocket = NULL;
|
I_NetCloseSocket = NULL;
|
||||||
I_NetFreeNodenum = Internal_FreeNodenum;
|
I_NetFreeNodenum = Internal_FreeNodenum;
|
||||||
I_NetMakeNodewPort = NULL;
|
I_NetMakeNodewPort = NULL;
|
||||||
|
@ -1375,7 +1364,6 @@ void D_CloseConnection(void)
|
||||||
|
|
||||||
I_NetGet = Internal_Get;
|
I_NetGet = Internal_Get;
|
||||||
I_NetSend = Internal_Send;
|
I_NetSend = Internal_Send;
|
||||||
I_NetCanSend = NULL;
|
|
||||||
I_NetCloseSocket = NULL;
|
I_NetCloseSocket = NULL;
|
||||||
I_NetFreeNodenum = Internal_FreeNodenum;
|
I_NetFreeNodenum = Internal_FreeNodenum;
|
||||||
I_NetMakeNodewPort = NULL;
|
I_NetMakeNodewPort = NULL;
|
||||||
|
|
|
@ -67,18 +67,10 @@ extern doomcom_t *doomcom;
|
||||||
*/
|
*/
|
||||||
extern boolean (*I_NetGet)(void);
|
extern boolean (*I_NetGet)(void);
|
||||||
|
|
||||||
/** \brief ask to driver if there is data waiting
|
|
||||||
*/
|
|
||||||
extern boolean (*I_NetCanGet)(void);
|
|
||||||
|
|
||||||
/** \brief send packet within doomcom struct
|
/** \brief send packet within doomcom struct
|
||||||
*/
|
*/
|
||||||
extern void (*I_NetSend)(void);
|
extern void (*I_NetSend)(void);
|
||||||
|
|
||||||
/** \brief ask to driver if all is ok to send data now
|
|
||||||
*/
|
|
||||||
extern boolean (*I_NetCanSend)(void);
|
|
||||||
|
|
||||||
/** \brief close a connection
|
/** \brief close a connection
|
||||||
|
|
||||||
\param nodenum node to be closed
|
\param nodenum node to be closed
|
||||||
|
|
|
@ -143,7 +143,6 @@ typedef union
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "i_addrinfo.h"
|
#include "i_addrinfo.h"
|
||||||
#define SELECTTEST
|
|
||||||
#define DEFAULTPORT "5029"
|
#define DEFAULTPORT "5029"
|
||||||
|
|
||||||
#ifdef USE_WINSOCK
|
#ifdef USE_WINSOCK
|
||||||
|
@ -631,56 +630,6 @@ static boolean SOCK_Get(void)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if we can send (do not go over the buffer)
|
|
||||||
|
|
||||||
static fd_set masterset;
|
|
||||||
|
|
||||||
#ifdef SELECTTEST
|
|
||||||
static boolean FD_CPY(fd_set *src, fd_set *dst, SOCKET_TYPE *fd, size_t len)
|
|
||||||
{
|
|
||||||
boolean testset = false;
|
|
||||||
FD_ZERO(dst);
|
|
||||||
for (size_t i = 0; i < len;i++)
|
|
||||||
{
|
|
||||||
if(fd[i] != (SOCKET_TYPE)ERRSOCKET &&
|
|
||||||
FD_ISSET(fd[i], src) && !FD_ISSET(fd[i], dst)) // no checking for dups
|
|
||||||
{
|
|
||||||
FD_SET(fd[i], dst);
|
|
||||||
testset = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return testset;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean SOCK_CanSend(void)
|
|
||||||
{
|
|
||||||
struct timeval timeval_for_select = {0, 0};
|
|
||||||
fd_set tset;
|
|
||||||
int wselect;
|
|
||||||
|
|
||||||
if(!FD_CPY(&masterset, &tset, mysockets, mysocketses))
|
|
||||||
return false;
|
|
||||||
wselect = select(255, NULL, &tset, NULL, &timeval_for_select);
|
|
||||||
if (wselect >= 1)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean SOCK_CanGet(void)
|
|
||||||
{
|
|
||||||
struct timeval timeval_for_select = {0, 0};
|
|
||||||
fd_set tset;
|
|
||||||
int rselect;
|
|
||||||
|
|
||||||
if(!FD_CPY(&masterset, &tset, mysockets, mysocketses))
|
|
||||||
return false;
|
|
||||||
rselect = select(255, &tset, NULL, NULL, &timeval_for_select);
|
|
||||||
if (rselect >= 1)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr)
|
static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr)
|
||||||
{
|
{
|
||||||
socklen_t d4 = (socklen_t)sizeof(struct sockaddr_in);
|
socklen_t d4 = (socklen_t)sizeof(struct sockaddr_in);
|
||||||
|
@ -922,7 +871,6 @@ static boolean UDP_Socket(void)
|
||||||
mysockets[s] = ERRSOCKET;
|
mysockets[s] = ERRSOCKET;
|
||||||
for (s = 0; s < MAXNETNODES+1; s++)
|
for (s = 0; s < MAXNETNODES+1; s++)
|
||||||
nodesocket[s] = ERRSOCKET;
|
nodesocket[s] = ERRSOCKET;
|
||||||
FD_ZERO(&masterset);
|
|
||||||
s = 0;
|
s = 0;
|
||||||
|
|
||||||
memset(&hints, 0x00, sizeof (hints));
|
memset(&hints, 0x00, sizeof (hints));
|
||||||
|
@ -949,7 +897,6 @@ static boolean UDP_Socket(void)
|
||||||
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
||||||
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
||||||
{
|
{
|
||||||
FD_SET(mysockets[s], &masterset);
|
|
||||||
myfamily[s] = hints.ai_family;
|
myfamily[s] = hints.ai_family;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
@ -970,7 +917,6 @@ static boolean UDP_Socket(void)
|
||||||
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
||||||
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
||||||
{
|
{
|
||||||
FD_SET(mysockets[s], &masterset);
|
|
||||||
myfamily[s] = hints.ai_family;
|
myfamily[s] = hints.ai_family;
|
||||||
s++;
|
s++;
|
||||||
#ifdef HAVE_MINIUPNPC
|
#ifdef HAVE_MINIUPNPC
|
||||||
|
@ -1003,7 +949,6 @@ static boolean UDP_Socket(void)
|
||||||
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
||||||
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
||||||
{
|
{
|
||||||
FD_SET(mysockets[s], &masterset);
|
|
||||||
myfamily[s] = hints.ai_family;
|
myfamily[s] = hints.ai_family;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
@ -1024,7 +969,6 @@ static boolean UDP_Socket(void)
|
||||||
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
|
||||||
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
|
||||||
{
|
{
|
||||||
FD_SET(mysockets[s], &masterset);
|
|
||||||
myfamily[s] = hints.ai_family;
|
myfamily[s] = hints.ai_family;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
@ -1150,16 +1094,13 @@ boolean I_InitTcpDriver(void)
|
||||||
|
|
||||||
static void SOCK_CloseSocket(void)
|
static void SOCK_CloseSocket(void)
|
||||||
{
|
{
|
||||||
for (size_t i=0; i < MAXNETNODES+1; i++)
|
for (size_t i=0; i < mysocketses; i++)
|
||||||
{
|
{
|
||||||
if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET
|
if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET)
|
||||||
&& FD_ISSET(mysockets[i], &masterset))
|
|
||||||
{
|
|
||||||
FD_CLR(mysockets[i], &masterset);
|
|
||||||
close(mysockets[i]);
|
close(mysockets[i]);
|
||||||
}
|
|
||||||
mysockets[i] = ERRSOCKET;
|
mysockets[i] = ERRSOCKET;
|
||||||
}
|
}
|
||||||
|
mysocketses = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_ShutdownTcpDriver(void)
|
void I_ShutdownTcpDriver(void)
|
||||||
|
@ -1245,12 +1186,6 @@ static boolean SOCK_OpenSocket(void)
|
||||||
I_NetFreeNodenum = SOCK_FreeNodenum;
|
I_NetFreeNodenum = SOCK_FreeNodenum;
|
||||||
I_NetMakeNodewPort = SOCK_NetMakeNodewPort;
|
I_NetMakeNodewPort = SOCK_NetMakeNodewPort;
|
||||||
|
|
||||||
#ifdef SELECTTEST
|
|
||||||
// seem like not work with libsocket : (
|
|
||||||
I_NetCanSend = SOCK_CanSend;
|
|
||||||
I_NetCanGet = SOCK_CanGet;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// build the socket but close it first
|
// build the socket but close it first
|
||||||
SOCK_CloseSocket();
|
SOCK_CloseSocket();
|
||||||
return UDP_Socket();
|
return UDP_Socket();
|
||||||
|
|
Loading…
Reference in a new issue