TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reorder dxx_recvfrom args

Browse source
This commit is contained in:
Kp 2015-01-18 01:58:33 +00:00
parent 40d1068fb4
commit 370434855a
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
similar/main/net_udp.cpp
View file

@ -264,9 +264,9 @@ static inline ssize_t dxx_sendto(const sockaddr_in6 &to, Args &&... args)
}
#endif
static ssize_t dxx_recvfrom(int sockfd, void *buf, int len, unsigned int flags, struct sockaddr *from, socklen_t *fromlen)
static ssize_t dxx_recvfrom(int sockfd, void *buf, size_t len, int flags, sockaddr &from, socklen_t &fromlen)
{
ssize_t rv = recvfrom(sockfd, reinterpret_cast<char *>(buf), len, flags, from, fromlen);
ssize_t rv = recvfrom(sockfd, reinterpret_cast<char *>(buf), len, flags, &from, &fromlen);
UDP_num_recvfrom++;
UDP_len_recvfrom += rv;
@ -274,6 +274,20 @@ static ssize_t dxx_recvfrom(int sockfd, void *buf, int len, unsigned int flags,
return rv;
}
static inline ssize_t dxx_recvfrom(sockaddr_in &from, socklen_t &fromlen, int sockfd, void *buf, size_t len, int flags)
{
fromlen = sizeof(from);
return dxx_recvfrom(sockfd, buf, len, flags, reinterpret_cast<sockaddr &>(from), fromlen);
}
#ifdef IPv6
static inline ssize_t dxx_recvfrom(sockaddr_in6 &from, socklen_t &fromlen, int sockfd, void *buf, size_t len, int flags)
{
fromlen = sizeof(from);
return dxx_recvfrom(sockfd, buf, len, flags, reinterpret_cast<sockaddr &>(from), fromlen);
}
#endif
static void udp_traffic_stat()
{
static fix64 last_traf_time = 0;
@ -459,7 +473,6 @@ static int udp_general_packet_ready(RAIIsocket &sock)
// Gets some text. Returns 0 if nothing on there.
static int udp_receive_packet(RAIIsocket &sock, ubyte *text, int len, struct _sockaddr *sender_addr)
{
socklen_t clen = sizeof (struct _sockaddr);
ssize_t msglen = 0;
if (!sock)
@ -467,7 +480,8 @@ static int udp_receive_packet(RAIIsocket &sock, ubyte *text, int len, struct _so
if (udp_general_packet_ready(sock))
{
msglen = dxx_recvfrom(sock, text, len, 0, (struct sockaddr *)sender_addr, &clen);
socklen_t clen;
msglen = dxx_recvfrom(*sender_addr, clen, sock, text, len, 0);
if (msglen < 0)
return 0;