X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fipv4.c;h=69f029c7f9ac1b33853738197c47442de2f0de1f;hb=b1873b4cff47aae8ada8cc303ea01b475cc7ccc8;hp=e2f18f8b058861c3f1e350c9235fc5a97517d5ff;hpb=ef39d8572e0366c53f10dd97ea389420052d4d8f;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index e2f18f8b..69f029c7 100644
--- a/Modules/IPStack/ipv4.c
+++ b/Modules/IPStack/ipv4.c
@@ -64,14 +64,19 @@ int IPv4_RegisterCallback(int ID, tIPCallback Callback)
 int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, const void *Data)
 {
 	tMacAddr	to = ARP_Resolve4(Iface, Address);
+	const tMacAddr	zero = {{0,0,0,0,0,0}};
 	 int	bufSize = sizeof(tIPv4Header) + Length;
 	char	buf[bufSize];
 	tIPv4Header	*hdr = (void*)buf;
 	 int	ret;
 	
+	if( MAC_EQU(to, zero) ) {
+		return 0;
+	}
+	
 	// OUTPUT Firewall rule go here
-	ret = IPTablesV4_TestChain("OUTPUT",
-		&Iface->IP4.Address, &Address,
+	ret = IPTables_TestChain("OUTPUT",
+		4, (tIPv4*)Iface->Address, &Address,
 		Protocol, 0,
 		Length, Data);
 	if(ret != 0) {
@@ -95,9 +100,9 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int
 	hdr->TTL = DEFAULT_TTL;
 	hdr->Protocol = Protocol;
 	hdr->HeaderChecksum = 0;	// Will be set later
-	hdr->Source = Iface->IP4.Address;
+	hdr->Source = *(tIPv4*)Iface->Address;
 	hdr->Destination = Address;
-	hdr->HeaderChecksum = IPv4_Checksum(hdr, sizeof(tIPv4Header));
+	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]);
@@ -144,9 +149,9 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Check Header checksum
 	{
 		Uint16	hdrVal, compVal;
-		hdrVal = hdr->HeaderChecksum;
+		hdrVal = ntohs(hdr->HeaderChecksum);
 		hdr->HeaderChecksum = 0;
-		compVal = IPv4_Checksum(hdr, hdr->HeaderLength);
+		compVal = IPv4_Checksum(hdr, hdr->HeaderLength * 4);
 		if(hdrVal != compVal) {
 			Log_Log("IPv4", "Header checksum fails (%04x != %04x)", hdrVal, compVal);
 			return ;
@@ -173,16 +178,16 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Firewall rules
 	if( iface ) {
 		// Incoming Packets
-		ret = IPTablesV4_TestChain("INPUT",
-			&hdr->Source, &hdr->Destination,
+		ret = IPTables_TestChain("INPUT",
+			4, &hdr->Source, &hdr->Destination,
 			hdr->Protocol, 0,
 			dataLength, data
 			);
 	}
 	else {
 		// Routed packets
-		ret = IPTablesV4_TestChain("FORWARD",
-			&hdr->Source, &hdr->Destination,
+		ret = IPTables_TestChain("FORWARD",
+			4, &hdr->Source, &hdr->Destination,
 			hdr->Protocol, 0,
 			dataLength, data
 			);
@@ -203,18 +208,40 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Routing
 	if(!iface)
 	{
+		tMacAddr	to;
+		tRoute	*rt;
+		
 		Log_Debug("IPv4", "Route the packet");
+		// Drop the packet if the TTL is zero
+		if( hdr->TTL == 0 ) {
+			Log_Warning("IPv4", "TODO: Sent ICMP-Timeout when TTL exceeded");
+			return ;
+		}
+		
+		hdr->TTL --;
+		
+		rt = IPStack_FindRoute(4, NULL, &hdr->Destination);	// Get the route (gets the interface)
+		to = ARP_Resolve4(rt->Interface, hdr->Destination);	// Resolve address
+		
+		// Send packet
+		Log_Log("IPv4", "Forwarding packet to %i.%i.%i.%i (via %i.%i.%i.%i)",
+			hdr->Destination.B[0], hdr->Destination.B[1],
+			hdr->Destination.B[2], hdr->Destination.B[3],
+			((tIPv4*)rt->NextHop)->B[0], ((tIPv4*)rt->NextHop)->B[1],
+			((tIPv4*)rt->NextHop)->B[2], ((tIPv4*)rt->NextHop)->B[3]);
+		Link_SendPacket(rt->Interface->Adapter, IPV4_ETHERNET_ID, to, Length, Buffer);
 		
-		// TODO: Parse Routing tables and determine where to send it
 		
 		return ;
 	}
 	
 	// Send it on
-	if( gaIPv4_Callbacks[hdr->Protocol] )
-		gaIPv4_Callbacks[hdr->Protocol]( iface, &hdr->Source, dataLength, data );
-	else
+	if( !gaIPv4_Callbacks[hdr->Protocol] ) {
 		Log_Log("IPv4", "Unknown Protocol %i", hdr->Protocol);
+		return ;
+	}
+	
+	gaIPv4_Callbacks[hdr->Protocol]( iface, &hdr->Source, dataLength, data );
 }
 
 /**
@@ -236,15 +263,15 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 	{
 		if( iface->Adapter != Adapter )	continue;
 		if( iface->Type != 4 )	continue;
-		if( IP4_EQU(Address, iface->IP4.Address) )
+		if( IP4_EQU(Address, *(tIPv4*)iface->Address) )
 			return iface;
 		
 		if( !Broadcast )	continue;
 		
-		this = ntohl( iface->IP4.Address.L );
+		this = ntohl( ((tIPv4*)iface->Address)->L );
 		
 		// Check for broadcast
-		netmask = IPv4_Netmask(iface->IP4.SubnetBits);
+		netmask = IPv4_Netmask(iface->SubnetBits);
 		
 		if( (addr & netmask) == (this & netmask)
 		 && (addr & ~netmask) == (0xFFFFFFFF & ~netmask) )
@@ -257,7 +284,7 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
  * \brief Convert a network prefix to a netmask
  * \param FixedBits	Netmask size (/n)
  * 
- * For example /24 will become 255.255.255.0
+ * For example /24 will become 255.255.255.0 (0xFFFFFF00)
  */
 Uint32 IPv4_Netmask(int FixedBits)
 {
@@ -277,18 +304,22 @@ Uint32 IPv4_Netmask(int FixedBits)
  */
 Uint16 IPv4_Checksum(const void *Buf, int Size)
 {
-	Uint16	sum = 0;
+	Uint32	sum = 0;
 	const Uint16	*arr = Buf;
 	 int	i;
 	
 	Size = (Size + 1) >> 1;	// 16-bit word count
 	for(i = 0; i < Size; i++ )
 	{
-		if((int)sum + arr[i] > 0xFFFF)
-			sum ++;	// Simulate 1's complement
-		sum += arr[i];
+		Uint16	val = ntohs(arr[i]);
+		sum += val;
 	}
-	return ~sum ;
+	
+	// Apply one's complement
+	while (sum >> 16)
+		sum = (sum & 0xFFFF) + (sum >> 16);
+	
+	return ~sum;
 }
 
 /**