Browse Source

[3199] Fixed option definition of DHCPv4 Time Offset.

Marcin Siodelski 11 years ago
parent
commit
732d98acba
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/lib/dhcp/std_option_defs.h
  2. 1 1
      src/lib/dhcp/tests/libdhcp++_unittest.cc

+ 2 - 2
src/lib/dhcp/std_option_defs.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -68,7 +68,7 @@ RECORD_DECL(FQDN_RECORDS, OPT_UINT8_TYPE, OPT_UINT8_TYPE, OPT_UINT8_TYPE,
 /// @brief Definitions of standard DHCPv4 options.
 const OptionDefParams OPTION_DEF_PARAMS4[] = {
     { "subnet-mask", DHO_SUBNET_MASK, OPT_IPV4_ADDRESS_TYPE, false, NO_RECORD_DEF, "" },
-    { "time-offset", DHO_TIME_OFFSET, OPT_UINT32_TYPE, false, NO_RECORD_DEF, "" },
+    { "time-offset", DHO_TIME_OFFSET, OPT_INT32_TYPE, false, NO_RECORD_DEF, "" },
     { "routers", DHO_ROUTERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
     { "time-servers", DHO_TIME_SERVERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
     { "name-servers", DHO_NAME_SERVERS, OPT_IPV4_ADDRESS_TYPE,

+ 1 - 1
src/lib/dhcp/tests/libdhcp++_unittest.cc

@@ -546,7 +546,7 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
                                     typeid(OptionCustom));
 
     LibDhcpTest::testStdOptionDefs4(DHO_TIME_OFFSET, begin, begin + 4,
-                                    typeid(OptionInt<uint32_t>));
+                                    typeid(OptionInt<int32_t>));
 
     LibDhcpTest::testStdOptionDefs4(DHO_ROUTERS, begin, end,
                                     typeid(Option4AddrLst));