[#1840] run script: warnings and minor changes

diff --git a/src/hooks/dhcp/run_script/run_script.cc b/src/hooks/dhcp/run_script/run_script.cc
index 8eac5f0bc6288ebb388ed97b3bda34b717a2c3e3..4c27e0a7df3fdca721554445223ba723cf99973d 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.cc
+++ b/src/hooks/dhcp/run_script/run_script.cc
@@ -74,7 +74,7 @@ RunScriptImpl::extractInteger(ProcessEnvVars& vars,
                               const uint64_t value,
                               const string& prefix,
                               const string& suffix) {
-    string data = "";
+    string data;
     try {
         data = boost::lexical_cast<string>(value);
     } catch (...) {
@@ -300,7 +300,7 @@ RunScriptImpl::extractLeases4(ProcessEnvVars& vars,
     if (leases4) {
         RunScriptImpl::extractInteger(vars, leases4->size(),
                                       prefix + "_SIZE", suffix);
-        for (int i = 0; i < leases4->size(); ++i) {
+        for (size_t i = 0; i < leases4->size(); ++i) {
             RunScriptImpl::extractLease4(vars, leases4->at(i),
                                          prefix + "_AT" +
                                          boost::lexical_cast<string>(i),
@@ -319,7 +319,7 @@ RunScriptImpl::extractLeases6(ProcessEnvVars& vars,
     if (leases6) {
         RunScriptImpl::extractInteger(vars, leases6->size(),
                                       prefix + "_SIZE", suffix);
-        for (int i = 0; i < leases6->size(); ++i) {
+        for (size_t i = 0; i < leases6->size(); ++i) {
             RunScriptImpl::extractLease6(vars, leases6->at(i),
                                          prefix + "_AT" +
                                          boost::lexical_cast<string>(i),
@@ -374,11 +374,16 @@ RunScriptImpl::extractPkt4(ProcessEnvVars& vars,
                                      prefix + "_LOCAL_HWADDR", suffix);
         RunScriptImpl::extractHWAddr(vars, pkt4->getRemoteHWAddr(),
                                      prefix + "_REMOTE_HWADDR", suffix);
-        RunScriptImpl::extractOption(vars, pkt4->getOption(82),
+        RunScriptImpl::extractOption(vars,
+                                     pkt4->getOption(DHO_DHCP_AGENT_OPTIONS),
                                      prefix + "_RAI", suffix);
-        RunScriptImpl::extractSubOption(vars, pkt4->getOption(82), 1,
+        RunScriptImpl::extractSubOption(vars,
+                                        pkt4->getOption(DHO_DHCP_AGENT_OPTIONS),
+                                        RAI_OPTION_AGENT_CIRCUIT_ID,
                                         prefix + "_RAI_CIRCUIT_ID", suffix);
-        RunScriptImpl::extractSubOption(vars, pkt4->getOption(82), 2,
+        RunScriptImpl::extractSubOption(vars,
+                                        pkt4->getOption(DHO_DHCP_AGENT_OPTIONS),
+                                        RAI_OPTION_REMOTE_ID,
                                         prefix + "_RAI_REMOTE_ID", suffix);
     } else {
         RunScriptImpl::extractString(vars, "", prefix + "_TYPE", suffix);

diff --git a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
index fb4a35466bdbbf40725d41e6a7982e3d752a2514..9fa05277f27b558da9fe331478e5e3fbf6e0ee3b 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
+++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
@@ -244,7 +244,7 @@ generatePkt4() {
 
     OptionCustomPtr rai(new OptionCustom(*rai_def, Option::V4));
 
-    uint8_t circuit_id[] = { 0x68, 0x6F, 0x77, 0x64, 0x79 };
+    uint8_t circuit_id[] = { 0x68, 0x6f, 0x77, 0x64, 0x79 };
     OptionPtr circuit_id_opt(new Option(Option::V4, RAI_OPTION_AGENT_CIRCUIT_ID,
                                         OptionBuffer(circuit_id,
                                         circuit_id + sizeof(circuit_id))));
@@ -256,7 +256,7 @@ generatePkt4() {
                                            subscriber_id + sizeof(subscriber_id))));
     rai->addOption(subscriber_id_opt);
 
-    uint8_t remote_id[] = { 0x87, 0xF6, 0x79, 0x77, 0xEF };
+    uint8_t remote_id[] = { 0x87, 0xf6, 0x79, 0x77, 0xef };
     OptionPtr remote_id_opt(new Option(Option::V4, RAI_OPTION_REMOTE_ID,
                                        OptionBuffer(remote_id,
                                        remote_id + sizeof(remote_id))));