From b2c2b63b1c32f719d306367903f2f4d385599758 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Tue, 14 Jul 2015 23:17:39 -0400 Subject: [PATCH] - switch default country to LO - only show raw traceroute data when debug flag is set --- traceroute.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/traceroute.py b/traceroute.py index a67a3d9..ed2e735 100755 --- a/traceroute.py +++ b/traceroute.py @@ -349,8 +349,8 @@ class Traceroute(object): report['pub_ip'] = self.pub_ip report['ifaces'] = self.ifaces report['routes'] = self.routes - - report['raw'] = self.raw_string + if self.debug: + report['raw'] = self.raw_string return report @@ -370,7 +370,7 @@ def main(): "-j", "--json_file", type="string", default="sources.json", help="List of sources in JSON file (default: sources.json)") cmdparser.add_option( - "-c", "--country", type="choice", default="US", + "-c", "--country", type="choice", default="LO", choices=["LO", "BY", "CH", "JP", "RU", "UK", "US"], help=("Traceroute will be initiated from this country; choose 'LO' " "for localhost to run traceroute locally, 'BY' for Belarus, "