if (IPAddress != NULL) {
IPAddress->Type = IP_ADDRESS_V4;
IPAddress->Address.IPv4Address = Address;
- IPAddress->Free = IPAddressFree;
}
return IPAddress;
(UCHAR)Interface->AddressLength, /* Hardware address length */
(UCHAR)Header->ProtoAddrLen, /* Protocol address length */
Interface->Address, /* Sender's (local) hardware address */
- &ADE->Address->Address, /* Sender's (local) protocol address */
+ &ADE->Address.Address, /* Sender's (local) protocol address */
SenderHWAddress, /* Target's (remote) hardware address */
SenderProtoAddress, /* Target's (remote) protocol address */
ARP_OPCODE_REPLY); /* ARP reply */
ForEachADE(Interface->ADEListHead,CurrentADE) {
if (CurrentADE->Type == TargetType) {
- *Address = CurrentADE->Address->Address.IPv4Address;
+ *Address = CurrentADE->Address.Address.IPv4Address;
return STATUS_SUCCESS;
}
} EndFor(CurrentADE);
ADE->Free = FreeADE;
ADE->NTE = NTE;
ADE->Type = Type;
- ADE->Address = Address;
+ RtlCopyMemory(&ADE->Address,Address,sizeof(ADE->Address));
/* Add ADE to the list on the interface */
InsertTailList(&IF->ADEListHead, &ADE->ListEntry);
while (CurrentEntry != &IF->ADEListHead) {
Current = CONTAINING_RECORD(CurrentEntry, ADDRESS_ENTRY, ListEntry);
- if (AddrIsEqual(Address, Current->Address)) {
+ if (AddrIsEqual(Address, &Current->Address)) {
*AddressType = Current->Type;
TcpipReleaseSpinLock(&IF->Lock, OldIrql);
return Current->NTE;
ForEachInterface(CurrentIF) {
/* Search the address entry list and return the ADE if found */
ForEachADE(CurrentIF->ADEListHead,CurrentADE) {
- if ((AddrIsEqual(Address, CurrentADE->Address)) &&
+ if ((AddrIsEqual(Address, &CurrentADE->Address)) &&
(CurrentADE->Type == AddressType)) {
TcpipReleaseSpinLock(&InterfaceListLock, OldIrql);
return CurrentADE;
}
/* NCE is already referenced */
- if (!RouterAddRoute(Current->Address, Current->PLE->Prefix, NCE, 1)) {
+ if (!RouterAddRoute(Current->Address, &Current->PLE->Prefix, NCE, 1)) {
TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n"));
}
INIT_TAG(PLE, TAG('P','L','E',' '));
PLE->Interface = IF;
- PLE->Prefix = Prefix;
+ RtlCopyMemory(&PLE->Prefix, Prefix, sizeof(PLE->Prefix));
PLE->PrefixLength = Length;
/* Add PLE to the global prefix list */
CurrentEntry = NextEntry;
}
- /* Free resources for the header, if it exists */
- if (IPDR->IPv4Header) {
- TI_DbgPrint(DEBUG_IP, ("Freeing IPv4 header data at (0x%X).\n", IPDR->IPv4Header));
- exFreePool(IPDR->IPv4Header);
- }
-
TI_DbgPrint(DEBUG_IP, ("Freeing IPDR data at (0x%X).\n", IPDR));
TcpipFreeToNPagedLookasideList(&IPDRList, IPDR);
}
/* Copy the header into the buffer */
- RtlCopyMemory(IPPacket->Header, IPDR->IPv4Header, IPDR->HeaderSize);
+ RtlCopyMemory(IPPacket->Header, &IPDR->IPv4Header, IPDR->HeaderSize);
Data = IPPacket->Header + IPDR->HeaderSize;
IPPacket->Data = Data;
AddrInitIPv4(&IPDR->DstAddr, IPv4Header->DstAddr);
IPDR->Id = IPv4Header->Id;
IPDR->Protocol = IPv4Header->Protocol;
- IPDR->IPv4Header = NULL;
InitializeListHead(&IPDR->FragmentListHead);
InitializeListHead(&IPDR->HoleListHead);
InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry);
/* If this is the first fragment, save the IP header */
if (FragFirst == 0) {
- IPDR->IPv4Header = exAllocatePool(NonPagedPool, IPPacket->HeaderSize);
- if (!IPDR->IPv4Header) {
- /* We don't have the resources to process this packet, discard it */
- Cleanup(&IPDR->Lock, OldIrql, IPDR, NULL);
- return;
- }
-
TI_DbgPrint(DEBUG_IP, ("First fragment found. Header buffer is at (0x%X). "
"Header size is (%d).\n", IPDR->IPv4Header, IPPacket->HeaderSize));
- RtlCopyMemory(IPDR->IPv4Header, IPPacket->Header, IPPacket->HeaderSize);
+ RtlCopyMemory(&IPDR->IPv4Header, IPPacket->Header, IPPacket->HeaderSize);
IPDR->HeaderSize = IPPacket->HeaderSize;
}
Datagram = ReassembleDatagram(IPDR);
+ RemoveIPDR(IPDR);
TcpipReleaseSpinLock(&IPDR->Lock, OldIrql);
- RemoveIPDR(IPDR);
FreeIPDR(IPDR);
if (!Datagram)
while (CurrentEntry != &PrefixListHead) {
Current = CONTAINING_RECORD(CurrentEntry, PREFIX_LIST_ENTRY, ListEntry);
- if (HasPrefix(Address, Current->Prefix, Current->PrefixLength) &&
+ if (HasPrefix(Address, &Current->Prefix, Current->PrefixLength) &&
((!NTE) || (NTE->Interface == Current->Interface)))
return Current->Interface;
INIT_TAG(Router, TAG('R','O','U','T'));
- FIBE->Free = FreeFIB;
- FIBE->NetworkAddress = NetworkAddress;
- FIBE->Netmask = Netmask;
+ RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress,
+ sizeof(FIBE->NetworkAddress) );
+ RtlCopyMemory( &FIBE->Netmask, Netmask,
+ sizeof(FIBE->Netmask) );
FIBE->Router = Router;
FIBE->Metric = Metric;
KIRQL OldIrql;
TI_DbgPrint(DEBUG_ROUTER, ("Called. FIBE (0x%X).\n", FIBE));
-
- TI_DbgPrint(DEBUG_ROUTER, ("FIBE (%s).\n", A2S(FIBE->NetworkAddress)));
+
+ TI_DbgPrint(DEBUG_ROUTER, ("FIBE (%s).\n", A2S(&FIBE->NetworkAddress)));
TcpipAcquireSpinLock(&FIBLock, &OldIrql);
DestroyFIBE(FIBE);
if (!FIBE) {
/* Not enough free resources */
NBRemoveNeighbor(NCE);
-
- (pNetworkAddress->Free)(pNetworkAddress);
- (pNetmask->Free)(pNetmask);
- (pRouterAddress->Free)(pRouterAddress);
}
return FIBE;
if( Status == NDIS_STATUS_SUCCESS )
Status = BuildRawIPPacket( &Packet,
BufferLen,
- AddrFile->ADE->Address,
+ &AddrFile->ADE->Address,
AddrFile->Port );
if( Status == NDIS_STATUS_SUCCESS ) {
extern ULONG TCP_IPIdentification;
extern LIST_ENTRY SleepingThreadsList;
extern FAST_MUTEX SleepingThreadsLock;
+extern RECURSIVE_MUTEX TCPLock;
int TCPSocketState(void *ClientData,
void *WhichSocket,
return 0;
}
+ TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+
if( (NewState & SEL_CONNECT) &&
!(Connection->State & SEL_CONNECT) ) {
while( !IsListEmpty( &Connection->ConnectRequest ) ) {
TI_DbgPrint(MID_TRACE,
("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
- if( NewState & SEL_FIN && !RecvLen ) {
+ if( (NewState & SEL_FIN) && !RecvLen ) {
Status = STATUS_END_OF_FILE;
Received = 0;
} else {
}
}
+ TcpipRecursiveMutexLeave( &TCPLock );
+
return 0;
}
Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) );
if( !Bucket ) {
TI_DbgPrint(MID_TRACE,("Failed to allocate bucket\n"));
+ TcpipRecursiveMutexLeave( &TCPLock );
return STATUS_NO_MEMORY;
}
Status = BuildUDPPacket( &Packet,
&RemoteAddress,
RemotePort,
- AddrFile->ADE->Address,
+ &AddrFile->ADE->Address,
AddrFile->Port,
BufferData,
DataSize );
while( (ListEntry =
ExInterlockedRemoveHeadList( &LanWorkList, &LanWorkLock )) ) {
- WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry);
+ WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry);
Packet = WorkItem->Packet;
Adapter = WorkItem->Adapter;
/* XXX how do we proceed? No ip address, no parameters... do we guess? */
if(RegHandle)
ZwClose(RegHandle);
- if(Address) Address->Free(Address);
- if(Netmask) Netmask->Free(Netmask);
IPDestroyInterface(IF);
return;
}
/* Create a net table entry for this interface */
if (!IPCreateNTE(IF, Address, AddrCountPrefixBits(Netmask))) {
- Netmask->Free(Netmask);
TI_DbgPrint(MIN_TRACE, ("IPCreateNTE() failed.\n"));
IPDestroyInterface(IF);
return;
}
- Netmask->Free(Netmask);
-
/* Register interface with IP layer */
IPRegisterInterface(IF);
INIT_TAG((IPAddress), TAG('I','P','V','4')); \
(IPAddress)->Type = IP_ADDRESS_V4; \
(IPAddress)->Address.IPv4Address = (RawAddress); \
- (IPAddress)->Free = IPAddressFree; \
}
#ifdef DBG
/* IP style address */
typedef struct IP_ADDRESS {
DEFINE_TAG
- UCHAR Type; /* Type of IP address */
+ UCHAR Type; /* Type of IP address */
union {
- IPv4_RAW_ADDRESS IPv4Address; /* IPv4 address (in network byte order) */
- PIPv6_RAW_ADDRESS IPv6Address; /* IPv6 address (in network byte order) */
+ IPv4_RAW_ADDRESS IPv4Address;/* IPv4 address (in network byte order) */
+ IPv6_RAW_ADDRESS IPv6Address;/* IPv6 address (in network byte order) */
} Address;
- OBJECT_FREE_ROUTINE Free; /* The free routine */
} IP_ADDRESS, *PIP_ADDRESS;
/* IP type constants */
-#define IP_ADDRESS_V4 0x00 /* IPv4 style address */
-#define IP_ADDRESS_V6 0x01 /* IPv6 style address */
+#define IP_ADDRESS_V4 0x04 /* IPv4 style address */
+#define IP_ADDRESS_V6 0x06 /* IPv6 style address */
/* IPv4 header format */
IPv4_RAW_ADDRESS DstAddr; /* Destination Address */
} IPv4_HEADER, *PIPv4_HEADER;
+/* IPv6 header format */
+typedef struct IPv6_HEADER {
+ ULONG VTF; /* Version, Traffic Class, Flow Label */
+ USHORT PayloadLength;
+ UCHAR NextHeader; /* Same as Protocol in IPv4 */
+ UCHAR HopLimit; /* Same as Ttl in IPv4 */
+ IPv6_RAW_ADDRESS SrcAddr;
+ IPv6_RAW_ADDRESS DstAddr;
+} IPv6_HEADER, *PIPv6_HEADER;
+
+typedef union _IP_HEADER {
+ IPv4_HEADER v4;
+ IPv6_HEADER v6;
+} IP_HEADER, *PIP_HEADER;
+
#define IPv4_FRAGOFS_MASK 0x1FFF /* Fragment offset mask (host byte order) */
#define IPv4_MF_MASK 0x2000 /* More fragments (host byte order) */
#define IPv4_DF_MASK 0x4000 /* Don't fragment (host byte order) */
OBJECT_FREE_ROUTINE Free; /* Routine used to free resources for the object */
struct _NET_TABLE_ENTRY *NTE; /* NTE associated with this address */
UCHAR Type; /* Address type */
- PIP_ADDRESS Address; /* Pointer to address identifying this entry */
+ IP_ADDRESS Address; /* Pointer to address identifying this entry */
} ADDRESS_ENTRY, *PADDRESS_ENTRY;
/* Values for address type -- also the interface flags */
DEFINE_TAG
LIST_ENTRY ListEntry; /* Entry on list */
PIP_INTERFACE Interface; /* Pointer to interface */
- PIP_ADDRESS Prefix; /* Pointer to prefix */
+ IP_ADDRESS Prefix; /* Pointer to prefix */
UINT PrefixLength; /* Length of prefix */
} PREFIX_LIST_ENTRY, *PPREFIX_LIST_ENTRY;
IP_ADDRESS DstAddr; /* Destination address */
UCHAR Protocol; /* Internet Protocol number */
USHORT Id; /* Identification number */
- PIPv4_HEADER IPv4Header; /* Pointer to IP header */
+ IP_HEADER IPv4Header; /* Pointer to IP header */
UINT HeaderSize; /* Length of IP header */
LIST_ENTRY FragmentListHead; /* IP fragment list */
LIST_ENTRY HoleListHead; /* IP datagram hole list */
typedef struct _FIB_ENTRY {
LIST_ENTRY ListEntry; /* Entry on list */
OBJECT_FREE_ROUTINE Free; /* Routine used to free resources for the object */
- PIP_ADDRESS NetworkAddress; /* Address of network */
- PIP_ADDRESS Netmask; /* Netmask of network */
+ IP_ADDRESS NetworkAddress; /* Address of network */
+ IP_ADDRESS Netmask; /* Netmask of network */
PNEIGHBOR_CACHE_ENTRY Router; /* Pointer to NCE of router to use */
UINT Metric; /* Cost of this route */
} FIB_ENTRY, *PFIB_ENTRY;
struct _CONNECTION_ENDPOINT *Connection;
/* Associated connection or NULL if no
associated connection exist */
- PIP_ADDRESS AddrCache; /* One entry address cache (destination
+ IP_ADDRESS AddrCache; /* One entry address cache (destination
address of last packet transmitted) */
/* The following members are used to control event notification */
Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP;
Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP;
Address->Address[0].Address[0].sin_port = AddrFile->Port;
- Address->Address[0].Address[0].in_addr = AddrFile->ADE->Address->Address.IPv4Address;
+ Address->Address[0].Address[0].in_addr = AddrFile->ADE->Address.Address.IPv4Address;
RtlZeroMemory(
&Address->Address[0].Address[0].sin_zero,
sizeof(Address->Address[0].Address[0].sin_zero));
Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP;
Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP;
Address->Address[0].Address[0].sin_port = AddrFile->Port;
- Address->Address[0].Address[0].in_addr = AddrFile->ADE->Address->Address.IPv4Address;
+ Address->Address[0].Address[0].in_addr = AddrFile->ADE->Address.Address.IPv4Address;
RtlZeroMemory(
&Address->Address[0].Address[0].sin_zero,
sizeof(Address->Address[0].Address[0].sin_zero));
while (CurrentEntry != &AddressFileListHead) {
Current = CONTAINING_RECORD(CurrentEntry, ADDRESS_FILE, ListEntry);
- IPAddress = Current->ADE->Address;
+ IPAddress = &Current->ADE->Address;
TI_DbgPrint(DEBUG_ADDRFILE, ("Comparing: ((%d, %d, %s), (%d, %d, %s)).\n",
WN2H(Current->Port),
}
TI_DbgPrint(MID_TRACE, ("Opening address %s for communication.\n",
- A2S(AddrFile->ADE->Address)));
+ A2S(&AddrFile->ADE->Address)));
/* Protocol specific handling */
switch (Protocol) {
*/
#include "precomp.h"
-#define NDEBUG
+//#define NDEBUG
#ifndef NDEBUG
DWORD DebugTraceLevel = 0x7fffffff;
while( RtCurrent < RouteEntries + RtCount ) {
/* Copy Desitnation */
- if( RCacheCur->NetworkAddress && RCacheCur->Netmask &&
- RCacheCur->Router ) {
+ if( RCacheCur->Router ) {
TI_DbgPrint(MAX_TRACE, ("%d: NA %08x NM %08x GW %08x MT %d\n",
RtCurrent - RouteEntries,
- RCacheCur->NetworkAddress->Address,
- RCacheCur->Netmask->Address,
+ &RCacheCur->NetworkAddress.Address,
+ &RCacheCur->Netmask.Address,
RCacheCur->Router->Address.Address,
RCacheCur->Metric));
RtlCopyMemory( &RtCurrent->Dest,
- &RCacheCur->NetworkAddress->Address,
+ &RCacheCur->NetworkAddress.Address,
sizeof(RtCurrent->Dest) );
RtlCopyMemory( &RtCurrent->Mask,
- &RCacheCur->Netmask->Address,
+ &RCacheCur->Netmask.Address,
sizeof(RtCurrent->Mask) );
/* Currently, this address is stuffed into the pointer.
* That probably is not intended. */
-# Import stubs Auto-generated by ./stubgen.sh
-ntoskrnl.a _imp_@InterlockedDecrement@4
-ntoskrnl.a _imp_@InterlockedExchange@8
-ntoskrnl.a _imp_@InterlockedIncrement@4
+# Automatically generated by stubgen
+ndis.a _imp__NDIS_BUFFER_TO_SPAN_PAGES@4
+ntoskrnl.a _imp__KeBugCheck@4
ntoskrnl.a _imp_@InterlockedPopEntrySList@4
ntoskrnl.a _imp_@InterlockedPushEntrySList@8
-ntoskrnl.a _imp_@IofCompleteRequest@8
-ntoskrnl.a _imp_@ObfDereferenceObject@4
-ntoskrnl.a _imp__ExAllocatePool@8
ntoskrnl.a _imp__ExDeleteNPagedLookasideList@4
-ntoskrnl.a _imp__ExFreePool@4
ntoskrnl.a _imp__ExInitializeNPagedLookasideList@28
-ntoskrnl.a _imp__ExInterlockedInsertTailList@12
+ndis.a _imp__NdisDeregisterProtocol@8
+ndis.a _imp__NdisRegisterProtocol@16
+ndis.a _imp__NdisCloseAdapter@8
+ndis.a _imp__NdisOpenAdapter@44
+ndis.a _imp__NdisSend@12
+ndis.a _imp__NdisTransferData@28
ntoskrnl.a _imp__ExInterlockedRemoveHeadList@8
-ntoskrnl.a _imp__ExQueueWorkItem@8
-ntoskrnl.a _imp__IoAcquireCancelSpinLock@4
+ndis.a _imp__NdisRequest@12
+ndis.a _imp__NdisFreePacket@4
+ndis.a _imp__NdisFreeBuffer@4
+ndis.a _imp__NdisAllocatePacket@12
+ndis.a _imp__NdisAllocateBuffer@20
+ntoskrnl.a _imp__ExInterlockedInsertTailList@12
+ntoskrnl.a _imp_@IofCompleteRequest@8
+ntoskrnl.a _imp__MmProbeAndLockPages@12
ntoskrnl.a _imp__IoAllocateMdl@20
-ntoskrnl.a _imp__IoCreateDevice@28
-ntoskrnl.a _imp__IoDeleteDevice@4
-ntoskrnl.a _imp__IoFileObjectType
+ntoskrnl.a _imp__ExFreePool@4
ntoskrnl.a _imp__IoFreeMdl@4
-ntoskrnl.a _imp__IoReleaseCancelSpinLock@4
-ntoskrnl.a _imp__KeBugCheck@4
-ntoskrnl.a _imp__KeCancelTimer@4
-ntoskrnl.a _imp__KeInitializeDpc@12
-ntoskrnl.a _imp__KeInitializeEvent@12
-ntoskrnl.a _imp__KeInitializeSpinLock@4
-ntoskrnl.a _imp__KeInitializeTimer@4
-ntoskrnl.a _imp__KeResetEvent@4
-ntoskrnl.a _imp__KeSetEvent@12
-ntoskrnl.a _imp__KeSetTimerEx@20
-ntoskrnl.a _imp__KeWaitForSingleObject@20
-ntoskrnl.a _imp__MmMapLockedPages@8
-ntoskrnl.a _imp__MmProbeAndLockPages@12
ntoskrnl.a _imp__MmUnlockPages@4
-ndis.a _imp__NDIS_BUFFER_TO_SPAN_PAGES@4
-ndis.a _imp__NdisAllocateBuffer@20
+ntoskrnl.a _imp__MmMapLockedPages@8
+ntoskrnl.a _imp_@ObfDereferenceObject@4
+ntoskrnl.a _imp__ObReferenceObjectByHandle@24
+ntoskrnl.a _imp__IoFileObjectType
+ntoskrnl.a _imp_@InterlockedExchange@8
+ntoskrnl.a _imp__KeSetTimerEx@20
+ntoskrnl.a _imp__KeInitializeTimer@4
+ntoskrnl.a _imp__KeInitializeDpc@12
ndis.a _imp__NdisAllocateBufferPool@12
-ndis.a _imp__NdisAllocatePacket@12
ndis.a _imp__NdisAllocatePacketPool@16
-ndis.a _imp__NdisCloseAdapter@8
-ndis.a _imp__NdisDeregisterProtocol@8
-ndis.a _imp__NdisFreeBuffer@4
-ndis.a _imp__NdisFreeBufferPool@4
-ndis.a _imp__NdisFreePacket@4
+ntoskrnl.a _imp__KeInitializeSpinLock@4
+ntoskrnl.a _imp__IoCreateDevice@28
+ntoskrnl.a _imp__ExQueueWorkItem@8
+ntoskrnl.a _imp__IoDeleteDevice@4
ndis.a _imp__NdisFreePacketPool@4
-ndis.a _imp__NdisOpenAdapter@44
-ndis.a _imp__NdisRegisterProtocol@16
-ndis.a _imp__NdisRequest@12
-ndis.a _imp__NdisSend@12
-ndis.a _imp__NdisTransferData@28
-ntoskrnl.a _imp__ObReferenceObjectByHandle@24
+ndis.a _imp__NdisFreeBufferPool@4
+ntoskrnl.a _imp__KeCancelTimer@4
+ntoskrnl.a _imp__KeWaitForSingleObject@20
+ntoskrnl.a _imp__KeResetEvent@4
+ntoskrnl.a _imp__IoReleaseCancelSpinLock@4
+ntoskrnl.a _imp__KeSetEvent@12
+ntoskrnl.a _imp__IoAcquireCancelSpinLock@4
+ntoskrnl.a _imp__KeInitializeEvent@12
+ntoskrnl.a _imp__ExAllocatePool@8
projects / reactos.git / commitdiff