mirror of
https://github.com/eduardogsilva/wireguard_webadmin.git
synced 2025-06-28 01:07:03 +00:00
Fix rx and tx value assignment in WireGuard parser
This commit is contained in:
parent
e4a1d715ec
commit
a25add722a
@ -136,13 +136,13 @@ def wireguard_status(request):
|
|||||||
return HttpResponseForbidden()
|
return HttpResponseForbidden()
|
||||||
else:
|
else:
|
||||||
return HttpResponseForbidden()
|
return HttpResponseForbidden()
|
||||||
|
|
||||||
if enhanced_filter:
|
if enhanced_filter:
|
||||||
for server_instance in WireGuardInstance.objects.all():
|
for server_instance in WireGuardInstance.objects.all():
|
||||||
for peer in user_allowed_peers(user_acl, server_instance):
|
for peer in user_allowed_peers(user_acl, server_instance):
|
||||||
if peer.public_key not in filter_peer_list:
|
if peer.public_key not in filter_peer_list:
|
||||||
filter_peer_list.append(peer.public_key)
|
filter_peer_list.append(peer.public_key)
|
||||||
|
|
||||||
commands = {
|
commands = {
|
||||||
'latest-handshakes': "wg show all latest-handshakes | expand | tr -s ' '",
|
'latest-handshakes': "wg show all latest-handshakes | expand | tr -s ' '",
|
||||||
'allowed-ips': "wg show all allowed-ips | expand | tr -s ' '",
|
'allowed-ips': "wg show all allowed-ips | expand | tr -s ' '",
|
||||||
@ -161,7 +161,7 @@ def wireguard_status(request):
|
|||||||
|
|
||||||
current_interface = None
|
current_interface = None
|
||||||
for line in stdout.strip().split('\n'):
|
for line in stdout.strip().split('\n'):
|
||||||
parts = line.split()
|
parts = line.split()
|
||||||
if len(parts) >= 3:
|
if len(parts) >= 3:
|
||||||
interface, peer, value = parts[0], parts[1], " ".join(parts[2:])
|
interface, peer, value = parts[0], parts[1], " ".join(parts[2:])
|
||||||
current_interface = interface
|
current_interface = interface
|
||||||
@ -185,7 +185,7 @@ def wireguard_status(request):
|
|||||||
if key == 'allowed-ips':
|
if key == 'allowed-ips':
|
||||||
output[interface][peer]['allowed-ips'].append(value)
|
output[interface][peer]['allowed-ips'].append(value)
|
||||||
elif key == 'transfer':
|
elif key == 'transfer':
|
||||||
tx, rx = value.split()[-2:]
|
rx, tx = value.split()[-2:]
|
||||||
output[interface][peer]['transfer'] = {'tx': int(tx), 'rx': int(rx)}
|
output[interface][peer]['transfer'] = {'tx': int(tx), 'rx': int(rx)}
|
||||||
elif key == 'endpoints':
|
elif key == 'endpoints':
|
||||||
output[interface][peer]['endpoints'] = value
|
output[interface][peer]['endpoints'] = value
|
||||||
|
Loading…
x
Reference in New Issue
Block a user