sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkPkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the NetworkPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:07 -08:00
committed by mergify[bot]
parent 2f88bd3a12
commit d1050b9dff
294 changed files with 29888 additions and 30440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
NetworkPkg/TcpDxe/TcpMain.c
View File

@@ -24,19 +24,20 @@
**/
EFI_STATUS
TcpChkDataBuf (
IN UINT32 DataLen,
IN UINT32 FragmentCount,
IN EFI_TCP4_FRAGMENT_DATA *FragmentTable
IN UINT32 DataLen,
IN UINT32 FragmentCount,
IN EFI_TCP4_FRAGMENT_DATA *FragmentTable
)
{
UINT32 Index;
UINT32 Index;
UINT32 Len;
UINT32 Len;
for (Index = 0, Len = 0; Index < FragmentCount; Index++) {
if (FragmentTable[Index].FragmentBuffer == NULL) {
return EFI_INVALID_PARAMETER;
}
Len = Len + FragmentTable[Index].FragmentLength;
}
@@ -73,12 +74,12 @@ TcpChkDataBuf (
EFI_STATUS
EFIAPI
Tcp4GetModeData (
IN EFI_TCP4_PROTOCOL *This,
OUT EFI_TCP4_CONNECTION_STATE *Tcp4State OPTIONAL,
OUT EFI_TCP4_CONFIG_DATA *Tcp4ConfigData OPTIONAL,
OUT EFI_IP4_MODE_DATA *Ip4ModeData OPTIONAL,
OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL,
OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL
IN EFI_TCP4_PROTOCOL *This,
OUT EFI_TCP4_CONNECTION_STATE *Tcp4State OPTIONAL,
OUT EFI_TCP4_CONFIG_DATA *Tcp4ConfigData OPTIONAL,
OUT EFI_IP4_MODE_DATA *Ip4ModeData OPTIONAL,
OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL,
OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL
)
{
TCP4_MODE_DATA TcpMode;
@@ -88,13 +89,13 @@ Tcp4GetModeData (
return EFI_INVALID_PARAMETER;
}
Sock = SOCK_FROM_THIS (This);
Sock = SOCK_FROM_THIS (This);
TcpMode.Tcp4State = Tcp4State;
TcpMode.Tcp4ConfigData = Tcp4ConfigData;
TcpMode.Ip4ModeData = Ip4ModeData;
TcpMode.MnpConfigData = MnpConfigData;
TcpMode.SnpModeData = SnpModeData;
TcpMode.Tcp4State = Tcp4State;
TcpMode.Tcp4ConfigData = Tcp4ConfigData;
TcpMode.Ip4ModeData = Ip4ModeData;
TcpMode.MnpConfigData = MnpConfigData;
TcpMode.SnpModeData = SnpModeData;
return SockGetMode (Sock, &TcpMode);
}
@@ -124,8 +125,8 @@ Tcp4GetModeData (
EFI_STATUS
EFIAPI
Tcp4Configure (
IN EFI_TCP4_PROTOCOL * This,
IN EFI_TCP4_CONFIG_DATA * TcpConfigData OPTIONAL
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_CONFIG_DATA *TcpConfigData OPTIONAL
)
{
EFI_TCP4_OPTION *Option;
@@ -142,22 +143,21 @@ Tcp4Configure (
// Tcp protocol related parameter check will be conducted here
//
if (NULL != TcpConfigData) {
CopyMem (&Ip, &TcpConfigData->AccessPoint.RemoteAddress, sizeof (IP4_ADDR));
if (IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {
return EFI_INVALID_PARAMETER;
}
if (TcpConfigData->AccessPoint.ActiveFlag && (0 == TcpConfigData->AccessPoint.RemotePort || (Ip == 0))) {
if (TcpConfigData->AccessPoint.ActiveFlag && ((0 == TcpConfigData->AccessPoint.RemotePort) || (Ip == 0))) {
return EFI_INVALID_PARAMETER;
}
if (!TcpConfigData->AccessPoint.UseDefaultAddress) {
CopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));
CopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));
if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) ||
(SubnetMask != 0 && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask)))) {
((SubnetMask != 0) && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask))))
{
return EFI_INVALID_PARAMETER;
}
}
@@ -211,26 +211,26 @@ Tcp4Configure (
EFI_STATUS
EFIAPI
Tcp4Routes (
IN EFI_TCP4_PROTOCOL *This,
IN BOOLEAN DeleteRoute,
IN EFI_IPv4_ADDRESS *SubnetAddress,
IN EFI_IPv4_ADDRESS *SubnetMask,
IN EFI_IPv4_ADDRESS *GatewayAddress
IN EFI_TCP4_PROTOCOL *This,
IN BOOLEAN DeleteRoute,
IN EFI_IPv4_ADDRESS *SubnetAddress,
IN EFI_IPv4_ADDRESS *SubnetMask,
IN EFI_IPv4_ADDRESS *GatewayAddress
)
{
SOCKET *Sock;
TCP4_ROUTE_INFO RouteInfo;
SOCKET *Sock;
TCP4_ROUTE_INFO RouteInfo;
if (NULL == This) {
return EFI_INVALID_PARAMETER;
}
Sock = SOCK_FROM_THIS (This);
Sock = SOCK_FROM_THIS (This);
RouteInfo.DeleteRoute = DeleteRoute;
RouteInfo.SubnetAddress = SubnetAddress;
RouteInfo.SubnetMask = SubnetMask;
RouteInfo.GatewayAddress = GatewayAddress;
RouteInfo.DeleteRoute = DeleteRoute;
RouteInfo.SubnetAddress = SubnetAddress;
RouteInfo.SubnetMask = SubnetMask;
RouteInfo.GatewayAddress = GatewayAddress;
return SockRoute (Sock, &RouteInfo);
}
@@ -257,13 +257,13 @@ Tcp4Routes (
EFI_STATUS
EFIAPI
Tcp4Connect (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_CONNECTION_TOKEN *ConnectionToken
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_CONNECTION_TOKEN *ConnectionToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == ConnectionToken || NULL == ConnectionToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == ConnectionToken) || (NULL == ConnectionToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -295,13 +295,13 @@ Tcp4Connect (
EFI_STATUS
EFIAPI
Tcp4Accept (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_LISTEN_TOKEN *ListenToken
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_LISTEN_TOKEN *ListenToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == ListenToken || NULL == ListenToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == ListenToken) || (NULL == ListenToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -342,28 +342,29 @@ Tcp4Accept (
EFI_STATUS
EFIAPI
Tcp4Transmit (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_IO_TOKEN *Token
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_IO_TOKEN *Token
)
{
SOCKET *Sock;
EFI_STATUS Status;
if (NULL == This ||
NULL == Token ||
NULL == Token->CompletionToken.Event ||
NULL == Token->Packet.TxData ||
0 == Token->Packet.TxData->FragmentCount ||
0 == Token->Packet.TxData->DataLength
) {
if ((NULL == This) ||
(NULL == Token) ||
(NULL == Token->CompletionToken.Event) ||
(NULL == Token->Packet.TxData) ||
(0 == Token->Packet.TxData->FragmentCount) ||
(0 == Token->Packet.TxData->DataLength)
)
{
return EFI_INVALID_PARAMETER;
}
Status = TcpChkDataBuf (
Token->Packet.TxData->DataLength,
Token->Packet.TxData->FragmentCount,
Token->Packet.TxData->FragmentTable
);
Token->Packet.TxData->DataLength,
Token->Packet.TxData->FragmentCount,
Token->Packet.TxData->FragmentTable
);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -407,28 +408,29 @@ Tcp4Transmit (
EFI_STATUS
EFIAPI
Tcp4Receive (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_IO_TOKEN *Token
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_IO_TOKEN *Token
)
{
SOCKET *Sock;
EFI_STATUS Status;
if (NULL == This ||
NULL == Token ||
NULL == Token->CompletionToken.Event ||
NULL == Token->Packet.RxData ||
0 == Token->Packet.RxData->FragmentCount ||
0 == Token->Packet.RxData->DataLength
) {
if ((NULL == This) ||
(NULL == Token) ||
(NULL == Token->CompletionToken.Event) ||
(NULL == Token->Packet.RxData) ||
(0 == Token->Packet.RxData->FragmentCount) ||
(0 == Token->Packet.RxData->DataLength)
)
{
return EFI_INVALID_PARAMETER;
}
Status = TcpChkDataBuf (
Token->Packet.RxData->DataLength,
Token->Packet.RxData->FragmentCount,
Token->Packet.RxData->FragmentTable
);
Token->Packet.RxData->DataLength,
Token->Packet.RxData->FragmentCount,
Token->Packet.RxData->FragmentTable
);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -436,7 +438,6 @@ Tcp4Receive (
Sock = SOCK_FROM_THIS (This);
return SockRcv (Sock, Token);
}
/**
@@ -464,13 +465,13 @@ Tcp4Receive (
EFI_STATUS
EFIAPI
Tcp4Close (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_CLOSE_TOKEN *CloseToken
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_CLOSE_TOKEN *CloseToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == CloseToken || NULL == CloseToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == CloseToken) || (NULL == CloseToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -506,8 +507,8 @@ Tcp4Close (
EFI_STATUS
EFIAPI
Tcp4Cancel (
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_COMPLETION_TOKEN *Token OPTIONAL
IN EFI_TCP4_PROTOCOL *This,
IN EFI_TCP4_COMPLETION_TOKEN *Token OPTIONAL
)
{
SOCKET *Sock;
@@ -538,7 +539,7 @@ Tcp4Cancel (
EFI_STATUS
EFIAPI
Tcp4Poll (
IN EFI_TCP4_PROTOCOL *This
IN EFI_TCP4_PROTOCOL *This
)
{
SOCKET *Sock;
@@ -548,7 +549,7 @@ Tcp4Poll (
return EFI_INVALID_PARAMETER;
}
Sock = SOCK_FROM_THIS (This);
Sock = SOCK_FROM_THIS (This);
Status = Sock->ProtoHandler (Sock, SOCK_POLL, NULL);
@@ -586,12 +587,12 @@ Tcp4Poll (
EFI_STATUS
EFIAPI
Tcp6GetModeData (
IN EFI_TCP6_PROTOCOL *This,
OUT EFI_TCP6_CONNECTION_STATE *Tcp6State OPTIONAL,
OUT EFI_TCP6_CONFIG_DATA *Tcp6ConfigData OPTIONAL,
OUT EFI_IP6_MODE_DATA *Ip6ModeData OPTIONAL,
OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL,
OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL
IN EFI_TCP6_PROTOCOL *This,
OUT EFI_TCP6_CONNECTION_STATE *Tcp6State OPTIONAL,
OUT EFI_TCP6_CONFIG_DATA *Tcp6ConfigData OPTIONAL,
OUT EFI_IP6_MODE_DATA *Ip6ModeData OPTIONAL,
OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL,
OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL
)
{
TCP6_MODE_DATA TcpMode;
@@ -601,7 +602,7 @@ Tcp6GetModeData (
return EFI_INVALID_PARAMETER;
}
Sock = SOCK_FROM_THIS (This);
Sock = SOCK_FROM_THIS (This);
TcpMode.Tcp6State = Tcp6State;
TcpMode.Tcp6ConfigData = Tcp6ConfigData;
@@ -662,8 +663,8 @@ Tcp6GetModeData (
EFI_STATUS
EFIAPI
Tcp6Configure (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CONFIG_DATA *Tcp6ConfigData OPTIONAL
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CONFIG_DATA *Tcp6ConfigData OPTIONAL
)
{
EFI_TCP6_OPTION *Option;
@@ -679,15 +680,15 @@ Tcp6Configure (
// Tcp protocol related parameter check will be conducted here
//
if (NULL != Tcp6ConfigData) {
Ip = &Tcp6ConfigData->AccessPoint.RemoteAddress;
if (!NetIp6IsUnspecifiedAddr (Ip) && !NetIp6IsValidUnicast (Ip)) {
return EFI_INVALID_PARAMETER;
}
if (Tcp6ConfigData->AccessPoint.ActiveFlag &&
(0 == Tcp6ConfigData->AccessPoint.RemotePort || NetIp6IsUnspecifiedAddr (Ip))
) {
((0 == Tcp6ConfigData->AccessPoint.RemotePort) || NetIp6IsUnspecifiedAddr (Ip))
)
{
return EFI_INVALID_PARAMETER;
}
@@ -750,13 +751,13 @@ Tcp6Configure (
EFI_STATUS
EFIAPI
Tcp6Connect (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CONNECTION_TOKEN *ConnectionToken
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CONNECTION_TOKEN *ConnectionToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == ConnectionToken || NULL == ConnectionToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == ConnectionToken) || (NULL == ConnectionToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -803,13 +804,13 @@ Tcp6Connect (
EFI_STATUS
EFIAPI
Tcp6Accept (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_LISTEN_TOKEN *ListenToken
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_LISTEN_TOKEN *ListenToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == ListenToken || NULL == ListenToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == ListenToken) || (NULL == ListenToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -858,28 +859,29 @@ Tcp6Accept (
EFI_STATUS
EFIAPI
Tcp6Transmit (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_IO_TOKEN *Token
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_IO_TOKEN *Token
)
{
SOCKET *Sock;
EFI_STATUS Status;
if (NULL == This ||
NULL == Token ||
NULL == Token->CompletionToken.Event ||
NULL == Token->Packet.TxData ||
0 == Token->Packet.TxData->FragmentCount ||
0 == Token->Packet.TxData->DataLength
) {
if ((NULL == This) ||
(NULL == Token) ||
(NULL == Token->CompletionToken.Event) ||
(NULL == Token->Packet.TxData) ||
(0 == Token->Packet.TxData->FragmentCount) ||
(0 == Token->Packet.TxData->DataLength)
)
{
return EFI_INVALID_PARAMETER;
}
Status = TcpChkDataBuf (
Token->Packet.TxData->DataLength,
Token->Packet.TxData->FragmentCount,
(EFI_TCP4_FRAGMENT_DATA *) Token->Packet.TxData->FragmentTable
);
Token->Packet.TxData->DataLength,
Token->Packet.TxData->FragmentCount,
(EFI_TCP4_FRAGMENT_DATA *)Token->Packet.TxData->FragmentTable
);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -938,28 +940,29 @@ Tcp6Transmit (
EFI_STATUS
EFIAPI
Tcp6Receive (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_IO_TOKEN *Token
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_IO_TOKEN *Token
)
{
SOCKET *Sock;
EFI_STATUS Status;
if (NULL == This ||
NULL == Token ||
NULL == Token->CompletionToken.Event ||
NULL == Token->Packet.RxData ||
0 == Token->Packet.RxData->FragmentCount ||
0 == Token->Packet.RxData->DataLength
) {
if ((NULL == This) ||
(NULL == Token) ||
(NULL == Token->CompletionToken.Event) ||
(NULL == Token->Packet.RxData) ||
(0 == Token->Packet.RxData->FragmentCount) ||
(0 == Token->Packet.RxData->DataLength)
)
{
return EFI_INVALID_PARAMETER;
}
Status = TcpChkDataBuf (
Token->Packet.RxData->DataLength,
Token->Packet.RxData->FragmentCount,
(EFI_TCP4_FRAGMENT_DATA *) Token->Packet.RxData->FragmentTable
);
Token->Packet.RxData->DataLength,
Token->Packet.RxData->FragmentCount,
(EFI_TCP4_FRAGMENT_DATA *)Token->Packet.RxData->FragmentTable
);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -999,13 +1002,13 @@ Tcp6Receive (
EFI_STATUS
EFIAPI
Tcp6Close (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CLOSE_TOKEN *CloseToken
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_CLOSE_TOKEN *CloseToken
)
{
SOCKET *Sock;
if (NULL == This || NULL == CloseToken || NULL == CloseToken->CompletionToken.Event) {
if ((NULL == This) || (NULL == CloseToken) || (NULL == CloseToken->CompletionToken.Event)) {
return EFI_INVALID_PARAMETER;
}
@@ -1052,8 +1055,8 @@ Tcp6Close (
EFI_STATUS
EFIAPI
Tcp6Cancel (
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_COMPLETION_TOKEN *Token OPTIONAL
IN EFI_TCP6_PROTOCOL *This,
IN EFI_TCP6_COMPLETION_TOKEN *Token OPTIONAL
)
{
SOCKET *Sock;
@@ -1087,7 +1090,7 @@ Tcp6Cancel (
EFI_STATUS
EFIAPI
Tcp6Poll (
IN EFI_TCP6_PROTOCOL *This
IN EFI_TCP6_PROTOCOL *This
)
{
SOCKET *Sock;
@@ -1097,10 +1100,9 @@ Tcp6Poll (
return EFI_INVALID_PARAMETER;
}
Sock = SOCK_FROM_THIS (This);
Sock = SOCK_FROM_THIS (This);
Status = Sock->ProtoHandler (Sock, SOCK_POLL, NULL);
return Status;
}