Merge pull request #1384 from kernelkit/new-frr

Author: mattiaswal

board/common/rootfs/etc/default/mgmtd

@@ -0,0 +1 @@
+MGMTD_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog --log-level err -M grpc"

board/common/rootfs/etc/finit.d/available/netd.conf

@@ -0,0 +1,2 @@
+#set DEBUG=1
+service [2345] <pid/confd,pid/staticd> name:netd netd -- Network route daemon

board/common/rootfs/etc/finit.d/enabled/netd.conf

@@ -0,0 +1 @@
+../available/netd.conf

board/common/rootfs/etc/frr/daemons

@@ -0,0 +1,28 @@
+# Default FRR daemons file for Infix - confd overwrites on routing changes.
+# watchfrr, zebra, mgmtd, and staticd are always started by frrinit.sh.
+ospfd=no
+ripd=no
+bfdd=no
+bgpd=no
+ospf6d=no
+ripngd=no
+isisd=no
+pimd=no
+pim6d=no
+ldpd=no
+eigrpd=no
+babeld=no
+vrrpd=no
+pathd=no
+
+vtysh_enable=yes
+watchfrr_options="-l 4"
+zebra_options="  -A 127.0.0.1 -s 90000000"
+mgmtd_options="  -A 127.0.0.1"
+ospfd_options="  -A 127.0.0.1"
+ripd_options="   -A 127.0.0.1"
+staticd_options="-A 127.0.0.1"
+bfdd_options="   -A 127.0.0.1"
+
+frr_profile="traditional"
+

board/common/rootfs/etc/frr/frr.conf

@@ -0,0 +1,2 @@
+# Replaces default frr.conf file
+log syslog warnings

board/common/rootfs/etc/frr/static.d/00default.conf

@@ -290,6 +290,14 @@ def parse_interface_info(ifname):
             if power_match:
                 result['txpower'] = float(power_match.group(1))
 
+        # wiphy index -> phy/radio name
+        elif stripped.startswith('wiphy '):
+            try:
+                wiphy_idx = int(stripped.split()[1])
+                result['phy'] = normalize_phy_name(f'phy{wiphy_idx}')
+            except (ValueError, IndexError):
+                pass
+
     return result
 
 

…rd/common/rootfs/etc/frr/static.d/.empty …ard/common/rootfs/etc/netd/conf.d/.emptyboard/common/rootfs/etc/frr/static.d/.empty renamed to board/common/rootfs/etc/netd/conf.d/.empty board/common/rootfs/etc/frr/static.d/.empty renamed to board/common/rootfs/etc/netd/conf.d/.empty

@@ -7,7 +7,7 @@ ACTION="$1"
 IP_CACHE="/var/lib/misc/${interface}.cache"
 RESOLV_CONF="/run/resolvconf/interfaces/${interface}.conf"
 NTPFILE="/run/chrony/dhcp-sources.d/${interface}.sources"
-NAME="/etc/frr/static.d/${interface}-dhcp.conf"
+NAME="/etc/netd/conf.d/${interface}-dhcp.conf"
 NEXT="${NAME}+"
 
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@@ -75,14 +75,23 @@ was_option_requested()
 # client MUST ignore the Router option.
 set_dhcp_routes()
 {
-    echo "! Generated by udhcpc" > "$NEXT"
+    echo "# Generated by udhcpc" > "$NEXT"
+    echo "" >> "$NEXT"
     if [ -n "$staticroutes" ]; then
 	if was_option_requested 121; then
 	    # format: dest1/mask gw1 ... destn/mask gwn
 	    set -- $staticroutes
 	    while [ -n "$1" -a -n "$2" ]; do
 		dbg "adding route $1 via $2 metric $metric tag 100"
-		echo "ip route $1 $2 $metric tag 100" >> "$NEXT"
+		cat >> "$NEXT" <<-EOF
+		route {
+		    prefix = "$1"
+		    nexthop = "$2"
+		    distance = $metric
+		    tag = 100
+		}
+
+		EOF
 		shift 2
 	    done
 	else
@@ -91,7 +100,15 @@ set_dhcp_routes()
     elif [ -n "$router" ] ; then
 	if was_option_requested 3; then
 	    for i in $router ; do
-		echo "ip route 0.0.0.0/0 $i $metric tag 100" >> "$NEXT"
+		cat >> "$NEXT" <<-EOF
+		route {
+		    prefix = "0.0.0.0/0"
+		    nexthop = "$i"
+		    distance = $metric
+		    tag = 100
+		}
+
+		EOF
 	    done
 	else
 	    log "ignoring unrequested router (option 3)"
@@ -102,7 +119,7 @@ set_dhcp_routes()
     cmp -s "$NAME" "$NEXT" && return
     mv "$NEXT" "$NAME"
 
-    initctl -nbq restart staticd
+    initctl reload netd
 }
 
 clr_dhcp_routes()
@@ -111,7 +128,7 @@ clr_dhcp_routes()
     [ -f "$NAME" ] || return
     rm "$NAME"
 
-    initctl -nbq restart staticd
+    initctl reload netd
 }
 
 clr_dhcp_addresses()