mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-14 07:51:07 +00:00
net_udp.h: Renamed all function argument names as socket to socketid.
net_udp.c: Renamed all function argument names as socket to socketid.
Replaced the inet_addr("127.0.0.1") call with htonl(INADDR_LOOPBACK).
Replaced qboolean _true with int _true.
net.h: Renamed the OpenSocket and CloseSocket function pointers to
Open_Socket and Close_Socket.
net_dgrm.c: Adjusted for Open_Socket and Close_Socket change.
net_sdlnet.c: Made some functions static.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@191 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero
parent
200602bbf3
commit
e98269bbf5
5 changed files with 43 additions and 42 deletions
|
|
@ -165,8 +165,8 @@ typedef struct
|
|||
int (*Init) (void);
|
||||
void (*Shutdown) (void);
|
||||
void (*Listen) (qboolean state);
|
||||
int (*OpenSocket) (int port);
|
||||
int (*CloseSocket) (int socket);
|
||||
int (*Open_Socket) (int port);
|
||||
int (*Close_Socket) (int socket);
|
||||
int (*Connect) (int socket, struct qsockaddr *addr);
|
||||
int (*CheckNewConnections) (void);
|
||||
int (*Read) (int socket, byte *buf, int len, struct qsockaddr *addr);
|
||||
|
|
|
|||
|
|
@ -592,7 +592,7 @@ static void Test_Poll(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
dfunc.CloseSocket(testSocket);
|
||||
dfunc.Close_Socket(testSocket);
|
||||
testInProgress = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -641,7 +641,7 @@ static void Net_Test_f (void)
|
|||
}
|
||||
|
||||
JustDoIt:
|
||||
testSocket = dfunc.OpenSocket(0);
|
||||
testSocket = dfunc.Open_Socket(0);
|
||||
if (testSocket == -1)
|
||||
return;
|
||||
|
||||
|
|
@ -724,7 +724,7 @@ Reschedule:
|
|||
Error:
|
||||
Con_Printf("Unexpected repsonse to Rule Info request\n");
|
||||
Done:
|
||||
dfunc.CloseSocket(test2Socket);
|
||||
dfunc.Close_Socket(test2Socket);
|
||||
test2InProgress = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -771,7 +771,7 @@ static void Test2_f (void)
|
|||
}
|
||||
|
||||
JustDoIt:
|
||||
test2Socket = dfunc.OpenSocket(0);
|
||||
test2Socket = dfunc.Open_Socket(0);
|
||||
if (test2Socket == -1)
|
||||
return;
|
||||
|
||||
|
|
@ -834,7 +834,7 @@ void Datagram_Shutdown (void)
|
|||
|
||||
void Datagram_Close (qsocket_t *sock)
|
||||
{
|
||||
sfunc.CloseSocket(sock->socket);
|
||||
sfunc.Close_Socket(sock->socket);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1073,7 +1073,7 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
|
|||
}
|
||||
|
||||
// allocate a network socket
|
||||
newsock = dfunc.OpenSocket(0);
|
||||
newsock = dfunc.Open_Socket(0);
|
||||
if (newsock == -1)
|
||||
{
|
||||
NET_FreeQSocket(sock);
|
||||
|
|
@ -1083,7 +1083,7 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
|
|||
// connect to the client
|
||||
if (dfunc.Connect (newsock, &clientaddr) == -1)
|
||||
{
|
||||
dfunc.CloseSocket(newsock);
|
||||
dfunc.Close_Socket(newsock);
|
||||
NET_FreeQSocket(sock);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1251,7 +1251,7 @@ static qsocket_t *_Datagram_Connect (char *host)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
newsock = dfunc.OpenSocket (0);
|
||||
newsock = dfunc.Open_Socket (0);
|
||||
if (newsock == -1)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -1393,7 +1393,7 @@ static qsocket_t *_Datagram_Connect (char *host)
|
|||
ErrorReturn:
|
||||
NET_FreeQSocket(sock);
|
||||
ErrorReturn2:
|
||||
dfunc.CloseSocket(newsock);
|
||||
dfunc.Close_Socket(newsock);
|
||||
if (m_return_onerror)
|
||||
{
|
||||
key_dest = key_menu;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ 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 the Free Software
|
||||
Foundat(&addr->sa_dataion, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ IPaddress myaddr;
|
|||
// contains a map of socket numbers to SDL_net UDP sockets
|
||||
UDPsocket net_sockets[MAX_SOCKETS];
|
||||
|
||||
int socket_id (UDPsocket socket_p)
|
||||
static int socket_id (UDPsocket socket_p)
|
||||
{
|
||||
int i;
|
||||
int idx = -1;
|
||||
|
|
@ -71,7 +71,7 @@ int socket_id (UDPsocket socket_p)
|
|||
return idx;
|
||||
}
|
||||
|
||||
char *_AddrToString (int ip, int port)
|
||||
static char *_AddrToString (int ip, int port)
|
||||
{
|
||||
static char buffer[22];
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ char *_AddrToString (int ip, int port)
|
|||
return buffer;
|
||||
}
|
||||
|
||||
char *_IPAddrToString (IPaddress *address)
|
||||
static char *_IPAddrToString (IPaddress *address)
|
||||
{
|
||||
int ip;
|
||||
int port;
|
||||
|
|
@ -156,7 +156,7 @@ void SDLN_Shutdown (void)
|
|||
SDLN_CloseSocket (net_controlsocket);
|
||||
}
|
||||
|
||||
void SDLN_GetLocalAddress()
|
||||
void SDLN_GetLocalAddress (void)
|
||||
{
|
||||
if (myaddr.host != INADDR_ANY)
|
||||
return;
|
||||
|
|
@ -246,7 +246,7 @@ int SDLN_CheckNewConnections (void)
|
|||
return -1;
|
||||
}
|
||||
|
||||
UDPpacket *init_packet(UDPpacket *packet, int len)
|
||||
static UDPpacket *init_packet(UDPpacket *packet, int len)
|
||||
{
|
||||
if (packet == NULL)
|
||||
return SDLNet_AllocPacket(len);
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ int UDP_OpenSocket (int port)
|
|||
{
|
||||
int newsocket;
|
||||
struct sockaddr_in address;
|
||||
qboolean _true = true;
|
||||
int _true = 1;
|
||||
|
||||
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
|
||||
return -1;
|
||||
|
|
@ -165,11 +165,11 @@ ErrorReturn:
|
|||
|
||||
//=============================================================================
|
||||
|
||||
int UDP_CloseSocket (int socket)
|
||||
int UDP_CloseSocket (int socketid)
|
||||
{
|
||||
if (socket == net_broadcastsocket)
|
||||
if (socketid == net_broadcastsocket)
|
||||
net_broadcastsocket = 0;
|
||||
return close (socket);
|
||||
return close (socketid);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -232,7 +232,7 @@ static int PartialIPAddress (char *in, struct qsockaddr *hostaddr)
|
|||
}
|
||||
//=============================================================================
|
||||
|
||||
int UDP_Connect (int socket, struct qsockaddr *addr)
|
||||
int UDP_Connect (int socketid, struct qsockaddr *addr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -266,13 +266,13 @@ static void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr)
|
|||
memcpy(&(qaddr->sa_data), &(saddr->sa_data), sizeof(qaddr->sa_data));
|
||||
}
|
||||
|
||||
int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
|
||||
int UDP_Read (int socketid, byte *buf, int len, struct qsockaddr *addr)
|
||||
{
|
||||
static struct sockaddr saddr;
|
||||
socklen_t addrlen = sizeof (struct sockaddr);
|
||||
int ret;
|
||||
|
||||
ret = recvfrom (socket, buf, len, 0, &saddr, &addrlen);
|
||||
ret = recvfrom (socketid, buf, len, 0, &saddr, &addrlen);
|
||||
if (ret == -1 && (errno == EWOULDBLOCK || errno == ECONNREFUSED))
|
||||
return 0;
|
||||
|
||||
|
|
@ -282,29 +282,29 @@ int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
|
|||
|
||||
//=============================================================================
|
||||
|
||||
int UDP_MakeSocketBroadcastCapable (int socket)
|
||||
int UDP_MakeSocketBroadcastCapable (int socketid)
|
||||
{
|
||||
int i = 1;
|
||||
|
||||
// make this socket broadcast capable
|
||||
if (setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) < 0)
|
||||
if (setsockopt(socketid, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) < 0)
|
||||
return -1;
|
||||
net_broadcastsocket = socket;
|
||||
net_broadcastsocket = socketid;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
int UDP_Broadcast (int socket, byte *buf, int len)
|
||||
int UDP_Broadcast (int socketid, byte *buf, int len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (socket != net_broadcastsocket)
|
||||
if (socketid != net_broadcastsocket)
|
||||
{
|
||||
if (net_broadcastsocket != 0)
|
||||
Sys_Error("Attempted to use multiple broadcasts sockets\n");
|
||||
ret = UDP_MakeSocketBroadcastCapable (socket);
|
||||
ret = UDP_MakeSocketBroadcastCapable (socketid);
|
||||
if (ret == -1)
|
||||
{
|
||||
Con_Printf("Unable to make socket broadcast capable\n");
|
||||
|
|
@ -312,16 +312,16 @@ int UDP_Broadcast (int socket, byte *buf, int len)
|
|||
}
|
||||
}
|
||||
|
||||
return UDP_Write (socket, buf, len, &broadcastaddr);
|
||||
return UDP_Write (socketid, buf, len, &broadcastaddr);
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
int UDP_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
|
||||
int UDP_Write (int socketid, byte *buf, int len, struct qsockaddr *addr)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
|
||||
ret = sendto (socketid, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
|
||||
if (ret == -1 && errno == EWOULDBLOCK)
|
||||
return 0;
|
||||
return ret;
|
||||
|
|
@ -359,17 +359,17 @@ int UDP_StringToAddr (char *string, struct qsockaddr *addr)
|
|||
|
||||
//=============================================================================
|
||||
|
||||
int UDP_GetSocketAddr (int socket, struct qsockaddr *addr)
|
||||
int UDP_GetSocketAddr (int socketid, struct qsockaddr *addr)
|
||||
{
|
||||
socklen_t addrlen = sizeof(struct qsockaddr);
|
||||
unsigned int a;
|
||||
|
||||
Q_memset(addr, 0, sizeof(struct qsockaddr));
|
||||
if (getsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
|
||||
if (getsockname(socketid, (struct sockaddr *)addr, &addrlen) != 0)
|
||||
return -1;
|
||||
|
||||
a = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
|
||||
if (a == 0 || a == inet_addr("127.0.0.1"))
|
||||
if (a == 0 || a == htonl(INADDR_LOOPBACK))
|
||||
((struct sockaddr_in *)addr)->sin_addr.s_addr = myAddr;
|
||||
|
||||
return 0;
|
||||
|
|
@ -443,3 +443,4 @@ int UDP_SetSocketPort (struct qsockaddr *addr, int port)
|
|||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -27,15 +27,15 @@ int UDP_Init (void);
|
|||
void UDP_Shutdown (void);
|
||||
void UDP_Listen (qboolean state);
|
||||
int UDP_OpenSocket (int port);
|
||||
int UDP_CloseSocket (int socket);
|
||||
int UDP_Connect (int socket, struct qsockaddr *addr);
|
||||
int UDP_CloseSocket (int socketid);
|
||||
int UDP_Connect (int socketid, struct qsockaddr *addr);
|
||||
int UDP_CheckNewConnections (void);
|
||||
int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
|
||||
int UDP_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
|
||||
int UDP_Broadcast (int socket, byte *buf, int len);
|
||||
int UDP_Read (int socketid, byte *buf, int len, struct qsockaddr *addr);
|
||||
int UDP_Write (int socketid, byte *buf, int len, struct qsockaddr *addr);
|
||||
int UDP_Broadcast (int socketid, byte *buf, int len);
|
||||
char *UDP_AddrToString (struct qsockaddr *addr);
|
||||
int UDP_StringToAddr (char *string, struct qsockaddr *addr);
|
||||
int UDP_GetSocketAddr (int socket, struct qsockaddr *addr);
|
||||
int UDP_GetSocketAddr (int socketid, struct qsockaddr *addr);
|
||||
int UDP_GetNameFromAddr (struct qsockaddr *addr, char *name);
|
||||
int UDP_GetAddrFromName (char *name, struct qsockaddr *addr);
|
||||
int UDP_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
|
||||
|
|
|
|||
Loading…
Reference in a new issue