proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-24 17:52:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,717 Commits 4 Branches 191 Tags 125 MiB
ba4555c646
Commit Graph

36717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Barry A. Trent
ba4555c646 pimd: fix autorp CLI bugs 
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
 2024-09-27 13:39:30 -07:00
Donatas Abraitis
51b19f9ce3
Merge pull request #16913 from chiragshah6/evpn_dev4 
bgpd: EVPN fix per rd specific type-2 json output
 2024-09-25 21:52:33 +03:00
Donatas Abraitis
8d76a02cf1
Merge pull request #16918 from donaldsharp/addr_cmp_problems_in_snmp 
zebra snmp fixes
 2024-09-25 21:50:35 +03:00
Donald Sharp
c57712c11d
Merge pull request #16916 from nabahr/pim-coverity 
pimd: Fix new issues found in coverity
 2024-09-25 12:30:19 -04:00
Donald Sharp
f53dde0e59 zebra: Add missing proto translations 
Add missing isis and eigrp proto translations.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-25 12:14:50 -04:00
Donald Sharp
e41ae0acc1 zebra: Correctly report metrics 
Report the routes metric in IPFORWARDMETRIC1 and return
-1 for the other metrics as required by the IP-FORWARD-MIB.

inetCidrRouteMetric2 OBJECT-TYPE
    SYNTAX     Integer32
    MAX-ACCESS read-create
    STATUS     current
    DESCRIPTION
           "An alternate routing metric for this route.  The
            semantics of this metric are determined by the routing-
            protocol specified in the route's inetCidrRouteProto
            value.  If this metric is not used, its value should be
            set to -1."
    DEFVAL { -1 }
    ::= { inetCidrRouteEntry 13 }

I've included metric2 but it's the same for all of them.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-25 12:09:40 -04:00
Donald Sharp
659cd66427 zebra: Let's use memset instead of walking bytes and setting to 0 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-25 12:08:03 -04:00
Donald Sharp
ecd9d441b0 zebra: Fix snmp walk of zebra rib 
The snmp walk of the zebra rib was skipping entries
because in_addr_cmp was replaced with a prefix_cmp
which worked slightly differently causing parts
of the zebra rib tree to be skipped.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-25 12:06:29 -04:00
Jafar Al-Gharaibeh
f5fb095433
Merge pull request #16915 from donaldsharp/bgp_dead_code 
bgpd: Remove dead code from recent commit
 2024-09-25 10:56:04 -05:00
Nathan Bahr
3e6cc0d0f1 pimd: Fix coverity checked return issue 
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-25 13:56:30 +00:00
Nathan Bahr
54bc821a2a pimd: Fix coverity checked return issue 
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-25 13:55:31 +00:00
Nathan Bahr
17972d104d pimd: Fix igmp proxy null pointer dereference 
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-25 13:53:30 +00:00
Donald Sharp
a172bea84b
Merge pull request #16912 from sri-mohan1/srib-24-frr-a 
bgpd: changes for code maintainability
 2024-09-25 09:47:39 -04:00
Donald Sharp
40c94ca369 bgpd: Remove dead code from recent commit 
Recent commit 4d0e7a49cf
brought in changes that moved a check for ret up
in the code, caused some code to be left around
and be effectively dead since it would never be called.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-25 09:30:37 -04:00
Sindhu Parvathi Gopinathan
ff008cee6b bgpd: EVPN fix per rd specific type-2 json output 
Current Issue:

paths key is not there for
'show bgp l2vpn evpn route rd <rd-id> mac <mac> json' uses
evpn prefix as key for each path.
Replace the evpn prefix with "paths".
This aligned with overall EVPN RIB json output like
'show bgp l2vpn evpn route json'
'show bgp l2vpn evpn route rd <> type 2 json'

Fix:

paths key is added instead of prefix info.

Ticket:#4087461

Issue:4087461

Testing:

Before fix:

leaf22# show bgp l2vpn evpn route rd 6.0.0.17:2 mac 00:02:00:00:00:12 json
{
  "prefix":"[2]:[0]:[48]:[00:02:00:00:00:12]",
  "prefixLen":352,
  "rd":"6.0.0.17:2",
  "routeType":2,
  "ethTag":0,
  "macLen":48,
  "mac":"00:02:00:00:00:12",
  "advertisedTo":{
    "220.20.0.33":{
      "hostname":"spine21"
    },
    "220.21.0.33":{
      "hostname":"spine22"
    }
  },
  "[2]:[0]:[48]:[00:02:00:00:00:12]":[ <=====  Prefix info instead of "paths" key
    [
      {
        "vni":"101101",
        "aspath":{
          "string":"65202 65024",
          "segments":[
            {
              "type":"as-sequence",
              "list":[
                65202,
                65024
              ]
            }
          ],
          "length":2
        },
        "esi":"03:00:00:00:77:02:04:00:00:18",
        "es_info":{
          "localEs":true
        },
        "origin":"IGP",
        "valid":true,
        "version":5,
        "bestpath":{
          "bestpathFromAs":65202,
          "overall":true,
          "selectionReason":"Older Path"
        },
        "extendedCommunity":{
          "string":"RT:65024:101101 ET:8"
        },
        "lastUpdate":{
          "epoch":1726803218,
          "string":"Fri Sep 20 03:33:38 2024\n"
        },
        "nexthops":[
          {
            "ip":"6.0.0.17",
            "hostname":"spine21",
            "afi":"ipv4",
            "metric":0,
            "accessible":true,
            "used":true
          }
        ],
        "peer":{
          "peerId":"220.20.0.33",
          "routerId":"6.0.0.20",
          "hostname":"spine21",
          "type":"external"
        }
      }
    ],
    [
      {
        "vni":"101101",
        "aspath":{
          "string":"65202 65024",
          "segments":[
            {
              "type":"as-sequence",
              "list":[
                65202,
                65024
              ]
            }
          ],
          "length":2
        },
        "esi":"03:00:00:00:77:02:04:00:00:18",
        "es_info":{
          "localEs":true
        },
        "origin":"IGP",
        "valid":true,
        "version":5,
        "extendedCommunity":{
          "string":"RT:65024:101101 ET:8"
        },
        "lastUpdate":{
          "epoch":1726803218,
          "string":"Fri Sep 20 03:33:38 2024\n"
        },
        "nexthops":[
          {
            "ip":"6.0.0.17",
            "hostname":"spine22",
            "afi":"ipv4",
            "metric":0,
            "accessible":true,
            "used":true
          }
        ],
        "peer":{
          "peerId":"220.21.0.33",
          "routerId":"6.0.0.21",
          "hostname":"spine22",
          "type":"external"
        }
      }
    ]
  ],
  "numPaths":2
}

After fix:

eaf22# show bgp l2vpn evpn route rd 6.0.0.17:2 mac 00:02:00:00:00:12 json
{
  "prefix":"[2]:[0]:[48]:[00:02:00:00:00:12]",
  "prefixLen":352,
  "rd":"6.0.0.17:2",
  "routeType":2,
  "ethTag":0,
  "macLen":48,
  "mac":"00:02:00:00:00:12",
  "advertisedTo":{
    "220.20.0.33":{
      "hostname":"spine21"
    },
    "220.21.0.33":{
      "hostname":"spine22"
    }
  },
  "paths":[
    [
      {
        "vni":"101101",
        "aspath":{
          "string":"65202 65024",
          "segments":[
            {
              "type":"as-sequence",
              "list":[
                65202,
                65024
              ]
            }
          ],
          "length":2
        },
        "esi":"03:00:00:00:77:02:04:00:00:18",
        "es_info":{
          "localEs":true
        },
        "origin":"IGP",
        "valid":true,
        "version":3,
        "bestpath":{
          "bestpathFromAs":65202,
          "overall":true,
          "selectionReason":"Router ID"
        },
        "extendedCommunity":{
          "string":"RT:65024:101101 ET:8"
        },
        "lastUpdate":{
          "epoch":1727175046,
          "string":"Tue Sep 24 10:50:46 2024\n"
        },
        "nexthops":[
          {
            "ip":"6.0.0.17",
            "hostname":"spine21",
            "afi":"ipv4",
            "metric":0,
            "accessible":true,
            "used":true
          }
        ],
        "peer":{
          "peerId":"220.20.0.33",
          "routerId":"6.0.0.20",
          "hostname":"spine21",
          "type":"external"
        }
      }
    ],
    [
      {
        "vni":"101101",
        "aspath":{
          "string":"65202 65024",
          "segments":[
            {
              "type":"as-sequence",
              "list":[
                65202,
                65024
              ]
            }
          ],
          "length":2
        },
        "esi":"03:00:00:00:77:02:04:00:00:18",
        "es_info":{
          "localEs":true
        },
        "origin":"IGP",
        "valid":true,
        "version":3,
        "extendedCommunity":{
          "string":"RT:65024:101101 ET:8"
        },
        "lastUpdate":{
          "epoch":1727175046,
          "string":"Tue Sep 24 10:50:46 2024\n"
        },
        "nexthops":[
          {
            "ip":"6.0.0.17",
            "hostname":"spine22",
            "afi":"ipv4",
            "metric":0,
            "accessible":true,
            "used":true
          }
        ],
        "peer":{
          "peerId":"220.21.0.33",
          "routerId":"6.0.0.21",
          "hostname":"spine22",
          "type":"external"
        }
      }
    ]
  ],
  "numPaths":2
}

Signed-off-by: Sindhu Parvathi Gopinathan's <sgopinathan@nvidia.com>
 2024-09-24 20:10:59 -07:00
Jafar Al-Gharaibeh
2203dc4777
Merge pull request #16909 from donaldsharp/help 
lib: Help text correction
 2024-09-24 21:23:03 -05:00
Jafar Al-Gharaibeh
57946f9fbf
Merge pull request #16911 from donaldsharp/command_node_is_fun 
Command node is fun
 2024-09-24 21:22:11 -05:00
sri-mohan1
5f30c6aa0a bgpd: changes for code maintainability 
these changes are for improving the code maintainability and readability

Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>
 2024-09-25 06:47:47 +05:30
Donald Sharp
d722e99075 lib: Removed unused RFP_DEFAULTS_NODE 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-24 16:11:43 -04:00
Donald Sharp
e54261e20d lib, zebra: TABLE_NODE is not used 
No-one is using this, remove

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-24 16:05:54 -04:00
Donald Sharp
c0ccf381d4
Merge pull request #16634 from nabahr/autorp 
PIM: Implement AutoRP functionality
 2024-09-24 15:36:09 -04:00
Donald Sharp
4e12ba08c4 lib: Help text correction 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-24 15:25:49 -04:00
Jafar Al-Gharaibeh
354f73d615
Merge pull request #16908 from donaldsharp/ospf6_snmp_special 
ospf6d: Remove unguarded debugs in ospf6_snmp.c
 2024-09-24 13:39:57 -05:00
Nathan Bahr
dff1db9ef6 tests: Addition of AutoRP Discovery uncovered broken PIM test 
With AutoRP discovery running by default, that adds a new
IGMP group that needs to be accounted for in IGMP output.

For pim.py
  The clear IGMP interfaces function is in a broken state. It was
  already ignoring any errors and returned true always, but with
  the addition of the AutoRP discovery group, you could end up
  with a different group order in the json which would cause a key
  error making the test fail. For now I just added a check to
  avoid the key error.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:40:57 +00:00
Nathan Bahr
ec37f603a1 tests: Update existing tests for changes introduced by AutoRP Discovery 
With AutoRP discovery running by default, that adds a new
IGMP group that needs to be accounted for in IGMP output.

For multicast_pim_sm_topo3:
  Ignore the total group number as it is unnecessary for the test.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:40:57 +00:00
Nathan Bahr
af45a16fce tests: Added tests for new AutoRP functionality 
Uses hardcoded sample AutoRP packets injected in to test
message parsing and proper application of AutoRP learned
RP info. Tests mix of AutoRP and static RP's.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:40:55 +00:00
Nathan Bahr
cbe39620f9 doc: Add user documentation for AutoRP CLI 
Document the CLI commands to configure AutoRP discovery
and candidate RP announcements.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:39:19 +00:00
Nathan Bahr
3b323fc441 pimd,yang: Implement AutoRP CLI and NB config path 
New CLI commands added:
router pim [vrf NAME]
  autorp discovery
  autorp announce RP-ADDR [GROUP | group-list PREFIX-LIST]
  autorp announce {scope (1-255) | interval (1-65535) | holdtime (0-65535)}

autorp discovery
  Enables Auto RP discovery for learning dynamic RP information using the
  AutoRP protocol.

autorp announce RP-ADDR [GROUP | group-list PREFIX-LIST]
  Enable announcements of a candidate RP with the given group range, or
  prefix list of group ranges, to an AutoRP mapping agent.

autorp announce {scope (1-255) | interval (1-65535) | holdtime (0-65535)}
  Configure the parameters of the AutoRP announcement messages.
  The scope sets the packet TTL.
  The interval sets the time between TX of announcements.
  The holdtime sets the hold time in the message, the time the mapping
  agent should wait before invalidating the candidate RP information.

debug pim autorp
  Enable debug logging of the AutoRP protocol

show ip pim [vrf NAME] autorp [json]
  Show details of the AutoRP protocol.
  To view learned RP info, use the existing command 'show ip pim rp-info'

Extend pim yang for new configuration:
  augment /frr-rt:routing/frr-rt:control-plane-protocols/frr-rt:control-plane-protocol/frr-pim:pim/frr-pim:address-family:
    +--rw rp
       +--rw auto-rp
          +--rw discovery-enabled?   boolean
          +--rw announce-scope?      uint8
          +--rw announce-interval?   uint16
          +--rw announce-holdtime?   uint16
          +--rw candidate-rp-list* [rp-address]
             +--rw rp-address           inet:ip-address
             +--rw (group-or-prefix-list)?
                +--:(group)
                |  +--rw group?         frr-route-types:ip-multicast-group-prefix
                +--:(prefix-list)
                   +--rw prefix-list?   plist-ref

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:39:17 +00:00
Nathan Bahr
f182255c0f pimd: Add AutoRP functionality to PIMD 
Perform AutoRP discovery and candidate RP announcements using the
AutoRP protocol.
Mapping agent is not yet implemented, but this feature is not
necessary for FRR to support AutoRP as we only need one AutoRP
mapping agent in the network.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
 2024-09-24 16:36:53 +00:00
Donald Sharp
269d63a5c1
Merge pull request #16861 from btrent98/igmp-proxy2 
Add igmp proxy support
 2024-09-24 12:32:15 -04:00
Jafar Al-Gharaibeh
cee061df3c
Merge pull request #16788 from LabNConsulting/jmuthii/nhrpd-retry-resolution 
nhrpd: Implement retrying resolution request
 2024-09-24 11:07:21 -05:00
Russ White
c12af9f2a7
Merge pull request #16855 from zhou-run/202409131731 
isisd: Fix NHLFE entry memory leaks
 2024-09-24 11:25:13 -04:00
Russ White
5cf4af6947
Merge pull request #16907 from opensourcerouting/fix/load_built-in_lua_functions 
lib: Load built-in Lua functions
 2024-09-24 10:56:25 -04:00
Donald Sharp
6540f0878d ospf6d: Remove unguarded debugs in ospf6_snmp.c 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-24 10:44:15 -04:00
Russ White
9fa9e41613
Merge pull request #16906 from opensourcerouting/fix/match_peer_self 
bgpd: Return NOMATCH only if both conf_if/group does not exist
 2024-09-24 10:16:35 -04:00
Russ White
d86524951f
Merge pull request #16904 from louis-6wind/fix-zebra-rib-range 
tests: fix zebra_rib range
 2024-09-24 10:15:25 -04:00
Russ White
74aef8aabd
Merge pull request #16895 from opensourcerouting/fix/dual_as_topotest 
tests: Simplify BGP dual-as topotest
 2024-09-24 10:13:14 -04:00
Russ White
e17a9834ea
Merge pull request #16853 from Shbinging/no_ip_ospf_dead_interval_minimal 
ospfd: fix snytax of some no commands
 2024-09-24 10:03:29 -04:00
Russ White
849df49bbd
Merge pull request #16851 from Shbinging/fix_timer_throttle_spf 
ospfd: reset spf_hold_multiplier when current SPF delay state is changed
 2024-09-24 10:03:05 -04:00
Russ White
1a2eaba14c
Merge pull request #16838 from opensourcerouting/fix/refresh_pr_9079 
Refreshement of BGP multi ASNs
 2024-09-24 10:01:10 -04:00
Russ White
3c89cb638f
Merge pull request #16533 from acooks-at-bda/less-controversial-ospf6d-refactor-before-adding-tlvs 
OSPF6: Refactor to prepare for E-LSA handling
 2024-09-24 09:50:19 -04:00
Russ White
de43ca890d
Merge pull request #16219 from cunningr/prevent-ipv6-link-local-injection 
bgpd - Exclude case for remote prefix w/o link-local #16198
 2024-09-24 09:44:36 -04:00
Donatas Abraitis
623fb6d996 tests: Check if built-in Lua functions are working 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2024-09-24 13:40:37 +03:00
Donatas Abraitis
4b0f4f96ac lib: Load built-in Lua functions 
We can't use even `string()` function because built-in functions are not
loaded.

Testing with:

```
$ cat /etc/frr/scripts/zebra.lua
function on_rib_process_dplane_results(ctx)
	log.warn(string.upper("testas"))
	return {}
end
```

This results to "TESTAS" in the logs.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2024-09-24 13:13:50 +03:00
Donatas Abraitis
a4ed22b0b6 tests: Add a basic test to verify match peer ... 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2024-09-24 12:34:19 +03:00
Donatas Abraitis
6e52dca1c2 bgpd: Return NOMATCH only if both conf_if/group does not exist 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2024-09-24 12:27:45 +03:00
Louis Scalbert
eb186bcdad tests: fix zebra_rib range 
Range is wrong. We want values 1 and 2 but we only test 1.

> >>> for i in range(1, 2):
> ...     print(i)
> ...
> 1

Fixes: abd2a1ff3f ("tests: Test some basic kernel <-> zebra interactions")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
 2024-09-24 10:15:49 +02:00
Donatas Abraitis
74542e1fc1
Merge pull request #16902 from donaldsharp/forwarding_on_off 
tests: Add v4/v6 forwarding off/on
 2024-09-24 10:22:00 +03:00
Donald Sharp
ddbea65491 tests: Add v4/v6 forwarding off/on 
There are no tests that ensured that turning off then on
v4 and v6 forwarding actually worked.  This does so.
This was found via looking at the code coverage.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2024-09-23 15:16:00 -04:00
Barry A. Trent
1425d4ac48 tests: add topotest for igmp proxy 
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
 2024-09-23 11:43:40 -07:00