[dhcp-agent-commits] dhcp-agent/src dhcp-librawnet.h,1.25,1.26

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

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26706

Modified Files:
	dhcp-librawnet.h 
Log Message:
Cosmetic fix to #defines


Index: dhcp-librawnet.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-librawnet.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** dhcp-librawnet.h	18 Aug 2003 01:49:32 -0000	1.25
--- dhcp-librawnet.h	25 May 2004 06:43:55 -0000	1.26
***************
*** 254,264 ****
  /* DHCP Type messages */
  
! # define DHCP_DISCOVER_TM 1
! # define DHCP_OFFER_TM    2
! # define DHCP_REQUEST_TM  3
! # define DHCP_DECLINE_TM  4
! # define DHCP_DHCPACK_TM  5
! # define DHCP_DHCPNAK_TM  6
! # define DHCP_RELEASE_TM  7
  
  /* BOOTP Types */
--- 254,264 ----
  /* DHCP Type messages */
  
! #define DHCP_DISCOVER_TM 1
! #define DHCP_OFFER_TM    2
! #define DHCP_REQUEST_TM  3
! #define DHCP_DECLINE_TM  4
! #define DHCP_DHCPACK_TM  5
! #define DHCP_DHCPNAK_TM  6
! #define DHCP_RELEASE_TM  7
  
  /* BOOTP Types */
***************
*** 277,356 ****
   */
  
! # define TAG_DHCP_PAD                           0
! # define TAG_DHCP_SUBNET_MASK                   1
! # define TAG_DHCP_TIME_OFFSET                   2
! # define TAG_DHCP_ROUTER                        3
! # define TAG_DHCP_TIME_SERVER                   4
! # define TAG_DHCP_NAME_SERVER                   5
! # define TAG_DHCP_DOMAIN_NAME_SERVER            6
! # define TAG_DHCP_LOG_SERVER                    7
! # define TAG_DHCP_COOKIE_SERVER                 8
! # define TAG_DHCP_LPR_SERVER                    9
! # define TAG_DHCP_IMPRESS_SERVER               10
! # define TAG_DHCP_RESOURCE_LOCATION_SERVER     11
! # define TAG_DHCP_HOST_NAME                    12
! # define TAG_DHCP_BOOT_FILE_SIZE               13
! # define TAG_DHCP_MERIT_DUMP_FILE              14
! # define TAG_DHCP_DOMAIN_NAME                  15
! # define TAG_DHCP_SWAP_SERVER                  16
! # define TAG_DHCP_ROOT_PATH                    17
! # define TAG_DHCP_EXTENSIONS_PATH              18
! # define TAG_DHCP_IP_FORWARDING                19
! # define TAG_DHCP_NON_LOCAL_SOURCE_ROUTING     20
! # define TAG_DHCP_POLICY_FILTER                21
! # define TAG_DHCP_MAX_DGRAM_REASSUMBLY_SIZE    22
! # define TAG_DHCP_IP_TIME_TO_LIVE              23
! # define TAG_DHCP_MTU_AGING_TIMEOUT            24
! # define TAG_DHCP_MTU_PLATEAU_TABLE            25
! # define TAG_DHCP_INTERFACE_MTU                26
! # define TAG_DHCP_SUBNETS_ARE_LOCAL            27
! # define TAG_DHCP_BROADCAST_ADDRESS            28
! # define TAG_DHCP_MASK_DISCOVERY               29
! # define TAG_DHCP_MASK_SUPPLIER                30
! # define TAG_DHCP_ROUTER_DISCOVERY             31
! # define TAG_DHCP_ROUTER_SOLICITATION          32
! # define TAG_DHCP_STATIC_ROUTE                 33
! # define TAG_DHCP_TRAILER_ENCAPSULATION        34
! # define TAG_DHCP_ARP_CACHE_TIMEOUT            35
! # define TAG_DHCP_ETHERNET_ENCAPSULATION       36
! # define TAG_DHCP_TCP_DEFAULT_TTL              37
! # define TAG_DHCP_TCP_KEEPALIVE_INTERVAL       38
! # define TAG_DHCP_TCP_KEEPALIVE_GARBAGE        39
! # define TAG_DHCP_NIS_DOMAIN_NAME              40
! # define TAG_DHCP_NIS_SERVERS                  41
! # define TAG_DHCP_NTP_SERVERS                  42
! # define TAG_DHCP_VENDOR_SPECIFIC              43
! # define TAG_DHCP_NETBIOSOTCP_NAME_SERVER      44
! # define TAG_DHCP_NETBIOSOTCP_DATAGRAM_SERVER  45
! # define TAG_DHCP_NETBIOSOTCP_NODE_TYPE        46
! # define TAG_DHCP_NETBIOSOTCP_SCOPE            47
! # define TAG_DHCP_XWIN_FONT_SERVER             48
! # define TAG_DHCP_XWIN_DISP_MANAGER_SERVER     49
! # define TAG_DHCP_REQUESTED_IP_ADDRESS         50
! # define TAG_DHCP_IP_ADDRESS_LEASE_TIME        51
! # define TAG_DHCP_OVERLOAD                     52
! # define TAG_DHCP_MESSAGE_TYPE                 53
! # define TAG_DHCP_SERVER_IDENTIFIER            54
! # define TAG_DHCP_PARAMETERS                   55
! # define TAG_DHCP_MESSAGE                      56
! # define TAG_DHCP_MAX_DHCP_SIZE                57
! # define TAG_DHCP_RENEWAL_TIME                 58
! # define TAG_DHCP_REBINDING_TIME               59
! # define TAG_DHCP_VENDOR_CLASS_ID              60
! # define TAG_DHCP_CLIENT_ID                    61
! # define TAG_DHCP_NISPLUS_DOMAIN               64
! # define TAG_DHCP_NISPLUS_SERVERS              65
! # define TAG_DHCP_TFTP_SERVER                  66
! # define TAG_DHCP_BOOT_FILE_NAME               67
! # define TAG_DHCP_IP_HOME_AGENT                68
! # define TAG_DHCP_SMTP_SERVER                  69
! # define TAG_DHCP_POP_SERVER                   70
! # define TAG_DHCP_NNTP_SERVER                  71
! # define TAG_DHCP_DEFAULT_WWW_SERVER           72
! # define TAG_DHCP_DEFAULT_FINGER_SERVER        73
! # define TAG_DHCP_DEFAULT_IRC_SERVER           74
! # define TAG_DHCP_DEFAULT_ST_SERVER            75
! # define TAG_DHCP_DEFAULT_STDA_SERVER          76
! # define TAG_DHCP_END                          255
  
  /* DHCP overload option values. */
--- 277,356 ----
   */
  
! #define TAG_DHCP_PAD                           0
! #define TAG_DHCP_SUBNET_MASK                   1
! #define TAG_DHCP_TIME_OFFSET                   2
! #define TAG_DHCP_ROUTER                        3
! #define TAG_DHCP_TIME_SERVER                   4
! #define TAG_DHCP_NAME_SERVER                   5
! #define TAG_DHCP_DOMAIN_NAME_SERVER            6
! #define TAG_DHCP_LOG_SERVER                    7
! #define TAG_DHCP_COOKIE_SERVER                 8
! #define TAG_DHCP_LPR_SERVER                    9
! #define TAG_DHCP_IMPRESS_SERVER               10
! #define TAG_DHCP_RESOURCE_LOCATION_SERVER     11
! #define TAG_DHCP_HOST_NAME                    12
! #define TAG_DHCP_BOOT_FILE_SIZE               13
! #define TAG_DHCP_MERIT_DUMP_FILE              14
! #define TAG_DHCP_DOMAIN_NAME                  15
! #define TAG_DHCP_SWAP_SERVER                  16
! #define TAG_DHCP_ROOT_PATH                    17
! #define TAG_DHCP_EXTENSIONS_PATH              18
! #define TAG_DHCP_IP_FORWARDING                19
! #define TAG_DHCP_NON_LOCAL_SOURCE_ROUTING     20
! #define TAG_DHCP_POLICY_FILTER                21
! #define TAG_DHCP_MAX_DGRAM_REASSUMBLY_SIZE    22
! #define TAG_DHCP_IP_TIME_TO_LIVE              23
! #define TAG_DHCP_MTU_AGING_TIMEOUT            24
! #define TAG_DHCP_MTU_PLATEAU_TABLE            25
! #define TAG_DHCP_INTERFACE_MTU                26
! #define TAG_DHCP_SUBNETS_ARE_LOCAL            27
! #define TAG_DHCP_BROADCAST_ADDRESS            28
! #define TAG_DHCP_MASK_DISCOVERY               29
! #define TAG_DHCP_MASK_SUPPLIER                30
! #define TAG_DHCP_ROUTER_DISCOVERY             31
! #define TAG_DHCP_ROUTER_SOLICITATION          32
! #define TAG_DHCP_STATIC_ROUTE                 33
! #define TAG_DHCP_TRAILER_ENCAPSULATION        34
! #define TAG_DHCP_ARP_CACHE_TIMEOUT            35
! #define TAG_DHCP_ETHERNET_ENCAPSULATION       36
! #define TAG_DHCP_TCP_DEFAULT_TTL              37
! #define TAG_DHCP_TCP_KEEPALIVE_INTERVAL       38
! #define TAG_DHCP_TCP_KEEPALIVE_GARBAGE        39
! #define TAG_DHCP_NIS_DOMAIN_NAME              40
! #define TAG_DHCP_NIS_SERVERS                  41
! #define TAG_DHCP_NTP_SERVERS                  42
! #define TAG_DHCP_VENDOR_SPECIFIC              43
! #define TAG_DHCP_NETBIOSOTCP_NAME_SERVER      44
! #define TAG_DHCP_NETBIOSOTCP_DATAGRAM_SERVER  45
! #define TAG_DHCP_NETBIOSOTCP_NODE_TYPE        46
! #define TAG_DHCP_NETBIOSOTCP_SCOPE            47
! #define TAG_DHCP_XWIN_FONT_SERVER             48
! #define TAG_DHCP_XWIN_DISP_MANAGER_SERVER     49
! #define TAG_DHCP_REQUESTED_IP_ADDRESS         50
! #define TAG_DHCP_IP_ADDRESS_LEASE_TIME        51
! #define TAG_DHCP_OVERLOAD                     52
! #define TAG_DHCP_MESSAGE_TYPE                 53
! #define TAG_DHCP_SERVER_IDENTIFIER            54
! #define TAG_DHCP_PARAMETERS                   55
! #define TAG_DHCP_MESSAGE                      56
! #define TAG_DHCP_MAX_DHCP_SIZE                57
! #define TAG_DHCP_RENEWAL_TIME                 58
! #define TAG_DHCP_REBINDING_TIME               59
! #define TAG_DHCP_VENDOR_CLASS_ID              60
! #define TAG_DHCP_CLIENT_ID                    61
! #define TAG_DHCP_NISPLUS_DOMAIN               64
! #define TAG_DHCP_NISPLUS_SERVERS              65
! #define TAG_DHCP_TFTP_SERVER                  66
! #define TAG_DHCP_BOOT_FILE_NAME               67
! #define TAG_DHCP_IP_HOME_AGENT                68
! #define TAG_DHCP_SMTP_SERVER                  69
! #define TAG_DHCP_POP_SERVER                   70
! #define TAG_DHCP_NNTP_SERVER                  71
! #define TAG_DHCP_DEFAULT_WWW_SERVER           72
! #define TAG_DHCP_DEFAULT_FINGER_SERVER        73
! #define TAG_DHCP_DEFAULT_IRC_SERVER           74
! #define TAG_DHCP_DEFAULT_ST_SERVER            75
! #define TAG_DHCP_DEFAULT_STDA_SERVER          76
! #define TAG_DHCP_END                          255
  
  /* DHCP overload option values. */
***************
*** 362,369 ****
  /* NetBIOS Scope Node Types */
  
! # define NETBIOS_B_NODE 0x01
! # define NETBIOS_P_NODE 0x02
! # define NETBIOS_M_NODE 0x04
! # define NETBIOS_H_NODE 0x06
  
  /* prototypes. */
--- 362,369 ----
  /* NetBIOS Scope Node Types */
  
! #define NETBIOS_B_NODE 0x01
! #define NETBIOS_P_NODE 0x02
! #define NETBIOS_M_NODE 0x04
! #define NETBIOS_H_NODE 0x06
  
  /* prototypes. */