Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 05:35:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RTL]

Browse source 
- Use ntstrsafe functions in RtlIpv4AddressToString*. Based on a patch by Mark Jansen.
CORE-6490

svn path=/trunk/; revision=67056
This commit is contained in:
Thomas Faber 2015-04-05 04:34:23 +00:00
parent c380c2c783
commit be57c2b21b
1 changed files with 86 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
reactos/lib/rtl/network.c
View file

@ -9,7 +9,7 @@
/* INCLUDES *****************************************************************/
#include <rtl.h>
#include <ntstrsafe.h>
#define NDEBUG
#include <debug.h>
@ -106,18 +106,29 @@ PSTR
NTAPI
RtlIpv4AddressToStringA(
_In_ const struct in_addr *Addr,
_Out_writes_(16) PCHAR S)
_Out_writes_(IPV4_ADDR_STRING_MAX_LEN) PCHAR S)
{
INT Length;
NTSTATUS Status;
PSTR End;
if (!S) return (PSTR)~0;
if (!S)
return (PSTR)~0;
Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1,
Addr->S_un.S_un_b.s_b2,
Addr->S_un.S_un_b.s_b3,
Addr->S_un.S_un_b.s_b4);
Status = RtlStringCchPrintfExA(S,
IPV4_ADDR_STRING_MAX_LEN,
&End,
NULL,
0,
"%u.%u.%u.%u",
Addr->S_un.S_un_b.s_b1,
Addr->S_un.S_un_b.s_b2,
Addr->S_un.S_un_b.s_b3,
Addr->S_un.S_un_b.s_b4);
ASSERT(Status == STATUS_SUCCESS);
if (!NT_SUCCESS(Status))
return (PSTR)~0;
return S + Length;
return End;
}
/*
@ -131,23 +142,38 @@ RtlIpv4AddressToStringExA(
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PCHAR AddressString,
_Inout_ PULONG AddressStringLength)
{
CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN];
CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN + IPV4_PORT_STRING_MAX_LEN];
NTSTATUS Status;
ULONG Length;
PSTR End;
if (!Address || !AddressString || !AddressStringLength)
return STATUS_INVALID_PARAMETER;
Length = sprintf(Buffer, "%u.%u.%u.%u", Address->S_un.S_un_b.s_b1,
Address->S_un.S_un_b.s_b2,
Address->S_un.S_un_b.s_b3,
Address->S_un.S_un_b.s_b4);
if (Port) Length += sprintf(Buffer + Length, ":%u", WN2H(Port));
Status = RtlStringCchPrintfExA(Buffer,
RTL_NUMBER_OF(Buffer),
&End,
NULL,
0,
Port ? "%u.%u.%u.%u:%u"
: "%u.%u.%u.%u",
Address->S_un.S_un_b.s_b1,
Address->S_un.S_un_b.s_b2,
Address->S_un.S_un_b.s_b3,
Address->S_un.S_un_b.s_b4,
WN2H(Port));
ASSERT(Status == STATUS_SUCCESS);
if (!NT_SUCCESS(Status))
return STATUS_INVALID_PARAMETER;
Length = End - Buffer;
if (*AddressStringLength > Length)
{
Status = RtlStringCchCopyA(AddressString,
*AddressStringLength,
Buffer);
ASSERT(Status == STATUS_SUCCESS);
*AddressStringLength = Length + 1;
strcpy(AddressString, Buffer);
return STATUS_SUCCESS;
}
@ -162,17 +188,29 @@ PWSTR
NTAPI
RtlIpv4AddressToStringW(
_In_ const struct in_addr *Addr,
_Out_writes_(16) PWCHAR S)
_Out_writes_(IPV4_ADDR_STRING_MAX_LEN) PWCHAR S)
{
INT Length;
NTSTATUS Status;
PWSTR End;
if (!S) return (PWSTR)~0;
if (!S)
return (PWSTR)~0;
Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1,
Addr->S_un.S_un_b.s_b2,
Addr->S_un.S_un_b.s_b3,
Addr->S_un.S_un_b.s_b4);
return S + Length;
Status = RtlStringCchPrintfExW(S,
IPV4_ADDR_STRING_MAX_LEN,
&End,
NULL,
0,
L"%u.%u.%u.%u",
Addr->S_un.S_un_b.s_b1,
Addr->S_un.S_un_b.s_b2,
Addr->S_un.S_un_b.s_b3,
Addr->S_un.S_un_b.s_b4);
ASSERT(Status == STATUS_SUCCESS);
if (!NT_SUCCESS(Status))
return (PWSTR)~0;
return End;
}
/*
@ -186,23 +224,38 @@ RtlIpv4AddressToStringExW(
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString,
_Inout_ PULONG AddressStringLength)
{
WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN];
WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN + IPV4_PORT_STRING_MAX_LEN];
NTSTATUS Status;
ULONG Length;
PWSTR End;
if (!Address || !AddressString || !AddressStringLength)
return STATUS_INVALID_PARAMETER;
Length = swprintf(Buffer, L"%u.%u.%u.%u", Address->S_un.S_un_b.s_b1,
Address->S_un.S_un_b.s_b2,
Address->S_un.S_un_b.s_b3,
Address->S_un.S_un_b.s_b4);
if (Port) Length += swprintf(Buffer + Length, L":%u", WN2H(Port));
Status = RtlStringCchPrintfExW(Buffer,
RTL_NUMBER_OF(Buffer),
&End,
NULL,
0,
Port ? L"%u.%u.%u.%u:%u"
: L"%u.%u.%u.%u",
Address->S_un.S_un_b.s_b1,
Address->S_un.S_un_b.s_b2,
Address->S_un.S_un_b.s_b3,
Address->S_un.S_un_b.s_b4,
WN2H(Port));
ASSERT(Status == STATUS_SUCCESS);
if (!NT_SUCCESS(Status))
return STATUS_INVALID_PARAMETER;
Length = End - AddressString;
if (*AddressStringLength > Length)
{
Status = RtlStringCchCopyW(AddressString,
*AddressStringLength,
Buffer);
ASSERT(Status == STATUS_SUCCESS);
*AddressStringLength = Length + 1;
wcscpy(AddressString, Buffer);
return STATUS_SUCCESS;
}