j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use static buffers for recvmmsg(), initialize them only as needed.

Browse source 
As suggested by Michael Tokarev.
This commit is contained in:
Guus Sliepen 2015-12-10 16:45:05 +01:00
parent e4fd81ed2d
commit cda5a477c8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/net_packet.c
View file

@ -1504,12 +1504,13 @@ void handle_incoming_vpn_data(void *data, int flags) {
#ifdef HAVE_RECVMMSG #ifdef HAVE_RECVMMSG
#define MAX_MSG 64 #define MAX_MSG 64
vpn_packet_t pkt[MAX_MSG]; static int num = MAX_MSG;
sockaddr_t addr[MAX_MSG]; static vpn_packet_t pkt[MAX_MSG];
struct mmsghdr msg[MAX_MSG]; static sockaddr_t addr[MAX_MSG];
struct iovec iov[MAX_MSG]; static struct mmsghdr msg[MAX_MSG];
static struct iovec iov[MAX_MSG];
for(int i = 0; i < MAX_MSG; i++) { for(int i = 0; i < num; i++) {
pkt[i].offset = 0; pkt[i].offset = 0;
iov[i] = (struct iovec){ iov[i] = (struct iovec){
@ -1525,7 +1526,7 @@ void handle_incoming_vpn_data(void *data, int flags) {
}; };
} }
int num = recvmmsg(ls->udp.fd, msg, MAX_MSG, MSG_DONTWAIT, NULL); num = recvmmsg(ls->udp.fd, msg, MAX_MSG, MSG_DONTWAIT, NULL);
if(num < 0) { if(num < 0) {
if(!sockwouldblock(sockerrno)) if(!sockwouldblock(sockerrno))