Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26252/src
Modified Files:
dhcp-net.c
Log Message:
fixed error checking
Index: dhcp-net.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-net.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-net.c 26 Jul 2003 23:46:16 -0000 1.6
--- dhcp-net.c 5 Aug 2003 04:58:31 -0000 1.7
***************
*** 89,94 ****
retval = recvfrom(sd, buff, buffsize, 0, (struct sockaddr *)&in, &len);
! if(retval < 0)
return -1;
*src_addr = in.sin_addr.s_addr;
--- 89,96 ----
retval = recvfrom(sd, buff, buffsize, 0, (struct sockaddr *)&in, &len);
! if(retval < 0) {
! ERROR_MESSAGE("error during recv() from udp socket: %s", strerror(errno));
return -1;
+ }
*src_addr = in.sin_addr.s_addr;
***************
*** 110,115 ****
retval = select((udp_sock + 1), NULL, &send_set, NULL, NULL);
! if(retval == -1)
return 1;
in.sin_family = PF_INET;
--- 112,119 ----
retval = select((udp_sock + 1), NULL, &send_set, NULL, NULL);
! if(retval == -1) {
! ERROR_MESSAGE("error during select() on udp socket: %s", strerror(errno));
return 1;
+ }
in.sin_family = PF_INET;
***************
*** 119,124 ****
retval = sendto(udp_sock, msg, size, 0, (struct sockaddr *)&in, len);
! if(retval != size)
return 1;
return 0;
--- 123,135 ----
retval = sendto(udp_sock, msg, size, 0, (struct sockaddr *)&in, len);
! if(retval != size) {
! ERROR_MESSAGE("did not send complete packet on udp socket: %s", strerror(errno));
! return 1;
! }
!
! if(retval == -1) {
! ERROR_MESSAGE("error during send() on udp socket: %s", strerror(errno));
return 1;
+ }
return 0;
|