fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-16 00:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

* net_udp.c: more minor fixes and tidy-ups.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@190 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2010-06-19 17:04:04 +00:00
parent 44608bb902
commit c5f6ed0763
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
quakespasm/Quake/net_udp.c
View file

@ -260,7 +260,7 @@ int UDP_CheckNewConnections (void)
//============================================================================= //=============================================================================
void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr) static void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr)
{ {
qaddr->sa_family = saddr->sa_family; qaddr->sa_family = saddr->sa_family;
memcpy(&(qaddr->sa_data), &(saddr->sa_data), sizeof(qaddr->sa_data)); memcpy(&(qaddr->sa_data), &(saddr->sa_data), sizeof(qaddr->sa_data));
@ -269,11 +269,10 @@ void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr)
int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr) int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
{ {
static struct sockaddr saddr; static struct sockaddr saddr;
unsigned int addrlen = sizeof (struct sockaddr); socklen_t addrlen = sizeof (struct sockaddr);
int ret; int ret;
ret = recvfrom (socket, buf, len, 0, &saddr, &addrlen); ret = recvfrom (socket, buf, len, 0, &saddr, &addrlen);
if (ret == -1 && (errno == EWOULDBLOCK || errno == ECONNREFUSED)) if (ret == -1 && (errno == EWOULDBLOCK || errno == ECONNREFUSED))
return 0; return 0;
@ -323,7 +322,6 @@ int UDP_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
int ret; int ret;
ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr)); ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
if (ret == -1 && errno == EWOULDBLOCK) if (ret == -1 && errno == EWOULDBLOCK)
return 0; return 0;
return ret; return ret;
@ -363,11 +361,10 @@ int UDP_StringToAddr (char *string, struct qsockaddr *addr)
int UDP_GetSocketAddr (int socket, struct qsockaddr *addr) int UDP_GetSocketAddr (int socket, struct qsockaddr *addr)
{ {
unsigned int addrlen = sizeof(struct qsockaddr); socklen_t addrlen = sizeof(struct qsockaddr);
unsigned int a; unsigned int a;
Q_memset(addr, 0, sizeof(struct qsockaddr)); Q_memset(addr, 0, sizeof(struct qsockaddr));
if (getsockname(socket, (struct sockaddr *)addr, &addrlen) != 0) if (getsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
return -1; return -1;