X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Flink.c;h=07234df05b0ece0c7c770efde8bdeb31b0399a3d;hb=f429a25f24ffd4762d59bee5f7122ac06881f3ca;hp=0191efb8b7024a094e102d2299d07893c193c226;hpb=ff1aacd48c7b616508c1d4e7a7ba03f741ee2cda;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/link.c b/Modules/IPStack/link.c
index 0191efb8..07234df0 100644
--- a/Modules/IPStack/link.c
+++ b/Modules/IPStack/link.c
@@ -17,6 +17,7 @@ void	Link_WatchDevice(tAdapter *Adapter);
 
 // === GLOBALS ===
  int	giRegisteredTypes = 0;
+ int	giRegisteredTypeSpace = 0;
 struct {
 	Uint16	Type;
 	tPacketCallback	Callback;
@@ -41,7 +42,7 @@ void Link_RegisterType(Uint16 Type, tPacketCallback Callback)
 	for( i = giRegisteredTypes; i -- ; )
 	{
 		if(gaRegisteredTypes[i].Type == Type) {
-			Warning("[NET  ] Attempt to register 0x%x twice", Type);
+			Log_Warning("NET", "Attempt to register 0x%x twice", Type);
 			return ;
 		}
 		// Ooh! Free slot!
@@ -50,14 +51,18 @@ void Link_RegisterType(Uint16 Type, tPacketCallback Callback)
 	
 	if(i == -1)
 	{
-		tmp = realloc(gaRegisteredTypes, (giRegisteredTypes+1)*sizeof(*gaRegisteredTypes));
+		giRegisteredTypeSpace += 5;
+		tmp = realloc(gaRegisteredTypes, giRegisteredTypeSpace*sizeof(*gaRegisteredTypes));
 		if(!tmp) {
-			Warning("[NET  ] Out of heap space!");
+			Log_Warning("NET",
+				"Out of heap space! (Attempted to allocate %i)",
+				giRegisteredTypeSpace*sizeof(*gaRegisteredTypes)
+				);
 			return ;
 		}
+		gaRegisteredTypes = tmp;
 		i = giRegisteredTypes;
 		giRegisteredTypes ++;
-		gaRegisteredTypes = tmp;
 	}
 	
 	gaRegisteredTypes[i].Callback = Callback;
@@ -74,7 +79,7 @@ void Link_SendPacket(tAdapter *Adapter, Uint16 Type, tMacAddr To, int Length, vo
 	Uint8	buf[bufSize];	// dynamic stack arrays ftw!
 	tEthernetHeader	*hdr = (void*)buf;
 	
-	Log("[NET  ] Sending %i bytes to %02x:%02x:%02x:%02x:%02x:%02x (Type 0x%x)",
+	Log_Log("NET", "Sending %i bytes to %02x:%02x:%02x:%02x:%02x:%02x (Type 0x%x)",
 		Length, To.B[0], To.B[1], To.B[2], To.B[3], To.B[4], To.B[5], Type);
 	
 	hdr->Dest = To;
@@ -98,12 +103,12 @@ void Link_WatchDevice(tAdapter *Adapter)
 	 int	tid = Proc_SpawnWorker();	// Create a new worker thread
 	
 	if(tid < 0) {
-		Warning("[NET  ] Unable to create watcher thread for '%s'", Adapter->Device);
+		Log_Warning("NET", "Unable to create watcher thread for '%s'", Adapter->Device);
 		return ;
 	}
 	
 	if(tid > 0) {
-		Log("[NET  ] Watching '%s' using tid %i", Adapter->Device, tid);
+		Log_Log("NET", "Watching '%s' using tid %i", Adapter->Device, tid);
 		return ;
 	}
 	
@@ -119,24 +124,25 @@ void Link_WatchDevice(tAdapter *Adapter)
 		Uint32	checksum;
 		
 		// Wait for a packet (Read on a network device is blocking)
+		Log_Debug("NET", "Waiting on adapter FD#0x%x", Adapter->DeviceFD);
 		ret = VFS_Read(Adapter->DeviceFD, MAX_PACKET_SIZE, buf);
 		if(ret == -1)	break;
 		
-		if(ret <= sizeof(tEthernetHeader)) {
-			Log("[NET  ] Recieved an undersized packet");
+		if(ret <= (int)sizeof(tEthernetHeader)) {
+			Log_Log("NET", "Recieved an undersized packet");
 			continue;
 		}
 		
-		Log("[NET  ] Packet from %02x:%02x:%02x:%02x:%02x:%02x",
+		Log_Log("NET", "Packet from %02x:%02x:%02x:%02x:%02x:%02x",
 			hdr->Src.B[0], hdr->Src.B[1], hdr->Src.B[2],
 			hdr->Src.B[3], hdr->Src.B[4], hdr->Src.B[5]
 			);
-		Log("[NET  ] to %02x:%02x:%02x:%02x:%02x:%02x",
+		Log_Log("NET", "to %02x:%02x:%02x:%02x:%02x:%02x",
 			hdr->Dest.B[0], hdr->Dest.B[1], hdr->Dest.B[2],
 			hdr->Dest.B[3], hdr->Dest.B[4], hdr->Dest.B[5]
 			);
 		checksum = *(Uint32*)&hdr->Data[ret-sizeof(tEthernetHeader)-4];
-		Log("[NET  ] Checksum 0x%08x", checksum);
+		Log_Log("NET", "Checksum 0x%08x", checksum);
 		
 		// Check if there is a registered callback for this packet type
 		for( i = giRegisteredTypes; i--; )
@@ -145,7 +151,7 @@ void Link_WatchDevice(tAdapter *Adapter)
 		}
 		// No? Ignore it
 		if( i == -1 ) {
-			Log("[NET  ] Unregistered type 0x%x", ntohs(hdr->Type));
+			Log_Log("NET", "Unregistered type 0x%x", ntohs(hdr->Type));
 			continue;
 		}
 		
@@ -158,7 +164,9 @@ void Link_WatchDevice(tAdapter *Adapter)
 			);
 	}
 	
-	Log("[NET  ] Watcher terminated (file closed)");
+	Log_Log("NET", "Watcher terminated (file closed)");
+	
+	Threads_Exit(0, 0);
 }
 
 // From http://www.cl.cam.ac.uk/research/srg/bluebook/21/crc/node6.html