commit 9e41965fbe337e8ef7c2c55bb4fbda2349317c45
author Denton Gentry <dgentry@google.com> Sat Oct 22 20:55:51 2016 -0700
committer Denton Gentry <dgentry@google.com> Sun Oct 23 07:37:56 2016 -0700
tree 6c69146d97a6afe2fc752ac8b43a9802ccfed605
parent 01d69cfd2c959298656c20e9aee204859c92a53e

castcheck & dialcheck: 10 second timeout

We've seen one case where castcheck hangs because avahi-browse
doesn't complete. Set a 10 second timeout.

Dialcheck had a 30 second timeout, set it to 10 seconds as well.

Change-Id: I421607909a77f928a9116bb296df6ce2205d60d7

cmds/castcheck

diff --git a/cmds/castcheck b/cmds/castcheck
index 70080ec..40c90cc 100755
--- a/cmds/castcheck
+++ b/cmds/castcheck
@@ -13,7 +13,7 @@
 while IFS=";" read ip; do
   cast_devices="$cast_devices $ip"
 done<<EOT
-$($AVAHI -tpvlr _googlecast._tcp | grep "^=" | cut -d";" -f8 | sort)
+$(timeout 10 $AVAHI -tpvlr _googlecast._tcp | grep "^=" | cut -d";" -f8 | sort)
 EOT
 
 echo "Cast responses from:$cast_devices"

cmds/dialcheck.cc

diff --git a/cmds/dialcheck.cc b/cmds/dialcheck.cc
index 17f8fbd..d5ea202 100644
--- a/cmds/dialcheck.cc
+++ b/cmds/dialcheck.cc
@@ -290,7 +290,7 @@
   int s4, s6;
 
   setlinebuf(stdout);
-  alarm(30);
+  alarm(10);
 
   while ((c = getopt(argc, argv, "t:")) != -1) {
     switch(c) {