From fa6bc1ca0d4656463bb4e66caa075a9f50dd0be2 Mon Sep 17 00:00:00 2001 From: sezero Date: Mon, 21 Jun 2010 16:23:06 +0000 Subject: [PATCH] * 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@222 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/net_udp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Quake/net_udp.c b/Quake/net_udp.c index cb261334..860a8fae 100644 --- a/Quake/net_udp.c +++ b/Quake/net_udp.c @@ -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) { - static struct sockaddr saddr; - socklen_t addrlen = sizeof(struct sockaddr); + socklen_t addrlen = sizeof(struct qsockaddr); int ret; - ret = recvfrom (socketid, buf, len, 0, &saddr, &addrlen); + ret = recvfrom (socketid, buf, len, 0, (struct sockaddr *)addr, &addrlen); if (ret == SOCKET_ERROR) { int err = SOCKETERRNO; if (err == EWOULDBLOCK || err == ECONNREFUSED) return 0; } - - get_qsockaddr(&saddr, addr); return ret; }