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

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]);
@@ -57,9 +57,7 @@ begin
         memcpy(uint32(p_data), uint32(buffer)+sizeof(TEthernetHeader), p_len);
         FCS:= puint32((uint32(buffer) + size) - 4);
         FCS^:= crc32(puint8(buffer), size - 4);
-        //writehexlnWND(FCS^, getTerminalHWND);
         net.send(buffer, size);
-        //printmemoryWND(uint32(buffer), size, 16, ' ', true, getTerminalHWND);
         kfree(buffer);
     end;
 end;

src/driver/net/l3/arp.pas

@@ -220,19 +220,28 @@ procedure terminal_command_arp(Params : PParamList);
 var
     i : uint32;
     elm : PARPCacheRecord;
+    sIP : pchar;
+    _IP : puint8;
 
 begin
-    if LL_Size(Cache) > 0 then begin
+    if ParamCount(Params) > 0 then begin
-        writestringlnWND('MAC                IPv4', getTerminalHWND);
+        sIP:= getParam(0, Params);
-        For i:=0 to LL_Size(Cache)-1 do begin
+        _IP:= stringToIPv4(sIP);
-            elm:= PARPCacheRecord(LL_Get(Cache, i));
+        sendRequest(_IP);
-            writeMACAddressEx(@elm^.MAC[0], getTerminalHWND);
+        writestringlnWND('ARP Request Sent.', getTerminalHWND);
-            writestringWND('  ', getTerminalHWND);
-            writeIPv4AddressEx(@elm^.IP[0], getTerminalHWND);
-            writestringlnWND(' ', getTerminalHWND);
-        end;
     end else begin
-        writestringlnWND('No entries in ARP table.', getTerminalHWND);
+        if LL_Size(Cache) > 0 then begin
+            writestringlnWND('MAC                IPv4', getTerminalHWND);
+            For i:=0 to LL_Size(Cache)-1 do begin
+                elm:= PARPCacheRecord(LL_Get(Cache, i));
+                writeMACAddressEx(@elm^.MAC[0], getTerminalHWND);
+                writestringWND('  ', getTerminalHWND);
+                writeIPv4AddressEx(@elm^.IP[0], getTerminalHWND);
+                writestringlnWND(' ', getTerminalHWND);
+            end;
+        end else begin
+            writestringlnWND('No entries in ARP table.', getTerminalHWND);
+        end;
     end;
 end;
 

src/include/asuro.pas

@@ -9,14 +9,14 @@ const
      VERSION_SUB   = '1';
      REVISION      = '677';
      RELEASE       = 'ia';
-     LINE_COUNT    = 28025;
+     LINE_COUNT    = 28032;
      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  = '08:34:35';
+     COMPILE_TIME  = '09:12:36';
  
 implementation