commit 06c61f1d356246a5c08e1d9c1a5ffa5fae3a4b5b
author Scott Funkenhauser <sfunkenhauser@google.com> Tue Jan 17 13:00:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 17 13:00:12 2017 +0000
tree fdb2bb5a3b0082ec581399affe5b1bd9c02d1459
parent f1bb17c8485e59acd2d080e63645f753d93fdfa9
parent e5d30d1609f77609a6e531b498ef97ed2976f16f

Merge "dialcheck: Make alarm timeout longer than the ssdp response timeout."

cmds/dialcheck.cc

diff --git a/cmds/dialcheck.cc b/cmds/dialcheck.cc
index d5ea202..c8adb7a 100644
--- a/cmds/dialcheck.cc
+++ b/cmds/dialcheck.cc
@@ -41,7 +41,8 @@
 
 
 typedef std::set<std::string> ResultsSet;
-int timeout_secs = 10;
+int ssdp_timeout_secs = 10;
+int alarm_timeout_secs = 15;
 
 
 /* SSDP Discover packet */
@@ -247,7 +248,7 @@
   int maxfd = (s4 > s6) ? s4 : s6;
 
   memset(&tv, 0, sizeof(tv));
-  tv.tv_sec = timeout_secs;
+  tv.tv_sec = ssdp_timeout_secs;
   tv.tv_usec = 0;
 
   FD_ZERO(&rfds);
@@ -290,12 +291,12 @@
   int s4, s6;
 
   setlinebuf(stdout);
-  alarm(10);
+  alarm(alarm_timeout_secs);
 
   while ((c = getopt(argc, argv, "t:")) != -1) {
     switch(c) {
       case 't':
-        timeout_secs = 1;
+        ssdp_timeout_secs = 1;
         ssdp_port = atoi(optarg);
         ssdp_loop = 1;
         break;