From c92ff59b8538ac58d543b7a5a356f8c0932a6019 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Fri, 19 Jun 2020 16:42:59 +0200 Subject: [PATCH] Add public IP info for each GRE tunnel --- omr-admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omr-admin.py b/omr-admin.py index 1babece..48b2be0 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -978,7 +978,9 @@ async def config(current_user: User = Depends(get_current_user)): gre_tunnel_remoteip = line.replace(line[:9], '').rstrip() if 'NETMASK=' in line: gre_tunnel_netmask = line.replace(line[:8], '').rstrip() - gre_tunnel_conf.append("{'local_ip': '" + gre_tunnel_localip + "', 'remote_ip': '" + gre_tunnel_remoteip + "', 'netmask': '" + gre_tunnel_netmask + "'}") + if 'INTFADDR=' in line: + gre_tunnel_intfaddr = line.replace(line[:9], '').rstrip() + gre_tunnel_conf.append("{'local_ip': '" + gre_tunnel_localip + "', 'remote_ip': '" + gre_tunnel_remoteip + "', 'netmask': '" + gre_tunnel_netmask + "', 'public_ip': '" + gre_tunnel_intfaddr + "'}") if 'vpnremoteip' in omr_config_data['users'][0][current_user.username]: vpn_remote_ip = omr_config_data['users'][0][current_user.username]['vpnremoteip']