Update the sockets applications

* Builds with GCC 4.4 compiler.

Signed-off by: lpleahy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12498 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lpleahy
2011-09-30 23:04:13 +00:00
parent a88c31639b
commit 59bc059327
52 changed files with 3062 additions and 235 deletions

View File

@@ -0,0 +1,44 @@
/** @file
Out-of-band transmit test application
Copyright (c) 2011, 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 <OobTx.h>
/**
Transmit out-of-band messages to the remote system.
@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.
**/
int
main (
IN int Argc,
IN char **Argv
)
{
int RetVal;
//
// Run the application
//
RetVal = OobTx ( Argc, Argv );
//
// Return the operation status
//
return RetVal;
}

View File

@@ -0,0 +1,248 @@
/** @file
Windows version of the OOB Transmit application
Copyright (c) 2011, 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 <OobTx.h>
UINT8 mBuffer[8192];
UINT8 mOob[512];
/**
Transmit out-of-band messages to the remote system.
@param [in] ArgC Argument count
@param [in] ArgV Argument value array
@retval 0 Successfully operation
**/
int
OobTx (
IN int ArgC,
IN char **ArgV
)
{
UINT32 BytesSent;
ssize_t BytesTransmitted;
UINT32 Index;
struct sockaddr_in LocalPort;
UINT32 OobInLine;
UINT16 PortNumber;
UINT32 RemoteAddress[4];
struct sockaddr_in RemotePort;
int RetVal;
UINT32 TransmittedAfter;
UINT32 TransmittedBefore;
UINT32 TransmittedOob;
SOCKET s;
//
// Create the socket
//
s = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
if ( -1 == s ) {
RetVal = GET_ERRNO;
printf ( "ERROR - socket error, errno: %d\r\n", RetVal );
}
else {
//
// Use for/break; instead of goto
//
for ( ; ; ) {
//
// Validate the arguments
//
if (( 2 > ArgC )
|| ( 4 != sscanf ( ArgV[1],
"%d.%d.%d.%d",
&RemoteAddress[0],
&RemoteAddress[1],
&RemoteAddress[2],
&RemoteAddress[3]))
|| ( 224 < RemoteAddress[0])
|| ( 255 < RemoteAddress[1])
|| ( 255 < RemoteAddress[2])
|| ( 255 < RemoteAddress[3])
|| (( 0 == RemoteAddress[0])
&& ( 0 == RemoteAddress[1])
&& ( 0 == RemoteAddress[2])
&& ( 0 == RemoteAddress[3]))) {
printf ( "%s <remote IP address> [optional: enables in-line OOB]\r\n", ArgV[0]);
RetVal = EINVAL;
break;
}
//
// Bind the socket to a local port
//
memset ( &LocalPort, 0, sizeof ( LocalPort ));
SIN_LEN ( LocalPort ) = sizeof ( LocalPort );
SIN_FAMILY ( LocalPort ) = AF_INET;
SIN_ADDR ( LocalPort ) = 0;
SIN_PORT ( LocalPort ) = 0;
RetVal = bind ( s,
(struct sockaddr *)&LocalPort,
sizeof ( LocalPort ));
if ( -1 == RetVal ) {
RetVal = GET_ERRNO;
printf ( "ERROR - bind error, errno: %d\r\n", RetVal );
break;
}
//
// Specify the remote port
//
PortNumber = OOB_RX_PORT;
memset ( &RemotePort, 0, sizeof ( RemotePort ));
SIN_LEN ( RemotePort ) = sizeof ( RemotePort );
SIN_FAMILY ( RemotePort ) = AF_INET;
SIN_ADDR ( RemotePort ) = ( RemoteAddress[3] << 24 )
| ( RemoteAddress[2] << 16 )
| ( RemoteAddress[1] << 8 )
| RemoteAddress[0];
SIN_PORT ( RemotePort ) = htons ( PortNumber );
//
// Connect to the remote server
//
RetVal = connect ( s, (struct sockaddr *)&RemotePort, sizeof ( RemotePort ));
if ( -1 == RetVal ) {
RetVal = GET_ERRNO;
printf ( "ERROR - connect error, errno: %d\r\n", RetVal );
break;
}
//
// Select the OOB processing
//
OobInLine = ( 2 < ArgC );
RetVal = setsockopt ( s,
SOL_SOCKET,
SO_OOBINLINE,
(char *)&OobInLine,
sizeof ( OobInLine ));
if ( -1 == RetVal ) {
RetVal = GET_ERRNO;
printf ( "ERROR - setsockopt OOBINLINE error, errno: %d\r\n", RetVal );
break;
}
printf ( "%s\r\n", ( 0 != OobInLine ) ? "OOB messages are in-line"
: "OOB messages move to the head of the queue" );
//
// Initialize the messages
//
memset ( &mBuffer[0], 0, sizeof ( mBuffer ));
memset ( &mOob[0], 0x11, sizeof ( mOob ));
//
// Send the data before the out-of-band message
//
TransmittedBefore = 0;
for ( Index = 0; TX_MSGS_BEFORE > Index; Index++ ) {
BytesSent = 0;
do {
BytesTransmitted = send ( s,
&mBuffer[BytesSent],
sizeof ( mBuffer ) - BytesSent,
0 );
if ( -1 == BytesTransmitted ) {
RetVal = GET_ERRNO;
printf ( "ERROR - send before error, errno: %d\r\n", RetVal );
break;
}
BytesSent += (UINT32)BytesTransmitted;
RetVal = 0;
} while ( sizeof ( mBuffer ) > BytesSent );
if ( 0 != RetVal ) {
break;
}
TransmittedBefore += BytesSent;
}
if ( 0 != RetVal ) {
break;
}
//
// Send the out-of-band message
//
BytesSent = 0;
do {
BytesTransmitted = send ( s,
&mOob[BytesSent],
sizeof ( mOob ) - BytesSent,
MSG_OOB );
if ( -1 == BytesTransmitted ) {
RetVal = GET_ERRNO;
printf ( "ERROR - send OOB error, errno: %d\r\n", RetVal );
break;
}
BytesSent += (UINT32)BytesTransmitted;
RetVal = 0;
} while ( sizeof ( mOob ) > BytesSent );
if ( 0 != RetVal ) {
break;
}
TransmittedOob = BytesSent;
//
// Send the data after the out-of-band message
//
TransmittedAfter = 0;
for ( Index = 0; TX_MSGS_AFTER > Index; Index++ ) {
BytesSent = 0;
do {
BytesTransmitted = send ( s,
&mBuffer[BytesSent],
sizeof ( mBuffer ) - BytesSent,
0 );
if ( -1 == BytesTransmitted ) {
RetVal = GET_ERRNO;
printf ( "ERROR - send after error, errno: %d\r\n", RetVal );
break;
}
BytesSent += (UINT32)BytesTransmitted;
RetVal = 0;
} while ( sizeof ( mBuffer ) > BytesSent );
if ( 0 != RetVal ) {
break;
}
TransmittedAfter += BytesSent;
}
//
// Test completed successfully
//
if ( 0 == RetVal ) {
printf ( "Bytes before OOB: %8d\r\n", TransmittedBefore );
printf ( "Out-of-band bytes: %8d\r\n", TransmittedOob );
printf ( "Bytes after OOB: %8d\r\n", TransmittedAfter );
printf ( " --------\r\n" );
printf ( "Total Bytes: %8d\r\n", TransmittedBefore
+ TransmittedOob
+ TransmittedAfter );
}
break;
}
//
// Close the socket
//
CLOSE_SOCKET ( s );
}
//
// Return the operation status
//
return RetVal;
}

View File

@@ -0,0 +1,97 @@
/** @file
Definitions for the OOB Transmit application
Copyright (c) 2011, 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.
**/
#ifndef _OOB_TX_H_
#define _OOB_TX_H_
//------------------------------------------------------------------------------
// Include Files
//------------------------------------------------------------------------------
#ifdef BUILD_FOR_WINDOWS
//
// Build for Windows environment
//
#include <winsock2.h>
#define CHAR8 char
#define CLOSE_SOCKET closesocket
#define EINVAL 22 // Invalid argument
#define GET_ERRNO WSAGetLastError ( )
#define SIN_ADDR(port) port.sin_addr.S_un.S_addr
#define SIN_FAMILY(port) port.sin_family
#define SIN_LEN(port) port.sin_family
#define SIN_PORT(port) port.sin_port
#define socklen_t int
#define ssize_t int
#else // BUILD_FOR_WINDOWS
//
// Build for EFI environment
//
#include <Uefi.h>
#include <errno.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <sys/EfiSysCall.h>
#include <sys/endian.h>
#include <sys/socket.h>
#define CLOSE_SOCKET close
#define GET_ERRNO errno
#define SIN_ADDR(port) port.sin_addr.s_addr
#define SIN_FAMILY(port) port.sin_family
#define SIN_LEN(port) port.sin_len
#define SIN_PORT(port) port.sin_port
#define SOCKET int
#endif // BUILD_FOR_WINDOWS
#include <stdio.h>
//------------------------------------------------------------------------------
// Constants
//------------------------------------------------------------------------------
#define OOB_RX_PORT 12344
#define TX_MSGS_BEFORE 32
#define TX_MSGS_AFTER 8
//------------------------------------------------------------------------------
// API
//------------------------------------------------------------------------------
/**
Transmit out-of-band messages to the remote system.
@param [in] ArgC Argument count
@param [in] ArgV Argument value array
@retval 0 Successfully operation
**/
int
OobTx (
IN int ArgC,
IN char **ArgV
);
//------------------------------------------------------------------------------
#endif // _OOB_TX_H_

View File

@@ -0,0 +1,64 @@
#/** @file
# OobTx Application
#
# This file contains an 'Intel Peripheral Driver' and is
# licensed for Intel CPUs and chipsets under the terms of your
# license agreement with Intel or your vendor. This file may
# be modified by the user, subject to additional terms of the
# license agreement
#
#
# Copyright (c) 20011 Intel Corporation. All rights reserved
# This software and associated documentation (if any) is furnished
# under a license and may only be used or copied in accordance
# with the terms of the license. Except as permitted by such
# license, no part of this software or documentation may be
# reproduced, stored in a retrieval system, or transmitted in any
# form or by any means without the express written consent of
# Intel Corporation.
#
##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = OobTx
FILE_GUID = EB740091-A494-44d7-8D96-C192F95A6394
MODULE_TYPE = UEFI_APPLICATION
VERSION_STRING = 1.0
ENTRY_POINT = ShellCEntryLib
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
[Sources]
Main.c
OobTx.c
[Packages]
MdePkg/MdePkg.dec
ShellPkg/ShellPkg.dec
StdLib/StdLib.dec
[LibraryClasses]
BaseMemoryLib
BsdSocketLib
DebugLib
EfiSocketLib
LibC
LibMath
ShellCEntryLib
UefiBootServicesTableLib
UefiLib
# UseSocketDxe
[BuildOptions]
INTEL:*_*_*_CC_FLAGS = /Qdiag-disable:181,186
MSFT:*_*_*_CC_FLAGS = /Od
GCC:*_*_*_CC_FLAGS = -O0 -Wno-unused-variable

View File

@@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OobTx", "OobTx.vcproj", "{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}.Debug|Win32.ActiveCfg = Debug|Win32
{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}.Debug|Win32.Build.0 = Debug|Win32
{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}.Release|Win32.ActiveCfg = Release|Win32
{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Binary file not shown.

View File

@@ -0,0 +1,211 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="OobTx"
ProjectGUID="{C5B91ED2-C2BA-4EE7-A789-F6621CE601B9}"
RootNamespace="OobTx"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".."
PreprocessorDefinitions="BUILD_FOR_WINDOWS; _CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".."
PreprocessorDefinitions="BUILD_FOR_WINDOWS; _CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\main.c"
>
</File>
<File
RelativePath="..\OobTx.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\OobTx.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -0,0 +1,56 @@
/** @file
Windows version of the OOB Transmit application
Copyright (c) 2011, 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 <OobTx.h>
/**
Transmit out-of-band messages to the remote system.
@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.
**/
int
main(
int argc,
char ** argv
)
{
int RetVal;
WSADATA WsaData;
//
// Initialize the WinSock layer
//
RetVal = WSAStartup ( MAKEWORD ( 2, 2 ), &WsaData );
if ( 0 == RetVal ) {
//
// Start the application
//
RetVal = OobTx ( argc, argv );
//
// Done with the WinSock layer
//
WSACleanup ( );
}
//
// Return the final result
//
return RetVal;
}