diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-09-14 11:57:31 +0200 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-09-14 11:57:31 +0200 |
commit | 99f5be29927de6863849441b8af4b794033cc8bd (patch) | |
tree | 0839cf61bcb12022573af8e9a17b469c83440043 | |
parent | 6fcf0fbbee1fb902bfebf8de00ac1981f11be70d (diff) | |
download | monitoring-plugins-99f5be29927de6863849441b8af4b794033cc8bd.tar.gz |
check_dhcp: Don't peek before reading response
Omit a recvfrom(3) call which has the MSG_PEEK flag set and should have
no effect at all. According to a comment in the code, this call was
meant to be a workaround to an opaque issue. If anyone runs into that
issue, we should fix it properly instead.
-rw-r--r-- | plugins-root/check_dhcp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index d8afb172..445ddbc1 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -692,17 +692,11 @@ int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, st } else{ - - /* why do we need to peek first? i don't know, its a hack. without it, the source address of the first packet received was - not being interpreted correctly. sigh... */ bzero(&source_address,sizeof(source_address)); address_size=sizeof(source_address); recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size); if(verbose) - printf("recv_result_1: %d\n",recv_result); - recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size); - if(verbose) - printf("recv_result_2: %d\n",recv_result); + printf("recv_result: %d\n",recv_result); if(recv_result==-1){ if(verbose){ |