| Message ID | 1477651478-16830-2-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0fe2196f8b8ccf04a4b4b50d739aaa7332ea8b06 |
| Headers | show |
On Fri, Oct 28, 2016 at 11:44:30AM +0100, Ard Biesheuvel wrote: > The fastboot TCP connection setup routine retrieves a hostname from a > UEFI variable 'hostname' that is scoped under a GUID gEfiHostnameVariableGuid > whose definition is missing from the code. Since the hostname is only printed > and then discarded, let's just drop the whole thing. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> It also gets rid of some needlessly hardcoded buffers, which I'm all for - so: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c | 23 -------------------- > EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf | 3 --- > 2 files changed, 26 deletions(-) > > diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c > index 8ec78aeb534e..7c008ac9722e 100644 > --- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c > +++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c > @@ -27,8 +27,6 @@ > #include <Library/UefiDriverEntryPoint.h> > #include <Library/UefiRuntimeServicesTableLib.h> > > -#include <Guid/Hostname.h> > - > #define IP4_ADDR_TO_STRING(IpAddr, IpAddrString) UnicodeSPrint ( \ > IpAddrString, \ > 16 * 2, \ > @@ -307,9 +305,6 @@ TcpFastbootTransportStart ( > EFI_HANDLE *HandleBuffer; > EFI_IP4_MODE_DATA Ip4ModeData; > UINTN NumHandles; > - UINTN HostnameSize = 256; > - CHAR8 Hostname[256]; > - CHAR16 HostnameUnicode[256] = L"<no hostname>"; > CHAR16 IpAddrString[16]; > UINTN Index; > > @@ -442,28 +437,10 @@ TcpFastbootTransportStart ( > // > IP4_ADDR_TO_STRING (Ip4ModeData.ConfigData.StationAddress, IpAddrString); > > - // Look up hostname > - Status = gRT->GetVariable ( > - L"Hostname", > - &gEfiHostnameVariableGuid, > - NULL, > - &HostnameSize, > - &Hostname > - ); > - if (!EFI_ERROR (Status) && HostnameSize != 0) { > - AsciiStrToUnicodeStr (Hostname, HostnameUnicode); > - } > - > - // Hostname variable is not null-terminated. > - Hostname[HostnameSize] = L'\0'; > - > mTextOut->OutputString (mTextOut, L"TCP Fastboot transport configured."); > mTextOut->OutputString (mTextOut, L"\r\nIP address: "); > mTextOut->OutputString (mTextOut ,IpAddrString); > mTextOut->OutputString (mTextOut, L"\r\n"); > - mTextOut->OutputString (mTextOut, L"\r\nhostname: "); > - mTextOut->OutputString (mTextOut, HostnameUnicode); > - mTextOut->OutputString (mTextOut, L"\r\n"); > > // > // Start listening for a connection > diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf > index 4d777934e5a4..89ff556b40ca 100644 > --- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf > +++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf > @@ -47,8 +47,5 @@ [Packages] > MdeModulePkg/MdeModulePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > > -[Guids] > - gEfiHostnameVariableGuid > - > [FixedPcd] > gEmbeddedTokenSpaceGuid.PcdAndroidFastbootTcpPort > -- > 2.7.4 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c index 8ec78aeb534e..7c008ac9722e 100644 --- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c +++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c @@ -27,8 +27,6 @@ #include <Library/UefiDriverEntryPoint.h> #include <Library/UefiRuntimeServicesTableLib.h> -#include <Guid/Hostname.h> - #define IP4_ADDR_TO_STRING(IpAddr, IpAddrString) UnicodeSPrint ( \ IpAddrString, \ 16 * 2, \ @@ -307,9 +305,6 @@ TcpFastbootTransportStart ( EFI_HANDLE *HandleBuffer; EFI_IP4_MODE_DATA Ip4ModeData; UINTN NumHandles; - UINTN HostnameSize = 256; - CHAR8 Hostname[256]; - CHAR16 HostnameUnicode[256] = L"<no hostname>"; CHAR16 IpAddrString[16]; UINTN Index; @@ -442,28 +437,10 @@ TcpFastbootTransportStart ( // IP4_ADDR_TO_STRING (Ip4ModeData.ConfigData.StationAddress, IpAddrString); - // Look up hostname - Status = gRT->GetVariable ( - L"Hostname", - &gEfiHostnameVariableGuid, - NULL, - &HostnameSize, - &Hostname - ); - if (!EFI_ERROR (Status) && HostnameSize != 0) { - AsciiStrToUnicodeStr (Hostname, HostnameUnicode); - } - - // Hostname variable is not null-terminated. - Hostname[HostnameSize] = L'\0'; - mTextOut->OutputString (mTextOut, L"TCP Fastboot transport configured."); mTextOut->OutputString (mTextOut, L"\r\nIP address: "); mTextOut->OutputString (mTextOut ,IpAddrString); mTextOut->OutputString (mTextOut, L"\r\n"); - mTextOut->OutputString (mTextOut, L"\r\nhostname: "); - mTextOut->OutputString (mTextOut, HostnameUnicode); - mTextOut->OutputString (mTextOut, L"\r\n"); // // Start listening for a connection diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf index 4d777934e5a4..89ff556b40ca 100644 --- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf +++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf @@ -47,8 +47,5 @@ [Packages] MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec -[Guids] - gEfiHostnameVariableGuid - [FixedPcd] gEmbeddedTokenSpaceGuid.PcdAndroidFastbootTcpPort
The fastboot TCP connection setup routine retrieves a hostname from a UEFI variable 'hostname' that is scoped under a GUID gEfiHostnameVariableGuid whose definition is missing from the code. Since the hostname is only printed and then discarded, let's just drop the whole thing. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c | 23 -------------------- EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf | 3 --- 2 files changed, 26 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel