git-svn-id: https://spexeah.com:8443/svn/Asuro@737 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

2018-05-13 11:06:36 +00:00 · 2018-05-13 11:06:36 +00:00 · b372e85e16
commit b372e85e16
parent ab96ce6efb
12 changed files with 6 additions and 6 deletions
--- a/Asuro.iso
+++ b/Asuro.iso
--- a/bin/kernel.bin
+++ b/bin/kernel.bin
--- a/iso/boot/asuro.bin
+++ b/iso/boot/asuro.bin
--- a/lib/arp.ppu
+++ b/lib/arp.ppu
--- a/lib/asuro.ppu
+++ b/lib/asuro.ppu
--- a/lib/libpconsole.a
+++ b/lib/libpconsole.a
--- a/lib/libpmultiboot.a
+++ b/lib/libpmultiboot.a
--- a/lib/libpsystem.a
+++ b/lib/libpsystem.a
--- a/lib/shell.ppu
+++ b/lib/shell.ppu
--- a/lib/terminal.ppu
+++ b/lib/terminal.ppu
--- a/src/driver/net/l3/arp.pas
+++ b/src/driver/net/l3/arp.pas
@ -205,12 +205,12 @@ begin
        copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
        Merge:= true;
    end else begin
-        if IPEqual(@AHeader.Destination_Protocol[0], @getIPv4Config^.Address[0]) then begin
        if not Merge then begin
            CacheElement:= PARPCacheRecord(LL_Add(Cache));
            CopyMAC(@AHeader.Source_Hardware[0], @CacheElement^.MAC[0]);
            copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
        end;
+        if IPEqual(@AHeader.Destination_Protocol[0], @getIPv4Config^.Address[0]) then begin
            case AHeader.Operation of
                $1:begin { ARP Request }
                    writeToLogLn('            arp.recv.arp.req');
--- a/src/include/asuro.pas
+++ b/src/include/asuro.pas
@ -16,7 +16,7 @@ const
     NASM_VERSION  = '2.10.09';
     MAKE_VERSION  = '3.81';
     COMPILE_DATE  = '13/05/18';
-     COMPILE_TIME  = '11:52:45';
+     COMPILE_TIME  = '12:06:37';
 
 implementation