From 13948fff26b0e6eebfa419218169dcdbe0b70723 Mon Sep 17 00:00:00 2001 From: bzglve Date: Wed, 14 Feb 2024 15:19:13 +0600 Subject: [PATCH 1/2] #541 fix --- jc/parsers/iwconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jc/parsers/iwconfig.py b/jc/parsers/iwconfig.py index d4b7d46c4..a69a08c2c 100644 --- a/jc/parsers/iwconfig.py +++ b/jc/parsers/iwconfig.py @@ -146,7 +146,7 @@ def parse( raw_output: List[Dict] = [] - re_interface = re.compile(r'^(?P[a-zA-Z0-9:._\-]+)\s+(?P([a-zA-Z0-9]+\s)*[a-zA-Z0-9.]+)\s+ESSID:\"(?P[a-zA-Z0-9:._\s\-]+)\"') + re_interface = re.compile(r'^(?P[a-zA-Z0-9:._\-]+)\s+(?P([a-zA-Z0-9]+\s)*[a-zA-Z0-9.]+)\s+ESSID:\"(?P[a-zA-Z0-9:._\s\-\^]+)\"') re_mode = re.compile(r'Mode:(?P\w+)') re_frequency = re.compile(r'Frequency:(?P[0-9.]+)\s(?P\w+)') re_access_point = re.compile(r'Access Point:\s*(?P[0-9A-F:]+)') From 413ea4bc68e9e025368be573c620bf0f7ab364e5 Mon Sep 17 00:00:00 2001 From: bzglve Date: Wed, 14 Feb 2024 15:36:04 +0600 Subject: [PATCH 2/2] added some more symbols following "SSID Naming Conventions" from https://www.cisco.com/assets/sol/sb/WAP321_Emulators/WAP321_Emulator_v1.0.0.3/help/Wireless05.html --- jc/parsers/iwconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jc/parsers/iwconfig.py b/jc/parsers/iwconfig.py index a69a08c2c..93f707be6 100644 --- a/jc/parsers/iwconfig.py +++ b/jc/parsers/iwconfig.py @@ -146,7 +146,7 @@ def parse( raw_output: List[Dict] = [] - re_interface = re.compile(r'^(?P[a-zA-Z0-9:._\-]+)\s+(?P([a-zA-Z0-9]+\s)*[a-zA-Z0-9.]+)\s+ESSID:\"(?P[a-zA-Z0-9:._\s\-\^]+)\"') + re_interface = re.compile(r'^(?P[a-zA-Z0-9:._\-]+)\s+(?P([a-zA-Z0-9]+\s)*[a-zA-Z0-9.]+)\s+ESSID:\"(?P[a-zA-Z0-9:._\s\-^!#%&\'()*,/:;<>@`{|}~]+)\"') re_mode = re.compile(r'Mode:(?P\w+)') re_frequency = re.compile(r'Frequency:(?P[0-9.]+)\s(?P\w+)') re_access_point = re.compile(r'Access Point:\s*(?P[0-9A-F:]+)')