Merge branch 'current' into equuleus

2 files changed, 66 insertions, 2 deletions

diff --git a/src/op_mode/show_vpn_ra.py b/src/op_mode/show_vpn_ra.py
new file mode 100755
index 000000000..cf6119c2f
--- /dev/null
+++ b/src/op_mode/show_vpn_ra.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import re
+import subprocess
+# from subprocess import Popen, PIPE
+
+# chech connection to pptp and l2tp daemon
+def get_sessions():
+    absent_pptp = False
+    absent_l2tp = False
+    pptp_cmd = ["accel-cmd", "-p 2003", "show sessions"]
+    l2tp_cmd = ["accel-cmd", "-p 2004", "show sessions"]
+    err_pattern = "^Connection.+failed$"
+    # This value for chack only output header without sessions.
+    len_def_header = 170
+    
+    # Check pptp
+    ret = subprocess.Popen(pptp_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    (output, err) = ret.communicate()
+    if not err and len(output.decode("utf-8")) > len_def_header and not re.search(err_pattern, output.decode("utf-8")):
+        print(output.decode("utf-8"))
+    else:
+        absent_pptp = True
+
+    # Check l2tp
+    ret = subprocess.Popen(l2tp_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    (output, err) = ret.communicate()
+    if not err and len(output.decode("utf-8")) > len_def_header and not re.search(err_pattern, output.decode("utf-8")):
+        print(output.decode("utf-8"))
+    else:
+        absent_l2tp = True
+
+    if absent_l2tp and absent_pptp:
+        print("No active remote access VPN sessions")
+
+
+def main():
+    get_sessions()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/op_mode/snmp_ifmib.py b/src/op_mode/snmp_ifmib.py
index 9d56a950b..180892694 100755
--- a/src/op_mode/snmp_ifmib.py
+++ b/src/op_mode/snmp_ifmib.py
@@ -77,10 +77,16 @@ def show_ifdescr(i):
     proc = subprocess.Popen(['/usr/bin/lspci', '-mm', '-d', device], stdout=subprocess.PIPE)
     (out, err) = proc.communicate()
 
+    vendor = ""
+    device = ""
+
     # convert output to string
     string = out.decode("utf-8").split('"')
-    vendor = string[3]
-    device = string[5]
+    if len(string) >= 3:
+      vendor = string[3]
+
+    if len(string) >= 5:
+      device = string[5]
 
     ret = 'ifDescr = {0} {1}'.format(vendor, device)
     return ret.replace('\n', '')