* net_udp.c (UDP_Read): Remove the get_qsockaddr() helper which came from the

old fitzsdl port, and use the struct qsockaddr *addr argument with typecasting
as in original quake.
(get_qsockaddr): Remove.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@222 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-06-21 16:23:06 +00:00
parent 5a4f294463
commit 79d6d5cf5a

View file

@ -239,27 +239,18 @@ sys_socket_t UDP_CheckNewConnections (void)
//============================================================================= //=============================================================================
static void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr)
{
qaddr->qsa_family = saddr->sa_family;
memcpy(&(qaddr->qsa_data), &(saddr->sa_data), sizeof(qaddr->qsa_data));
}
int UDP_Read (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr) int UDP_Read (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr)
{ {
static struct sockaddr saddr; socklen_t addrlen = sizeof(struct qsockaddr);
socklen_t addrlen = sizeof(struct sockaddr);
int ret; int ret;
ret = recvfrom (socketid, buf, len, 0, &saddr, &addrlen); ret = recvfrom (socketid, buf, len, 0, (struct sockaddr *)addr, &addrlen);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK || err == ECONNREFUSED) if (err == EWOULDBLOCK || err == ECONNREFUSED)
return 0; return 0;
} }
get_qsockaddr(&saddr, addr);
return ret; return ret;
} }