X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fipv4.c;h=3c67c03a0588676ea61f0ea42ea11118897a18a7;hb=23096bbffa94688e90db5045d124dcdfe83a132e;hp=672b4ec1ea8b915927eb7d88ff7c5d598d1f57d7;hpb=2023a18b48a2b1fd5a5bb46977e483624d46ac1c;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index 672b4ec1..3c67c03a 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;
 	
-	// TODO: OUTPUT Firewall rule go here
+	if( MAC_EQU(to, zero) ) {
+		return 0;
+	}
+	
+	// OUTPUT Firewall rule go here
 	ret = IPTablesV4_TestChain("OUTPUT",
-		&Iface->IP4.Address, &Address,
+		(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 ;
@@ -203,7 +208,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Routing
 	if(!iface)
 	{
-		Log_Debug("IPv4", "Route the packet");
+		//Log_Debug("IPv4", "Route the packet");
 		
 		// TODO: Parse Routing tables and determine where to send it
 		
@@ -236,15 +241,16 @@ 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) )
+		//Log_Debug("IPv4", "%x == %x?\n", addr, ntohl(((tIPv4*)iface->Address)->L));
+		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) )
@@ -277,18 +283,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;
 }
 
 /**