better testing

Reviewed-on: #36
Reviewed-by: Aaron Hance <[email protected]>

compile_sources.sh

@@ -4,4 +4,4 @@ echo "======================="
 echo " "
 echo "Compiling FPC Sources..."
 echo " "
-fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/include/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas

src/driver/net/l1/net.pas

@@ -100,8 +100,8 @@ end;
 
 procedure send(p_data : void; p_len : uint16);
 begin
-    push_trace('net.send');
-    writeToLogLn('L1/NET: send');
+    //push_trace('net.send');
+    //writeToLogLn('L1: net.send');
     if CBSend <> nil then CBSend(p_data, p_len);
     pop_trace;
 end;
@@ -111,7 +111,8 @@ var
     context : PPacketContext;
 
 begin
-    push_trace('net.recv');
+    //push_trace('net.recv');
+    //writeToLogLn('L1: net.recv');
     context:= newPacketContext;
     if CBNext <> nil then CBNext(p_data, p_len, context);
     freePacketContext(context);
@@ -128,7 +129,6 @@ end;
 procedure init;
 begin
     push_trace('net.init');
-    writeToLogLn('L1/NET: init');
     //l2
     eth2.register;
     //l3
@@ -136,7 +136,6 @@ begin
     ipv4.register;
     //l4
     icmp.register;
-    tcp.register;
     udp.register;
     //l5
     dhcp.register;

src/driver/net/l2/eth2.pas

@@ -46,7 +46,6 @@ var
 
 procedure registerTypePromisc(eType : uint16; RecvCB : TRecvCallback);
 begin
-    push_trace('eth2.registerTypePromisc');
     register;
     if EthTypes[eType] = nil then EthTypes[eType]:= RecvCB;
     Promisc[eType]:= true;
@@ -54,7 +53,6 @@ end;
 
 procedure registerType(eType : uint16; RecvCB : TRecvCallback);
 begin
-    push_trace('eth2.registerType');
     register;
     if EthTypes[eType] = nil then EthTypes[eType]:= RecvCB;
 end;
@@ -95,7 +93,7 @@ var
     buf        : puint8;
 
 begin
-    push_trace('eth2.recv');
+    //writeToLogLn('    L2: eth2.recv');
     buf:= puint8(p_data);
     
     Header:= PEthernetHeader(buf);
@@ -122,7 +120,6 @@ var
 begin
     push_trace('eth2.register');
     if not Registered then begin
-        writeToLogLn('    L2/ETH: register');
         for i:=0 to 65535 do begin
             EthTypes[i]:= nil;
             Promisc[i]:= false;

src/driver/net/l3/arp.pas

@@ -96,7 +96,6 @@ var
     hSize, pSize : uint8;
 
 begin
-    push_trace('arp.send');
     if p_context <> nil then begin
         buf:= kalloc(sizeof(TARPHeader));
         hdr:= PARPHeader(buf);
@@ -136,8 +135,6 @@ var
     context : PPacketContext;
 
 begin
-     push_trace('arp.sendGratuitous');
-     writeToLogLn('      L3/ARP: sendGratuitous');
      context:= newPacketContext;
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Destination[0]);
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
@@ -153,7 +150,6 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
-     push_trace('arp.sendRequestGateway');
      context:= newPacketContext;
      CacheRecord:= findCacheRecordByIP(@getIPv4Config^.Gateway[0]);
      if CacheRecord <> nil then begin
@@ -172,8 +168,6 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
-     push_trace('arp.sendRequest');
-     writeToLogLn('      L3/ARP: sendRequest');
      context:= newPacketContext;
      CopyIPv4(ip, @context^.IP.Destination[0]);
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
@@ -190,7 +184,6 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
-    push_trace('arp.resolveIP');
     CacheRecord:= findCacheRecordByIP(ip);
     resolveIP:= nil;
     if CacheRecord = nil then begin
@@ -210,7 +203,6 @@ var
     context      : PPacketContext;
 
 begin
-    push_trace('arp.recv');
     { Get our converted Header }
     Header:= PARPHeader(p_data);
     AHeader.Hardware_Type:= (Header^.Hardware_Type_Hi SHL 8) + Header^.Hardware_Type_Lo;
@@ -306,7 +298,6 @@ procedure register;
 begin
     push_trace('arp.register');
     if not Registered then begin
-        writeToLogLn('      L3/ARP: register');
         Cache:= LL_New(sizeof(TARPCacheRecord));
         eth2.registerTypePromisc($0806, @recv);
         stdio.registerCommand('ARP', @terminal_command_arp, 'Get ARP Table.');

src/driver/net/l3/ipv4.pas

@@ -46,9 +46,7 @@ var
 
 function  getIPv4Config : PIPv4Configuration;
 begin
-    push_trace('ipv4.getIPv4Config');
     getIPv4Config:= @Config;
-    pop_trace;
 end;
 
 procedure send(p_data : void; p_len : uint16; p_context : PPacketContext);
@@ -59,7 +57,6 @@ var
     buffer : void;
 
 begin
-    push_trace('ipv4.send');
     inc(CurrentID);
     Header.version:= 4;
     Header.header_len:= 5;
@@ -87,7 +84,6 @@ begin
     memcpy(uint32(p_data), uint32(Buffer) + (Header.header_len * 4), p_len);
     eth2.send(Buffer, (Header.header_len * 4) + p_len, $0800, p_context);
     kfree(Buffer);
-    pop_trace;
 end;
 
 procedure recv(p_data : void; p_len : uint16; p_context : PPacketContext);
@@ -99,7 +95,6 @@ var
     len     : uint16;
 
 begin
-    push_trace('ipv4.recv');
     Header:= PIPV4Header(p_data);
     AHeader.version:= Header^.version;
     AHeader.header_len:= Header^.header_len;
@@ -200,7 +195,6 @@ var
 begin
     push_trace('ipv4.register');
     if not Registered then begin
-        writeToLogLn('      L3/IPv4: register');
         for i:=0 to 255 do begin
             Protocols[i]:= nil;
         end;
@@ -219,7 +213,6 @@ end;
 
 procedure registerProtocol(Protocol_ID : uint8; recv_callback : TRecvCallback);
 begin
-    push_trace('ipv4.registerProtocol');
     register;
     if Protocols[Protocol_ID] = nil then Protocols[Protocol_ID]:= recv_callback;
     pop_trace;

src/driver/net/l4/icmp.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     bios_data_area,
-    lmemorymanager, tracer,
+    lmemorymanager,
     net, nettypes, netutils, ipv4, arp, util;
 
 type
@@ -55,7 +55,6 @@ var
     i : uint8;
 
 begin
-    push_trace('icmp.nextInactiveHandler');
     nextInactiveHandler:= 0;
     for i:=1 to 255 do begin
         if not Handlers[i].Active then begin
@@ -81,8 +80,6 @@ var
     Size     : uint32;
 
 begin
-    push_trace('icmp.sendICMPRequest');
-    writeToLogLn('        L4/ICMP: sendICMPRequest');
     handle:= nextInactiveHandler;
     Handlers[handle].Active:= true;
     Handlers[handle].OnReply:= OnRep;
@@ -138,8 +135,6 @@ var
     Handle : uint8;
 
 begin
-    push_trace('icmp.recv');
-    writeToLogLn('        L4/ICMP: recv');
     Header:= PICMPHeader(p_data);
     //writehexlnWND(Header^.ICMP_Type, getTerminalHWND); 
     case Header^.ICMP_Type of
@@ -248,8 +243,6 @@ var
     i : uint32;
 
 begin
-    push_trace('icmp.register');
-    writeToLogLn('        L4/ICMP: register');
     for i:=0 to 255 do begin
         Handlers[i].Active:= false;
         Handlers[i].OnError:= nil;

src/driver/net/l4/udp.pas

@@ -25,7 +25,7 @@ uses
     lmemorymanager,
     nettypes, netutils,
     ipv4, net,
-    tracer, util;
+    util;
 
 procedure register();
 function bind(bindContext : PUDPBindContext) : TUDPError;
@@ -71,7 +71,6 @@ begin
             nullend:= true;
         end;
         pseudoBuffer:= kalloc(sizeof(TUDPPseudoHeader) + pseudoSize);
-        push_trace('udp.CalculateChecksum');
         pseudoBuffer8:= puint8(pseudoBuffer);
         pseudoBuffer16:= puint16(pseudoBuffer);
         pseudoBuffer32:= puint32(pseudoBuffer);
@@ -119,7 +118,6 @@ var
 
 
 begin
-    push_trace('udp.send');
     if udpContext <> nil then begin
         size:= p_len + sizeof(TUDPHeader);
         buffer:= kalloc(size);
@@ -154,7 +152,6 @@ var
     context : PUDPBindContext;
 
 begin
-    push_trace('udp.bind');
     result:= tueGenericError;
     if bindContext <> nil then begin
         if Ports[bindContext^.port] = nil then begin
@@ -177,7 +174,6 @@ var
     context : PUDPBindContext;
 
 begin
-    push_trace('udp.unbind');
     result:= tueGenericError;
     if bindContext <> nil then begin
         context:= Ports[bindContext^.port];
@@ -207,7 +203,6 @@ var
     size    : uint16;
 
 begin
-    push_trace('udp.ProcessPacket');
     header:= PUDPHeader(p_data);
     if Ports[switchendian16(header^.DstPort)] <> nil then begin
         context:= PUDPPacketContext(kalloc(sizeof(TUDPPacketContext)));
@@ -250,8 +245,6 @@ var
     Checksum      : uint32;
 
 begin
-    push_trace('udp.register');
-    writeToLogLn('        L4/UDP: register');
     for i:=0 to 65535 do begin
         Ports[i]:= nil;
     end;

src/driver/net/l5/dhcp.pas

@@ -415,7 +415,7 @@ end;
 
 procedure processPacket_NAK(Header : PDHCPHeader; Options : PDHCPOptions);
 begin
-    writeToLogLn('          L5/DHCP: Process NAK.');
+    syslog.logln('DHCP', 'Process NAK.'); 
     { Server provided a NAK, NULL configuration ready for next DISCOVER/Request } 
     nullConfiguration();  
 end;
@@ -429,7 +429,7 @@ var
     cfgopt : void;
 
 begin
-    writeToLogLn('          L5/DHCP: Process ACK.');
+    syslog.logln('DHCP', 'Process ACK.');
     getIPv4Config^.UP:= false;
     
     //Copy new address
@@ -484,7 +484,7 @@ Var
 
 begin
     syslog.logln('DHCP', 'Process OFFER.');  
-    writeToLogLn('          L5/DHCP: Process OFFER.');
+
     { Check the Transaction ID matches our stored ID, discard if not. }
     if Header^.Transaction_ID = Configuration^.Transaction then begin
         syslog.logln('DHCP', 'XID Match');
@@ -566,7 +566,6 @@ var
 
 begin
     tracer.push_trace('dhcp.processPacket.enter');
-    writeToLogLn('          L5/DHCP: processPacket');
     syslog.logln('DHCP','processPacket');
     
     { Give access to header values & process to correct endianness. }
@@ -637,7 +636,6 @@ var
 
 begin
     tracer.push_trace('dhcp.DHCPDiscover.begin');
-    writeToLogLn('          L5/DHCP: DHCPDiscover');
     { Ensure we have a socket bound. }
     if Socket <> nil then begin    
         { Clear any current configuration }
@@ -713,7 +711,6 @@ var
 
 begin
     tracer.push_trace('dhcp.register');
-    writeToLogLn('          L5/DHCP: register');
     syslog.logln('DHCP', 'Register begin.');
     
     { Kalloc our Configuration Data }