[Dhcp-agent-commits] dhcp-agent TODO,1.32,1.33 dhcp-agent.h,1.63,1.64 dhcp-client-control.c,1.23,1.24 dhcp-client-states.c,1.36,1.37

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv6074

Modified Files:
	TODO dhcp-agent.h dhcp-client-control.c dhcp-client-states.c 
Log Message:
client now uses new xid per entry into discover/offer state

Index: TODO
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/TODO,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TODO	2 Jul 2002 18:42:09 -0000	1.32
--- TODO	2 Jul 2002 18:46:21 -0000	1.33
***************
*** 68,73 ****
  -- other minor optimizations which would be nice are noted in FIXMEs
     all over the code.
- -- make more uses of different xid. currently only one per reboot is
-    chosen. this is compliant with the rfc, but not really good.
  -- be nice to servers. sort the list according to option tag value.
     the highest value first seems about right.
--- 68,71 ----

Index: dhcp-agent.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-agent.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** dhcp-agent.h	30 Jun 2002 21:22:15 -0000	1.63
--- dhcp-agent.h	2 Jul 2002 18:46:21 -0000	1.64
***************
*** 730,733 ****
--- 730,734 ----
  extern dhcp_client_control_t *create_dhcp_client_control_dummy(char *interface);
  extern void dhcp_client_interface_down(dhcp_client_control_t *dc);
+ extern void dhcp_client_update_xid(dhcp_client_control_t *dc);
  
  /* dhcp client conf */

Index: dhcp-client-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-control.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** dhcp-client-control.c	30 Jun 2002 08:23:45 -0000	1.23
--- dhcp-client-control.c	2 Jul 2002 18:46:21 -0000	1.24
***************
*** 109,113 ****
  }
  
! static void update_dhcp_xid(dhcp_client_control_t *dc)
  {
      dc->xid = dhcp_gen_xid();
--- 109,113 ----
  }
  
! void dhcp_client_update_xid(dhcp_client_control_t *dc)
  {
      dc->xid = dhcp_gen_xid();
***************
*** 181,185 ****
      
      /* xid setting */
!     update_dhcp_xid(dc);
      
      /* secs settings. */
--- 181,185 ----
      
      /* xid setting */
!     dhcp_client_update_xid(dc);
      
      /* secs settings. */

Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-states.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** dhcp-client-states.c	2 Jul 2002 18:41:40 -0000	1.36
--- dhcp-client-states.c	2 Jul 2002 18:46:21 -0000	1.37
***************
*** 213,216 ****
--- 213,219 ----
      dhcp_client_update_secs(dc);
  
+     /* update new xid per start of discovery .*/
+     dhcp_client_update_xid(dc);
+ 
      /* Our options cleared by build_* since they are passed
       * down and later purged. */