diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-05 18:22:40 +0100 |
|---|---|---|
| committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-06 20:22:35 +0100 |
| commit | a0d8238710b56c53523800c181ae6639c577d38a (patch) | |
| tree | c7bc939b0f3c7a5b397341bbf53c993a61c6f927 | |
| parent | 9fabc8caec5a39e10fbbe20325d268ccacf1e0a9 (diff) | |
| download | vyos-1x-a0d8238710b56c53523800c181ae6639c577d38a.tar.gz vyos-1x-a0d8238710b56c53523800c181ae6639c577d38a.zip | |
util: T2226: rewrite show vpn to use popen
| -rwxr-xr-x | src/op_mode/show_vpn_ra.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/op_mode/show_vpn_ra.py b/src/op_mode/show_vpn_ra.py index cf6119c2f..2323193b1 100755 --- a/src/op_mode/show_vpn_ra.py +++ b/src/op_mode/show_vpn_ra.py @@ -17,8 +17,8 @@ import os import sys import re -import subprocess -# from subprocess import Popen, PIPE + +from vyos.util import popen # chech connection to pptp and l2tp daemon def get_sessions(): @@ -31,18 +31,16 @@ def get_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")) + output, err = popen(pptp_cmd, decode='utf-8') + if not err and len(output) > len_def_header and not re.search(err_pattern, output): + print(output) 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")) + output, err = popen(l2tp_cmd, decode='utf-8') + if not err and len(output) > len_def_header and not re.search(err_pattern, output): + print(output) else: absent_l2tp = True |