diff --git a/Asuro.iso b/Asuro.iso index ad4f3679..6909095b 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index a9a39091..e7ee4b63 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 a9a39091..e7ee4b63 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 973b83cc..13eec398 100644 Binary files a/lib/arp.ppu and b/lib/arp.ppu differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index 869c548e..53c3094a 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/eth2.ppu b/lib/eth2.ppu index 333e82dc..b343aeba 100644 Binary files a/lib/eth2.ppu and b/lib/eth2.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 76ba682b..7b3df6f1 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 2bfb1ae4..4172a5b7 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 3fd1438a..a901243f 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/shell.ppu b/lib/shell.ppu index c74cff14..52eb71f2 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index df2eba76..61af7a58 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/driver/net/l2/eth2.pas b/src/driver/net/l2/eth2.pas index 70e99841..47e01f73 100644 --- a/src/driver/net/l2/eth2.pas +++ b/src/driver/net/l2/eth2.pas @@ -47,7 +47,7 @@ begin push_trace('eth2.send'); writeToLogLn(' L2: eth2.send'); if p_context <> nil then begin - size:= sizeof(TEthernetHeader) + p_len + pad;// + 4; + size:= sizeof(TEthernetHeader) + p_len;// + pad;// + 4; buffer:= kalloc(size); copyMAC(@p_context^.MAC.Source[0], @hdr.src[0]); copyMAC(@p_context^.MAC.Destination[0], @hdr.dst[0]); @@ -55,8 +55,8 @@ begin hdr.EthTypeLo:= eth_type AND $FF; memcpy(uint32(@hdr), uint32(buffer), sizeof(TEthernetHeader)); memcpy(uint32(p_data), uint32(buffer)+sizeof(TEthernetHeader), p_len); - FCS:= puint32((uint32(buffer) + size) - 4); - FCS^:= crc32(puint8(buffer), size - 4); + //FCS:= puint32((uint32(buffer) + size) - 4); + //FCS^:= crc32(puint8(buffer), size - 4); net.send(buffer, size); kfree(buffer); end; diff --git a/src/driver/net/l3/arp.pas b/src/driver/net/l3/arp.pas index 5221918f..351e7d18 100644 --- a/src/driver/net/l3/arp.pas +++ b/src/driver/net/l3/arp.pas @@ -119,7 +119,7 @@ begin CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Destination[0]); CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]); CopyMAC(GetMAC, @context^.MAC.Source[0]); - CopyMAC(@BROADCAST_MAC[0], @context^.MAC.Destination[0]); + CopyMAC(@NULL_MAC[0], @context^.MAC.Destination[0]); arp.send($1, $0800, $1, context); freePacketContext(context); end; @@ -133,7 +133,7 @@ begin CopyIPv4(ip, @context^.IP.Destination[0]); CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]); CopyMAC(GetMAC, @context^.MAC.Source[0]); - CopyMAC(@BROADCAST_MAC[0], @context^.MAC.Destination[0]); + CopyMAC(@NULL_MAC[0], @context^.MAC.Destination[0]); arp.send($1, $0800, $1, context); freePacketContext(context); end; diff --git a/src/include/asuro.pas b/src/include/asuro.pas index 9c4e45ba..76364d03 100644 --- 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 = '11/05/18'; - COMPILE_TIME = '09:17:35'; + COMPILE_TIME = '09:53:40'; implementation