Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use static IP addresses

Browse Source
This commit is contained in:
Ruihan Li
2024-09-19 11:40:28 +08:00
committed by Tate, Hongliang Tian
parent 9abdebbae3
commit d62bb1ca76
3 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/src/net/iface/init.rs
View File

@ -33,10 +33,17 @@ pub fn init() {
}
fn new_virtio() -> Arc<Iface> {
use aster_bigtcp::{iface::EtherIface, wire::EthernetAddress};
use aster_bigtcp::{
iface::EtherIface,
wire::{EthernetAddress, Ipv4Address, Ipv4Cidr},
};
use aster_network::AnyNetworkDevice;
use aster_virtio::device::network::DEVICE_NAME;
const VIRTIO_ADDRESS: Ipv4Address = Ipv4Address::new(10, 0, 2, 15);
const VIRTIO_ADDRESS_PREFIX_LEN: u8 = 24; // mask: 255.255.255.0
const VIRTIO_GATEWAY: Ipv4Address = Ipv4Address::new(10, 0, 2, 2);
let virtio_net = aster_network::get_device(DEVICE_NAME).unwrap();
let ether_addr = virtio_net.lock().mac_addr().0;
@ -58,6 +65,8 @@ fn new_virtio() -> Arc<Iface> {
EtherIface::new(
Wrapper(virtio_net),
EthernetAddress(ether_addr),
Ipv4Cidr::new(VIRTIO_ADDRESS, VIRTIO_ADDRESS_PREFIX_LEN),
VIRTIO_GATEWAY,
IfaceExt::new("virtio".to_owned()),
)
}
@ -66,13 +75,10 @@ fn new_loopback() -> Arc<Iface> {
use aster_bigtcp::{
device::{Loopback, Medium},
iface::IpIface,
wire::{IpAddress, IpCidr, Ipv4Address},
wire::{Ipv4Address, Ipv4Cidr},
};
const LOOPBACK_ADDRESS: IpAddress = {
let ipv4_addr = Ipv4Address::new(127, 0, 0, 1);
IpAddress::Ipv4(ipv4_addr)
};
const LOOPBACK_ADDRESS: Ipv4Address = Ipv4Address::new(127, 0, 0, 1);
const LOOPBACK_ADDRESS_PREFIX_LEN: u8 = 8; // mask: 255.0.0.0
struct Wrapper(Mutex<Loopback>);
@ -91,7 +97,7 @@ fn new_loopback() -> Arc<Iface> {
IpIface::new(
Wrapper(Mutex::new(Loopback::new(Medium::Ip))),
IpCidr::new(LOOPBACK_ADDRESS, LOOPBACK_ADDRESS_PREFIX_LEN),
Ipv4Cidr::new(LOOPBACK_ADDRESS, LOOPBACK_ADDRESS_PREFIX_LEN),
IfaceExt::new("lo".to_owned()),
) as _
}