diff options
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | freerouter.spec | 46 | ||||
| -rw-r--r-- | rtr-hw.txt | 7 | ||||
| -rw-r--r-- | rtr-sw.txt | 85 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 127 insertions, 25 deletions
@@ -46,3 +46,15 @@ /v25.4.13.tar.gz /v25.4.19.tar.gz /v25.4.24.tar.gz +/v25.4.26.tar.gz +/v25.5.3.tar.gz +/v25.5.9.tar.gz +/v25.5.22.tar.gz +/v25.5.24.tar.gz +/v25.6.2.tar.gz +/v25.7.17.tar.gz +/v25.8.4.tar.gz +/v25.8.16.tar.gz +/v25.8.24.tar.gz +/v25.8.30.tar.gz +/v25.11.9.tar.gz diff --git a/freerouter.spec b/freerouter.spec index e291d43..7b19cce 100644 --- a/freerouter.spec +++ b/freerouter.spec @@ -3,7 +3,7 @@ %define _use_weak_usergroup_deps 1 Name: freerouter -Version: 25.4.24 +Version: 25.11.9 Release: 1%{?dist} Summary: Free, open source router OS process @@ -24,28 +24,24 @@ Source11: veth250.network Source12: veth251.network Source13: veth251.netdev Source14: 80-freerouter.conf +Source15: rtr-hw.txt +Source16: rtr-sw.txt -%if 0%{?rhel} == 7 -BuildRequires: openssl1.1-devel -%else -BuildRequires: openssl-devel -BuildRequires: liburing-devel -BuildRequires: libxdp-devel -Recommends: freerouter-native -Recommends: socat -Recommends: telnet -%endif -BuildRequires: systemd BuildRequires: clang llvm BuildRequires: dpdk-devel -BuildRequires: libpcap-devel BuildRequires: libmnl-devel -%if 0%{?fedora} > 41 || 0%{?rhel} > 9 +BuildRequires: libpcap-devel +BuildRequires: liburing-devel +BuildRequires: libxdp-devel +BuildRequires: openssl-devel +BuildRequires: systemd zip BuildRequires: java-21-openjdk-devel Requires: java-21-openjdk-headless -%else -BuildRequires: java-11-openjdk-devel -Requires: java-11-openjdk-headless +Recommends: freerouter-native +Recommends: socat +Recommends: telnet +%if 0%{?fedora} || 0%{?suse_version} +Requires(pre): group(dialout) %endif %description @@ -63,9 +59,7 @@ effect: there are no vrf-awareness questions %package native Summary: Native tools for better performance than socat Requires: %{name} = %{version}-%{release} -%if 0%{?rhel} != 7 Recommends: dpdk-tools xdp-tools systemd-networkd -%endif %description native These tools are completely optional but should deliver better performance @@ -84,6 +78,14 @@ Examples of freeRouter test configurations. %prep %setup -q -n freeRtr-%{?version} cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} . +cp %{SOURCE15} %{SOURCE16} misc + +%if 0%{?suse_version} +sed -i 's|/usr/bin/freerouter|/usr/lib64/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service +sed -i 's|libmnl/libmnl.h|libmnl/libmnl/libmnl.h|g' misc/native/{p4mnl_user.c,veth.c} +%else +sed -i 's|/usr/bin/freerouter|/usr/lib/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service +%endif %build pushd src @@ -99,11 +101,6 @@ popd %install find binTmp -size 0 -print -delete find misc/demo -type f -not -name '*.txt' -delete -%if 0%{?fedora} > 41 || 0%{?rhel} > 9 -sed -i 's|/usr/bin/freerouter|/usr/lib/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service -%else -sed -i 's|/usr/bin/freerouter|/usr/lib/jvm/jre-11-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service -%endif mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libdir} @@ -172,6 +169,7 @@ usermod -aG dialout freerouter %doc freerouter-p4emu.service freerouter-p4mnl.service %doc freerouter-p4udp.service freerouter-p4urng.service %doc freerouter-p4xdp.service freerouter-p4xsk.service +%doc misc/rtr-hw.txt misc/rtr-sw.txt %dir %{_sysconfdir}/freerouter/interfaces %config(noreplace) %{_sysconfdir}/sysctl.d/80-freerouter.conf %config(noreplace) %{_sysconfdir}/freerouter/interfaces/cpu_port diff --git a/rtr-hw.txt b/rtr-hw.txt new file mode 100644 index 0000000..4cc1e21 --- /dev/null +++ b/rtr-hw.txt @@ -0,0 +1,7 @@ +hwid emu +! cpu_port +int eth0 eth 0000.1111.00fb 127.0.0.1 22710 127.0.0.1 22709 +! freerouter cli +tcp2vrf 2323 host 23 127.0.0.1 +! freerouter control port for message +tcp2vrf 9080 host 9080 127.0.0.1 diff --git a/rtr-sw.txt b/rtr-sw.txt new file mode 100644 index 0000000..868a5d6 --- /dev/null +++ b/rtr-sw.txt @@ -0,0 +1,85 @@ +hostname rtr +buggy +! +logging buffered debug 10240 +logging file debug core1.log +! +vrf definition host + exit +! +vrf definition test + exit +! +interface ethernet0 + no shutdown + no log-link-change + exit +! +interface sdn1 + mtu 1500 + macaddr 0000.0000.1111 + vrf forwarding test + ipv4 address dynamic dynamic + ipv4 dhcp-client enable + no shutdown + no log-link-change + exit +! +interface sdn2 + mtu 1500 + macaddr 0000.0000.2222 + vrf forwarding test + no shutdown + no log-link-change + exit +! +console0 + no exec authorization + no login authentication + exit +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +server telnet host + security protocol telnet + exec timeout 0 + exec colorize header + no exec authorization + no login authentication + vrf host + exit +! +server p4lang p4 + export-vrf test + export-port sdn1 0 0 0 0 0 + export-port sdn2 1 0 0 0 0 + interconnect ethernet0 + vrf host + exit +! +! +end @@ -1 +1 @@ -fca986537aaaf306a7a47ce0affc5c5e v25.4.24.tar.gz +99f656d26ec1acbf566e66ca942737df v25.11.9.tar.gz |