From 8a095f86fce3dc26f7b7d40657cb6824657aa0f7 Mon Sep 17 00:00:00 2001
From: Vizzini <vizzini@plasmic.com>
Date: Thu, 20 Nov 2003 17:55:10 +0000
Subject: [PATCH] TDI stuff I forgot to commit

svn path=/trunk/; revision=6730
---
 reactos/drivers/net/afd/afd/tdi.c            | 16 ++++++++--------
 reactos/drivers/net/tcpip/include/fileobjs.h |  2 +-
 reactos/drivers/net/tcpip/tcpip/fileobjs.c   |  2 +-
 reactos/drivers/net/tcpip/tcpip/main.c       |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/reactos/drivers/net/afd/afd/tdi.c b/reactos/drivers/net/afd/afd/tdi.c
index bbb238c68ea..f3925b48a44 100644
--- a/reactos/drivers/net/afd/afd/tdi.c
+++ b/reactos/drivers/net/afd/afd/tdi.c
@@ -51,7 +51,7 @@ inline DWORD TdiAddressSizeFromName(
 {
   switch (Name->sa_family) {
   case AF_INET:
-    return sizeof(TA_ADDRESS_IP);
+    return sizeof(TA_IP_ADDRESS);
   /* FIXME: More to come */
   }
   AFD_DbgPrint(MIN_TRACE, ("Unknown address family (%d).\n", Name->sa_family));
@@ -60,7 +60,7 @@ inline DWORD TdiAddressSizeFromName(
 
 
 VOID TdiBuildAddressIPv4(
-  PTA_ADDRESS_IP Address,
+  PTA_IP_ADDRESS Address,
   LPSOCKADDR Name)
 /*
  * FUNCTION: Builds an IPv4 TDI style address
@@ -93,7 +93,7 @@ NTSTATUS TdiBuildAddress(
 
   switch (Name->sa_family) {
   case AF_INET:
-    TdiBuildAddressIPv4((PTA_ADDRESS_IP)Address, Name);
+    TdiBuildAddressIPv4((PTA_IP_ADDRESS)Address, Name);
     break;
   /* FIXME: More to come */
   default:
@@ -313,7 +313,7 @@ NTSTATUS TdiOpenAddressFileIPv4(
  */
 {
   PFILE_FULL_EA_INFORMATION EaInfo;
-  PTA_ADDRESS_IP Address;
+  PTA_IP_ADDRESS Address;
   NTSTATUS Status;
   ULONG EaLength;
 
@@ -322,7 +322,7 @@ NTSTATUS TdiOpenAddressFileIPv4(
 
   EaLength = sizeof(FILE_FULL_EA_INFORMATION) +
              TDI_TRANSPORT_ADDRESS_LENGTH +
-             sizeof(TA_ADDRESS_IP);
+             sizeof(TA_IP_ADDRESS);
   EaInfo = (PFILE_FULL_EA_INFORMATION)ExAllocatePool(NonPagedPool, EaLength);
   if (!EaInfo)
     return STATUS_INSUFFICIENT_RESOURCES;
@@ -332,8 +332,8 @@ NTSTATUS TdiOpenAddressFileIPv4(
   RtlCopyMemory(EaInfo->EaName,
                 TdiTransportAddress,
                 TDI_TRANSPORT_ADDRESS_LENGTH);
-  EaInfo->EaValueLength = sizeof(TA_ADDRESS_IP);
-  Address = (PTA_ADDRESS_IP)(EaInfo->EaName + TDI_TRANSPORT_ADDRESS_LENGTH);
+  EaInfo->EaValueLength = sizeof(TA_IP_ADDRESS);
+  Address = (PTA_IP_ADDRESS)(EaInfo->EaName + TDI_TRANSPORT_ADDRESS_LENGTH);
   TdiBuildAddressIPv4(Address, Name);
   Status = TdiOpenDevice(DeviceName,
                          EaLength,
@@ -1107,7 +1107,7 @@ NTSTATUS TdiReceiveDatagram(
     }
 
     /* FIXME: Get from socket information */
-    TdiAddressSize = sizeof(TA_ADDRESS_IP);
+    TdiAddressSize = sizeof(TA_IP_ADDRESS);
 
     ReceiveInfo = (PTDI_CONNECTION_INFORMATION)
         ExAllocatePool(NonPagedPool,
diff --git a/reactos/drivers/net/tcpip/include/fileobjs.h b/reactos/drivers/net/tcpip/include/fileobjs.h
index 4ce5f2cdd20..59deaa10f26 100644
--- a/reactos/drivers/net/tcpip/include/fileobjs.h
+++ b/reactos/drivers/net/tcpip/include/fileobjs.h
@@ -16,7 +16,7 @@ extern KSPIN_LOCK ConnectionEndpointListLock;
 
 NTSTATUS FileOpenAddress(
   PTDI_REQUEST Request,
-  PTA_ADDRESS_IP AddrList,
+  PTA_IP_ADDRESS AddrList,
   USHORT Protocol,
   PVOID Options);
 
diff --git a/reactos/drivers/net/tcpip/tcpip/fileobjs.c b/reactos/drivers/net/tcpip/tcpip/fileobjs.c
index 33043990b65..f9527221fee 100644
--- a/reactos/drivers/net/tcpip/tcpip/fileobjs.c
+++ b/reactos/drivers/net/tcpip/tcpip/fileobjs.c
@@ -252,7 +252,7 @@ VOID RequestWorker(
  */
 NTSTATUS FileOpenAddress(
   PTDI_REQUEST Request,
-  PTA_ADDRESS_IP Address,
+  PTA_IP_ADDRESS Address,
   USHORT Protocol,
   PVOID Options)
 {
diff --git a/reactos/drivers/net/tcpip/tcpip/main.c b/reactos/drivers/net/tcpip/tcpip/main.c
index d403e692f67..7311ed4af9c 100644
--- a/reactos/drivers/net/tcpip/tcpip/main.c
+++ b/reactos/drivers/net/tcpip/tcpip/main.c
@@ -153,7 +153,7 @@ NTSTATUS TiCreateFileObject(
   PFILE_FULL_EA_INFORMATION EaInfo;
   PTRANSPORT_CONTEXT Context;
   PIO_STACK_LOCATION IrpSp;
-  PTA_ADDRESS_IP Address;
+  PTA_IP_ADDRESS Address;
   TDI_REQUEST Request;
   PVOID ClientContext;
   NTSTATUS Status;
@@ -191,8 +191,8 @@ CP
     /* This is a request to open an address */
 CP
     /* Parameter checks */
-    Address = (PTA_ADDRESS_IP)(EaInfo->EaName + EaInfo->EaNameLength);
-    if ((EaInfo->EaValueLength < sizeof(TA_ADDRESS_IP)) ||
+    Address = (PTA_IP_ADDRESS)(EaInfo->EaName + EaInfo->EaNameLength);
+    if ((EaInfo->EaValueLength < sizeof(TA_IP_ADDRESS)) ||
       (Address->TAAddressCount != 1) ||
       (Address->Address[0].AddressLength < TDI_ADDRESS_LENGTH_IP) ||
       (Address->Address[0].AddressType != TDI_ADDRESS_TYPE_IP)) {