Browse Source

[1959] Small fix in logical operator.

Marcin Siodelski 12 years ago
parent
commit
5813168519

+ 1 - 1
tests/tools/perfdhcp/test_control.cc

@@ -278,7 +278,7 @@ TestControl::factoryIana6(Option::Universe, uint16_t,
     // @todo allow different values of T1, T2 and IAID.
     // @todo allow different values of T1, T2 and IAID.
     const uint8_t buf_array[] = {
     const uint8_t buf_array[] = {
         0, 0, 0, 1,                     // IAID = 1
         0, 0, 0, 1,                     // IAID = 1
-        0, 0, 3600 >> 8, 3600 && 0xff,  // T1 = 3600
+        0, 0, 3600 >> 8, 3600 & 0xff,  // T1 = 3600
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
     };
     };
     OptionBuffer buf_ia_na(buf_array, buf_array + sizeof(buf_array));
     OptionBuffer buf_ia_na(buf_array, buf_array + sizeof(buf_array));

+ 1 - 1
tests/tools/perfdhcp/tests/test_control_unittest.cc

@@ -795,7 +795,7 @@ TEST_F(TestControlTest, Options6) {
     // Every IA_NA option is expected to start with this sequence.
     // Every IA_NA option is expected to start with this sequence.
     const uint8_t opt_ia_na_array[] = {
     const uint8_t opt_ia_na_array[] = {
         0, 0, 0, 1,                     // IAID = 1
         0, 0, 0, 1,                     // IAID = 1
-        0, 0, 3600 >> 8, 3600 && 0xff,  // T1 = 3600
+        0, 0, 3600 >> 8, 3600 & 0xff,  // T1 = 3600
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
     };
     };
     OptionBuffer opt_ia_na_ref(opt_ia_na_array,
     OptionBuffer opt_ia_na_ref(opt_ia_na_array,