automatic import of freerouter

15 files changed, 75 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index d7ccb71..ddb80cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /v24.9.1.tar.gz
 /v24.9.5.tar.gz
 /v24.9.6.tar.gz
+/v24.9.8.tar.gz
diff --git a/10-virtio.link b/10-virtio.link
new file mode 100644
index 0000000..47dbeb3
--- /dev/null
+++ b/10-virtio.link
@@ -0,0 +1,5 @@
+[Match]
+Driver=virtio_net
+
+[Link]
+GenericReceiveOffload=false
diff --git a/20-veth.link b/20-veth.link
new file mode 100644
index 0000000..37749ba
--- /dev/null
+++ b/20-veth.link
@@ -0,0 +1,6 @@
+[Match]
+Driver=veth
+
+[Link]
+TransmitChecksumOffload=false
+TransmitVLANCTAGHardwareAcceleration=false
diff --git a/freerouter-p4dpdk-pkt.service b/freerouter-p4dpdk-pkt.service
index d809f87..2ab2ec0 100644
--- a/freerouter-p4dpdk-pkt.service
+++ b/freerouter-p4dpdk-pkt.service
@@ -2,6 +2,8 @@
 Description=p4dpdk specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4dpdk.service b/freerouter-p4dpdk.service
index 1269eb3..6ddf558 100644
--- a/freerouter-p4dpdk.service
+++ b/freerouter-p4dpdk.service
@@ -2,6 +2,8 @@
 Description=p4dpdk specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4emu.service b/freerouter-p4emu.service
index 647f60d..5e8766d 100644
--- a/freerouter-p4emu.service
+++ b/freerouter-p4emu.service
@@ -2,6 +2,8 @@
 Description=p4emu specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4mnl.service b/freerouter-p4mnl.service
index 82c3c4e..d3a7672 100644
--- a/freerouter-p4mnl.service
+++ b/freerouter-p4mnl.service
@@ -2,6 +2,8 @@
 Description=p4mnl specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4urng.service b/freerouter-p4urng.service
index e9cdb28..5a21fad 100644
--- a/freerouter-p4urng.service
+++ b/freerouter-p4urng.service
@@ -2,6 +2,8 @@
 Description=p4urng specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4xdp.service b/freerouter-p4xdp.service
index bfee29c..983f2dd 100644
--- a/freerouter-p4xdp.service
+++ b/freerouter-p4xdp.service
@@ -2,6 +2,8 @@
 Description=p4xdp specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter-p4xsk.service b/freerouter-p4xsk.service
index c5f8c6f..28acfee 100644
--- a/freerouter-p4xsk.service
+++ b/freerouter-p4xsk.service
@@ -2,6 +2,8 @@
 Description=p4xsk specific process of freerouter
 Requires=freerouter.service freerouter-native@cpu_port.service network.target
 After=freerouter.service freerouter-native@cpu_port.service network.target
+Wants=sys-subsystem-net-devices-veth250.device
+After=sys-subsystem-net-devices-veth250.device
 
 [Service]
 Type=simple
diff --git a/freerouter.spec b/freerouter.spec
index 44c8920..6990b32 100644
--- a/freerouter.spec
+++ b/freerouter.spec
@@ -2,7 +2,7 @@
 %undefine _debugsource_packages
 
 Name:           freerouter
-Version:        24.9.6
+Version:        24.9.8
 Release:        1%{?dist}
 Summary:        Free, open source router OS process
 
@@ -17,6 +17,12 @@ Source5:        freerouter-p4udp.service
 Source6:        freerouter-p4urng.service
 Source7:        freerouter-p4xdp.service
 Source8:        freerouter-p4xsk.service
+Source9:        10-virtio.link
+Source10:       20-veth.link
+Source11:       veth250.network
+Source12:       veth251.network
+Source13:       veth251.netdev
+
 %if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?openEuler}
 Recommends:     socat
 Recommends:     freerouter-native
@@ -50,7 +56,7 @@ effect: there are no vrf-awareness questions
 Summary:        Native tools for better performance than socat
 Requires:       %{name} = %{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?openEuler}
-Recommends:     dpdk-tools xdp-tools
+Recommends:     dpdk-tools xdp-tools systemd-networkd
 %endif
 
 %description native
@@ -69,7 +75,7 @@ Examples of freeRouter test configurations.
 
 %prep
 %setup -q -n freeRtr-%{?version}
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
 
 %build
 pushd src
@@ -93,6 +99,7 @@ mkdir -p %{buildroot}%{_javadir}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_datadir}/freerouter
 mkdir -p %{buildroot}%{_sysconfdir}/freerouter/interfaces
+mkdir -p %{buildroot}%{_sysconfdir}/systemd/network
 mkdir -p %{buildroot}%{_sharedstatedir}/freerouter
 
 install -m644 src/rtr.jar %{buildroot}%{_javadir}
@@ -101,6 +108,7 @@ install -m755 binTmp/*.so %{buildroot}%{_libdir}
 install -m755 misc/debian2/interface.sh %{buildroot}%{_datadir}/freerouter/
 install -m644 misc/debian2/interface.cpu_port %{buildroot}%{_sysconfdir}/freerouter/interfaces/cpu_port
 install -m644 misc/debian2/rtr-hw.txt misc/debian2/rtr-sw.txt %{buildroot}%{_sysconfdir}/freerouter
+install -m644 10-virtio.link 20-veth.link veth250.network veth251.network veth251.netdev %{buildroot}%{_sysconfdir}/systemd/network/
 install -m644 misc/debian2/freerouter-native@.service %{buildroot}%{_unitdir}
 install -m644 misc/debian2/freerouter.service %{buildroot}%{_unitdir}
 install -m644 misc/debian2/freerouter.service %{buildroot}%{_unitdir}/freerouter@.service
@@ -152,6 +160,7 @@ usermod -aG dialout freerouter
 %doc freerouter-p4xdp.service freerouter-p4xsk.service
 %dir %{_sysconfdir}/freerouter/interfaces
 %config(noreplace) %{_sysconfdir}/freerouter/interfaces/cpu_port
+%config(noreplace) %{_sysconfdir}/systemd/network/*
 %{_bindir}/*.bin
 %{_libdir}/*.so
 %{_datadir}/freerouter/
diff --git a/sources b/sources
index 619e33b..e81743d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a95b65ba89d90f759301f8e008c73684  v24.9.6.tar.gz
+4c6a32e65b27c021a6f7265044da91aa  v24.9.8.tar.gz
diff --git a/veth250.network b/veth250.network
new file mode 100644
index 0000000..c4a7277
--- /dev/null
+++ b/veth250.network
@@ -0,0 +1,14 @@
+[Match]
+Name=veth250
+
+[Network]
+ConfigureWithoutCarrier=true
+IgnoreCarrierLoss=true
+LinkLocalAddressing=no
+IPv6AcceptRA=no
+IPv6SendRA=no
+DHCP=no
+
+[Link]
+MTUBytes=65535
+Promiscuous=true
diff --git a/veth251.netdev b/veth251.netdev
new file mode 100644
index 0000000..8fd4ba2
--- /dev/null
+++ b/veth251.netdev
@@ -0,0 +1,8 @@
+[NetDev]
+Name=veth251
+Kind=veth
+MACAddress=00:16:3e:00:01:01
+
+[Peer]
+Name=veth250
+MACAddress=00:16:3e:00:01:02
diff --git a/veth251.network b/veth251.network
new file mode 100644
index 0000000..8b74fff
--- /dev/null
+++ b/veth251.network
@@ -0,0 +1,14 @@
+[Match]
+Name=veth251
+
+[Network]
+ConfigureWithoutCarrier=true
+IgnoreCarrierLoss=true
+LinkLocalAddressing=no
+IPv6AcceptRA=no
+IPv6SendRA=no
+DHCP=no
+
+[Link]
+MTUBytes=65535
+Promiscuous=true