AppPkg/Applications/Sockets: Address GCC and Linux compilation problems.

1) Fix copyright and license notices.
  2) Replace '\' in include paths with '/'.
  3) Fix case mismatch between include paths and actual files and directories.

Signed-off-by: darylm503
Reviewed-by: geekboy15a


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13142 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
darylm503 2012-03-27 00:47:35 +00:00
parent 06c355b42f
commit 6dbd32caf6
3 changed files with 458 additions and 466 deletions

View File

@ -1,17 +1,15 @@
/** @file
Translate the port number into a service name
Copyright (c) 2011-2012, Intel Corporation
All rights reserved. This program and the accompanying materials
Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
@ -19,8 +17,8 @@
#include <Uefi.h>
#include <unistd.h>
#include <arpa\nameser.h>
#include <arpa\nameser_compat.h>
#include <arpa/nameser.h>
#include <arpa/nameser_compat.h>
#include <Library/DebugLib.h>
#include <Library/UefiLib.h>
@ -30,8 +28,8 @@
/**
Translate the IP address into a host name
@param [in] Argc The number of arguments
@param [in] Argv The argument value array
@param[in] Argc The number of arguments
@param[in] Argv The argument value array
@retval 0 The application exited normally.
@retval Other An error occurred.

View File

@ -1,225 +1,222 @@
/**
@file
Display the DHCP options
/** @file
Display the DHCP options
Copyright (c) 2011-2012, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <WebServer.h>
#include <Guid/DxeServices.h>
#include <pi/PiDxeCis.h>
#include <protocol/Dhcp4.h>
#include <protocol/ServiceBinding.h>
/**
Respond with the DHCP options
@param [in] SocketFD The socket's file descriptor to add to the list.
@param [in] pPort The WSDT_PORT structure address
@param [out] pbDone Address to receive the request completion status
@retval EFI_SUCCESS The request was successfully processed
**/
EFI_STATUS
DhcpOptionsPage (
IN int SocketFD,
IN WSDT_PORT * pPort,
OUT BOOLEAN * pbDone
)
{
// EFI_HANDLE Dhcp4Handle;
EFI_DHCP4_MODE_DATA Dhcp4Mode;
UINTN HandleCount;
EFI_DHCP4_PROTOCOL * pDhcp4;
EFI_DHCP4_PACKET * pDhcp4Packet;
EFI_HANDLE * pEnd;
EFI_HANDLE * pHandle;
// EFI_SERVICE_BINDING_PROTOCOL * pService;
EFI_STATUS Status;
DBG_ENTER ( );
//
// Send the DHCP options
//
for ( ; ; ) {
//
// Send the page header
//
Status = HttpPageHeader ( SocketFD, pPort, L"DHCP Options" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Build the header
//
Status = HttpSendAnsiString ( SocketFD,
pPort,
"<h1>" );
if ( EFI_ERROR ( Status )) {
break;
}
Status = HttpSendUnicodeString ( SocketFD,
pPort,
L"DHCP Options" );
if ( EFI_ERROR ( Status )) {
break;
}
Status = HttpSendAnsiString ( SocketFD,
pPort,
"</h1>\r\n" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Attempt to locate DHCP clients
//
Status = gBS->LocateHandleBuffer ( ByProtocol,
// &gEfiDhcp4ServiceBindingProtocolGuid,
&gEfiDhcp4ProtocolGuid,
NULL,
&HandleCount,
&pHandle );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"DHCP not in use" );
if ( EFI_ERROR ( Status )) {
break;
}
}
else {
//
// Walk the list of handles
//
pEnd = &pHandle [ HandleCount ];
while ( pEnd > pHandle ) {
/*
//
// Get the DHCP service binding
//
Status = gBS->OpenProtocol ( *pHandle,
&gEfiDhcp4ServiceBindingProtocolGuid,
&pService,
NULL,
gImageHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to open gEfiDhcp4ServiceBindingProtocolGuid" );
break;
}
//
// Get the DHCP handle
//
Status = pService->CreateChild ( pService,
&Dhcp4Handle );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to create DHCP4 child" );
}
else {
*/
//
// Get the DHCP protocol
//
Status = gBS->OpenProtocol ( *pHandle,
// Dhcp4Handle,
&gEfiDhcp4ProtocolGuid,
(VOID **)&pDhcp4,
NULL,
gImageHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to open gEfiDhcp4ProtocolGuid" );
}
else {
//
// Get the DHCP packet
//
Status = pDhcp4->GetModeData ( pDhcp4,
&Dhcp4Mode );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to get DHCP4 mode" );
}
else {
//
// Get the last packet
//
pDhcp4Packet = Dhcp4Mode.ReplyPacket;
if ( NULL == pDhcp4Packet ) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"No DHCP reply received!<br/>DHCP Mode:<br/>" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Display the DHCP mode data
//
Status = HttpSendDump ( SocketFD,
pPort,
sizeof ( Dhcp4Mode ),
(UINT8 *)&Dhcp4Mode );
}
else {
//
// Display the DHCP packet
//
Status = HttpSendDump ( SocketFD,
pPort,
pDhcp4Packet->Length,
(UINT8 *)&pDhcp4Packet->Dhcp4 );
}
}
/*
}
//
// Done with the DHCP protocol
//
pService->DestroyChild ( pService,
Dhcp4Handle );
*/
}
//
// Set the next service binding
//
pHandle += 1;
}
}
//
// Send the page trailer
//
Status = HttpPageTrailer ( SocketFD, pPort, pbDone );
break;
}
//
// Return the operation status
//
DBG_EXIT_STATUS ( Status );
return Status;
}
Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <WebServer.h>
#include <Guid/DxeServices.h>
#include <Pi/PiDxeCis.h>
#include <Protocol/Dhcp4.h>
#include <Protocol/ServiceBinding.h>
/**
Respond with the DHCP options
@param[in] SocketFD The socket's file descriptor to add to the list.
@param[in] pPort The WSDT_PORT structure address
@param[out] pbDone Address to receive the request completion status
@retval EFI_SUCCESS The request was successfully processed
**/
EFI_STATUS
DhcpOptionsPage (
IN int SocketFD,
IN WSDT_PORT * pPort,
OUT BOOLEAN * pbDone
)
{
// EFI_HANDLE Dhcp4Handle;
EFI_DHCP4_MODE_DATA Dhcp4Mode;
UINTN HandleCount;
EFI_DHCP4_PROTOCOL * pDhcp4;
EFI_DHCP4_PACKET * pDhcp4Packet;
EFI_HANDLE * pEnd;
EFI_HANDLE * pHandle;
// EFI_SERVICE_BINDING_PROTOCOL * pService;
EFI_STATUS Status;
DBG_ENTER ( );
//
// Send the DHCP options
//
for ( ; ; ) {
//
// Send the page header
//
Status = HttpPageHeader ( SocketFD, pPort, L"DHCP Options" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Build the header
//
Status = HttpSendAnsiString ( SocketFD,
pPort,
"<h1>" );
if ( EFI_ERROR ( Status )) {
break;
}
Status = HttpSendUnicodeString ( SocketFD,
pPort,
L"DHCP Options" );
if ( EFI_ERROR ( Status )) {
break;
}
Status = HttpSendAnsiString ( SocketFD,
pPort,
"</h1>\r\n" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Attempt to locate DHCP clients
//
Status = gBS->LocateHandleBuffer ( ByProtocol,
// &gEfiDhcp4ServiceBindingProtocolGuid,
&gEfiDhcp4ProtocolGuid,
NULL,
&HandleCount,
&pHandle );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"DHCP not in use" );
if ( EFI_ERROR ( Status )) {
break;
}
}
else {
//
// Walk the list of handles
//
pEnd = &pHandle [ HandleCount ];
while ( pEnd > pHandle ) {
/*
//
// Get the DHCP service binding
//
Status = gBS->OpenProtocol ( *pHandle,
&gEfiDhcp4ServiceBindingProtocolGuid,
&pService,
NULL,
gImageHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to open gEfiDhcp4ServiceBindingProtocolGuid" );
break;
}
//
// Get the DHCP handle
//
Status = pService->CreateChild ( pService,
&Dhcp4Handle );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to create DHCP4 child" );
}
else {
*/
//
// Get the DHCP protocol
//
Status = gBS->OpenProtocol ( *pHandle,
// Dhcp4Handle,
&gEfiDhcp4ProtocolGuid,
(VOID **)&pDhcp4,
NULL,
gImageHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to open gEfiDhcp4ProtocolGuid" );
}
else {
//
// Get the DHCP packet
//
Status = pDhcp4->GetModeData ( pDhcp4,
&Dhcp4Mode );
if ( EFI_ERROR ( Status )) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"Failed to get DHCP4 mode" );
}
else {
//
// Get the last packet
//
pDhcp4Packet = Dhcp4Mode.ReplyPacket;
if ( NULL == pDhcp4Packet ) {
Status = HttpSendAnsiString ( SocketFD,
pPort,
"No DHCP reply received!<br/>DHCP Mode:<br/>" );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Display the DHCP mode data
//
Status = HttpSendDump ( SocketFD,
pPort,
sizeof ( Dhcp4Mode ),
(UINT8 *)&Dhcp4Mode );
}
else {
//
// Display the DHCP packet
//
Status = HttpSendDump ( SocketFD,
pPort,
pDhcp4Packet->Length,
(UINT8 *)&pDhcp4Packet->Dhcp4 );
}
}
/*
}
//
// Done with the DHCP protocol
//
pService->DestroyChild ( pService,
Dhcp4Handle );
*/
}
//
// Set the next service binding
//
pHandle += 1;
}
}
//
// Send the page trailer
//
Status = HttpPageTrailer ( SocketFD, pPort, pbDone );
break;
}
//
// Return the operation status
//
DBG_EXIT_STATUS ( Status );
return Status;
}

View File

@ -1,235 +1,232 @@
/**
@file
Display the DXE services table
/** @file
Display the DXE services table
Copyright (c) 2011-2012, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <WebServer.h>
#include <Guid/DxeServices.h>
#include <pi/PiDxeCis.h>
/**
Respond with the DXE services table
@param [in] SocketFD The socket's file descriptor to add to the list.
@param [in] pPort The WSDT_PORT structure address
@param [out] pbDone Address to receive the request completion status
@retval EFI_SUCCESS The request was successfully processed
**/
EFI_STATUS
DxeServicesTablePage (
IN int SocketFD,
IN WSDT_PORT * pPort,
OUT BOOLEAN * pbDone
)
{
EFI_DXE_SERVICES * pDS;
EFI_STATUS Status;
DBG_ENTER ( );
//
// Send the DXE services page
//
for ( ; ; ) {
//
// Get the DXE services table
//
Status = EfiGetSystemConfigurationTable (&gEfiDxeServicesTableGuid, (VOID **) &pDS);
if ( EFI_ERROR ( Status )) {
break;
}
//
// Send the page and table header
//
Status = TableHeader ( SocketFD, pPort, L"DXE Services Table", pDS );
if ( EFI_ERROR ( Status )) {
break;
}
///
/// The table header for the DXE Services Table.
/// This header contains the DXE_SERVICES_SIGNATURE and DXE_SERVICES_REVISION values.
///
Status = EfiTableHeader ( SocketFD,
pPort,
&pDS->Hdr );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Global Coherency Domain Services
//
Status = RowPointer ( SocketFD,
pPort,
"AddMemorySpace",
(VOID *)pDS->AddMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AllocateMemorySpace",
(VOID *)pDS->AllocateMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"FreeMemorySpace",
(VOID *)pDS->FreeMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"RemoveMemorySpace",
(VOID *)pDS->RemoveMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetMemorySpaceDescriptor",
(VOID *)pDS->GetMemorySpaceDescriptor,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"SetMemorySpaceAttributes",
(VOID *)pDS->SetMemorySpaceAttributes,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetMemorySpaceMap",
(VOID *)pDS->GetMemorySpaceMap,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AddIoSpace",
(VOID *)pDS->AddIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AllocateIoSpace",
(VOID *)pDS->AllocateIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"FreeIoSpace",
(VOID *)pDS->FreeIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"RemoveIoSpace",
(VOID *)pDS->RemoveIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetIoSpaceDescriptor",
(VOID *)pDS->GetIoSpaceDescriptor,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetIoSpaceMap",
(VOID *)pDS->GetIoSpaceMap,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Dispatcher Services
//
Status = RowPointer ( SocketFD,
pPort,
"Dispatch",
(VOID *)pDS->Dispatch,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"Schedule",
(VOID *)pDS->Schedule,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"Trust",
(VOID *)pDS->Trust,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Service to process a single firmware volume found in a capsule
//
Status = RowPointer ( SocketFD,
pPort,
"ProcessFirmwareVolume",
(VOID *)pDS->ProcessFirmwareVolume,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Build the table trailer
//
Status = TableTrailer ( SocketFD,
pPort,
pbDone );
break;
}
//
// Return the operation status
//
DBG_EXIT_STATUS ( Status );
return Status;
}
Copyright (c) 2011 - 2012 Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--*/
#include <WebServer.h>
#include <Guid/DxeServices.h>
#include <Pi/PiDxeCis.h>
/**
Respond with the DXE services table
@param[in] SocketFD The socket's file descriptor to add to the list.
@param[in] pPort The WSDT_PORT structure address
@param[out] pbDone Address to receive the request completion status
@retval EFI_SUCCESS The request was successfully processed
**/
EFI_STATUS
DxeServicesTablePage (
IN int SocketFD,
IN WSDT_PORT * pPort,
OUT BOOLEAN * pbDone
)
{
EFI_DXE_SERVICES * pDS;
EFI_STATUS Status;
DBG_ENTER ( );
//
// Send the DXE services page
//
for ( ; ; ) {
//
// Get the DXE services table
//
Status = EfiGetSystemConfigurationTable (&gEfiDxeServicesTableGuid, (VOID **) &pDS);
if ( EFI_ERROR ( Status )) {
break;
}
//
// Send the page and table header
//
Status = TableHeader ( SocketFD, pPort, L"DXE Services Table", pDS );
if ( EFI_ERROR ( Status )) {
break;
}
///
/// The table header for the DXE Services Table.
/// This header contains the DXE_SERVICES_SIGNATURE and DXE_SERVICES_REVISION values.
///
Status = EfiTableHeader ( SocketFD,
pPort,
&pDS->Hdr );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Global Coherency Domain Services
//
Status = RowPointer ( SocketFD,
pPort,
"AddMemorySpace",
(VOID *)pDS->AddMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AllocateMemorySpace",
(VOID *)pDS->AllocateMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"FreeMemorySpace",
(VOID *)pDS->FreeMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"RemoveMemorySpace",
(VOID *)pDS->RemoveMemorySpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetMemorySpaceDescriptor",
(VOID *)pDS->GetMemorySpaceDescriptor,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"SetMemorySpaceAttributes",
(VOID *)pDS->SetMemorySpaceAttributes,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetMemorySpaceMap",
(VOID *)pDS->GetMemorySpaceMap,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AddIoSpace",
(VOID *)pDS->AddIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"AllocateIoSpace",
(VOID *)pDS->AllocateIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"FreeIoSpace",
(VOID *)pDS->FreeIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"RemoveIoSpace",
(VOID *)pDS->RemoveIoSpace,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetIoSpaceDescriptor",
(VOID *)pDS->GetIoSpaceDescriptor,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"GetIoSpaceMap",
(VOID *)pDS->GetIoSpaceMap,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Dispatcher Services
//
Status = RowPointer ( SocketFD,
pPort,
"Dispatch",
(VOID *)pDS->Dispatch,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"Schedule",
(VOID *)pDS->Schedule,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
Status = RowPointer ( SocketFD,
pPort,
"Trust",
(VOID *)pDS->Trust,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Service to process a single firmware volume found in a capsule
//
Status = RowPointer ( SocketFD,
pPort,
"ProcessFirmwareVolume",
(VOID *)pDS->ProcessFirmwareVolume,
NULL );
if ( EFI_ERROR ( Status )) {
break;
}
//
// Build the table trailer
//
Status = TableTrailer ( SocketFD,
pPort,
pbDone );
break;
}
//
// Return the operation status
//
DBG_EXIT_STATUS ( Status );
return Status;
}