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

View File

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

View File

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