Address a couple of coverity issues

tomflynn · tomflynn · commit 82c3ebe2eed4 · 2020-05-12T09:21:56.000-07:00
Signed-off-by: Tom Flynn &lt;tom.flynn@gmail.com&gt;
Change-Id: Iafc0ebfaaad2fd67e041c7e431f3e7ab1fd76879
diff --git a/agent-ovs/cmd/opflex_agent.cpp b/agent-ovs/cmd/opflex_agent.cpp
@@ -223,21 +223,25 @@ int main(int argc, char** argv) {
 
     // Parse command line options
     po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help,h", "Print this help message")
-        ("version,v", "print version information and git hash")
-        ("config,c",
-         po::value<std::vector<string> >(),
-         "Read configuration from the specified files or directories")
-        ("watch,w", "Watch configuration directories for changes")
-        ("log", po::value<string>()->default_value(""),
-         "Log to the specified file (default standard out)")
-        ("level", po::value<string>()->default_value("info"),
-         "Use the specified log level (default info). "
-         "Overridden by log level in configuration file")
-        ("syslog", "Log to syslog instead of file or standard out")
-        ("daemon", "Run the agent as a daemon")
-        ;
+    try {
+        desc.add_options()
+            ("help,h", "Print this help message")
+            ("version,v", "print version information and git hash")
+            ("config,c",
+             po::value<std::vector<string> >(),
+             "Read configuration from the specified files or directories")
+            ("watch,w", "Watch configuration directories for changes")
+            ("log", po::value<string>()->default_value(""),
+             "Log to the specified file (default standard out)")
+            ("level", po::value<string>()->default_value("info"),
+             "Use the specified log level (default info). "
+             "Overridden by log level in configuration file")
+            ("syslog", "Log to syslog instead of file or standard out")
+            ("daemon", "Run the agent as a daemon");
+    } catch (const boost::bad_lexical_cast& e) {
+        std::cerr << e.what() << std::endl;
+        return 1;
+    }
 
     bool daemon = false;
     bool watch = false;
@@ -274,10 +278,10 @@ int main(int argc, char** argv) {
         }
     } catch (const po::unknown_option& e) {
         std::cerr << e.what() << std::endl;
-        return 1;
+        return 2;
     } catch (const std::bad_cast& e) {
         std::cerr << e.what() << std::endl;
-        return 2;
+        return 3;
     }
 
     if (daemon)
@@ -288,7 +292,12 @@ int main(int argc, char** argv) {
     // Initialize agent and configuration
     std::vector<string> configFiles;
     if (vm.count("config"))
-        configFiles = vm["config"].as<std::vector<string> >();
+        try {
+            configFiles = vm["config"].as<std::vector<string> >();
+        } catch (const boost::bad_any_cast& e) {
+            std::cerr << e.what() << std::endl;
+            return 4;
+        }
     else
         configFiles.push_back(DEFAULT_CONF);
 
diff --git a/agent-ovs/cmd/test/framework_stress.cpp b/agent-ovs/cmd/test/framework_stress.cpp
@@ -67,16 +67,19 @@ int main(int argc, char** argv) {
     signal(SIGPIPE, SIG_IGN);
     // Parse command line options
     po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help,h", "Print this help message")
-        ("log", po::value<string>()->default_value(""),
-         "Log to the specified file (default standard out)")
-        ("level", po::value<string>()->default_value("info"),
-         "Use the specified log level (default info)")
-        ("policy,p", po::value<string>()->default_value(""),
-         "Read the specified policy file to seed the MODB")
-        ;
-
+    try {
+        desc.add_options()
+            ("help,h", "Print this help message")
+            ("log", po::value<string>()->default_value(""),
+             "Log to the specified file (default standard out)")
+            ("level", po::value<string>()->default_value("info"),
+             "Use the specified log level (default info)")
+            ("policy,p", po::value<string>()->default_value(""),
+             "Read the specified policy file to seed the MODB");
+    } catch (const boost::bad_lexical_cast& e) {
+        std::cerr << e.what() << std::endl;
+        return 1;
+    }
     std::string log_file;
     std::string level_str;
     std::string policy_file;
@@ -98,10 +101,10 @@ int main(int argc, char** argv) {
 
     } catch (const po::unknown_option& e) {
         std::cerr << e.what() << std::endl;
-        return 1;
+        return 2;
     } catch (const std::bad_cast& e) {
         std::cerr << e.what() << std::endl;
-        return 2;
+        return 3;
     }
 
     initLogging(level_str, false /*syslog*/, log_file, "framework-stress");
@@ -202,9 +205,9 @@ int main(int argc, char** argv) {
         server.stop();
     } catch (const std::exception& e) {
         LOG(ERROR) << "Fatal error: " << e.what();
-        return 2;
+        return 4;
     } catch (...) {
         LOG(ERROR) << "Unknown fatal error";
-        return 3;
+        return 5;
     }
 }
diff --git a/agent-ovs/cmd/test/opflex_server.cpp b/agent-ovs/cmd/test/opflex_server.cpp
@@ -60,35 +60,39 @@ int main(int argc, char** argv) {
     signal(SIGPIPE, SIG_IGN);
     // Parse command line options
     po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help,h", "Print this help message")
-        ("log", po::value<string>()->default_value(""),
-         "Log to the specified file (default standard out)")
-        ("level", po::value<string>()->default_value("info"),
-         "Use the specified log level (default info)")
-        ("sample", po::value<string>()->default_value(""),
-         "Output a sample policy to the given file then exit")
-        ("daemon", "Run the opflex server as a daemon")
-        ("policy,p", po::value<string>()->default_value(""),
-         "Read the specified policy file to seed the MODB")
-        ("ssl_castore", po::value<string>()->default_value("/etc/ssl/certs/"),
-         "Use the specified path or certificate file as the SSL CA store")
-        ("ssl_key", po::value<string>()->default_value(""),
-         "Enable SSL and use the private key specified")
-        ("ssl_pass", po::value<string>()->default_value(""),
-         "Use the specified password for the private key")
-        ("peer", po::value<std::vector<string> >(),
-         "A peer specified as hostname:port to return in identity response")
-        ("transport_mode_proxies", po::value<std::vector<string> >(),
-         "3 transport_mode_proxy IPv4 addresses specified to return "
-         "in identity response")
-        ("grpc_address", po::value<string>()->default_value("localhost:19999"),
-         "GRPC server address for policy updates")
-        ("grpc_conf", po::value<string>()->default_value(""),
-         "GRPC config file, should be in same directory as policy file")
-        ("prr_interval_secs", po::value<int>()->default_value(60),
-         "How often to wakeup prr thread to check for prr timeouts")
-        ;
+    try {
+        desc.add_options()
+            ("help,h", "Print this help message")
+            ("log", po::value<string>()->default_value(""),
+             "Log to the specified file (default standard out)")
+            ("level", po::value<string>()->default_value("info"),
+             "Use the specified log level (default info)")
+            ("sample", po::value<string>()->default_value(""),
+             "Output a sample policy to the given file then exit")
+            ("daemon", "Run the opflex server as a daemon")
+            ("policy,p", po::value<string>()->default_value(""),
+             "Read the specified policy file to seed the MODB")
+            ("ssl_castore", po::value<string>()->default_value("/etc/ssl/certs/"),
+             "Use the specified path or certificate file as the SSL CA store")
+            ("ssl_key", po::value<string>()->default_value(""),
+             "Enable SSL and use the private key specified")
+            ("ssl_pass", po::value<string>()->default_value(""),
+             "Use the specified password for the private key")
+            ("peer", po::value<std::vector<string> >(),
+             "A peer specified as hostname:port to return in identity response")
+            ("transport_mode_proxies", po::value<std::vector<string> >(),
+             "3 transport_mode_proxy IPv4 addresses specified to return "
+             "in identity response")
+            ("grpc_address", po::value<string>()->default_value("localhost:19999"),
+             "GRPC server address for policy updates")
+            ("grpc_conf", po::value<string>()->default_value(""),
+             "GRPC config file, should be in same directory as policy file")
+            ("prr_interval_secs", po::value<int>()->default_value(60),
+             "How often to wakeup prr thread to check for prr timeouts");
+    } catch (const boost::bad_lexical_cast& e) {
+        std::cerr << e.what() << std::endl;
+        return 1;
+    }
 
     bool daemon = false;
     std::string log_file;
@@ -166,10 +170,10 @@ int main(int argc, char** argv) {
         prr_interval_secs = vm["prr_interval_secs"].as<int>();
     } catch (const po::unknown_option& e) {
         std::cerr << e.what() << std::endl;
-        return 1;
+        return 2;
     } catch (const std::bad_cast& e) {
         std::cerr << e.what() << std::endl;
-        return 2;
+        return 3;
     }
 
     if (daemon)
@@ -271,9 +275,9 @@ int main(int argc, char** argv) {
         server.stop();
     } catch (const std::exception& e) {
         LOG(ERROR) << "Fatal error: " << e.what();
-        return 2;
+        return 4;
     } catch (...) {
         LOG(ERROR) << "Unknown fatal error";
-        return 3;
+        return 5;
     }
 }
diff --git a/agent-ovs/cmd/test/policy_repo_stress.cpp b/agent-ovs/cmd/test/policy_repo_stress.cpp
@@ -347,7 +347,7 @@ int main(int argc, char** argv) {
 
     if (agents.size() == 0) {
         LOG(opflexagent::ERROR) << "No agents created";
-        return 2;
+        return 3;
     }
 
     opflexagent::initLogging(level_str, false, "");
@@ -403,7 +403,12 @@ int main(int argc, char** argv) {
 
     stats.stop();
     for (TestAgent& a : agents) {
-        a.agent->stop();
+        try {
+            a.agent->stop();
+        } catch (const std::runtime_error& e) {
+            std::cerr << e.what() << std::endl;
+            return 4;
+        }
     }
 
     return 0;
diff --git a/agent-ovs/lib/Agent.cpp b/agent-ovs/lib/Agent.cpp
@@ -66,6 +66,7 @@ Agent::Agent(OFFramework& framework_, const LogParams& _logParams)
       extraConfigManager(framework),
       notifServer(agent_io),rendererFwdMode(opflex_elem_t::INVALID_MODE),
       started(false), presetFwdMode(opflex_elem_t::INVALID_MODE),
+      contractInterval(0), securityGroupInterval(0), interfaceInterval(0),
       spanManager(framework, agent_io),
       netflowManager(framework,agent_io),
       prometheusEnabled(true),
@@ -732,7 +733,7 @@ void Agent::stop() {
     if (io_service_thread) {
         io_service_thread->join();
         io_service_thread.reset();
-	LOG(DEBUG) << "IO service thread stopped";
+	    LOG(DEBUG) << "IO service thread stopped";
     }
 
     framework.stop();
diff --git a/agent-ovs/lib/include/opflexagent/Endpoint.h b/agent-ovs/lib/include/opflexagent/Endpoint.h
@@ -39,7 +39,11 @@ class Endpoint {
      */
     Endpoint() : promiscuousMode(false), discoveryProxyMode(false), natMode(false),
                  external(false), aapModeAA(false), disableAdv(false),
-                 accessAllowUntagged(false), extEncap(0) {}
+                 accessAllowUntagged(false), extEncap(0) {
+#ifdef HAVE_PROMETHEUS_SUPPORT
+        attr_hash = 0;
+#endif
+    }
 
     /**
      * Construct a new Endpoint with the given uuid.  Note that
