Spexeah/Asuro
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kieron
2018-05-11 08:12:39 +00:00
parent 9a6d556602
commit 9798b158e8
14 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/net/l2/eth2.pas
View File

@ -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;

29
src/driver/net/l3/arp.pas
View File

@ -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
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;
if ParamCount(Params) > 0 then begin
sIP:= getParam(0, Params);
_IP:= stringToIPv4(sIP);
sendRequest(_IP);
writestringlnWND('ARP Request Sent.', getTerminalHWND);
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;

4
src/include/asuro.pas
View File

@ -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