X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=NetworkPkg%2FMtftp6Dxe%2FMtftp6Impl.c;fp=NetworkPkg%2FMtftp6Dxe%2FMtftp6Impl.c;h=387ae3d8af3e810dece52275195d039e9771e277;hp=067b1f53ba0612daf530c3db0383c3a6818c29de;hb=d1050b9dff1cace252aff86630bfdb59dff5f507;hpb=2f88bd3a1296c522317f1c21377876de63de5be7 diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c index 067b1f53ba..387ae3d8af 100644 --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c @@ -16,7 +16,7 @@ #include "Mtftp6Impl.h" -EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = { +EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = { EfiMtftp6GetModeData, EfiMtftp6Configure, EfiMtftp6GetInfo, @@ -25,7 +25,7 @@ EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = { EfiMtftp6WriteFile, EfiMtftp6ReadDirectory, EfiMtftp6Poll - }; +}; /** Returns the current operating mode data for the MTFTP6 instance. @@ -45,14 +45,14 @@ EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = { EFI_STATUS EFIAPI EfiMtftp6GetModeData ( - IN EFI_MTFTP6_PROTOCOL *This, - OUT EFI_MTFTP6_MODE_DATA *ModeData + IN EFI_MTFTP6_PROTOCOL *This, + OUT EFI_MTFTP6_MODE_DATA *ModeData ) { MTFTP6_INSTANCE *Instance; EFI_TPL OldTpl; - if (This == NULL || ModeData == NULL) { + if ((This == NULL) || (ModeData == NULL)) { return EFI_INVALID_PARAMETER; } @@ -79,14 +79,13 @@ EfiMtftp6GetModeData ( // Set the current support options in mode data. // ModeData->SupportedOptionCount = MTFTP6_SUPPORTED_OPTIONS_NUM; - ModeData->SupportedOptions = (UINT8 **) mMtftp6SupportedOptions; + ModeData->SupportedOptions = (UINT8 **)mMtftp6SupportedOptions; gBS->RestoreTPL (OldTpl); return EFI_SUCCESS; } - /** Initializes, changes, or resets the default operational setting for this EFI MTFTPv6 Protocol driver instance. @@ -128,22 +127,22 @@ EfiMtftp6GetModeData ( EFI_STATUS EFIAPI EfiMtftp6Configure ( - IN EFI_MTFTP6_PROTOCOL *This, - IN EFI_MTFTP6_CONFIG_DATA *MtftpConfigData OPTIONAL + IN EFI_MTFTP6_PROTOCOL *This, + IN EFI_MTFTP6_CONFIG_DATA *MtftpConfigData OPTIONAL ) { - MTFTP6_SERVICE *Service; - MTFTP6_INSTANCE *Instance; - EFI_UDP6_PROTOCOL *Udp6; - EFI_UDP6_CONFIG_DATA Udp6Cfg; - EFI_STATUS Status; - EFI_TPL OldTpl; + MTFTP6_SERVICE *Service; + MTFTP6_INSTANCE *Instance; + EFI_UDP6_PROTOCOL *Udp6; + EFI_UDP6_CONFIG_DATA Udp6Cfg; + EFI_STATUS Status; + EFI_TPL OldTpl; if (This == NULL) { return EFI_INVALID_PARAMETER; } - if (MtftpConfigData != NULL && !NetIp6IsValidUnicast (&MtftpConfigData->ServerIp)) { + if ((MtftpConfigData != NULL) && !NetIp6IsValidUnicast (&MtftpConfigData->ServerIp)) { return EFI_INVALID_PARAMETER; } @@ -167,6 +166,7 @@ EfiMtftp6Configure ( Status = EFI_ACCESS_DENIED; goto ON_EXIT; } + // // Allocate the configure buffer of the instance and store the user's data. // @@ -195,7 +195,7 @@ EfiMtftp6Configure ( Status = gBS->OpenProtocol ( Instance->UdpIo->UdpHandle, &gEfiUdp6ProtocolGuid, - (VOID **) &Udp6, + (VOID **)&Udp6, Service->Image, Instance->Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER @@ -229,7 +229,7 @@ EfiMtftp6Configure ( CopyMem ( &Udp6Cfg.StationAddress, &Instance->Config->StationIp, - sizeof(EFI_IPv6_ADDRESS) + sizeof (EFI_IPv6_ADDRESS) ); CopyMem ( @@ -252,16 +252,17 @@ ON_EXIT: FreePool (Instance->Config); Instance->Config = NULL; } + if (Instance->UdpIo != NULL) { UdpIoFreeIo (Instance->UdpIo); Instance->UdpIo = NULL; } } + gBS->RestoreTPL (OldTpl); return Status; } - /** Get the information of the download from the server. @@ -319,26 +320,27 @@ ON_EXIT: EFI_STATUS EFIAPI EfiMtftp6GetInfo ( - IN EFI_MTFTP6_PROTOCOL *This, - IN EFI_MTFTP6_OVERRIDE_DATA *OverrideData OPTIONAL, - IN UINT8 *Filename, - IN UINT8 *ModeStr OPTIONAL, - IN UINT8 OptionCount, - IN EFI_MTFTP6_OPTION *OptionList OPTIONAL, - OUT UINT32 *PacketLength, - OUT EFI_MTFTP6_PACKET **Packet OPTIONAL + IN EFI_MTFTP6_PROTOCOL *This, + IN EFI_MTFTP6_OVERRIDE_DATA *OverrideData OPTIONAL, + IN UINT8 *Filename, + IN UINT8 *ModeStr OPTIONAL, + IN UINT8 OptionCount, + IN EFI_MTFTP6_OPTION *OptionList OPTIONAL, + OUT UINT32 *PacketLength, + OUT EFI_MTFTP6_PACKET **Packet OPTIONAL ) { - EFI_STATUS Status; - EFI_MTFTP6_TOKEN Token; - MTFTP6_GETINFO_CONTEXT Context; - - if (This == NULL || - Filename == NULL || - PacketLength == NULL || - (OptionCount != 0 && OptionList == NULL) || - (OverrideData != NULL && !NetIp6IsValidUnicast (&OverrideData->ServerIp)) - ) { + EFI_STATUS Status; + EFI_MTFTP6_TOKEN Token; + MTFTP6_GETINFO_CONTEXT Context; + + if ((This == NULL) || + (Filename == NULL) || + (PacketLength == NULL) || + ((OptionCount != 0) && (OptionList == NULL)) || + ((OverrideData != NULL) && !NetIp6IsValidUnicast (&OverrideData->ServerIp)) + ) + { return EFI_INVALID_PARAMETER; } @@ -346,11 +348,11 @@ EfiMtftp6GetInfo ( *Packet = NULL; } - *PacketLength = 0; + *PacketLength = 0; - Context.Packet = Packet; - Context.PacketLen = PacketLength; - Context.Status = EFI_SUCCESS; + Context.Packet = Packet; + Context.PacketLen = PacketLength; + Context.Status = EFI_SUCCESS; // // Fill fields of the Token for GetInfo operation. @@ -384,7 +386,6 @@ EfiMtftp6GetInfo ( return Status; } - /** Parse the options in an MTFTPv6 OACK packet. @@ -418,11 +419,11 @@ EfiMtftp6GetInfo ( EFI_STATUS EFIAPI EfiMtftp6ParseOptions ( - IN EFI_MTFTP6_PROTOCOL *This, - IN UINT32 PacketLen, - IN EFI_MTFTP6_PACKET *Packet, - OUT UINT32 *OptionCount, - OUT EFI_MTFTP6_OPTION **OptionList OPTIONAL + IN EFI_MTFTP6_PROTOCOL *This, + IN UINT32 PacketLen, + IN EFI_MTFTP6_PACKET *Packet, + OUT UINT32 *OptionCount, + OUT EFI_MTFTP6_OPTION **OptionList OPTIONAL ) { if (This == NULL) { @@ -432,7 +433,6 @@ EfiMtftp6ParseOptions ( return Mtftp6ParseStart (Packet, PacketLen, OptionCount, OptionList); } - /** Download a file from an MTFTPv6 server. @@ -477,14 +477,13 @@ EfiMtftp6ParseOptions ( EFI_STATUS EFIAPI EfiMtftp6ReadFile ( - IN EFI_MTFTP6_PROTOCOL *This, - IN EFI_MTFTP6_TOKEN *Token + IN EFI_MTFTP6_PROTOCOL *This, + IN EFI_MTFTP6_TOKEN *Token ) { return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_RRQ); } - /** Send a file to an MTFTPv6 server. @@ -530,14 +529,13 @@ EfiMtftp6ReadFile ( EFI_STATUS EFIAPI EfiMtftp6WriteFile ( - IN EFI_MTFTP6_PROTOCOL *This, - IN EFI_MTFTP6_TOKEN *Token + IN EFI_MTFTP6_PROTOCOL *This, + IN EFI_MTFTP6_TOKEN *Token ) { return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_WRQ); } - /** Download a data file directory from an MTFTPv6 server. @@ -581,14 +579,13 @@ EfiMtftp6WriteFile ( EFI_STATUS EFIAPI EfiMtftp6ReadDirectory ( - IN EFI_MTFTP6_PROTOCOL *This, - IN EFI_MTFTP6_TOKEN *Token + IN EFI_MTFTP6_PROTOCOL *This, + IN EFI_MTFTP6_TOKEN *Token ) { return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_DIR); } - /** Polls for incoming data packets and processes outgoing data packets. @@ -616,11 +613,11 @@ EfiMtftp6ReadDirectory ( EFI_STATUS EFIAPI EfiMtftp6Poll ( - IN EFI_MTFTP6_PROTOCOL *This + IN EFI_MTFTP6_PROTOCOL *This ) { - MTFTP6_INSTANCE *Instance; - EFI_UDP6_PROTOCOL *Udp6; + MTFTP6_INSTANCE *Instance; + EFI_UDP6_PROTOCOL *Udp6; if (This == NULL) { return EFI_INVALID_PARAMETER;