From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7C46021AEB0B5 for ; Tue, 25 Jul 2017 19:27:13 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2017 19:29:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,413,1496127600"; d="scan'208";a="1155409103" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga001.jf.intel.com with ESMTP; 25 Jul 2017 19:29:15 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Jul 2017 19:29:14 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Jul 2017 19:29:14 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.116]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.197]) with mapi id 14.03.0319.002; Wed, 26 Jul 2017 10:29:12 +0800 From: "Wu, Jiaxin" To: "Fu, Siyuan" , "edk2-devel@lists.01.org" CC: "Ye, Ting" Thread-Topic: [Patch 2/4] MdePkg/UefiDevicePathLib: Add DevPathFromTextDns and DevPathToTextDns libraries Thread-Index: AQHTBT9j6qkU4eSuy0GTvihqwa8QUqJkv5IAgACOEDD//4sZgIAAiGgA Date: Wed, 26 Jul 2017 02:29:12 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274162FC502@SHSMSX103.ccr.corp.intel.com> References: <1500984765-8040-1-git-send-email-jiaxin.wu@intel.com> <1500984765-8040-3-git-send-email-jiaxin.wu@intel.com> <895558F6EA4E3B41AC93A00D163B7274162FC4BF@SHSMSX103.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTI5NmZlNWQtZjE5YS00Nzk3LWE1MmYtNzU3OWZlMjM0OGM1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IkZFZDVhaHlLSFRObDZhYUpBb2xYc0VGUHJCanhYazEyYkdWQlFRMW5DS2M9In0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch 2/4] MdePkg/UefiDevicePathLib: Add DevPathFromTextDns and DevPathToTextDns libraries X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2017 02:27:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Siyuan, I mean the string of Dns() can't be input as param and the library is inner= function of UefiDevicePathLibConvertTextToDeviceNode(). So, the error code= for such string looks weird. Moreover, other libraries also don't have suc= h check (e.g. DevPathFromTextIPv4/ DevPathFromTextVlan/...). What do you think? Thanks, Jiaxin > -----Original Message----- > From: Fu, Siyuan > Sent: Wednesday, July 26, 2017 10:13 AM > To: Wu, Jiaxin ; edk2-devel@lists.01.org > Cc: Ye, Ting > Subject: RE: [Patch 2/4] MdePkg/UefiDevicePathLib: Add > DevPathFromTextDns and DevPathToTextDns libraries >=20 > Jiaxin, >=20 > If "Dns()" is not a valid test represent device path node, I think > DevPathFromTextDns() should return an error code for this. >=20 > Best Regards, > Siyuan >=20 > -----Original Message----- > From: Wu, Jiaxin > Sent: Wednesday, July 26, 2017 10:08 AM > To: Fu, Siyuan ; edk2-devel@lists.01.org > Cc: Ye, Ting > Subject: RE: [Patch 2/4] MdePkg/UefiDevicePathLib: Add > DevPathFromTextDns and DevPathToTextDns libraries >=20 > Hi Siyuan, >=20 > For DevPathFromTextDns(), it's impossible to input the string with "Dns()= ". > The input param is in pair of parentheses follow the given node name. >=20 > For example, given the "Dns(192.168.10.12,192.168.10.16)" and NodeName > "Dns", the param is "192.168.10.12,192.168.10.16". >=20 > We can check the detailed implementation from > UefiDevicePathLibConvertTextToDeviceNode() function. >=20 >=20 > Thanks, > Jiaxin >=20 > > -----Original Message----- > > From: Fu, Siyuan > > Sent: Wednesday, July 26, 2017 8:43 AM > > To: Wu, Jiaxin ; edk2-devel@lists.01.org > > Cc: Ye, Ting > > Subject: RE: [Patch 2/4] MdePkg/UefiDevicePathLib: Add > > DevPathFromTextDns and DevPathToTextDns libraries > > > > Hi, Jiaxin > > > > Is an empty DNS text node a valid representation, like "Dns()"? > > Can below code handle such kind of input string? > > > > + DeviceNodeStr =3D TextDeviceNode; > > + DnsServerIpCount =3D 0; > > + while (DeviceNodeStr !=3D NULL) { > > + GetNextParamStr (&DeviceNodeStr); > > + DnsServerIpCount ++; > > + } > > > > Best Regards, > > Siyuan > > > > -----Original Message----- > > From: Wu, Jiaxin > > Sent: Tuesday, July 25, 2017 8:13 PM > > To: edk2-devel@lists.01.org > > Cc: Ye, Ting ; Fu, Siyuan ; Wu, > > Jiaxin > > Subject: [Patch 2/4] MdePkg/UefiDevicePathLib: Add > DevPathFromTextDns > > and DevPathToTextDns libraries > > > > Cc: Ye Ting > > Cc: Fu Siyuan > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Wu Jiaxin > > --- > > .../Library/UefiDevicePathLib/DevicePathFromText.c | 72 > > ++++++++++++++++++++++ > > .../Library/UefiDevicePathLib/DevicePathToText.c | 46 ++++++++++++++ > > 2 files changed, 118 insertions(+) > > > > diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > > b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > > index f50c11c..60057ec 100644 > > --- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > > +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c > > @@ -2723,10 +2723,81 @@ DevPathFromTextBluetoothLE ( > > ); > > return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothLeDp; > > } > > > > /** > > + Converts a text device path node to DNS device path structure. > > + > > + @param TextDeviceNode The input Text device path node. > > + > > + @return A pointer to the newly-created DNS device path structure. > > + > > +**/ > > +EFI_DEVICE_PATH_PROTOCOL * > > +DevPathFromTextDns ( > > + IN CHAR16 *TextDeviceNode > > + ) > > +{ > > + CHAR16 *DeviceNodeStr; > > + UINT32 DnsServerIpCount; > > + UINT16 DnsDeviceNodeLength; > > + DNS_DEVICE_PATH *DnsDeviceNode; > > + UINT32 DnsServerIpIndex; > > + CHAR16 *DnsServerIp; > > + > > + > > + // > > + // Count the DNS server address number. > > + // > > + DeviceNodeStr =3D TextDeviceNode; > > + DnsServerIpCount =3D 0; > > + while (DeviceNodeStr !=3D NULL) { > > + GetNextParamStr (&DeviceNodeStr); > > + DnsServerIpCount ++; > > + } > > + > > + // > > + // Create the DNS DeviceNode. > > + // > > + DnsDeviceNodeLength =3D (UINT16) (sizeof > (EFI_DEVICE_PATH_PROTOCOL) > > + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS)); > > + DnsDeviceNode =3D (DNS_DEVICE_PATH *) CreateDeviceNode ( > > + MESSAGING_DEVICE_PATH, > > + MSG_DNS_DP, > > + DnsDeviceNodeLength > > + ); > > + > > + // > > + // Confirm the DNS server address is IPv4 or IPv6 type. > > + // > > + DeviceNodeStr =3D TextDeviceNode; > > + while (!IS_NULL (*DeviceNodeStr)) { > > + if (*DeviceNodeStr =3D=3D L'.') { > > + DnsDeviceNode->IsIPv6 =3D 0x00; > > + break; > > + } > > + > > + if (*DeviceNodeStr =3D=3D L':') { > > + DnsDeviceNode->IsIPv6 =3D 0x01; > > + break; > > + } > > + > > + DeviceNodeStr++; > > + } > > + > > + for (DnsServerIpIndex =3D 0; DnsServerIpIndex < DnsServerIpCount; > > DnsServerIpIndex++) { > > + DnsServerIp =3D GetNextParamStr (&TextDeviceNode); > > + if (DnsDeviceNode->IsIPv6 =3D=3D 0x00) { > > + StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode- > > >DnsServerIp[DnsServerIpIndex].v4), NULL); > > + } else { > > + StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode- > > >DnsServerIp[DnsServerIpIndex].v6), NULL); > > + } > > + } > > + > > + return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode; > > +} > > + > > +/** > > Converts a text device path node to URI device path structure. > > > > @param TextDeviceNode The input Text device path node. > > > > @return A pointer to the newly-created URI device path structure. > > @@ -3395,10 +3466,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED > > DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevP > > {L"UsbTestAndMeasurement", > > DevPathFromTextUsbTestAndMeasurement }, > > {L"UsbWwid", DevPathFromTextUsbWwid = }, > > {L"Unit", DevPathFromTextUnit = }, > > {L"iSCSI", DevPathFromTextiSCSI = }, > > {L"Vlan", DevPathFromTextVlan = }, > > + {L"Dns", DevPathFromTextDns = }, > > {L"Uri", DevPathFromTextUri = }, > > {L"Bluetooth", DevPathFromTextBluetooth = }, > > {L"Wi-Fi", DevPathFromTextWiFi = }, > > {L"BluetoothLE", DevPathFromTextBluetoothLE = }, > > {L"MediaPath", DevPathFromTextMediaPath = }, > > diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > > b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > > index b8d9491..63542db 100644 > > --- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > > +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > > @@ -1695,10 +1695,55 @@ DevPathToTextBluetoothLE ( > > BluetoothLE->Address.Type > > ); > > } > > > > /** > > + Converts a DNS device path structure to its string representative. > > + > > + @param Str The string representative of input device. > > + @param DevPath The input device path structure. > > + @param DisplayOnly If DisplayOnly is TRUE, then the shorter text > > representation > > + of the display node is used, where applicable= . If DisplayOnly > > + is FALSE, then the longer text representation= of the display > > node > > + is used. > > + @param AllowShortcuts If AllowShortcuts is TRUE, then the shortcut > > forms of text > > + representation for a device node can be used,= where > > applicable. > > + > > +**/ > > +VOID > > +DevPathToTextDns ( > > + IN OUT POOL_PRINT *Str, > > + IN VOID *DevPath, > > + IN BOOLEAN DisplayOnly, > > + IN BOOLEAN AllowShortcuts > > + ) > > +{ > > + DNS_DEVICE_PATH *DnsDevPath; > > + UINT32 DnsServerIpCount; > > + UINT32 DnsServerIpIndex; > > + > > + DnsDevPath =3D DevPath; > > + DnsServerIpCount =3D (UINT32) (DevicePathNodeLength(DnsDevPath) - > > sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / > > sizeof (EFI_IP_ADDRESS); > > + > > + UefiDevicePathLibCatPrint (Str, L"Dns("); > > + > > + for (DnsServerIpIndex =3D 0; DnsServerIpIndex < DnsServerIpCount; > > DnsServerIpIndex++) { > > + if (DnsDevPath->IsIPv6 =3D=3D 0x00) { > > + CatIPv4Address (Str, &(DnsDevPath- > > >DnsServerIp[DnsServerIpIndex].v4)); > > + } else { > > + CatIPv6Address (Str, &(DnsDevPath- > > >DnsServerIp[DnsServerIpIndex].v6)); > > + } > > + > > + if (DnsServerIpIndex < DnsServerIpCount - 1) { > > + UefiDevicePathLibCatPrint (Str, L","); > > + } > > + } > > + > > + UefiDevicePathLibCatPrint (Str, L")"); > > +} > > + > > +/** > > Converts a URI device path structure to its string representative. > > > > @param Str The string representative of input device. > > @param DevPath The input device path structure. > > @param DisplayOnly If DisplayOnly is TRUE, then the shorter text > > representation > > @@ -2223,10 +2268,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED const > > DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLib > > {MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, > > DevPathToTextInfiniBand }, > > {MESSAGING_DEVICE_PATH, MSG_UART_DP, > > DevPathToTextUart }, > > {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, > > DevPathToTextVendor }, > > {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, > > DevPathToTextiSCSI }, > > {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, > > DevPathToTextVlan }, > > + {MESSAGING_DEVICE_PATH, MSG_DNS_DP, > > DevPathToTextDns }, > > {MESSAGING_DEVICE_PATH, MSG_URI_DP, > > DevPathToTextUri }, > > {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP, > > DevPathToTextBluetooth }, > > {MESSAGING_DEVICE_PATH, MSG_WIFI_DP, > > DevPathToTextWiFi }, > > {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_LE_DP, > > DevPathToTextBluetoothLE }, > > {MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, > > DevPathToTextHardDrive }, > > -- > > 1.9.5.msysgit.1