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

2018-05-11 09:10:39 +00:00 · 2018-05-11 09:10:39 +00:00 · ad4894627c
commit ad4894627c
parent da474b5573
12 changed files with 4 additions and 2 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
@ -166,8 +166,10 @@ begin
    { Process ARP Packet }
    Merge:= false;
    CacheElement:= findCacheRecordByIP(@AHeader.Source_Protocol[0]);
+    if CacheElement = nil then CacheElement:= findCacheRecordByMAC(@AHeader.Source_Hardware[0]);
    if CacheElement <> nil then begin
        copyMAC(@AHeader.Source_Hardware[0], @CacheElement^.MAC[0]);
+        copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
        Merge:= true;
    end else begin
        if IPEqual(@AHeader.Destination_Protocol[0], @getIPv4Config^.Address[0]) then begin
--- a/src/include/asuro.pas
+++ b/src/include/asuro.pas
@ -9,14 +9,14 @@ const
     VERSION_SUB   = '1';
     REVISION      = '677';
     RELEASE       = 'ia';
-     LINE_COUNT    = 28044;
+     LINE_COUNT    = 28046;
     FILE_COUNT    = 90;
     DRIVER_COUNT  = 32;
     FPC_VERSION   = '2.6.4';
     NASM_VERSION  = '2.10.09';
     MAKE_VERSION  = '3.81';
     COMPILE_DATE  = '11/05/18';
-     COMPILE_TIME  = '10:09:01';
+     COMPILE_TIME  = '10:10:37';
 
 implementation