IPStack - Cleaned up unneeded malloc() calls

[tpg/acess2.git] / Modules / IPStack / link.c

diff --git a/Modules/IPStack/link.c b/Modules/IPStack/link.c
index 4be9d80..e5e789a 100644 (file)
--- a/Modules/IPStack/link.c
+++ b/Modules/IPStack/link.c
@@ -101,7 +101,7 @@ void Link_WatchDevice(tAdapter *Adapter)
         int    tid = Proc_SpawnWorker();       // Create a new worker thread
        
        if(tid < 0) {
-               Log_Warning("NET", "Unable to create watcher thread for '%s'", Adapter->Device);
+               Log_Warning("Net Link", "Unable to create watcher thread for '%s'", Adapter->Device);
                return ;
        }
        
@@ -129,18 +129,20 @@ void Link_WatchDevice(tAdapter *Adapter)
                ret = VFS_Read(Adapter->DeviceFD, MAX_PACKET_SIZE, buf);
                if(ret == -1)   break;
                
-               if(ret <= (int)sizeof(tEthernetHeader)) {
-                       Log_Log("NET", "Recieved an undersized packet");
+               if(ret < sizeof(tEthernetHeader)) {
+                       Log_Log("Net Link", "Recieved an undersized packet (%i < %i)",
+                               ret, sizeof(tEthernetHeader));
                        continue;
                }
                
                Log_Log("Net Link",
                        "Packet from %02x:%02x:%02x:%02x:%02x:%02x"
-                       " to %02x:%02x:%02x:%02x:%02x:%02x",
+                       " to %02x:%02x:%02x:%02x:%02x:%02x (Type=%04x)",
                        hdr->Src.B[0], hdr->Src.B[1], hdr->Src.B[2],
                        hdr->Src.B[3], hdr->Src.B[4], hdr->Src.B[5],
                        hdr->Dest.B[0], hdr->Dest.B[1], hdr->Dest.B[2],
-                       hdr->Dest.B[3], hdr->Dest.B[4], hdr->Dest.B[5]
+                       hdr->Dest.B[3], hdr->Dest.B[4], hdr->Dest.B[5],
+                       ntohs(hdr->Type)
                        );
                checksum = *(Uint32*)&hdr->Data[ret-sizeof(tEthernetHeader)-4];
                //Log_Log("NET", "Checksum 0x%08x", checksum);
@@ -166,7 +168,7 @@ void Link_WatchDevice(tAdapter *Adapter)
                        );
        }
        
-       Log_Log("NET", "Watcher terminated (file closed)");
+       Log_Log("Net Link", "Watcher terminated (file closed)");
        
        Threads_Exit(0, 0);
 }