diff --git a/Asuro.iso b/Asuro.iso index e79af80b..c17c1743 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 50a34a52..5feeeba7 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index 50a34a52..5feeeba7 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/arp.ppu b/lib/arp.ppu index dc773fc4..119ac7a6 100644 Binary files a/lib/arp.ppu and b/lib/arp.ppu differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index f5c8b388..00c9f99b 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/eth2.ppu b/lib/eth2.ppu index 184f6b93..9507c305 100644 Binary files a/lib/eth2.ppu and b/lib/eth2.ppu differ diff --git a/lib/ipv4.ppu b/lib/ipv4.ppu index 22b8dead..edc864a6 100644 Binary files a/lib/ipv4.ppu and b/lib/ipv4.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 2b577fa4..9d846c85 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index ab3cd2db..6d9f9b3f 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 40f7a5bd..91131f74 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/net.ppu b/lib/net.ppu index ca1afe1e..d3847083 100644 Binary files a/lib/net.ppu and b/lib/net.ppu differ diff --git a/lib/netlog.ppu b/lib/netlog.ppu index 9d768634..139c892a 100644 Binary files a/lib/netlog.ppu and b/lib/netlog.ppu differ diff --git a/lib/shell.ppu b/lib/shell.ppu index a3fa80a0..d2e44fb4 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index 9bd36925..be43032c 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/driver/net/l1/net.pas b/src/driver/net/l1/net.pas index f3ab4130..716e7954 100644 --- a/src/driver/net/l1/net.pas +++ b/src/driver/net/l1/net.pas @@ -83,7 +83,7 @@ end; procedure send(p_data : void; p_len : uint16); begin push_trace('net.send'); - writeToLogLn('net.send'); + writeToLogLn('L1: net.send'); if CBSend <> nil then CBSend(p_data, p_len); pop_trace; end; @@ -94,7 +94,7 @@ var begin push_trace('net.recv'); - writeToLogLn('net.recv'); + writeToLogLn('L1: net.recv'); context:= newPacketContext; if CBNext <> nil then CBNext(p_data, p_len, context); freePacketContext(context); diff --git a/src/driver/net/l2/eth2.pas b/src/driver/net/l2/eth2.pas index cf8f2148..ef877cbf 100644 --- a/src/driver/net/l2/eth2.pas +++ b/src/driver/net/l2/eth2.pas @@ -35,7 +35,7 @@ var begin push_trace('eth2.recv'); - if getNetlogHWND <> 0 then writestringlnWND('eth2.recv', getNetlogHWND); + writeToLogLn('L2: eth2.recv'); //console.outputln('net.eth2', 'RECV.'); buf:= puint8(p_data); diff --git a/src/driver/net/l3/arp.pas b/src/driver/net/l3/arp.pas index c5cee7ce..f240f428 100644 --- a/src/driver/net/l3/arp.pas +++ b/src/driver/net/l3/arp.pas @@ -5,7 +5,7 @@ interface uses tracer, util, lists, console, - nettypes, netutils, + net, nettypes, netutils, netlog, eth2; @@ -22,9 +22,6 @@ function MACToIIPv4(mac : puint8) : puint8; implementation -uses - net; - var Registered : Boolean = false; Cache : PLinkedListBase; @@ -73,7 +70,7 @@ var begin push_trace('arp.recv'); - writeToLogLn('arp.recv'); + writeToLogLn('L3: arp.recv'); { Get our converted Header } Header:= PARPHeader(p_data); AHeader.Hardware_Type:= (Header^.Hardware_Type_Hi SHL 8) + Header^.Hardware_Type_Lo; @@ -87,31 +84,31 @@ begin copyIPv4(@Header^.Destination_Protocol[0], @AHeader.Destination_Protocol[0]); case AHeader.Operation of $1:begin { ARP Request } - writeToLogLn('arp.recv.arp.req'); + writeToLogLn(' arp.recv.arp.req'); end; $2:begin { ARP Reply } - writeToLogLn('arp.recv.arp.rep'); + writeToLogLn(' arp.recv.arp.rep'); end; $3:begin { RARP Request } - writeToLogLn('arp.recv.rarp.req'); + writeToLogLn(' arp.recv.rarp.req'); end; $4:begin { RARP Reply } - writeToLogLn('arp.recv.rarp.rep'); + writeToLogLn(' arp.recv.rarp.rep'); end; $5:begin { DRARP Request } - writeToLogLn('arp.recv.drarp.req'); + writeToLogLn(' arp.recv.drarp.req'); end; $6:begin { DRARP Reply } - writeToLogLn('arp.recv.drarp.rep'); + writeToLogLn(' arp.recv.drarp.rep'); end; $7:begin { DRARP Error } - writeToLogLn('arp.recv.drarp.err'); + writeToLogLn(' arp.recv.drarp.err'); end; $8:begin { InARP Request } - writeToLogLn('arp.recv.inarp.req'); + writeToLogLn(' arp.recv.inarp.req'); end; $9:begin { InARP Reply } - writeToLogLn('arp.recv.inarp.rep'); + writeToLogLn(' arp.recv.inarp.rep'); end; end; pop_trace; diff --git a/src/driver/net/l3/ipv4.pas b/src/driver/net/l3/ipv4.pas index fa4ab7cd..deeb7673 100644 --- a/src/driver/net/l3/ipv4.pas +++ b/src/driver/net/l3/ipv4.pas @@ -29,7 +29,7 @@ var begin push_trace('ipv4.recv'); - writeToLogLn('ipv4.recv'); + writeToLogLn('L3: ipv4.recv'); Header:= PIPV4Header(p_data); AHeader.version:= Header^.version; AHeader.header_len:= Header^.header_len; diff --git a/src/include/asuro.pas b/src/include/asuro.pas index c85e9878..b7973116 100644 --- a/src/include/asuro.pas +++ b/src/include/asuro.pas @@ -9,14 +9,14 @@ const VERSION_SUB = '1'; REVISION = '677'; RELEASE = 'ia'; - LINE_COUNT = 27664; + LINE_COUNT = 27661; FILE_COUNT = 89; DRIVER_COUNT = 32; FPC_VERSION = '2.6.4'; NASM_VERSION = '2.10.09'; MAKE_VERSION = '3.81'; COMPILE_DATE = '10/05/18'; - COMPILE_TIME = '08:56:35'; + COMPILE_TIME = '09:02:09'; implementation