Merge pull request #1 from fduraffourg/master

Fix AS path computation for bgpmap & Fix missing import
This commit is contained in:
Steffen Vogel 2015-12-20 02:15:32 +02:00
commit a4830951b1

8
lg.py
View file

@ -32,7 +32,7 @@ import random
import re
import subprocess
from toolbox import mask_is_valid, ipv6_is_valid, ipv4_is_valid, resolve, save_cache_pickle, load_cache_pickle, get_asname_from_whois, unescape
from toolbox import mask_is_valid, ipv6_is_valid, ipv4_is_valid, resolve, resolve_ptr, save_cache_pickle, load_cache_pickle, get_asname_from_whois, unescape
from dns.resolver import NXDOMAIN
from flask import Flask, render_template, jsonify, redirect, session, request, abort, Response, Markup
@ -588,7 +588,11 @@ def build_as_tree_from_raw_bird_ouput(host, proto, text):
net_dest = expr2.group(1).strip()
if line.startswith("BGP.as_path:"):
path.extend(line.replace("BGP.as_path:", "").strip().split(" "))
ASes = line.replace("BGP.as_path:", "").strip().split(" ")
if path:
path.extend(ASes)
else:
path = ASes
if path:
path.append(net_dest)