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@651 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

Browse Source
This commit is contained in:
kieron
2018-05-02 17:17:58 +00:00
parent 191f0a8159
commit b42c7641e6
35 changed files with 265 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/driver/net/include/netutils.pas
View File

@ -7,8 +7,8 @@ uses
procedure copyMAC(src : puint8; dst : puint8);
procedure copyIPv4(src : puint8; dst : puint8);
procedure writeMACAddress(mac : puint8);
procedure writeIPv4Address(ip : puint8);
procedure writeMACAddress(mac : puint8; WND : HWND);
procedure writeIPv4Address(ip : puint8; WND : HWND);
function MACEqual(mac1 : puint8; mac2 : puint8) : boolean;
function IPEqual(ip1 : puint8; ip2 : puint8) : boolean;
function newPacketContext : PPacketContext;
@ -48,33 +48,33 @@ begin
pop_trace;
end;
procedure writeIPv4Address(ip : puint8);
procedure writeIPv4Address(ip : puint8; WND : HWND);
var
i : integer;
begin
push_trace('netutils.writeIPv4Address');
console.writeint(ip[0]);
console.writeintWND(ip[0], WND);
for i:=1 to 3 do begin
console.writestring('.');
console.writeint(ip[i]);
console.writestringWND('.', WND);
console.writeintWND(ip[i], WND);
end;
console.writestringln(' ');
console.writestringlnWND(' ', WND);
pop_trace;
end;
procedure writeMACAddress(mac : puint8);
procedure writeMACAddress(mac : puint8; WND : HWND);
var
i : integer;
begin
push_trace('netutils.writeMACAddress');
console.writehexpair(mac[0]);
console.writehexpairWND(mac[0], WND);
for i:=1 to 5 do begin
console.writestring(':');
console.writehexpair(mac[i]);
console.writestringWND(':', WND);
console.writehexpairWND(mac[i], WND);
end;
console.writestringln(' ');
console.writestringlnWND(' ', WND);
pop_trace;
end;

20
src/driver/net/l3/ipv4.pas
View File

@ -71,18 +71,18 @@ begin
push_trace('ipv4.terminal_command_ifconfig');
if paramCount(params) > 2 then begin
end else begin
writestring(' MAC: ');
writeMACAddress(net.GetMAC);
writestring(' IPv4: ');
writeIPv4Address(@Config.Address[0]);
writestring(' Gateway: ');
writeIPv4Address(@Config.Gateway[0]);
writestring(' Netmask: ');
writeIPv4Address(@Config.Netmask[0]);
writestringWND(' MAC: ', getTerminalHWND);
writeMACAddress(net.GetMAC, getTerminalHWND);
writestringWND(' IPv4: ', getTerminalHWND);
writeIPv4Address(@Config.Address[0], getTerminalHWND);
writestringWND(' Gateway: ', getTerminalHWND);
writeIPv4Address(@Config.Gateway[0], getTerminalHWND);
writestringWND(' Netmask: ', getTerminalHWND);
writeIPv4Address(@Config.Netmask[0], getTerminalHWND);
if Config.UP then
writestringln(' NetUP: true')
writestringlnWND(' NetUP: true', getTerminalHWND)
else
writestringln(' NetUP: false');
writestringlnWND(' NetUP: false', getTerminalHWND);
end;
pop_trace;
end;

5
src/driver/netdev/E1000.pas
View File

@ -438,7 +438,7 @@ end;
procedure console_command_mac(params : PParamList);
begin
push_trace('E1000.console_command_mac');
writeMACAddress(@mac[0]);
writeMACAddress(@mac[0], getTerminalHWND);
pop_trace;
end;
@ -474,6 +474,7 @@ begin
TestPacket[26]:= mac[4];
TestPacket[27]:= mac[5];
sendPacket(void(@TestPacket[0]), 42);
writeStringlnWND('E1000 ARP Testpacket Sent.', getTerminalHWND);
pop_trace;
end;
@ -513,7 +514,7 @@ begin
load:= false;
end else begin
console.output('E1000 Driver', 'MAC Address: ');
writeMACAddress(@mac[0]);
writeMACAddress(@mac[0], 0);
startLink();

4
src/driver/storage/storagemanagement.pas
View File

@ -255,8 +255,8 @@ begin
fileSystems:= ll_New(sizeof(TFilesystem));
terminal.registerCommand('DISK', @disk_command, 'Disk utility');
terminal.registerCommand('VOLUME', @volume_command, 'Volume utility');
terminal.registerCommand('mkdir', @mkdir_command, 'Volume utility');
terminal.registerCommand('ls', @ls_command, 'Volume utility');
terminal.registerCommandEx('mkdir', @mkdir_command, 'Volume utility', true);
terminal.registerCommandEx('ls', @ls_command, 'Volume utility', true);
pop_trace();
end;