diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index 04b8f4b77c93e7af48943c02956eebcceabe9b61..d16cc97d0d6154a4c21e1320fde27de6a85d3050 100644
--- a/Modules/IPStack/ipv4.c
+++ b/Modules/IPStack/ipv4.c
@@ -21,7 +21,7 @@ extern tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address);
void IPv4_int_GetPacket(tAdapter *Interface, tMacAddr From, int Length, void *Buffer);
tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast);
Uint32 IPv4_Netmask(int FixedBits);
-Uint16 IPv4_Checksum(const Uint16 *Buf, int WordCount);
+Uint16 IPv4_Checksum(const void *Buf, size_t Length);
int IPv4_Ping(tInterface *Iface, tIPv4 Addr);
// === GLOBALS ===
@@ -105,7 +105,7 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int
hdr->HeaderChecksum = 0; // Will be set later
hdr->Source = *(tIPv4*)Iface->Address;
hdr->Destination = Address;
- hdr->HeaderChecksum = htons(IPv4_Checksum((Uint16*)hdr, sizeof(tIPv4Header)/2));
+ hdr->HeaderChecksum = htons( IPv4_Checksum(hdr, sizeof(tIPv4Header)) );
Log_Log("IPv4", "Sending packet to %i.%i.%i.%i",
Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
@@ -154,7 +154,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
Uint16 hdrVal, compVal;
hdrVal = ntohs(hdr->HeaderChecksum);
hdr->HeaderChecksum = 0;
- compVal = IPv4_Checksum((Uint16*)hdr, (hdr->HeaderLength * 4) / 2);
+ compVal = IPv4_Checksum(hdr, hdr->HeaderLength * 4);
if(hdrVal != compVal) {
Log_Log("IPv4", "Header checksum fails (%04x != %04x)", hdrVal, compVal);
return ;
@@ -311,17 +311,19 @@ Uint32 IPv4_Netmask(int FixedBits)
*
* One's complement sum of all 16-bit words (bitwise inverted)
*/
-Uint16 IPv4_Checksum(const Uint16 *Buf, int WordCount)
+Uint16 IPv4_Checksum(const void *Buf, size_t Length)
{
+ const Uint16 *words = Buf;
Uint32 sum = 0;
int i;
// Sum all whole words
- for(i = 0; i < WordCount; i++ )
+ for(i = 0; i < Length/2; i++ )
{
- Uint16 val = ntohs(Buf[i]);
- sum += val;
+ sum += ntohs(words[i]);
}
+ if( Length & 1 )
+ sum += ntohs( words[i] & 0xFF );
// Apply one's complement
while (sum >> 16)
diff --git a/Modules/IPStack/ipv4.h b/Modules/IPStack/ipv4.h
index 563965c935a5ea7417d64d519b9f67ecf286dff4..2c3e1cae865cd3f479d7949c0e3d55883b6607e5 100644
--- a/Modules/IPStack/ipv4.h
+++ b/Modules/IPStack/ipv4.h
@@ -46,7 +46,7 @@ struct sIPv4Header
// === FUNCTIONS ===
extern int IPv4_RegisterCallback(int ID, tIPCallback Callback);
-extern Uint16 IPv4_Checksum(const Uint16 *Buf, int WordCount);
+extern Uint16 IPv4_Checksum(const void *Buf, size_t Length);
extern int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, const void *Data);
#endif
diff --git a/Modules/IPStack/ipv6.c b/Modules/IPStack/ipv6.c
index ed59923815c98047bba6b3edfc4df4040ceb0ccd..7cb8e0a8335b977175c01ddf4fdd8b8574687208 100644
--- a/Modules/IPStack/ipv6.c
+++ b/Modules/IPStack/ipv6.c
@@ -43,6 +43,20 @@ int IPv6_RegisterCallback(int ID, tIPCallback Callback)
return 1;
}
+/**
+ * \brief Creates and sends an IPv6 Packet
+ * \param Iface Interface
+ * \param Destination Destination IP
+ * \param Protocol Protocol ID
+ * \param Length Data Length
+ * \param Data Packet Data
+ * \return Boolean Success
+ */
+int IPv6_SendPacket(tInterface *Iface, tIPv6 Destination, int Protocol, size_t Length, const void *Data)
+{
+ return 0;
+}
+
/**
* \fn void IPv6_int_GetPacket(tInterface *Interface, tMacAddr From, int Length, void *Buffer)
* \brief Process an IPv6 Packet
diff --git a/Modules/IPStack/ipv6.h b/Modules/IPStack/ipv6.h
index 07428078395093342ed7e4a5d4634e7fdf4d52b9..d2e4f28dd70d22ae920004f2d89139248d6f3197 100644
--- a/Modules/IPStack/ipv6.h
+++ b/Modules/IPStack/ipv6.h
@@ -36,4 +36,7 @@ struct sIPv6Header
#define IPV6_ETHERNET_ID 0x86DD
+extern int IPv6_RegisterCallback(int ID, tIPCallback Callback);
+extern int IPv6_SendPacket(tInterface *Iface, tIPv6 Destination, int Protocol, size_t Length, const void *Data);
+
#endif
diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index c89e79affd097e20886d8d41aa39bbdcead23df7..5f650b3321464162115034886620773c6125c96c 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -229,7 +229,7 @@ int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Ad
const Uint8 *addr1 = Address1, *addr2 = Address2;
// Sanity check size
- if( CheckBits < 0 ) CheckBits = 0;
+ if( CheckBits < 0 ) CheckBits = size*8;
if( CheckBits > size*8 ) CheckBits = size*8;
if( CheckBits == 0 ) return 1; // /0 matches anything
diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c
index 1600bb46acd75e6f6b2f597c22f63af1233cb053..3952d8e6657f7503d504101ca368e20548db8646 100644
--- a/Modules/IPStack/tcp.c
+++ b/Modules/IPStack/tcp.c
@@ -5,9 +5,12 @@
#define DEBUG 1
#include "ipstack.h"
#include "ipv4.h"
+#include "ipv6.h"
#include "tcp.h"
#define USE_SELECT 1
+#define HEXDUMP_INCOMING 0
+#define HEXDUMP_OUTGOING 0
#define CACHE_FUTURE_PACKETS_IN_BYTES 1 // Use a ring buffer to cache out of order packets
#define TCP_MIN_DYNPORT 0xC000
@@ -23,7 +26,7 @@ void TCP_StartConnection(tTCPConnection *Conn);
void TCP_SendPacket(tTCPConnection *Conn, size_t Length, tTCPHeader *Data);
void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header, int Length);
-void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Ptk);
+void TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length);
void TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection);
Uint16 TCP_GetUnusedPort();
int TCP_AllocatePort(Uint16 Port);
@@ -68,6 +71,7 @@ void TCP_Initialise(void)
IPStack_AddFile(&gTCP_ServerFile);
IPStack_AddFile(&gTCP_ClientFile);
IPv4_RegisterCallback(IP4PROT_TCP, TCP_GetPacket);
+ IPv6_RegisterCallback(IP4PROT_TCP, TCP_GetPacket);
}
/**
@@ -78,24 +82,43 @@ void TCP_Initialise(void)
*/
void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data )
{
- size_t buflen;
- Uint32 *buf;
+ Uint16 checksum[2];
+
+ Data->Checksum = 0;
+ checksum[1] = htons( ~IPv4_Checksum( (void*)Data, Length ) ); // Partial checksum
+ if(Length & 1)
+ ((Uint8*)Data)[Length] = 0;
+
+ // TODO: Fragment packet
+
switch( Conn->Interface->Type )
{
- case 4: // Append IPv4 Pseudo Header
- buflen = 4 + 4 + 4 + ((Length+1)&~1);
- buf = malloc( buflen );
- buf[0] = ((tIPv4*)Conn->Interface->Address)->L;
- buf[1] = Conn->RemoteIP.v4.L;
- buf[2] = (htons(Length)<<16) | (6<<8) | 0;
- Data->Checksum = 0;
- memcpy( &buf[3], Data, Length );
- if(Length & 1)
- ((Uint8*)buf)[12+Length] = 0;
- Data->Checksum = htons( IPv4_Checksum( (Uint16*)buf, buflen/2 ) );
- free(buf);
+ case 4:
+ // Append IPv4 Pseudo Header
+ {
+ Uint32 buf[3];
+ buf[0] = ((tIPv4*)Conn->Interface->Address)->L;
+ buf[1] = Conn->RemoteIP.v4.L;
+ buf[2] = (htons(Length)<<16) | (6<<8) | 0;
+ checksum[0] = htons( ~IPv4_Checksum(buf, sizeof(buf)) ); // Partial checksum
+ }
+ Data->Checksum = htons( IPv4_Checksum(checksum, 2*2) ); // Combine the two
IPv4_SendPacket(Conn->Interface, Conn->RemoteIP.v4, IP4PROT_TCP, 0, Length, Data);
break;
+
+ case 6:
+ // Append IPv6 Pseudo Header
+ {
+ Uint32 buf[4+4+1+1];
+ memcpy(buf, Conn->Interface->Address, 16);
+ memcpy(&buf[4], &Conn->RemoteIP, 16);
+ buf[8] = htonl(Length);
+ buf[9] = htonl(6);
+ checksum[0] = htons( ~IPv4_Checksum(buf, sizeof(buf)) ); // Partial checksum
+ }
+ Data->Checksum = htons( IPv4_Checksum(checksum, 2*2) ); // Combine the two
+ IPv6_SendPacket(Conn->Interface, Conn->RemoteIP.v6, IP4PROT_TCP, Length, Data);
+ break;
}
}
@@ -136,11 +159,13 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
if( Length > (hdr->DataOffset >> 4)*4 )
{
Log_Log("TCP", "TCP_GetPacket: SequenceNumber = 0x%x", ntohl(hdr->SequenceNumber));
+#if HEXDUMP_INCOMING
Debug_HexDump(
"TCP_GetPacket: Packet Data = ",
(Uint8*)hdr + (hdr->DataOffset >> 4)*4,
Length - (hdr->DataOffset >> 4)*4
);
+#endif
}
// Check Servers
@@ -169,10 +194,8 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
if(conn->RemotePort != ntohs(hdr->SourcePort)) continue;
// Check Source IP
- if(conn->Interface->Type == 6 && !IP6_EQU(conn->RemoteIP.v6, *(tIPv6*)Address))
- continue;
- if(conn->Interface->Type == 4 && !IP4_EQU(conn->RemoteIP.v4, *(tIPv4*)Address))
- continue;
+ if( IPStack_CompareAddress(conn->Interface->Type, &conn->RemoteIP, Address, -1) != 0 )
+ continue ;
Log_Log("TCP", "TCP_GetPacket: Matches connection %p", conn);
// We have a response!
@@ -277,9 +300,9 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
* \param Length Length of the packet
*/
void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header, int Length)
-{
- tTCPStoredPacket *pkt;
+{
int dataLen;
+ Uint32 sequence_num;
// Silently drop once finished
// TODO: Check if this needs to be here
@@ -309,7 +332,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
//
switch( Connection->State )
{
- // Pre-init conneciton?
+ // Pre-init connection?
case TCP_ST_CLOSED:
Log_Log("TCP", "Packets to a closed connection?!");
break;
@@ -390,25 +413,22 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
// PSH - Has Data?
// /NOTES
- // Allocate and fill cached packet
- pkt = malloc( sizeof(tTCPStoredPacket) + dataLen );
- pkt->Next = NULL;
- pkt->Sequence = ntohl(Header->SequenceNumber);
- pkt->Length = dataLen;
- memcpy(pkt->Data, (Uint8*)Header + (Header->DataOffset>>4)*4, dataLen);
+ sequence_num = ntohl(Header->SequenceNumber);
Log_Log("TCP", "0x%08x <= 0x%08x < 0x%08x",
Connection->NextSequenceRcv,
- pkt->Sequence,
+ ntohl(Header->SequenceNumber),
Connection->NextSequenceRcv + TCP_WINDOW_SIZE
);
// Is this packet the next expected packet?
- if( pkt->Sequence == Connection->NextSequenceRcv )
+ if( sequence_num == Connection->NextSequenceRcv )
{
// Ooh, Goodie! Add it to the recieved list
- TCP_INT_AppendRecieved(Connection, pkt);
- free(pkt);
+ TCP_INT_AppendRecieved(Connection,
+ (Uint8*)Header + (Header->DataOffset>>4)*4,
+ dataLen
+ );
Log_Log("TCP", "0x%08x += %i", Connection->NextSequenceRcv, dataLen);
Connection->NextSequenceRcv += dataLen;
@@ -431,24 +451,32 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
//Connection->NextSequenceSend ++;
}
// Check if the packet is in window
- else if( WrapBetween(Connection->NextSequenceRcv, pkt->Sequence,
+ else if( WrapBetween(Connection->NextSequenceRcv, sequence_num,
Connection->NextSequenceRcv+TCP_WINDOW_SIZE, 0xFFFFFFFF) )
{
+ Uint8 *dataptr = (Uint8*)Header + (Header->DataOffset>>4)*4;
#if CACHE_FUTURE_PACKETS_IN_BYTES
Uint32 index;
int i;
- index = pkt->Sequence % TCP_WINDOW_SIZE;
- for( i = 0; i < pkt->Length; i ++ )
+ index = sequence_num % TCP_WINDOW_SIZE;
+ for( i = 0; i < dataLen; i ++ )
{
Connection->FuturePacketValidBytes[index/8] |= 1 << (index%8);
- Connection->FuturePacketValidBytes[index] = pkt->Data[i];
+ Connection->FuturePacketData[index] = dataptr[i];
// Do a wrap increment
index ++;
if(index == TCP_WINDOW_SIZE) index = 0;
}
#else
- tTCPStoredPacket *tmp, *prev = NULL;
+ tTCPStoredPacket *pkt, *tmp, *prev = NULL;
+
+ // Allocate and fill cached packet
+ pkt = malloc( sizeof(tTCPStoredPacket) + dataLen );
+ pkt->Next = NULL;
+ pkt->Sequence = ntohl(Header->SequenceNumber);
+ pkt->Length = dataLen;
+ memcpy(pkt->Data, dataptr, dataLen);
Log_Log("TCP", "We missed a packet, caching",
pkt->Sequence, Connection->NextSequenceRcv);
@@ -481,7 +509,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
}
else
{
- free(pkt);
+ free(pkt); // TODO: Find some way to remove this
}
SHORTREL( &Connection->lFuturePackets );
#endif
@@ -490,8 +518,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
else
{
Log_Log("TCP", "Fully out of sequence packet (0x%08x not between 0x%08x and 0x%08x), dropped",
- pkt->Sequence, Connection->NextSequenceRcv, Connection->NextSequenceRcv+TCP_WINDOW_SIZE);
- free(pkt);
+ sequence_num, Connection->NextSequenceRcv, Connection->NextSequenceRcv+TCP_WINDOW_SIZE);
// TODO: Spec says we should send an empty ACK with the current state
}
break;
@@ -589,12 +616,13 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
/**
* \brief Appends a packet to the recieved list
* \param Connection Connection structure
- * \param Pkt Packet structure on heap
+ * \param Data Packet contents
+ * \param Length Length of \a Data
*/
-void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
+void TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length)
{
Mutex_Acquire( &Connection->lRecievedPackets );
- if(Connection->RecievedBuffer->Length + Pkt->Length > Connection->RecievedBuffer->Space )
+ if(Connection->RecievedBuffer->Length + Length > Connection->RecievedBuffer->Space )
{
Log_Error("TCP", "Buffer filled, packet dropped (%s)",
// TCP_INT_DumpConnection(Connection)
@@ -603,7 +631,7 @@ void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
return ;
}
- RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length );
+ RingBuffer_Write( Connection->RecievedBuffer, Data, Length );
VFS_MarkAvaliable(&Connection->Node, 1);
@@ -1076,7 +1104,9 @@ void TCP_INT_SendDataPacket(tTCPConnection *Connection, size_t Length, void *Dat
memcpy(packet->Options, Data, Length);
Log_Debug("TCP", "Send sequence 0x%08x", Connection->NextSequenceSend);
+#if HEXDUMP_OUTGOING
Debug_HexDump("TCP_INT_SendDataPacket: Data = ", Data, Length);
+#endif
TCP_SendPacket( Connection, sizeof(tTCPHeader)+Length, packet );