Add vagrant and docker scripts

* Initilze vagrant configuration
* Initilze docker container
* fix `IPConfig` and `NetInfo` conflictions

Author: ssfdust

.gitignore

@@ -19,4 +19,21 @@ cscope.out
 cscope.in.out
 cscope.po.out
 
+### Vagrant ###
+# General
+.vagrant/
 
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.logs
+
+### Rust ###
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk

Vagrantfile

@@ -0,0 +1,27 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "rockylinux/9"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder "./", "/home/vagrant/workspace", type: "nfs", nfs_udp: false, nfs_version: "4.2"
+  config.vm.synced_folder ENV["HOME"] + "/.cargo", "/home/vagrant/.cargo", type: "nfs", nfs_udp: false, nfs_version: "4.2"
+  config.vm.network "private_network", type: "dhcp"
+  config.vm.network "private_network", ip: "192.168.50.4"
+  config.vm.provision "shell", inline: "bash /home/vagrant/workspace/scripts/vagrant/init.sh"
+  config.vm.provider :libvirt do |libvirt|
+    # CPU 核心数
+    libvirt.cpus = 16
+    # 内存大小
+    libvirt.memory = 16384
+    # 存储池名称
+    libvirt.storage_pool_name = "virtual"
+    # 使用系统接口
+    libvirt.uri = "qemu:///system"
+    # 默认网络修改
+    libvirt.management_network_name = "vagrant-virbr2"
+    # 阻止自定义网络被删除
+    libvirt.management_network_keep = true
+  end
+  config.trigger.after :provision do |trigger|
+    trigger.info = "Adding kitty terminfo.."
+    trigger.run = {inline: "bash -c 'infocmp -a xterm-kitty | vagrant ssh -c \"tic -x -o \~/.terminfo /dev/stdin\" 2>/dev/null || true'"}
+  end
+end

network/src/dispatch/ipconfigs.rs

@@ -8,7 +8,7 @@ use ipnet::IpNet;
 use libc::{AF_INET, AF_INET6};
 use nm::{ConnectionExt, IPAddress, SettingIPConfig, SettingIPConfigExt, SettingIP4Config, SettingIP6Config};
 use std::boxed::Box;
-use crate::utils::IPConfig;
+use crate::net::NetInfo;
 
 fn ipnet2ipaddr(ipnet: IpNet) -> Result<IPAddress> {
     let ipaddress: IPAddress;
@@ -30,13 +30,13 @@ pub async fn get_ip_config(conn_name: String, family: i32) -> Result<NetworkResp
         // Parser configuration
         if family == 4 {
             if let Some(setting_ip4_config) = connection.setting_ip4_config().map(|x| <SettingIP4Config as Into<SettingIPConfig>>::into(x)) {
-                IPConfig::try_from(setting_ip4_config)
+                NetInfo::try_from(setting_ip4_config)
             } else {
                 bail!("Failed to get ipv4 config")
             }
         } else {
             if let Some(setting_ip6_config) = connection.setting_ip6_config().map(|x| <SettingIP6Config as Into<SettingIPConfig>>::into(x)) {
-                IPConfig::try_from(setting_ip6_config)
+                NetInfo::try_from(setting_ip6_config)
             } else {
                 bail!("Failed to get ipv6 config")
             }
@@ -52,7 +52,7 @@ pub async fn get_ip_config(conn_name: String, family: i32) -> Result<NetworkResp
 pub async fn update_ip_config(
     conn_name: String,
     family: i32,
-    config: IPConfig,
+    config: NetInfo,
 ) -> Result<NetworkResponse> {
     let client = create_client().await?;
     let _conn: Option<nm::RemoteConnection> = try {

network/src/lib.rs

@@ -19,7 +19,7 @@ extern crate eyre;
 
 mod dispatch;
 mod net;
-mod tokio;
+mod tokio_client;
 
 use std::sync::Arc;
 

network/src/tokio.rs renamed to network/src/tokio_client.rs

@@ -2,7 +2,7 @@ mod fixture;
 
 use fixture::start_instance;
 use ipnet::IpNet;
-use network::{send_command, IPConfig, NetworkCommand, NetworkResponse, Route, State};
+use network::{send_command, NetInfo, NetworkCommand, NetworkResponse, State};
 use rstest::rstest;
 use std::net::IpAddr;
 use std::sync::Arc;
@@ -50,7 +50,7 @@ async fn test_modify_ip_configuration(start_instance: &Arc<State>) {
     }
     let gw: IpAddr = "192.168.101.1".parse().unwrap();
     let addresses: Vec<IpNet> = vec!["192.168.101.38/24".parse().unwrap()];
-    let ip4_config = IPConfig {
+    let ip4_config = NetInfo {
         method: String::from("manual"),
         addresses,
         gateway: Some(gw),
@@ -75,7 +75,7 @@ async fn test_modify_ip_configuration(start_instance: &Arc<State>) {
     tokio::time::sleep(std::time::Duration::from_secs(5)).await;
     let gw: IpAddr = "fe80::5c51:8df8:ee41:d98a".parse().unwrap();
     let addresses: Vec<IpNet> = vec!["fe80::5c51:8df8:ee41:d98a/64".parse().unwrap()];
-    let ip6_config = IPConfig {
+    let ip6_config = NetInfo {
         method: String::from("manual"),
         addresses,
         gateway: Some(gw),

network/tests/test_configuration.rs

@@ -0,0 +1,11 @@
+#!/bin/nu
+let container = (buildah from docker.io/library/rockylinux:9)
+buildah add $container inner /
+buildah run --network=host $container -- bash /docker-init/localize.sh
+buildah run --network=host $container -- bash -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly -y"
+buildah run --network=host $container -- dnf install -y NetworkManager-libnm-devel systemd-devel git protobuf-devel gcc
+buildah run --network=host $container -- dnf clean all
+buildah run --network=host $container -- cp /docker-init/config /root/.cargo/config
+buildah config --env PATH=/root/.cargo/bin:$PATH $container 
+buildah commit $container docker.io/ssfdust/orbuculum-dev:latest
+buildah rm $container

scripts/build-dev-container.nu

@@ -0,0 +1,3 @@
+#!/bin/nu
+alias xcargo = podman run --network=host --rm --name test -v $"(pwd | str trim):/work" -v $"($env.HOME)/.cargo:/root/.cargo" --workdir /work --replace -ti docker.io/ssfdust/orbuculum-dev cargo
+alias xbash = podman run --network=host --rm --name test -v $"(pwd | str trim):/work" -v $"($env.HOME)/.cargo:/root/.cargo" --workdir /work --replace -ti docker.io/ssfdust/orbuculum-dev

scripts/cargo

@@ -0,0 +1,14 @@
+[source.crates-io]
+# To use sparse index, change 'rsproxy' to 'rsproxy-sparse'
+replace-with = 'rsproxy'
+
+[source.rsproxy]
+registry = "https://rsproxy.cn/crates.io-index"
+[source.rsproxy-sparse]
+registry = "sparse+https://rsproxy.cn/index/"
+
+[registries.rsproxy]
+index = "https://rsproxy.cn/crates.io-index"
+
+[net]
+git-fetch-with-cli = true

scripts/inner/docker-init/config

@@ -0,0 +1,8 @@
+#!/bin/sh
+sed -i '/\[crb\]/,/enabled/s/enabled=0/enabled=1/' /etc/yum.repos.d/rocky.repo
+sed -e 's|^mirrorlist=|#mirrorlist=|g' \
+    -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.nju.edu.cn/rocky|g' \
+    -i.bak \
+    /etc/yum.repos.d/*.repo
+dnf makecache
+dnf update -y

scripts/inner/docker-init/localize.sh

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+[ -f /etc/.initilized ] && exit 0
+
+# Prepare environment
+sed -i '/\[crb\]/,/enabled/s/enabled=0/enabled=1/' /etc/yum.repos.d/rocky.repo
+sed -e 's|^mirrorlist=|#mirrorlist=|g' \
+    -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.nju.edu.cn/rocky|g' \
+    -i.bak \
+    /etc/yum.repos.d/*.repo
+dnf makecache
+dnf update -y
+dnf install -y NetworkManager-libnm-devel systemd-devel git protobuf-devel gcc
+
+# Install rust
+runuser -u vagrant -- /home/vagrant/.cargo/bin/rustup default nightly
+echo "source ~/.cargo/env" | tee -a /home/vagrant/.bashrc
+
+# Install starship
+dnf copr enable -y atim/starship 
+dnf install -y starship
+echo 'eval "$(starship init bash)"' | tee -a /home/vagrant/.bashrc
+
+# create startship configuration
+install -d -o vagrant -g vagrant /home/vagrant/.config
+cat > /home/vagrant/.config/starship.toml <<EOF
+format = """[\uE0B6](fg:#1C4961)[\$directory](bg:#1C4961)[\uE0B0](fg:#1C4961 bg:#2F79A1)\$git_branch[\uE0B0](fg:#2F79A1 bg:#3A95C7)\$git_status[\uE0B0](#3A95C7 bg:#40A9E0)\$cmd_duration[\uE0B0](#40A9E0 bg:none) \$all\$character"""
+
+right_format = ""
+
+add_newline = false
+
+[directory]
+style = "bg:#1C4961 fg:white"
+
+[git_branch]
+format = "[ \$symbol\$branch ](\$style)"
+style = "bg:#2F79A1 fg:white"
+
+[git_status]
+format = "[ \$all_status\$ahead_behind ](\$style)"
+style = "bg:#3A95C7 fg:white"
+
+[cmd_duration]
+disabled = false
+format = "[ took \$duration ](\$style)"
+show_milliseconds = true
+style = "bg:#40A9E0 fg:white"
+EOF
+
+touch /etc/.initilized