From 599d33b8d84bba6f017b6c7a46e645af15cd6f60 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 25 Apr 2010 01:25:59 -0400 Subject: [PATCH] Move to -c rcc-auto. Signed-off-by: Anders Kaseorg --- routeradvert-scan.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/routeradvert-scan.py b/routeradvert-scan.py index d739a9a..1e1f62b 100755 --- a/routeradvert-scan.py +++ b/routeradvert-scan.py @@ -40,11 +40,11 @@ import urllib # configuration interface = 'eth1' -timeout = 30 -zclass = 'andersk-auto' +timeout = 120 +zclass = 'rcc-auto' zinstance = '6to4' zsig = '%s on %s' % (sys.argv[0], socket.gethostname()) -cert_file = '/home/anders/Private/andersk.pem' +cert_file = os.path.join(os.path.dirname(__file__), 'sipbcert.pem') # end configuration mac_re = re.compile(r'^(?:[0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$') @@ -52,7 +52,7 @@ mac_re = re.compile(r'^(?:[0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$') seen_macs = {} def msg(m): - os.spawnlp(os.P_WAIT, 'zwrite', 'zwrite', '-q', '-d', '-c', zclass, '-i', zinstance, '-s', zsig, '-m', m) + os.spawnlp(os.P_WAIT, 'zwrite', 'zwrite', '-q', '-d', '-c', zclass, '-i', zinstance, '-s', zsig, '-O', 'auto', '-m', m) br = mechanize.Browser() br.add_client_certificate("https://nic.mit.edu", cert_file, cert_file) @@ -97,8 +97,6 @@ def check_gone(): else: signal.alarm(int(math.ceil(next - now))) -msg('Starting %s' % sys.argv[0]) - signal.signal(signal.SIGALRM, lambda signum, frame: check_gone()) p = subprocess.Popen(['tcpdump', '-elnp', '-i', interface, 'icmp6 and (ip6[40] = 134)'], stdout=subprocess.PIPE) -- 2.45.1