From a1efb7ab247022edaf4c02c6ae9325e7b410b6af Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 Jul 2015 19:55:20 +0000 Subject: [PATCH] - alter format to be more flexible to values coming back - no need for default gateway element --- traceroute.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/traceroute.py b/traceroute.py index 1f13e08..f83256f 100755 --- a/traceroute.py +++ b/traceroute.py @@ -312,24 +312,20 @@ class Traceroute(object): if k == 'default': continue - if len(gws[k]) == 1: - (ip,interface,is_gateway) = gws[k][0] + for r in gws[k]: + (ip,interface,is_gateway) = r - if is_gateway: - gw_name = 'default' - else: # just use the index value from netifaces - gw_name = "{0}".format(k) + gw_name = "{0}".format(netifaces.address_families[k]) routes.append({ gw_name : { 'ip_address' : ip, - 'interface' : interface + 'interface' : interface, + 'default' : is_gateway } } ) - else: - print "Error interpretting network routes. check netifaces output" return routes