Two bugfixes -- indentation and actual call to check_features()

This commit is contained in:
dsx 2015-01-27 11:55:31 -05:00
parent 8aadc7c072
commit 85cc385cc2
1 changed files with 6 additions and 5 deletions

View File

@ -66,6 +66,7 @@ def check_features():
@app.route("/traceroute6") @app.route("/traceroute6")
def traceroute(): def traceroute():
check_accesslist() check_accesslist()
check_features()
if sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd') or sys.platform.startswith('openbsd'): if sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd') or sys.platform.startswith('openbsd'):
traceroute4 = ['traceroute'] traceroute4 = ['traceroute']
@ -77,13 +78,12 @@ def traceroute():
src = [] src = []
if request.path == '/traceroute6': if request.path == '/traceroute6':
traceroute = traceroute6 traceroute = traceroute6
if app.config.get("IPV6_SOURCE", ""): if app.config.get("IPV6_SOURCE", ""):
src = ["-s", app.config.get("IPV6_SOURCE")] src = ["-s", app.config.get("IPV6_SOURCE")]
else: else:
traceroute = traceroute4 traceroute = traceroute4
if app.config.get("IPV4_SOURCE", ""): if app.config.get("IPV4_SOURCE", ""):
src = ["-s", app.config.get("IPV4_SOURCE")] src = ["-s", app.config.get("IPV4_SOURCE")]
query = request.args.get("q", "") query = request.args.get("q", "")
query = unquote(query) query = unquote(query)
@ -104,6 +104,7 @@ def traceroute():
@app.route("/bird6") @app.route("/bird6")
def bird(): def bird():
check_accesslist() check_accesslist()
check_features()
if request.path == "/bird": if request.path == "/bird":
b = BirdSocket(file=app.config.get('SOCKET_PATH').get(4)) b = BirdSocket(file=app.config.get('SOCKET_PATH').get(4))