Bump rtnetlink version to the latest

Signed-off-by: Guvenc Gulce <[email protected]>

Author: guvenc

Cargo.lock

@@ -38,8 +38,8 @@ digest = "0.10"
 clap = { version = "4.5.48", features = ["derive", "env"] }
 dotenvy = { version = "0.15"}
 libc = "0.2"
-rtnetlink = "0.14.1"
-netlink-packet-route = "~0.19.0"
+rtnetlink = "0.18.1"
+netlink-packet-route = "~0.25.0"
 pnet = "0.35.0"
 dhcproto = "0.13.0"
 socket2 = "0.6.0"

Cargo.toml

@@ -8,9 +8,7 @@ use feos_proto::image_service::{
 };
 use log::{error, info, warn};
 use oci_distribution::{
-    client::{ClientConfig, ClientProtocol},
-    errors::OciDistributionError,
-    secrets, Client, ParseError, Reference,
+    client::ClientConfig, errors::OciDistributionError, secrets, Client, ParseError, Reference,
 };
 use std::collections::HashMap;
 use tokio::sync::{broadcast, mpsc, oneshot};
@@ -221,10 +219,7 @@ async fn download_layer_data(image_ref: &str) -> Result<Vec<u8>, PullError> {
         VMLINUZ_MEDIA_TYPE,
     ];
 
-    let insecure_registries = vec!["ghcr.io:5000".to_string()];
-
     let config = ClientConfig {
-        protocol: ClientProtocol::HttpsExcept(insecure_registries),
         ..Default::default()
     };
 

feos/services/image-service/src/worker.rs

@@ -5,7 +5,7 @@ use dhcproto::v6::*;
 use futures::stream::TryStreamExt;
 use log::{error, info, warn};
 use netlink_packet_route::route::{
-    RouteAddress, RouteAttribute, RouteProtocol, RouteScope, RouteType,
+    RouteAddress, RouteAttribute, RouteMessage, RouteProtocol, RouteScope, RouteType,
 };
 use netlink_packet_route::AddressFamily;
 use nix::net::if_::if_nametoindex;
@@ -498,8 +498,8 @@ pub async fn add_ipv6_route(
         .try_next()
         .await?
         .ok_or(Error::RequestFailed)?;
-    let mut req = handle.route().add();
-    let msg = req.message_mut();
+    
+    let mut msg = RouteMessage::default();
     msg.header.address_family = AddressFamily::Inet6;
     msg.header.scope = RouteScope::Universe;
     msg.header.protocol = RouteProtocol::Static;
@@ -515,7 +515,8 @@ pub async fn add_ipv6_route(
     }
     msg.attributes.push(RouteAttribute::Oif(link.header.index));
     msg.attributes.push(RouteAttribute::Priority(metric));
-    req.execute().await
+    
+    handle.route().add(msg).execute().await
 }
 
 pub async fn set_ipv6_gateway(
@@ -531,8 +532,8 @@ pub async fn set_ipv6_gateway(
         .try_next()
         .await?
         .ok_or(Error::RequestFailed)?;
-    let mut req = handle.route().add();
-    let msg = req.message_mut();
+    
+    let mut msg = RouteMessage::default();
     msg.header.address_family = AddressFamily::Inet6;
     msg.header.scope = RouteScope::Universe;
     msg.header.protocol = RouteProtocol::Static;
@@ -541,5 +542,6 @@ pub async fn set_ipv6_gateway(
     msg.attributes
         .push(RouteAttribute::Gateway(RouteAddress::Inet6(ipv6_gateway)));
     msg.attributes.push(RouteAttribute::Oif(link.header.index));
-    req.execute().await
+    
+    handle.route().add(msg).execute().await
 }

feos/utils/src/network/dhcpv6.rs

@@ -5,6 +5,7 @@ use super::dhcpv6::*;
 use futures::stream::TryStreamExt;
 use log::{error, info, warn};
 use netlink_packet_route::route::RouteType;
+use netlink_packet_route::link::{LinkAttribute, LinkFlags, LinkMessage};
 use rtnetlink::new_connection;
 use std::fs::File;
 use std::io;
@@ -162,24 +163,28 @@ pub async fn configure_network_devices() -> Result<Option<(Ipv6Addr, u8)>, Strin
         .map_err(|e| format!("{interface_name} not found: {e}"))?
         .ok_or("Link not found".to_string())?;
 
+    let mut link_msg = LinkMessage::default();
+    link_msg.header.index = link.header.index;
+    link_msg.header.flags = link.header.flags | LinkFlags::Up;
+    link_msg.header.change_mask = LinkFlags::Up;
+
     handle
         .link()
-        .set(link.header.index)
-        .up()
+        .set(link_msg)
         .execute()
         .await
         .map_err(|e| format!("{interface_name} can not be set up: {e}"))?;
 
     info!("{interface_name}:");
     for attr in link.attributes {
         match attr {
-            netlink_packet_route::link::LinkAttribute::Address(mac_bytes) => {
+            LinkAttribute::Address(mac_bytes) => {
                 info!("  mac: {}", format_mac(mac_bytes.clone()));
             }
-            netlink_packet_route::link::LinkAttribute::Carrier(carrier) => {
+            LinkAttribute::Carrier(carrier) => {
                 info!("  carrier: {carrier}");
             }
-            netlink_packet_route::link::LinkAttribute::Mtu(mtu) => {
+            LinkAttribute::Mtu(mtu) => {
                 info!("  mtu: {mtu}");
             }
             _ => (),

feos/utils/src/network/utils.rs

@@ -23,7 +23,6 @@ cat <<EOF >>etc/hosts
 127.0.0.1    localhost
 127.0.1.1    feos
 ::1          localhost feos
-2a10:afc0:e013:fe01:: ghcr.io
 EOF
 
 echo "feos" > etc/hostname

hack/initramfs/mk-initramfs

@@ -1 +1 @@
-console=tty0 console=ttyS0,115200
+console=tty0