Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv3537
Modified Files:
dhcp-convert.c dhcp-files.c
Log Message:
bug fix; integer to network conversion in client now works;
Index: dhcp-convert.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-convert.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-convert.c 9 Feb 2002 15:50:30 -0000 1.6
--- dhcp-convert.c 9 Feb 2002 16:22:35 -0000 1.7
***************
*** 726,733 ****
fatal_error("illegal size passed to string_int_to_network()!");
}
switch(size) {
!
! case sizeof(uint32_t):
val = string_to_uint32(s);
--- 726,735 ----
fatal_error("illegal size passed to string_int_to_network()!");
}
+
+ } else {
switch(size) {
!
! case sizeof(uint32_t):
val = string_to_uint32(s);
***************
*** 736,740 ****
break;
! case sizeof(uint16_t):
val = string_to_uint16(s);
*(uint16_t *)net_val = htons(*(uint16_t *)val);
--- 738,743 ----
break;
! case sizeof(uint16_t):
!
val = string_to_uint16(s);
*(uint16_t *)net_val = htons(*(uint16_t *)val);
***************
*** 742,746 ****
break;
! default:
/* ditto on the b0rkination. */
fatal_error("illegal size passed to string_int_to_network()!");
--- 745,749 ----
break;
! default:
/* ditto on the b0rkination. */
fatal_error("illegal size passed to string_int_to_network()!");
Index: dhcp-files.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-files.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dhcp-files.c 8 Feb 2002 17:04:32 -0000 1.4
--- dhcp-files.c 9 Feb 2002 16:22:35 -0000 1.5
***************
*** 170,174 ****
else {
line_buff[string_size] = 0;
- warn_message("string read: %s",line_buff);
return 0;
}
--- 170,173 ----
|
