From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 14DC2AC17DA for ; Wed, 10 Apr 2024 16:03:11 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=kYcTEaMU+sxlOEwKprWGF+qA1BYV+VJBv5Y2lBfu1ug=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1712764990; v=1; b=TIilhruLoo0EGE+CGWo7bmgcwlkUQm8I6X+GyqjOALrX3UDw/mvY1vDI5frbM1pKlUtlRnwc Voc400rPyGnbL3OZksEkhUikwB6ImBwUiqmW5/PFf+MT7qum7YL+l5ROWjgCYJDwvf8Z72pDoeS Vg8ZBCjUXzKx6EHdUMIICUx0IxKefJutewB5p0qgx7ecab4o8RxtIA5cZe9V92ddSUjbNbYCQff m+NnDkVUfkqQNefF++UJJEaAen5hJ2asBOKgIrxsPJCo33AwFQY1GON3P9MAxGi33/wRFWzaHNe 4L3q0y6xM/RegvtEd9JHN1FT8zHQU3djGVOBpS9zDWt6Q== X-Received: by 127.0.0.2 with SMTP id cD4JYY7687511xR7L1JamXzw; Wed, 10 Apr 2024 09:03:10 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mx.groups.io with SMTP id smtpd.web10.3848.1712764989750240971 for ; Wed, 10 Apr 2024 09:03:09 -0700 X-CSE-ConnectionGUID: hbUVMrQ+TKaK1/D4bTLstA== X-CSE-MsgGUID: sWQispKjRIeaJ2pbukwyRA== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8313131" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8313131" X-Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 09:03:09 -0700 X-CSE-ConnectionGUID: 8dPs62BBTfKHeRk0oXoxtQ== X-CSE-MsgGUID: 20tVnn1/T1uTRLaYgj3Pew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20567161" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmviesa010.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 10 Apr 2024 09:03:08 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 09:03:08 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Wed, 10 Apr 2024 09:03:08 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 10 Apr 2024 09:03:07 -0700 X-Received: from CO6PR11MB5601.namprd11.prod.outlook.com (2603:10b6:303:13d::7) by DM6PR11MB4610.namprd11.prod.outlook.com (2603:10b6:5:2ab::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.26; Wed, 10 Apr 2024 16:03:05 +0000 X-Received: from CO6PR11MB5601.namprd11.prod.outlook.com ([fe80::465a:c2ce:a07e:2b5e]) by CO6PR11MB5601.namprd11.prod.outlook.com ([fe80::465a:c2ce:a07e:2b5e%4]) with mapi id 15.20.7452.019; Wed, 10 Apr 2024 16:03:05 +0000 From: "Clark-williams, Zachary" To: "Tan, Ming" , "devel@edk2.groups.io" CC: "Kasbekar, Saloni" , "Bi, Dandan" , "POLUDOV, FELIX" , "Liu, Liqi" Subject: Re: [edk2-devel] [PATCH] NetworkPkg/WifiConnectionManagerDxe: Update UI according to UEFI spec Thread-Topic: [PATCH] NetworkPkg/WifiConnectionManagerDxe: Update UI according to UEFI spec Thread-Index: AQHae/dygxKPbR+c5UiNHS0ckxFlDbFhyRqg Date: Wed, 10 Apr 2024 16:03:04 +0000 Message-ID: References: <20240322011611.7297-1-ming.tan@intel.com> In-Reply-To: <20240322011611.7297-1-ming.tan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO6PR11MB5601:EE_|DM6PR11MB4610:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: Q7wa8LR69cfsCJ434f5V0Z+nQUYNXU1wZZ9HaEUt360g2R9xaA0vtc0SLl4DGk2a4YboD3pTNbZ880cvGMy3nlRyQDnR6vnOwcABXgeAEVItqPC3CN6ZBjc3vN/CBacbGPJKt4vwDi4W9eD3xymJxSXIFzLHuNwyWdnU00iq40wxaUDlop/7W1n2NG/uk/Loq1qL492WJxLzm6uHPBzmtiG7DnNYE6SbL/2iJjejRbD6LBj9QlHysU9iVB62FSIsEM4hM4EjhXguCM5FiBoL1Xhk572g4t2/mZWR015LcztwIblCkUsd7DSntr3CsDim6CZDjQE/NVsfXXfLdP9B6RsyhPjxKx8ka+ozMznzNKq2zNmpfIAQ/4An6t1qOm44aviXjAia+xPWNzUf6oJ1cgK0hsOLnyGXCuHrKzbkpPtb+rZ3xrXb+oDzGr1FiT7vUKaKecZrjm6McaLtblZwFO26dQKKrbnr+ubX9HyYMIN6tXhZxZjsuFaw4VDtMB5JOTp6rWcw3tvdv5EdwTHhLarBbbzMCxV+EwkQfFNdlirzU7OWwXZet7Pv3wD/gnP6GzVuHsEJI9R020nj9kdUvn/XPsHx/WH5CFxPravHOb/i3NCxjoJcdAFhQoJICozC x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dYxEotqWAHRejd8BDhGWeobGO6YA6b1fvDJdGqL1YhcgPPl/0V/oOldQpb2V?= =?us-ascii?Q?0mS2aZfm31mqos02bNyL6HyVK2Cc+VLEG0Hedk7L7wYMG2psoHomXZRw2mbl?= =?us-ascii?Q?fZVsXpsbBqhYhvpMHC9nHYQaPozFhsSEAFKHU2qa84NrvTx7Cq+TXMNP4P9X?= =?us-ascii?Q?3dupYWEUUfjCQqpkjfIbNb9hN/42fQLwGUoBCJYtNdhItzrLpf4CvbRz5L5v?= =?us-ascii?Q?Dd3xJgrA7gj+kJB/MXu+M68CfEYMOIAoXOKIOaU+/Zdm4vU2sMI2y9bx37eX?= =?us-ascii?Q?xOFvEgajB8UAoKPvZqpPahQH+z5wd0S3yVRL8GhMYH2fBnY93SM84LdtgUPC?= =?us-ascii?Q?BgAtY/ArsBoVwd5pe6+/AgSSDwO/qcF14aCCl94HvuI2MuGDs5dpPScPIS4w?= =?us-ascii?Q?FGJfhi/0/NihhxpABjZUW0soAVmB79p2IjfPLwhCvuQGystpNRS6s5D2U9k/?= =?us-ascii?Q?oZai+2wWyScKquIv7VtZur9k9Y4wi64k5teXXNG4Qc4+2C7yRq7TSemqYZfm?= =?us-ascii?Q?YZJ32DZ/WLkAQAfHffeX1NjY1Ky2z8MKRT+b5qt79kMEY0XoUFI1/+m/hsiS?= =?us-ascii?Q?NUEgqAZB05BzV/z4QI2Sp054wj5vEKY8md01sewgvqXh2wib+M+HHy7tKQS0?= =?us-ascii?Q?lwoA6t0CcRMt4EXAuqyd9rJCmm0xzSM0KqCHVCdBNDgXXZRGT89vQOT6qtfR?= =?us-ascii?Q?AmeGjyNNzatCIr8X+f7sgp6KZI8ybkdlruUGTPkA1dhIzqh0ljY5P8mwpGCV?= =?us-ascii?Q?d17Z4wf4jOMnqtHA/KzL4gf4OSnwe/RMBUnDwy64Jx06PBbLSA5w91jW69oT?= =?us-ascii?Q?adXRAbNqbp5U0kkC98Jkl8yer2IzzwgQptobArN5H9jYdgVy79VimIUCB5fT?= =?us-ascii?Q?Ndm8ZgG3BPeEHwvvjLohtBIh46xnf1dLpSRr1X2iu8wVNTc2nMh1FOh10/4B?= =?us-ascii?Q?og+s8JLeM5R8yv75pJ7Wrmc5ip4DeNc3Z2bC4ZJmVsNwQp1QYmTluHCwP2Un?= =?us-ascii?Q?AkY/TiF75j8fzPiSwN0p04Bj/zKurNhz+Ey0sJaUCM2qEbsVweNhATVfk8nn?= =?us-ascii?Q?weBdynQewf9Xghflr3bPQaf0oDdvjYh1K85jXI9dWUSLsne5yfdeu86+omLo?= =?us-ascii?Q?jplXOYhxn03rmkKVSpEovzyBEjx4whi8hAiRJTX1f/9WPBxS5aBDr3fc0c/J?= =?us-ascii?Q?fPzvqhVynHhNhlhdM1SZxzBTxAdLoc4v0q+1PibYzyPr2xb/4n5vmJHaPPg7?= =?us-ascii?Q?nxNADJjKZtIMGfG4M45kJ/GAyS2ZFvaikozRTWMiCnj1v1e+dHB2XVecH6eJ?= =?us-ascii?Q?eJlH1+g8y3aqcxcjqPj8UMc9qc9AJUb1m/ilG+EUmn9nPS+jSOlPOtZPncBT?= =?us-ascii?Q?PPgWvm2h8OcKr3a9TcTHhSbS/UXk65n/e0SOFBUSS/8AhIt3O6LAJObN/TRf?= =?us-ascii?Q?A+fUiE061k4Nw6ZfnKvJx03tLq9wJoEv6I+GeTNz8lSI0DnLTeFEfEfydt6d?= =?us-ascii?Q?W7e3HnLa+E0V5CkYUxDCygBQOO7nrmqAdJ6evIwSyYBnkm8yeJJYwjhEyOuS?= =?us-ascii?Q?enKJShAFbYrvwxsyMNJqEyLcBNvV5xXfAc5RWA6wRFrMyHbt175YPBevkCBA?= =?us-ascii?Q?Ag=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5601.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9866347e-0b35-410a-c8a1-08dc5977b4d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2024 16:03:04.9436 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: It0bjkD+EmZPT83szfxbN8mQ2OOswJtmXvEv/OEswxCOH5uq2OIZmX6rhJiDpIAeKaBARFIr3SpL+BaDO5oAdT4WQRVSPD2cbNzoPPZSuv4OXr0onumyggLnLr6Q0MHJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4610 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 10 Apr 2024 09:03:09 -0700 Resent-From: zachary.clark-williams@intel.com Reply-To: devel@edk2.groups.io,zachary.clark-williams@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7RoMjK7LPAMoF38cNcPHsGtIx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=TIilhruL; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Zachary Clark-Williams -----Original Message----- From: Tan, Ming =20 Sent: Thursday, March 21, 2024 6:16 PM To: devel@edk2.groups.io Cc: Kasbekar, Saloni ; Clark-williams, Zachary <= zachary.clark-williams@intel.com>; Bi, Dandan ; POLUDO= V, FELIX ; Liu, Liqi Subject: [PATCH] NetworkPkg/WifiConnectionManagerDxe: Update UI according t= o UEFI spec REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4736 In UEFI_Spec_2_10_Aug29.pdf page 1694 section 35.5.4 for EFI_BROWSER_ACTION_FORM_OPEN: NOTE: EFI_FORM_BROWSER2_PROTOCOL.BrowserCallback() cannot be used with this= browser action because question values have not been retrieved yet. So should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN= call back function. Now use wifi list key and enroll cert key instead of the connect action key= , move wifi info display from open action to close action. Cc: Saloni Kasbekar Cc: Zachary Clark-williams Cc: Dandan Bi Cc: Felix Polyudov Signed-off-by: Liqi Liu Signed-off-by: Ming Tan --- PR: https://github.com/tianocore/edk2/pull/5487 .../WifiConnectionMgrHiiConfigAccess.c | 113 ++++++++++++------ 1 file changed, 74 insertions(+), 39 deletions(-) diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfig= Access.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAc= cess.c index 431fcbb33a..f242bdf056 100644 --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.= c +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAcce +++ ss.c @@ -1412,7 +1412,9 @@ WifiMgrDxeHiiConfigAccessCallback ( return EFI_OUT_OF_RESOURCES; } - HiiGetBrowserData (&gWifiConfigFor= mSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData);+ if (Action= !=3D EFI_BROWSER_ACTION_FORM_OPEN) {+ HiiGetBrowserData (&gWifiConfigFo= rmSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData);+ } if (= Action =3D=3D EFI_BROWSER_ACTION_FORM_OPEN) { switch (QuestionId) {@@ -= 1438,43 +1440,6 @@ WifiMgrDxeHiiConfigAccessCallback ( break; - case KEY_CONNECT_ACTION:-- if (Private->Curr= entNic->UserSelectedProfile =3D=3D NULL) {- break;- }-- = Profile =3D Private->CurrentNic->UserSelectedProfile;-- //- = // Enter the network connection configuration page- // Recovery f= rom restored data- //- if (HiiSetString (Private->RegisteredH= andle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) =3D=3D 0) {- = return EFI_OUT_OF_RESOURCES;- }-- IfrNvData->SecurityType =3D= Profile->SecurityType;- if (HiiSetString (- Private->R= egisteredHandle,- STRING_TOKEN (STR_SECURITY_TYPE),- = mSecurityType[IfrNvData->SecurityType],- NULL- = ) =3D=3D 0)- {- return EFI_OUT_OF_RESOURCES;- }-- = if ((IfrNvData->SecurityType =3D=3D SECURITY_TYPE_WPA2_ENTERPRISE) |= |- (IfrNvData->SecurityType =3D=3D SECURITY_TYPE_WPA3_ENTERPRISE= ))- {- IfrNvData->EapAuthMethod =3D Profile->EapAuthM= ethod;- IfrNvData->EapSecondAuthMethod =3D Profile->EapSecondAuthM= ethod;- StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profil= e->EapIdentity);- }-- break;- case KEY_ENROLLED_CERT_NA= ME: if (Private->CurrentNic->UserSelectedProfile =3D=3D NULL) {@@ = -1524,6 +1489,43 @@ WifiMgrDxeHiiConfigAccessCallback ( } } else if (Action =3D=3D EFI_BROWSER_ACTION_FORM_CLOSE) { swit= ch (QuestionId) {+ case KEY_EAP_ENROLL_CERT_FROM_FILE:++ if (Pr= ivate->CurrentNic->UserSelectedProfile =3D=3D NULL) {+ break;+ = }++ Profile =3D Private->CurrentNic->UserSelectedProfile;++ = //+ // Enter the network connection configuration page+ //= Recovery from restored data+ //+ if (HiiSetString (Private->= RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) =3D=3D 0) {= + return EFI_OUT_OF_RESOURCES;+ }++ IfrNvData->Secur= ityType =3D Profile->SecurityType;+ if (HiiSetString (+ = Private->RegisteredHandle,+ STRING_TOKEN (STR_SECURITY_TYPE),= + mSecurityType[IfrNvData->SecurityType],+ NULL+ = ) =3D=3D 0)+ {+ return EFI_OUT_OF_RESOURCES;+ = }++ if ( (IfrNvData->SecurityType =3D=3D SECURITY_TYPE_WPA2_= ENTERPRISE)+ || (IfrNvData->SecurityType =3D=3D SECURITY_TYPE_WPA= 3_ENTERPRISE))+ {+ IfrNvData->EapAuthMethod =3D Profi= le->EapAuthMethod;+ IfrNvData->EapSecondAuthMethod =3D Profile->Ea= pSecondAuthMethod;+ StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_= SIZE, Profile->EapIdentity);+ }++ break;+ case KEY_CONN= ECT_ACTION: if (Private->CurrentNic->UserSelectedProfile =3D=3D NU= LL) {@@ -1909,6 +1911,39 @@ WifiMgrDxeHiiConfigAccessCallback ( NULL ); }++ if (Private->Cu= rrentNic->UserSelectedProfile =3D=3D NULL) {+ break;+ }= ++ Profile =3D Private->CurrentNic->UserSelectedProfile;++ = //+ // Enter the network connection configuration page+ = // Recovery from restored data+ //+ if (HiiSetString (Pr= ivate->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) =3D= =3D 0) {+ return EFI_OUT_OF_RESOURCES;+ }++ If= rNvData->SecurityType =3D Profile->SecurityType;+ if (HiiSetString= (+ Private->RegisteredHandle,+ STRING_TOKEN = (STR_SECURITY_TYPE),+ mSecurityType[IfrNvData->SecurityType]= ,+ NULL+ ) =3D=3D 0)+ {+ = return EFI_OUT_OF_RESOURCES;+ }++ if ( (IfrNvData->Secur= ityType =3D=3D SECURITY_TYPE_WPA2_ENTERPRISE)+ || (IfrNvData->S= ecurityType =3D=3D SECURITY_TYPE_WPA3_ENTERPRISE))+ {+ = IfrNvData->EapAuthMethod =3D Profile->EapAuthMethod;+ IfrN= vData->EapSecondAuthMethod =3D Profile->EapSecondAuthMethod;+ St= rCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);+ = } } break;@@ -1944,7 +1979,7 @@ WifiMgrDxeHiiConfi= gAccessCallback ( } } - if (!EFI_ERROR (Status)) {+ if (!EFI_ERROR (Status) && (Acti= on !=3D EFI_BROWSER_ACTION_FORM_OPEN)) { // // Pass changed uncommi= tted data back to Form Browser. //--=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117605): https://edk2.groups.io/g/devel/message/117605 Mute This Topic: https://groups.io/mt/105077953/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-