Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #267 from blanham/add_multiboot2_network_tag

Browse Source 
Implement Multiboot2 network tag
This commit is contained in:
ミンツキ 2023-04-24 16:39:30 +02:00 committed by GitHub
commit d7da6d63b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/protos/multiboot2.c
View File

@ -24,6 +24,7 @@
#include <mm/pmm.h>
#include <lib/misc.h>
#include <drivers/vga_textmode.h>
#include <pxe/pxe.h>
#define LIMINE_BRAND "Limine " LIMINE_VERSION
@ -56,6 +57,7 @@ static size_t get_multiboot2_info_size(
ALIGN_UP(sizeof(struct multiboot_tag_efi64_ih), MULTIBOOT_TAG_ALIGN) + // EFI image handle 64
#endif
#endif
ALIGN_UP(sizeof(struct multiboot_tag_network) + cached_dhcp_packet_len, MULTIBOOT_TAG_ALIGN) + // network info
ALIGN_UP(sizeof(struct multiboot_tag), MULTIBOOT_TAG_ALIGN); // end
}
@ -782,6 +784,22 @@ skip_modeset:;
}
#endif
//////////////////////////////////////////////
// Create network info tag
//////////////////////////////////////////////
{
if (cached_dhcp_packet_len) {
struct multiboot_tag_network *tag = (struct multiboot_tag_network *)(mb2_info + info_idx);
tag->type = MULTIBOOT_TAG_TYPE_NETWORK;
tag->size = sizeof(struct multiboot_tag_network) + cached_dhcp_packet_len;
// Copy over the DHCP packet.
memcpy(tag->dhcpack, cached_dhcp_packet, cached_dhcp_packet_len);
append_tag(info_idx, tag);
}
}
//////////////////////////////////////////////
// Create end tag
//////////////////////////////////////////////

3
common/pxe/pxe.h
View File

@ -4,6 +4,9 @@
#include <stdint.h>
#include <lib/part.h>
extern uint8_t cached_dhcp_packet[1472];
extern int cached_dhcp_packet_len;
#if defined (BIOS)
struct volume *pxe_bind_volume(void);

8
common/pxe/tftp.s2.c
View File

@ -10,6 +10,10 @@
#include <mm/pmm.h>
#include <lib/misc.h>
// cache the dhcp packet
uint8_t cached_dhcp_packet[1472] = { 0 };
int cached_dhcp_packet_len = 0;
#if defined (BIOS)
static uint32_t get_boot_server_info(void) {
@ -17,6 +21,8 @@ static uint32_t get_boot_server_info(void) {
cachedinfo.packet_type = PXENV_PACKET_TYPE_CACHED_REPLY;
pxe_call(PXENV_GET_CACHED_INFO, ((uint16_t)rm_seg(&cachedinfo)), (uint16_t)rm_off(&cachedinfo));
struct bootph *ph = (struct bootph*)(void *) (((((uint32_t)cachedinfo.buffer) >> 16) << 4) + (((uint32_t)cachedinfo.buffer) & 0xFFFF));
memcpy(&cached_dhcp_packet, ph, sizeof(struct bootph));
cached_dhcp_packet_len = sizeof(struct bootph);
return ph->sip;
}
@ -141,6 +147,8 @@ static EFI_IP_ADDRESS *parse_ip_addr(struct volume *part, const char *server_add
else if (part->pxe_base_code->Mode->ProxyOfferReceived) packet = &part->pxe_base_code->Mode->ProxyOffer;
else packet = &part->pxe_base_code->Mode->DhcpAck;
memcpy(out.Addr, packet->Dhcpv4.BootpSiAddr, 4);
memcpy(cached_dhcp_packet, packet, sizeof(EFI_PXE_BASE_CODE_PACKET));
cached_dhcp_packet_len = sizeof(EFI_PXE_BASE_CODE_PACKET);
} else {
if (inet_pton(server_addr, &out.Addr)) {
panic(true, "tftp: Invalid IPv4 address: \"%s\"", server_addr);

6
test/multiboot2.c
View File

@ -132,6 +132,12 @@ void multiboot2_main(uint32_t magic, struct multiboot_info* mb_info_addr) {
break;
}
case MULTIBOOT_TAG_TYPE_NETWORK: {
struct multiboot_tag_network *network = (struct multiboot_tag_network *)tag;
e9_printf("\t network tag exists");
break;
}
}
add_size = tag->size;