[dhcp-agent-commits] dhcp-agent/src dhcp-sysconf.c,1.21,1.22 dhcp-option.h,1.6,1.7 dhcp-client-states.c,1.42,1.43

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

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23929/src

Modified Files:
	dhcp-sysconf.c dhcp-option.h dhcp-client-states.c 
Log Message:
now not using dhcp option marcos outside of dhcp-option*.c

Index: dhcp-sysconf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-sysconf.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dhcp-sysconf.c	27 Jun 2003 03:16:27 -0000	1.21
--- dhcp-sysconf.c	27 Jun 2003 20:59:17 -0000	1.22
***************
*** 61,68 ****
          while((orig = list_next(options)) != NULL) {
  
!             if(DHCP_OPT_GET_TAG(override) == DHCP_OPT_GET_TAG(orig)) {
  
                  list_remove_by_datum(options, orig);
!                 DHCP_OPT_DESTROY(orig);
  
                  list_add(options, dhcp_option_copy(override));
--- 61,68 ----
          while((orig = list_next(options)) != NULL) {
  
!             if(dhcp_opt_get_tag(override) == dhcp_opt_get_tag(orig)) {
  
                  list_remove_by_datum(options, orig);
!                 dhcp_opt_destroy(orig);
  
                  list_add(options, dhcp_option_copy(override));
***************
*** 87,91 ****
          while((add_opt = list_next(add_options)) != NULL) {
  
!             if(DHCP_OPT_GET_TAG(orig) == DHCP_OPT_GET_TAG(add_opt)) {
  
                  /* we already know that the conf code guarantees
--- 87,91 ----
          while((add_opt = list_next(add_options)) != NULL) {
  
!             if(dhcp_opt_get_tag(orig) == dhcp_opt_get_tag(add_opt)) {
  
                  /* we already know that the conf code guarantees

Index: dhcp-option.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-option.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-option.h	27 Jun 2003 03:16:27 -0000	1.6
--- dhcp-option.h	27 Jun 2003 20:59:17 -0000	1.7
***************
*** 67,71 ****
  /* convenience macros. this makes accessing what's under the attr structure easier. */
  
- 
  #define DHCP_OPT_GET_TYPE(x)                           (x->opt_attr->type)
  #define DHCP_OPT_GET_VAL_TYPE(x)                       (x->opt_attr->val_type)
--- 67,70 ----

Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-states.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** dhcp-client-states.c	27 Jun 2003 03:15:25 -0000	1.42
--- dhcp-client-states.c	27 Jun 2003 20:59:17 -0000	1.43
***************
*** 383,388 ****
      while((option = list_next(options)) != NULL) {
  
!         if(DHCP_OPT_GET_TAG(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             passed_ip = DHCP_OPT_TO_INTERNAL_DATA(option);
              break;
          }
--- 383,388 ----
      while((option = list_next(options)) != NULL) {
  
!         if(dhcp_opt_get_tag(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             passed_ip = dhcp_opt_get_host_data(option);
              break;
          }
***************
*** 1056,1061 ****
      while((option = list_next(cache_options)) != NULL) {
  
!         if(DHCP_OPT_GET_TAG(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             my_addr = DHCP_OPT_TO_INTERNAL_DATA(option);
              break;
          }
--- 1056,1061 ----
      while((option = list_next(cache_options)) != NULL) {
  
!         if(dhcp_opt_get_tag(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             my_addr = dhcp_opt_get_host_data(option);
              break;
          }
***************
*** 1141,1146 ****
      while((option = list_next(options)) != NULL) {
  
!         if(DHCP_OPT_GET_TAG(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             passed_ip = DHCP_OPT_TO_INTERNAL_DATA(option);
              break;
          }
--- 1141,1146 ----
      while((option = list_next(options)) != NULL) {
  
!         if(dhcp_opt_get_tag(option) == TAG_DHCP_REQUESTED_IP_ADDRESS) {
!             passed_ip = dhcp_opt_get_host_data(option);
              break;
          }