From 65186fec5a44b7e80bad390946dfc5cde3b608c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 2 Apr 2007 09:22:22 +0000 Subject: [PATCH] Removed duplicated information (the PARAMETER_* constants were already expressed in form of the OPTION_* constants). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20508 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/net/DHCPClient.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/servers/net/DHCPClient.cpp b/src/servers/net/DHCPClient.cpp index c8e31af6e1..2dbc552ef5 100644 --- a/src/servers/net/DHCPClient.cpp +++ b/src/servers/net/DHCPClient.cpp @@ -40,6 +40,7 @@ enum message_option { OPTION_PAD = 0, OPTION_END = 255, OPTION_SUBNET_MASK = 1, + OPTION_TIME_OFFSET = 2, OPTION_ROUTER_ADDRESS = 3, OPTION_DOMAIN_NAME_SERVER = 6, OPTION_HOST_NAME = 12, @@ -48,6 +49,8 @@ enum message_option { OPTION_MTU = 26, OPTION_BROADCAST_ADDRESS = 28, OPTION_NETWORK_TIME_SERVERS = 42, + OPTION_NETBIOS_NAME_SERVER = 44, + OPTION_NETBIOS_SCOPE = 47, // DHCP specific options OPTION_REQUEST_IP_ADDRESS = 50, @@ -76,18 +79,6 @@ enum message_type { DHCP_INFORM }; -enum parameter_type { - PARAMETER_SUBNET_MASK = 1, - PARAMETER_TIME_OFFSET = 2, - PARAMETER_ROUTER = 3, - PARAMETER_NAME_SERVER = 6, - PARAMETER_HOST_NAME = 12, - PARAMETER_DOMAIN_NAME = 15, - PARAMETER_BROADCAST_ADDRESS = 28, - PARAMETER_NETBIOS_NAME_SERVER = 44, - PARAMETER_NETBIOS_SCOPE = 47, -}; - struct dhcp_option_cookie { dhcp_option_cookie() : state(0), file_has_options(false), server_name_has_options(false) {} @@ -142,8 +133,8 @@ struct dhcp_message { const uint32 kMsgLeaseTime = 'lstm'; static const uint8 kRequiredParameters[] = { - PARAMETER_SUBNET_MASK, PARAMETER_ROUTER, - PARAMETER_NAME_SERVER, PARAMETER_BROADCAST_ADDRESS + OPTION_SUBNET_MASK, OPTION_ROUTER_ADDRESS, + OPTION_DOMAIN_NAME_SERVER, OPTION_BROADCAST_ADDRESS }; @@ -276,6 +267,7 @@ dhcp_message::PrepareMessage(uint8 type) return next; } + uint8* dhcp_message::PutOption(uint8* options, message_option option) {