proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 13:04:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,014 Commits 4 Branches 191 Tags 125 MiB
1cadfaf213
Commit Graph

28014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Stapp
f77f21afaf
Merge pull request #10915 from opensourcerouting/printfrr-pzn 
doc/developer: daemon-specific printfrr formats
 2022-03-31 07:22:14 -04:00
Javier Garcia
d4e5ceae70 docker: Adding support for ubi-8 images. 
- Create frr docker container based in new Red Hat Universal Base
  Images.

- This build a docker container based in ubi-8.
- Need to get the devel packages from centos-8 stream repos.
- Centos-8 stream repos added : base, appstream, powertools and epel

Signed-off-by: Javier Garcia <javier.martin.garcia@ibm.com>
 2022-03-31 12:12:38 +02:00
Philippe Guibert
cdfb430e2f isisd: fix typo in show debugging 
fix typo in show debugging.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2022-03-31 11:19:26 +02:00
Philippe Guibert
a514ac486a isisd: prevent from accessing a non initialised pointer 
When using bfd on a single level, one may access a null pointer
list. Prevent from using it.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2022-03-31 11:18:45 +02:00
Igor Ryzhov
ab313a9e35
Merge pull request #10934 from opensourcerouting/fix/ospf_state_neighbor_detail 2022-03-31 11:16:43 +03:00
anlan_cs
c4992a2f71 zebra: fix missing vrf change of l2vni on vxlan interface 
The bounded vrf of `l2vni/zevpn` have wrong relation with the order
in which vxlan interface and svi interface are set.

If set vxlan interface with vlanid first, then set svi interface with
vrf, it is ok that vxlan interface will get correct `vrf` inherited
from svi. But reverse the set sequence (i.e. set svi first, then vxlan),
vxlan interface can't get correct `vrf`, becasue the handling of
`ZEBRA_VXLIF_VLAN_CHANGE` missed inheritting `vrf` by mistake.

```
host# do show  evpn vni 101
VNI: 101
Type: L2
Tenant VRF: vrf1
```

So update `vrf` ("Tenant VRF") of l2vni in `zebra_vxlan_if_update()`.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
 2022-03-31 02:51:26 -04:00
Donatas Abraitis
49ecb8b807 bgpd: Show match script SCRIPT in running config 
Before:
```
route-map lua permit 10
exit
```

After:
```
route-map lua permit 10
 match script rm
exit
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2022-03-31 09:39:52 +03:00
Donatas Abraitis
41710ed15e ospfd: Show neighbor state in full format (e.g. Full/DR instead of Full) 
Before:
```
$ vtysh -c 'show ip ospf neighbor json' | jq '.neighbors."100.100.200.100"[0].nbrState'
"Full/DR"
$ vtysh -c 'show ip ospf neighbor detail json' | jq '.neighbors."100.100.200.100"[0].nbrState'
"Full"
```

After:
```
$ vtysh -c 'show ip ospf neighbor json' | jq '.neighbors."100.100.200.100"[0].nbrState'
"Full/DR"
$ vtysh -c 'show ip ospf neighbor detail json' | jq '.neighbors."100.100.200.100"[0].nbrState'
"Full/DR"
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2022-03-30 22:28:39 +03:00
Donatas Abraitis
66da8b5ac8
Merge pull request #10926 from donaldsharp/all_stop 
tools: Modify all_stop to actually try to stop all daemons
 2022-03-30 21:14:25 +03:00
David Lamparter
c0d6ed6bc4
Merge pull request #10676 from AbhishekNR/pim_showcli_com 2022-03-30 17:15:54 +02:00
Donald Sharp
1bb4a33d05
Merge pull request #10912 from mobash-rasool/fixes2 
pimd: Do not create PIM state when an invalid IGMPv3 join is received
 2022-03-30 10:34:56 -04:00
David Lamparter
c5c7de20fa doc/developer: daemon-specific printfrr formats 
Group together and extend docs on daemon-specific printfrr formats.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2022-03-30 16:14:28 +02:00
Donald Sharp
442cefd638
Merge pull request #10922 from idryzhov/ospf6-crash 
ospf6d: fix crash when applying a route-map on a temporary route
 2022-03-30 08:27:48 -04:00
Donald Sharp
eda1d29a06
Merge pull request #10918 from opensourcerouting/fix/bgpd_crash 
bgpd: Fix Lua route-map crash
 2022-03-30 07:53:03 -04:00
Donald Sharp
1686b1d486 tools: Modify all_stop to actually try to stop all daemons 
If a user enters:
/usr/lib/frr/frrinit.sh start
<modifies daemons file to remove a daemon from being used>
then calls:
/usr/lib/frr/frrinit.sh stop

The daemon(s) that are removed from the file are not stopped.

Apparently in shell scripting naming the variables the same
as the callee does not work as one would think.  Just renaming
the variable to something else solved the problem.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2022-03-30 07:44:31 -04:00
anlan_cs
2be18df4dc zebra: remove unnecessary check for parsing macfdb 
Since `NDA_VLAN` is no longer mannually defined in header file,
the check for `NDA_VLAN` should be removed.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
 2022-03-30 05:50:21 -04:00
Donatas Abraitis
2f7f0f77c5
Merge pull request #10850 from crosser/fix-m4-gitignore 
autoconf: do not .gitignore m4/ax_lua.m4
 2022-03-30 10:20:45 +03:00
Donatas Abraitis
11fc3db305
Merge pull request #10902 from bobuhiro11/fix_zebra_srv6_func_bits 
zebra: fix doc and default value of "func-bits" for SRv6
 2022-03-30 10:20:36 +03:00
anlan_cs
44a84850a9 zebra: use "assert" instead of unnecessary check 
Like `zvni_map_to_svi_ns()` for `ns_walk_func()`, just use "assert"
instead of unnecessary check.

Since these parameters for `ns_walk_func()`, e.g. `in_param` and others,
must not be NULL. So use `assert` to ensure the these parameters, and
remove those unnecessary checks.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
 2022-03-30 03:19:28 -04:00
Quentin Young
9d3a021262 tests: skip grpc test if frr not installed 
it wants yang models installed which will only be there if frr has been
installed before, causing `make check` to fail when run on a system on
which frr has not been installed when GRPC is enabled (--enable-grpc)

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
 2022-03-29 16:16:35 -04:00
Russ White
4037154240
Merge pull request #10838 from ton31337/feature/bgpd_callbacks_for_start_end_configurations 
bgpd: Add BGP configuration start/end markers
 2022-03-29 11:30:47 -04:00
Russ White
1ab250f173
Merge pull request #10825 from fdumontet6WIND/ospfdefaultoriginatedissue2 
ospfd: fix ospf default route wrongly sent back
 2022-03-29 11:29:51 -04:00
Russ White
62336db0a3
Merge pull request #10848 from pguibert6WIND/ospf_srlb_config 
Ospf srlb config
 2022-03-29 11:15:21 -04:00
Russ White
1f1d8f03de
Merge pull request #10837 from opensourcerouting/fix/consistent_JSON_keys_for_ospf_neighbor 
ospfd: Use consistent JSON keys for `show ip ospf neighbor` and detai…
 2022-03-29 11:14:05 -04:00
Russ White
8084c3325b
Merge pull request #10845 from opensourcerouting/feature/unify_bgp_logging 
bgpd: Print hostname along with IP for most useful debug messages
 2022-03-29 11:13:29 -04:00
Russ White
a790f7435b
Merge pull request #10888 from anlancs/bgpd-cleanup-3 
bgpd: small simplification for evpn RT commands
 2022-03-29 11:10:19 -04:00
Igor Ryzhov
68618ebca8 ospf6d: fix crash when applying a route-map on a temporary route 
ospf6_routemap_rule_match_interface uses route->ospf6 field for matching
so we must fill the field in our temporary variable.

Fixes #10911.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
 2022-03-29 18:09:53 +03:00
Russ White
73d198b68d
Merge pull request #10906 from opensourcerouting/fix/stop_llgr_timer_when_established 
bgpd: Stop LLGR timer when the connection is established
 2022-03-29 11:07:30 -04:00
Russ White
06cefd420d
Merge pull request #10913 from louis-oui/lsp-parse 
isisd: fix infinite loop when parsing LSPs
 2022-03-29 11:06:39 -04:00
Russ White
1dcec1fb2f
Merge pull request #10834 from rgirada/ospf_def 
ospfd: Default route becomes stale  route in nbrs even after flush from originator
 2022-03-29 11:01:17 -04:00
Russ White
dcaba5ae1a
Merge pull request #10719 from opensourcerouting/nb-show-fixes 
lib: fix and improve yang operational data display
 2022-03-29 10:51:02 -04:00
Donatas Abraitis
9aa2174c39 bgpd: Make sure we pop the table from the stack when decoding struct attr 
```
bgpd[81718]: bgpd/bgp_routemap.c:382: route_match_script(): assertion (lua_gettop(lfs->L) == 1) failed
BGP[81718]: Received signal 6 at 1648554165 (si_addr 0x6e00013f36, PC 0x7fcc5adebce1); aborting...
BGP[81718]: /usr/local/lib/libfrr.so.0(zlog_backtrace_sigsafe+0x5e) [0x7fcc5b1caf5e]
BGP[81718]: /usr/local/lib/libfrr.so.0(zlog_signal+0xe6) [0x7fcc5b1cb136]
BGP[81718]: /usr/local/lib/libfrr.so.0(+0xcd4b2) [0x7fcc5b1f54b2]
BGP[81718]: /lib/x86_64-linux-gnu/libpthread.so.0(+0x14140) [0x7fcc5af89140]
BGP[81718]: /lib/x86_64-linux-gnu/libc.so.6(gsignal+0x141) [0x7fcc5adebce1]
BGP[81718]: /lib/x86_64-linux-gnu/libc.so.6(abort+0x123) [0x7fcc5add5537]
BGP[81718]: /usr/local/lib/libfrr.so.0(_zlog_assert_failed+0xd7) [0x7fcc5b21ecd7]
BGP[81718]: /usr/lib/frr/bgpd(+0x162710) [0x55ed70255710]
BGP[81718]: /usr/local/lib/libfrr.so.0(+0xc0e47) [0x7fcc5b1e8e47]
BGP[81718]: /usr/local/lib/libfrr.so.0(route_map_apply_ext+0x4b6) [0x7fcc5b1eaaf6]
BGP[81718]: /usr/lib/frr/bgpd(+0x13eb24) [0x55ed70231b24]
BGP[81718]: /usr/lib/frr/bgpd(bgp_update+0x7db) [0x55ed7023f81b]
BGP[81718]: /usr/lib/frr/bgpd(bgp_nlri_parse_ip+0x113) [0x55ed70241bc3]
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2022-03-29 17:47:28 +03:00
Donatas Abraitis
93b2d38aed bgpd: Do not print .lua extension twice 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
 2022-03-29 17:47:09 +03:00
Javier Garcia
d4793367e5 docker: Centos-8 dockerfile fix. 
- Need to adapt repos to new centos-8 stream.

Signed-off-by: Javier Garcia <javier.martin.garcia@ibm.com>
 2022-03-29 15:08:29 +02:00
mobash-rasool
f06b9fee95
Merge pull request #10882 from opensourcerouting/pim6-txrx 
pim6d: send IPv6 PIM packets
 2022-03-29 18:30:10 +05:30
Russ White
c845d58d6f
Merge pull request #10158 from ckishimo/ospf6d_norefresh 
ospf6d: stop refreshing type-5 from NSSA
 2022-03-29 08:36:05 -04:00
Louis Scalbert
5e56a50559 isisd: fix infinite loop when parsing LSPs 
Fixing the crash:

> #0  0x0000560aa80f8e30 in lspdb_const_find (h=<error reading variable: Cannot access memory at address 0x7fff5e95efe8>, item=<error reading variable: Cannot access memory at address 0x7fff5e95efe0>) at ./isisd/isis_lsp.h:64
> #1  0x0000560aa80f8e9d in lspdb_find (h=0x560aaa1ed3b8, item=0x7fff5e95f050) at ./isisd/isis_lsp.h:64
> #2  0x0000560aa80f92f9 in lsp_search (head=0x560aaa1ed3b8, id=0x7fff5e95f200 "") at isisd/isis_lsp.c:100
> #3  0x0000560aa8113d69 in spf_adj_list_parse_tlv (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, id=0x560aad331a78 "", desig_is_id=0x0, pseudo_metric=0, metric=3, oldmetric=false, subtlvs=0x0) at isisd/isis_spf.c:1330
> #4  0x0000560aa811419d in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1f4e50, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1429
> #5  0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1ff8e0, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> #6  0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1f4e50, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> (...)
> #65507 0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1ff8e0, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> #65508 0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1f4e50, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> #65509 0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1ff8e0, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> #65510 0x0000560aa81141fe in spf_adj_list_parse_lsp (spftree=0x560aaa1f09d0, adj_list=0x560aaa214480, lsp=0x560aaa1f4e50, pseudo_nodeid=0x0, pseudo_metric=0) at isisd/isis_spf.c:1442
> #65511 0x0000560aa8114313 in isis_spf_build_adj_list (spftree=0x560aaa1f09d0, lsp=0x560aaa1f4e50) at isisd/isis_spf.c:1455
> #65512 0x0000560aa8114f09 in isis_run_spf (spftree=0x560aaa1f09d0) at isisd/isis_spf.c:1775
> #65513 0x0000560aa8115057 in isis_run_spf_with_protection (area=0x560aaa1ed3b0, spftree=0x560aaa1f09d0) at isisd/isis_spf.c:1801
> #65514 0x0000560aa8115311 in isis_run_spf_cb (thread=0x7fff5f15e5a0) at isisd/isis_spf.c:1859
> #65515 0x00007f90bac66dcc in thread_call (thread=0x7fff5f15e5a0) at lib/thread.c:2002
> #65516 0x00007f90bac013ee in frr_run (master=0x560aa9f5cb40) at lib/libfrr.c:1196
> #65517 0x0000560aa80e7da2 in main (argc=2, argv=0x7fff5f15e7b8, envp=0x7fff5f15e7d0) at isisd/isis_main.c:273

Fixes: 7b36d36e0e ("isisd: make the SPF code more modular")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
 2022-03-29 09:47:09 +02:00
Abhishek N R
2d85c67144 pim6d: Implementing "show ipv6 pim state" CLI 
Adding new show CLI to display pim internal state related to groups.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
b1a419baef pim6d: Implementing "show ipv6 pim upstream-rpf" CLI. 
Adding new show CLI to display pim RPF for upstreams.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
e577f6e7d5 pim6d: Implementing "show ipv6 pim upstream-join-desired" CLI 
Adding new show CLI to display group join desired status.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
95023bd72a pim6d: Implementing "show ipv6 pim upstream" CLI 
Adding new show CLI to display pim upstream information.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
4f58b6aaa4 pim6d: Implementing "show ipv6 pim statistics" CLI 
Adding new show CLI to display pim statistics.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
626dab7f3f pim6d: Implementing "show ipv6 pim secondary" CLI 
Adding new show CLI to display pim secondary addresses.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
1aa8de4687 pim6d: Implementing "show ipv6 pim rpf" CLI 
Adding new show CLI to display pim RPF information.

Also corrected ipv4 json object.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
45e26aa0b2 pimd: Moving the common functions from pim_cmd.c 
Moving the functions that are used by both IPV4 and IPV6 to a
common file pim_cmd_common.c file

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:24 -07:00
Abhishek N R
0095f482ca pim6d: Implementing "show ipv6 pim rp-info" CLI 
Adding new show CLI to display pim RP information.

Also corrected ipv4 json object.

Signed-off-by: Abhishek N R <abnr@vmware.com>
 2022-03-28 23:53:15 -07:00
Donatas Abraitis
92f7542085
Merge pull request #10904 from mobash-rasool/fixes 
pim6d: Correct the show ip prefix-list display for pim6d
 2022-03-29 08:53:44 +03:00
Mobashshera Rasool
261b019f78 pimd: update the pim state when there is a group change 
Re-evaluate the creation/deletion of groups when there is
a change in group type.

Issue: #10128
Co-authored-by: Vishal Dhingra <rac.vishaldhingra@gmail.com>
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
 2022-03-28 22:45:33 -07:00
Mobashshera Rasool
037a2c2e37 pimd: Do not create PIM state for invalid (S,G) 
Currently FRR creates an (S,G) PIM state when an IGMPv3
(S,G) join with INCLUDE mode is received for the ASM group.

Since it is an ASM group, we should not create (S,G) PIM state
and should not be sending PIM (S,G) joins towards the source.

This is a misconfiguration. So keep this group in IGMP table
and do not create PIM state.

Issue: #10128
Co-authored-by: Vishal Dhingra <rac.vishaldhingra@gmail.com>
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
 2022-03-28 22:45:28 -07:00
ckishimo
9a974f2292 ospf6d: fix topotest 
The routes in the test_nssa_range() are E2

  "routes":{
    "2001:db8:1000::2/128":{
      "destinationType":"Network",
      "installedTimeSince":"00:06:29",
      "changedTimeSince":"00:06:29",
      "numberOfLock":2,
      "flags":"BA--",
      "associatedArea":"0.0.0.2",
      "pathType":"External-2",
      "lsOriginRoutePathType":"NSSA",
      "lsId":"0.0.0.3",
      "lsAdvertisingRouter":"10.254.254.4",
      "options":"--|-|-|--|-|--",
      "routerBits":"--------",
      "prefixOptions":"--|P|--|--|--",
      "metricType":2,
      "metricCost":10,
      "metricCostE2":20,
      "pathsCount":1,
      "nextHopCount":1,
      "nextHops":[
        {
          "nextHop":"::",
          "interfaceName":"r2-eth2"
        }
      ]
    }

This PR fixes the key from `metricCost` to `metricCostE2`

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
 2022-03-28 22:19:53 +02:00