From patchwork Sat Dec 11 15:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: hasbaddana@outlook.com X-Patchwork-Id: 1566833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Lmkqhf4R; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=A9LlTpE3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JBBcK39SSz9s3q for ; Sun, 12 Dec 2021 02:33:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5oYr4hAui+Ce0rz3TcqBqT0G81Jp9eqaybc1HYrrhUs=; b=Lmkqhf4RW/0leh ymsjpwNXXqcjjElGBWtEXrgB66tezWQMhiEg+CTFeG+Ba5UqFZVgUhzKAfgg18yVIRx6h2Q4q+QKE X3HA3MsLxlNJXao0+Gk9lNmoXcMzbnOn8LuYmXm2gN05TnGWbKMQgtpp5l/XsqkavBybo2eVVOOaV 9HKQPF8CG4Ah65v1p4guCO4WJjBY4OrSyEkNry34r+Dvw/iTLmjqWdnKEAbHWsMbmicUZnL1LLtzj ey2H7Z/ccdhN4A3reY87mEarGCPKZmI1jGa7WROVILjmz3lfkee3351coe9YZeIL6Rln2DskP0Fdc uKGiLjYm3xP+2cwuCpxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mw4Hn-005Bww-BX; Sat, 11 Dec 2021 15:27:43 +0000 Received: from mail-oln040092071101.outbound.protection.outlook.com ([40.92.71.101] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mw4Hh-005Bvj-7g for openwrt-devel@lists.openwrt.org; Sat, 11 Dec 2021 15:27:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8QHcsFdCy5PVePFO2S62KSHLJJr5vHx6uWpipS/lQI1Gv1ZDObWyl4FIf4WXYmo2yZi8szO+DG85dfw2G2vDhGIHyas29rB9+9DldmgK4d1JkN3w9+5BvhPVRWFCZxw5tp7sMv2hnwaoGpE/FL4cYeYYXHpbXxVGw0QvDWXHcQpoCtHlXQgjF8vSThxaqRAC204//+kVGIJu0o2+lEBjGdYsFDLwDJmjBTXVIwR1M2DuEcgOVGvuVDCIeRODrxgh2x/RGrDSpZROR6QEflHDJgVwdgJItZWNknxtEGBHPh4HlsMKAFe9fXnchwYO/rzbbV6ZWthk+KiTMS0xO6hww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HnBbZoRe/R4y7G+POqJzWtuiMqhRylCXgIiZGXXLr/o=; b=cpK193vEAasDLbJgGk9QY+2BgA70dZiZYb5MTj5jVL14QnXJrABz5GElA8NTqdaKXcJrOi0ES8wGXIm1KYPuQYhxaegnjwTxTjzk3UFcN/LxItDvlS3CLawIZWKyLOgniMIdCTymrYE7urUS+aAGU7F4SMW0HO8wpOuhCaC5NKpTMZyjJCDRPTnzY6JZhoAeYN7Ifn9GJ8VEgojjxJkbxLgYGiSdskIQx9G+6j8NbA8+RvS4UyRMcDKoSQhVQUj3K2L4onGmFhsd+C/Uaek+T40Mxu4V082fbOozqvM1s8God8VH46UPPAYff37jmEcAZm33N5JFfyko3R6Mi5pdyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HnBbZoRe/R4y7G+POqJzWtuiMqhRylCXgIiZGXXLr/o=; b=A9LlTpE3Q3AN1rInYhpSaKK++SPcV47lWZnDAGV7bIfvOzNTztm9dMbRve17qHPF1F2w4Nso91iDyADJ/63y/aAwfxCSkyQV4Bca0shknaN90dwOgzS3WTJzO3+89jer7U5TB37x+MMfggzjB81rBXBEcaUhnatKoNnmg68OwdGmjUB7cck/gRhiAb1THm4lAvZ2+soqgjwlHvpcbOLNBVE0LQ493/evSV2mfK1a7eAStXDEmAQ/UlgN0yk42fmKIP9uygeKxWWxlgPtYAsuJ5zMD5ASN42UHNfWlqZynGsFnTqh1w/x5cvhsfmAWQpv8CXx2eFGT29/3nDQJHUi0w== Received: from DBBPR08MB6265.eurprd08.prod.outlook.com (2603:10a6:10:207::18) by DB9PR08MB6857.eurprd08.prod.outlook.com (2603:10a6:10:2a2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Sat, 11 Dec 2021 15:27:32 +0000 Received: from DBBPR08MB6265.eurprd08.prod.outlook.com ([fe80::b043:5079:b77b:1cb1]) by DBBPR08MB6265.eurprd08.prod.outlook.com ([fe80::b043:5079:b77b:1cb1%8]) with mapi id 15.20.4778.017; Sat, 11 Dec 2021 15:27:32 +0000 From: hasbaddana@outlook.com To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?0KLRmNC1dSDQmtCw0YNpbQ==?= Subject: [PATCH] iwinfo: expose country code in Lua scanlist Date: Sat, 11 Dec 2021 16:27:26 +0100 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [yBbGLSWNPB7wwXRN9PKni44ObddXuFoU] X-ClientProxiedBy: AM4PR07CA0009.eurprd07.prod.outlook.com (2603:10a6:205:1::22) To DBBPR08MB6265.eurprd08.prod.outlook.com (2603:10a6:10:207::18) X-Microsoft-Original-Message-ID: <20211211152726.5196-1-hasbaddana@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdf1413c-a476-4887-5635-08d9bcbac015 X-MS-Exchange-SLBlob-MailProps: 3UeWkQkuiJOo2f2mxAFYDhYBsoQGu+RYTU3QKcqNfczd2TSR16Aa4ZWSjfz5rL4BWhdZrtZA/AGp456iAZld4O/N6UE/5hS003Ox053T1erIi7VxyyOzijDYFeMEOAVKcqHKRhqKG0HSaRFUtTEHoAObQpfYqrklzddmyUcrqOK9sPajlj85cqnufgZ5Ya45CUjNmQXUFuk/dKsnsfkl9Z14or37JykXim5HcZHv25yuB7vnhZ7bn6w5AJZcvl2GB8seYVrQNTxaZvmVDcAoFVGYmzdjvYZ41Oxd09CURLh0gmDIYFqCAR9uF1RiazmB8DDH5CZqSMeQQXITg2sDr6Xz7nh+PnhVZrlD/RoZeJnzwWOwEwHEeVgBgDP4QnqXIUdCjhtUfzF66F+WmwgSRhajJzMojDhoZMAuRh0UYkuT5fi1P/3chOpscN3d1rz8URaqUvUxgUtFzfKDV3zr/KLGv8ywaIV9jWwP5l6oY33U0f5Pgt38VctjOmzge8j1WIeQQbUwG77SMgAyJ9HvMJloDrQDyj6cGBNE08axR10TK9R7XixlKkAYKh/4PwNamTrQaWiRrcrT4ougocQx/5aRisuB+I/MuYxmixFsiv2iT0Kqh/CZDeWvkA9G0MVa3nr4AAQYJZo1ocwXtpwNcIuHZrHqpt29fmVcBHCOYKwHM3vv4XupY/HYJjjQc69g1XpLml1fJT8DBMahbqgGutjWP0nag0GWUO5+ulJvVtJ3N+BTQkox2A== X-MS-TrafficTypeDiagnostic: DB9PR08MB6857:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xs6aa8WsutWEL77+wfjPj4EIYfb/STbA+yt2fWJ/v60cRUaCAW0MjVwrho5iU84E6OkW5xdBIvuR83CpBez7lOV76hPE6Y5fushri5Scq2DaB5Tf0luSSygLYMS1DbkrWl+XUSfBzEl5qbOtsRlSioMoDMA0Jtm0f7rqRe3SMBL1pwZ644o25ty3GuMg1KrCwI1JIj0LkFhQkOyn6n9ORNch+rCixlvme7OPS0ntwiynsy4i2nd7k5NeQOU5R9FGx4k/j2K2+gRE/RoDM1pDLumYu15uL6xndV1qNVmBLngKZ0VZpnqCrOuUEuTVGx1+GIJGA1iDzY4oxMjogkrAvRHjbAt5uVgmvHAGOjV2YK0kLp98ch2SrWLM0YAhhimQla7Iz50xNZAht2ukoOilukPhGococAmBLOG8F2KF4D2sW/MEA0UBy3pgXLZm/kLLwWlvDg4ptBP0CxLPylbf/BhRltiXYOR62RiCfFeQCC03vyp4Zoxp1in9OFw6E9GURMiZ29cZE+q640qLIv8veYU0V/awGAB40tZpeJCZzMI9QP7+qOnaWuvwFDD2OarEivBuG5wU6Kdi5KdDXL673g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?y9+RhShzYEIFXosnSzos1duHouu/?= =?utf-8?q?9tC8qmWG9ZmdktGjys6VfhA5hLwNag86+G8wEL4bCjungjMscMzt6kaehKPftk4Xh?= =?utf-8?q?EyVCBkNVkgw2XX2oq0NrY3V59cAqsZRMmPLuklaQEJdybLPJzkhM+opkYu4i78juY?= =?utf-8?q?n5fFTMtiLV2sSr4/bSlFcBDAhgl+CuBAoQLQUA02jLaAimQyUpR5nze4HvqvVb5E9?= =?utf-8?q?oI5tFOEwHfSzGTODLGpIYo/X5fhh4lgwBmooQzBpQ4h7W7JjxnYNK2Tttk99C65Dw?= =?utf-8?q?ZL4BVDpUJ9sA9wsP8VdEpPTyuvnhGQMAXoCLevvYx17tTkzQNpkrZCaSGiHpoxKLb?= =?utf-8?q?Ym5XIjfDkZUs4lrI7zsA2/3hVGedU/CCJSmkmRzjfhDy5EL75Knu20bNAiCkFoLCS?= =?utf-8?q?JZIBgM0eDts1oVJZRoq0aEN2ewj35N4hpSh8J4qmYh3fGv+t10fsP4CBzT3+1E7Sl?= =?utf-8?q?o2jaarNLbXdj8Y2uXukYX9htEFotx36AX6okau3Xx4Lg5GmGxZaBxVhLzKA61M8Nx?= =?utf-8?q?VC2oOy0Q1u1cTDzZFFKyJEUtdNZD7DtSiPYpsdY06d+6/XD3xej+MBHggtBNypkfA?= =?utf-8?q?+40yojOj47b6xlBBFQhxWMZD/IWoTFp5b8HYo9kecklAgSjmT7f5xdLqXAniqE/9z?= =?utf-8?q?aP1UTeZ/Qqkwu7/sGaxBN61p/6qTRpIdYJfqpHhQmL1+nd6fks8Jf/uusuD52u5g5?= =?utf-8?q?YTNK/3eS/H0MrZfe37Sck/QQfc7S7WcOjze1Z1znLSDPtMxNl7rXG3W71m0A6w8p3?= =?utf-8?q?e12xFxYfPdaoVzVwSYbnTRCuTPH+xhib4r8gikGvbHW/yPkPztCg2njw34bK2S8f5?= =?utf-8?q?l9nX1fydnrYjchTsTPOO45EYZqHeVHnOyY9YCkMycehVUr/1SIdYnHQXC/5XTPz+v?= =?utf-8?q?G8iofe3A6oJimJd3Fw/t/5OUK8RyrfP2nWXU2IfU3Sng=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdf1413c-a476-4887-5635-08d9bcbac015 X-MS-Exchange-CrossTenant-AuthSource: DBBPR08MB6265.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 15:27:32.3562 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6857 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211211_072737_458342_2B5A88EB X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?b?IENvbnRlbnQgcHJldmlldzogIEZyb206INCi0ZjQtXUg0JrQsNGDaW0g?= =?unknown-8bit?b?QWRkcyBhIG5ldyBmaWVsZCBgaXdpbmZvX3NjYW5saXN0X2VudHJ5LmNv?= =?unknown-8bit?b?dW50cnlfY29kZWA=?= =?unknown-8bit?q?_for_the_ISO_3166_alpha2_of_the_regulatory_domain=2C_extrac?= =?unknown-8bit?q?ted_from_an_information?= =?unknown-8bit?q?_element=2E_It_is_left_zero_when_the_IE_is_not_present=2C_o?= =?unknown-8bit?q?r_when_a_dif_=5B=2E=2E=2E=5D_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E2_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?q?_=5B40=2E92=2E71=2E101_listed_in_list=2Ednswl=2Eorg=5D?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FMSPIKE=5FH2______RBL=3A_Average_reputat?= =?unknown-8bit?q?ion_=28+2=29?= =?unknown-8bit?q?_=5B40=2E92=2E71=2E101_listed_in_wl=2Emailspike=2Enet=5D?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bhasbaddana=5Bat=5Doutlook=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Тјеu Кауim Adds a new field `iwinfo_scanlist_entry.country_code` for the ISO 3166 alpha2 of the regulatory domain, extracted from an information element. It is left zero when the IE is not present, or when a different driver than nl80211 is used. Also updates the Lua interface to expose it. Signed-off-by: Тјеu Кауim --- include/iwinfo.h | 1 + iwinfo_lua.c | 7 +++++++ iwinfo_nl80211.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/include/iwinfo.h b/include/iwinfo.h index 8469ee7..9e9a2c4 100644 --- a/include/iwinfo.h +++ b/include/iwinfo.h @@ -223,6 +223,7 @@ struct iwinfo_scanlist_entry { struct iwinfo_crypto_entry crypto; struct iwinfo_scanlist_ht_chan_entry ht_chan_info; struct iwinfo_scanlist_vht_chan_entry vht_chan_info; + char country_code[2]; }; struct iwinfo_country_entry { diff --git a/iwinfo_lua.c b/iwinfo_lua.c index e49e454..03b6467 100644 --- a/iwinfo_lua.c +++ b/iwinfo_lua.c @@ -454,6 +454,13 @@ static int iwinfo_L_scanlist(lua_State *L, int (*func)(const char *, char *, int iwinfo_L_cryptotable(L, &e->crypto); lua_setfield(L, -2, "encryption"); + /* Country */ + if (e->country_code[0]) + { + lua_pushlstring(L, e->country_code, 2); + lua_setfield(L, -2, "country_code"); + } + lua_rawseti(L, -2, x); } } diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c index c4b0ee2..af1e579 100644 --- a/iwinfo_nl80211.c +++ b/iwinfo_nl80211.c @@ -2463,6 +2463,11 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss, e->vht_chan_info.center_chan_2 = ie[4]; } break; + + case 7: /* Country */ + if (ie[1] >= 3) + memcpy(e->country_code, ie + 2, 2); + break; } ielen -= ie[1] + 2;