mirror of
https://github.com/Fennix-Project/Kernel.git
synced 2025-07-11 07:19:20 +00:00
Update kernel
This commit is contained in:
@ -27,8 +27,6 @@
|
||||
#include <debug.h>
|
||||
|
||||
#include "../kernel.h"
|
||||
#include "../mapi.hpp"
|
||||
#include "../Fex.hpp"
|
||||
|
||||
/* FIXME: The functions MUST have little endian parameters and return values. */
|
||||
|
||||
@ -39,14 +37,15 @@ namespace NetworkInterfaceManager
|
||||
NetworkInterface::NetworkInterface()
|
||||
{
|
||||
this->vma = new Memory::VirtualMemoryArea(nullptr);
|
||||
if (ModuleManager->GetModules().size() > 0)
|
||||
{
|
||||
foreach (auto Module in ModuleManager->GetModules())
|
||||
if (((FexExtended *)Module.ExtendedHeaderAddress)->Module.Type == FexModuleType::FexModuleType_Network)
|
||||
this->FetchNetworkCards(Module.modUniqueID);
|
||||
}
|
||||
else
|
||||
KPrint("\eE85230No network drivers found! Cannot fetch network cards!");
|
||||
/* KernelCallback */
|
||||
// if (DriverManager->GetModules().size() > 0)
|
||||
// {
|
||||
// foreach (auto Driver in DriverManager->GetModules())
|
||||
// if (((FexExtended *)Driver.ExtendedHeaderAddress)->Driver.Type == FexDriverType::FexDriverType_Network)
|
||||
// this->FetchNetworkCards(Driver.modUniqueID);
|
||||
// }
|
||||
// else
|
||||
// KPrint("\eE85230No network drivers found! Cannot fetch network cards!");
|
||||
|
||||
DbgNetwork();
|
||||
}
|
||||
@ -70,14 +69,15 @@ namespace NetworkInterfaceManager
|
||||
|
||||
void NetworkInterface::FetchNetworkCards(unsigned long modUniqueID)
|
||||
{
|
||||
KernelCallback cb{};
|
||||
cb.Reason = QueryReason;
|
||||
ModuleManager->IOCB(modUniqueID, &cb);
|
||||
// KernelCallback cb{};
|
||||
// cb.Reason = QueryReason;
|
||||
// DriverManager->IOCB(modUniqueID, &cb);
|
||||
/* KernelCallback */
|
||||
|
||||
DeviceInterface *Iface = (DeviceInterface *)vma->RequestPages(TO_PAGES(sizeof(DeviceInterface) + 1));
|
||||
strcpy(Iface->Name, cb.NetworkCallback.Fetch.Name);
|
||||
// strcpy(Iface->Name, cb.NetworkCallback.Fetch.Name);
|
||||
Iface->ID = this->CardIDs++;
|
||||
Iface->MAC.FromHex(cb.NetworkCallback.Fetch.MAC);
|
||||
// Iface->MAC.FromHex(cb.NetworkCallback.Fetch.MAC);
|
||||
Iface->DriverID = modUniqueID;
|
||||
Interfaces.push_back(Iface);
|
||||
|
||||
@ -98,62 +98,68 @@ namespace NetworkInterfaceManager
|
||||
thisThread->SetPriority(Tasking::TaskPriority::Critical);
|
||||
DeviceInterface *DefaultDevice = nullptr;
|
||||
foreach (auto inf in Interfaces)
|
||||
{
|
||||
if (inf)
|
||||
{
|
||||
DefaultDevice = inf;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!DefaultDevice)
|
||||
error("No network device found!");
|
||||
else
|
||||
{
|
||||
DbgWriteScreen("Using %s (%s) as the default network device", DefaultDevice->Name, DefaultDevice->MAC.ToString());
|
||||
NetworkEthernet::Ethernet *eth = new NetworkEthernet::Ethernet(DefaultDevice); // Use the first device found as the ethernet device
|
||||
NetworkARP::ARP *arp = new NetworkARP::ARP(eth);
|
||||
NetworkIPv4::IPv4 *ipv4 = new NetworkIPv4::IPv4(arp, eth);
|
||||
NetworkUDP::UDP *udp = new NetworkUDP::UDP(ipv4, DefaultDevice);
|
||||
NetworkUDP::Socket *DHCP_Socket = udp->Connect(InternetProtocol() /* Default value is 255.255.255.255 */, 67);
|
||||
NetworkDHCP::DHCP *dhcp = new NetworkDHCP::DHCP(DHCP_Socket, DefaultDevice);
|
||||
debug("eth: %p; arp: %p; ipv4: %p; udp: %p; dhcp: %p",
|
||||
eth, arp, ipv4, udp, dhcp);
|
||||
udp->Bind(DHCP_Socket, dhcp);
|
||||
dhcp->Request();
|
||||
|
||||
DefaultDevice->IP.v4.FromHex(dhcp->IP.v4.ToHex());
|
||||
ipv4->SubNetworkMaskIP = dhcp->SubNetworkMask;
|
||||
ipv4->GatewayIP = dhcp->Gateway;
|
||||
arp->Broadcast(dhcp->Gateway);
|
||||
TaskManager->Sleep(200);
|
||||
DbgWriteScreen("IP: %s", dhcp->IP.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("SubNetwork Mask: %s", dhcp->SubNetworkMask.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("Gateway: %s", dhcp->Gateway.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("DNS: %s", dhcp->DomainNameSystem.v4.ToStringLittleEndian());
|
||||
TaskManager->Sleep(200);
|
||||
|
||||
/* TODO: This is a quick workaround we need DNS resolver asap.
|
||||
|
||||
https://tf.nist.gov/tf-cgi/servers.cgi
|
||||
https://www.ntppool.org
|
||||
|
||||
- 0.ro.pool.ntp.org ( {86, 127, 71, 168} )
|
||||
- time-a-g.nist.gov ( {129, 6, 15, 28} )
|
||||
*/
|
||||
// InternetProtocol ip = {.v4 = {.Address = {129, 6, 15, 28}},
|
||||
// .v6 = {.Address = {}}};
|
||||
// NetworkUDP::Socket *NTP_Socket = udp->Connect(ip, 123);
|
||||
// NetworkNTP::NTP *ntp = new NetworkNTP::NTP(NTP_Socket);
|
||||
// udp->Bind(NTP_Socket, ntp);
|
||||
// int UnixTimestamp = ntp->ReadTime();
|
||||
// Time::Clock time = Time::ConvertFromUnix(UnixTimestamp);
|
||||
// DbgWriteScreen("NTP: %d - %d.%d.%d %d:%d:%d", time.Counter,
|
||||
// time.Day, time.Month, time.Year,
|
||||
// time.Hour, time.Minute, time.Second);
|
||||
TaskManager->Sleep(200);
|
||||
|
||||
/* TODO: Store everything in an vector and initialize all network cards */
|
||||
error("No network device found!");
|
||||
KPrint("\eE85230No network device found!");
|
||||
thisThread->SetPriority(Tasking::TaskPriority::Idle);
|
||||
CPU::Halt(true);
|
||||
}
|
||||
|
||||
KPrint("Using %s (%s) as the default network device",
|
||||
DefaultDevice->Name, DefaultDevice->MAC.ToString());
|
||||
NetworkEthernet::Ethernet *eth = new NetworkEthernet::Ethernet(DefaultDevice); // Use the first device found as the ethernet device
|
||||
NetworkARP::ARP *arp = new NetworkARP::ARP(eth);
|
||||
NetworkIPv4::IPv4 *ipv4 = new NetworkIPv4::IPv4(arp, eth);
|
||||
NetworkUDP::UDP *udp = new NetworkUDP::UDP(ipv4, DefaultDevice);
|
||||
NetworkUDP::Socket *DHCP_Socket = udp->Connect(InternetProtocol() /* Default value is 255.255.255.255 */, 67);
|
||||
NetworkDHCP::DHCP *dhcp = new NetworkDHCP::DHCP(DHCP_Socket, DefaultDevice);
|
||||
debug("eth: %p; arp: %p; ipv4: %p; udp: %p; dhcp: %p",
|
||||
eth, arp, ipv4, udp, dhcp);
|
||||
udp->Bind(DHCP_Socket, dhcp);
|
||||
dhcp->Request();
|
||||
|
||||
DefaultDevice->IP.v4.FromHex(dhcp->IP.v4.ToHex());
|
||||
ipv4->SubNetworkMaskIP = dhcp->SubNetworkMask;
|
||||
ipv4->GatewayIP = dhcp->Gateway;
|
||||
arp->Broadcast(dhcp->Gateway);
|
||||
TaskManager->Sleep(200);
|
||||
DbgWriteScreen("IP: %s", dhcp->IP.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("SubNetwork Mask: %s", dhcp->SubNetworkMask.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("Gateway: %s", dhcp->Gateway.v4.ToStringLittleEndian());
|
||||
DbgWriteScreen("DNS: %s", dhcp->DomainNameSystem.v4.ToStringLittleEndian());
|
||||
TaskManager->Sleep(200);
|
||||
|
||||
/* TODO: This is a quick workaround we need DNS resolver asap.
|
||||
|
||||
https://tf.nist.gov/tf-cgi/servers.cgi
|
||||
https://www.ntppool.org
|
||||
|
||||
- 0.ro.pool.ntp.org ( {86, 127, 71, 168} )
|
||||
- time-a-g.nist.gov ( {129, 6, 15, 28} )
|
||||
*/
|
||||
// InternetProtocol ip = {.v4 = {.Address = {129, 6, 15, 28}},
|
||||
// .v6 = {.Address = {}}};
|
||||
// NetworkUDP::Socket *NTP_Socket = udp->Connect(ip, 123);
|
||||
// NetworkNTP::NTP *ntp = new NetworkNTP::NTP(NTP_Socket);
|
||||
// udp->Bind(NTP_Socket, ntp);
|
||||
// int UnixTimestamp = ntp->ReadTime();
|
||||
// Time::Clock time = Time::ConvertFromUnix(UnixTimestamp);
|
||||
// DbgWriteScreen("NTP: %d - %d.%d.%d %d:%d:%d", time.Counter,
|
||||
// time.Day, time.Month, time.Year,
|
||||
// time.Hour, time.Minute, time.Second);
|
||||
TaskManager->Sleep(200);
|
||||
|
||||
/* TODO: Store everything in an vector and initialize all network cards */
|
||||
|
||||
thisThread->SetPriority(Tasking::TaskPriority::Idle);
|
||||
CPU::Halt(true);
|
||||
}
|
||||
@ -190,11 +196,12 @@ namespace NetworkInterfaceManager
|
||||
void *DataToBeSent = vma->RequestPages(TO_PAGES(Length + 1));
|
||||
memcpy(DataToBeSent, Data, Length);
|
||||
|
||||
KernelCallback cb{};
|
||||
cb.Reason = SendReason;
|
||||
cb.NetworkCallback.Send.Data = (uint8_t *)DataToBeSent;
|
||||
cb.NetworkCallback.Send.Length = Length;
|
||||
ModuleManager->IOCB(Interface->DriverID, &cb);
|
||||
/* KernelCallback */
|
||||
// KernelCallback cb{};
|
||||
// cb.Reason = SendReason;
|
||||
// cb.NetworkCallback.Send.Data = (uint8_t *)DataToBeSent;
|
||||
// cb.NetworkCallback.Send.Length = Length;
|
||||
// DriverManager->IOCB(Interface->DriverID, &cb);
|
||||
|
||||
vma->FreePages(DataToBeSent, TO_PAGES(Length + 1));
|
||||
foreach (auto ev in RegisteredEvents)
|
||||
|
Reference in New Issue
Block a user