proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,050 Commits 4 Branches 191 Tags 125 MiB
a67223a8b6
Commit Graph

8050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
devicenull
6e63f8cb52 Add note about bridge limitations 
Add note that Zebra will never be able to detect the master interface for any interface due to IFLA_INFO_SLAVE_KIND not being defined
 2017-07-17 13:04:55 -04:00
David Lamparter
f0735da293 Merge pull request #826 from qlyoung/rm-vtyoutln 
eigrpd: remove last vty_outln
 2017-07-17 18:37:46 +02:00
Quentin Young
2b2f79ae69
eigrpd: remove last vty_outln 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-07-17 11:18:56 -04:00
tmartiro
a8a4fa8954 merge with upstream 2017-07-17 17:23:20 +03:00
whitespace / reindent
d62a17aede *: reindent 
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-17 14:04:07 +02:00
David Lamparter
888ac268a0 *: add indent control files 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-17 14:00:23 +02:00
Jafar Al-Gharaibeh
13c2f50cd5 Merge pull request #818 from donaldsharp/eigrp_afi 
Eigrp afi
 2017-07-14 12:55:28 -05:00
Donald Sharp
e553b498f1 Merge pull request #820 from opensourcerouting/gcc7 
fix new warnings emitted by GCC 7
 2017-07-14 12:54:40 -04:00
Donald Sharp
9b42781b5d Merge pull request #794 from opensourcerouting/table-hash-ospf6-lsdb-refactor 
use hash in lib/table, also refactor ospf6 lsdb code
 2017-07-14 12:18:06 -04:00
David Lamparter
33cef91932 lib: parser: remove incorrect assert 
A {foo|bar|baz} graph node will have more than 1/2 incoming links even
if no other references are left to it (which is what the assert was
previously trying to ensure.)

I don't see a good way to "fix" the assert so I'm just removing it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 17:53:59 +02:00
David Lamparter
9eb03e7565 Merge pull request #806 from dwalton76/bgpd-set-ipv4-vpn-nexthop 
bgpd: "set ipv4 vpn next-hop 1.1.1.1" is saved/displayed as "set ip vpn next-hop 1.1.1.1"
 2017-07-14 17:37:04 +02:00
David Lamparter
53a37141f9 tests/ospf6d/test_lsdb: remove vty_outln 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 17:32:22 +02:00
David Lamparter
22106bbf68 Merge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 17:30:56 +02:00
David Lamparter
3192b3ac46 nhrpd: enable -Werror 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 16:59:44 +02:00
David Lamparter
20a6c6f31f *: fix GCC 7 warnings/issues 
The label initializer & nhrpd variable are just to shut up GCC 7,
the other two are actual bugs.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 16:59:44 +02:00
David Lamparter
acd738fc7f *: fix GCC 7 switch/case fallthrough warnings 
Need a comment on these.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 16:59:43 +02:00
Donald Sharp
888efdbb5e Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master 
Redhat doc fixes for master branch
 2017-07-14 10:59:31 -04:00
Russ White
805d1ca6b0 Merge pull request #809 from donaldsharp/evpn_plus_struct_attr 
Evpn plus struct attr
 2017-07-14 09:36:31 -04:00
Donald Sharp
2850f0ea58 bgpd, zebra: Cleanup warnings from new code 
1) Clean up VTY_NEWLINE -> \n
2) Remove usages of VTY_GET_INTEGER

Signed-off-by: Donald Sharp
 2017-07-14 08:52:45 -04:00
Donald Sharp
1ea6b3f237 Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr 2017-07-14 08:24:46 -04:00
Donald Sharp
da571b7a6c Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr 2017-07-14 08:11:05 -04:00
Donald Sharp
8c19712819 bgpd: Disable new EVPN CLI 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-14 08:08:52 -04:00
Russ White
28bd1c1158 Merge pull request #813 from opensourcerouting/newline-redux 
newline redux
 2017-07-14 08:00:43 -04:00
Donald Sharp
eef83e96f7 Merge pull request #762 from bingen/mutiple_nh_recursive_levels 
Allow for more than 1 NH recursion level
 2017-07-14 07:44:02 -04:00
Donald Sharp
4e671a08d6 Merge pull request #804 from opensourcerouting/fixes/tests/prng 
tests: update prng to return better pseudo random numbers
 2017-07-14 07:43:40 -04:00
David Lamparter
28b672fcd3 lib, vtysh: remove now-useless newline arg 
It's always \n now, hooray.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 13:18:14 +02:00
David Lamparter
84a98309de Merge remote-tracking branch 'frr/master' into newline-redux 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 13:15:55 +02:00
Russ White
444d4d3b93 Merge pull request #799 from dwalton76/bgpd-show-labeled-unicast 
bgpd: show bgp ipv4 label-unicast does not provide any output
 2017-07-14 07:12:02 -04:00
Russ White
79af1cb338 Merge pull request #808 from qlyoung/vtysh-termcols 
lib, vtysh: pretty-print variable autocompletions
 2017-07-14 07:10:13 -04:00
David Lamparter
50790e72fb *: remove vty_outln again 
(PRs merged to master added another few vty_outln() calls)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 13:09:47 +02:00
David Lamparter
2d8270596a Merge remote-tracking branch 'frr/master' into newline-redux 
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 13:07:30 +02:00
Russ White
ac45e83c04 Merge pull request #800 from qlyoung/fix-old-vpn-commands 
bgpd: fix old-style vpn commands
 2017-07-14 06:53:34 -04:00
Russ White
905c150793 Merge pull request #815 from dwalton76/CMD_WARNING_take2 
vtysh: return non-zero for configuration failures
 2017-07-14 06:24:01 -04:00
Russ White
2ddcf30b2a Merge pull request #817 from donaldsharp/babel_redist 
babeld: Allow babel to redistribute v6 routes
 2017-07-14 06:20:54 -04:00
David Lamparter
90325a8304 Merge pull request #814 from qlyoung/vtysh-password-commands 
vtysh: fixup password commands
 2017-07-14 10:24:22 +02:00
David Lamparter
625e016d14 *: remove VTYNL, part 6 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter
cdda201036 *: remove VTYNL, part 5 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter
55f70b671f *: remove VTYNL, part 4 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter
61b7d449bd *: remove VTYNL, part 3 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter
26a429fe8e *: remove VTYNL, part 2 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:02 +02:00
David Lamparter
6d3c2ed4ed *: remove VTYNL, part 1 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:02 +02:00
David Lamparter
6b18e3b2e0 ospf6d: VNL -> VTYNL 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:02 +02:00
David Lamparter
181039f3d7 *: ditch vty_outln(), part 2 of 2 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:19:58 +02:00
Donald Sharp
07ccdc88ad eigrpd: Fix up some redistribution issues 
Get EIGRP to start attempting to redistribute routes
as well as to display the fact it thinks it is redistributed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-13 18:58:31 -04:00
Donald Sharp
9e9012d7c1 eigrpd: Let eigrp setup it's router-id in some situations 
If the router-id is passed up to eigrp before we have
started the instance, allow it to set it up properly
as we start the instance.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-13 18:45:20 -04:00
Donald Sharp
d286e5f565 eigrpd: Fixed wrong type used 
Recent additions to prefix_copy to check afi type exposed
an issue with eigrp setting the wrong afi type for a `struct prefix`.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-13 18:12:07 -04:00
Donald Sharp
0277c4d712 babeld: Allow babel to redistribute v6 routes 
Turn on the ability in babel to receive v6 routes when requested.

robot# show babel route
192.168.201.0/24 metric 0 (exported)
2606:a000:111d:803e::/64 metric 0 (exported)
robot# conf t
robot(config)# int enp3s0
robot(config-if)# ipv6 addr 2404:4000:991d:804c:c32:ee94:742c:4d5/73
robot(config-if)# end
robot# show babel route
192.168.201.0/24 metric 0 (exported)
2606:a000:111d:803e::/64 metric 0 (exported)
2404:4000:991d:804c:c00::/73 metric 0 (exported)
robot#

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-13 17:35:29 -04:00
Daniel Walton
f1a05de982 vtysh: return non-zero for configuration failures 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

This allows frr-reload.py (or anything else that scripts via vtysh)
to know if the vtysh command worked or hit an error.
 2017-07-13 19:56:08 +00:00
Quentin Young
ac74942cfb
vtysh: fixup password commands 
`password` and `enable password` commands got a bit broken in an earlier
commit, fix 'em up.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-07-13 15:28:41 -04:00
David Lamparter
5c7571d43f *: ditch vty_outln(), part 1 of 2 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-13 20:29:22 +02:00