proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:02:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,338 Commits 4 Branches 191 Tags 125 MiB
ee9de2cce5
Commit Graph

7338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Donald Sharp
ee9de2cce5 Merge pull request #588 from opensourcerouting/nhrpd-20170519 
nhrpd: configure mgre ipv6 nd for nhrp
 2017-05-19 08:33:07 -04:00
Donald Sharp
4bf6638636 Merge remote-tracking branch 'origin/stable/3.0' 2017-05-19 08:09:42 -04:00
David Lamparter
be1f2d1802 Merge pull request #586 from donaldsharp/msdp_crashalicious 
pimd: Fix crash from cli missinterpertation
 2017-05-19 13:38:48 +02:00
Timo Teräs
896868a63e nhrpd: configure mgre ipv6 nd for nhrp 
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-19 13:32:05 +02:00
Donald Sharp
53c438dae2 pimd: Fix crash from cli missinterpertation 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-18 23:06:12 -04:00
David Lamparter
16156c1018 ldpd: use frr_init() 
Without this, modules aren't loaded.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:07:28 -04:00
David Lamparter
5662e2c91c lib: fix __attribute__ typo 
__attribute breaks pycparser

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:07:28 -04:00
David Lamparter
297c8f6a31 lib: qobj: MT-guard with rwlock 
Make qobj_* calls MT-Safe/LF-Blocking.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:07:28 -04:00
David Lamparter
b85120bcb3 lib: detangle protocol name/instance from logging 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:07:28 -04:00
David Lamparter
4d2d73c281 Merge pull request #571 from donaldsharp/nhrp 
Nhrp
 2017-05-18 19:24:29 +02:00
David Lamparter
f634740f41 Merge pull request #573 from donaldsharp/pim_crash_a_boo 
pimd: Thread changes allow pim to crash a boo
 2017-05-18 19:22:03 +02:00
Donald Sharp
ac139b5fb6 Merge remote-tracking branch 'origin/master' into pim_crash_a_boo 2017-05-18 09:45:57 -04:00
Donald Sharp
25c58d6d2b pimd: Address PR Comments 
Remove a bit more dead code and unused variable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-18 09:44:09 -04:00
Donald Sharp
69b174d4ec pimd: Fix indentation issue that is causing clang unhappiness 
The indentation of ifjoin_to_noinfo was not consistent with
the rest of the function and caused clang to loose it's mind

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-18 09:03:58 -04:00
Donald Sharp
f1deac618b pimd: Fix indentation issue that is causing clang unhappiness 
The indentation of ifjoin_to_noinfo was not consistent with
the rest of the function and caused clang to loose it's mind

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-18 08:56:40 -04:00
David Lamparter
0e20096f60 zebra: fix label manager merge snafu 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:51:56 +02:00
Timo Teräs
37dc8ab5b6 nhrpd: announce ipv6 routes to zebra 
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 2017-05-18 08:40:40 -04:00
David Lamparter
fa84d1932b Merge branch 'stable/3.0' 
Conflicts:
	ldpd/lde.c
	zebra/label_manager.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:14:00 +02:00
David Lamparter
05220b6d5d Revert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop" 
This reverts commit fa14eb2c0b.

This was for stable/2.0 and wasn't intended to go on stable/3.0
-- my bad, missed this in the merge.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 14:05:53 +02:00
Donald Sharp
f6a64b5fa0 Merge pull request #512 from bingen/tmp_lm_relay_async 
lm: Make relay label manager async
 2017-05-18 07:09:07 -04:00
David Lamparter
d9b75ea8db Merge branch 'frr/pull/569' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:35:53 +02:00
David Lamparter
e2f30ad1c2 Merge branch 'frr/pull/569' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:34:34 +02:00
David Lamparter
20ae26767d Merge branch 'frr/pull/567' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:33:50 +02:00
David Lamparter
c3fb7c1064 Merge branch 'frr/pull/550' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:32:28 +02:00
David Lamparter
57463530f3 Merge branch 'stable/3.0' 
Conflicts:
	ospf6d/ospf6_lsa.c
	ospfd/ospf_vty.c
	zebra/interface.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:28:12 +02:00
David Lamparter
ac39ea2823 Merge branch 'frr/pull/575' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:23:23 +02:00
David Lamparter
92eedda1fb Merge branch stable/2.0 into stable/3.0 
Conflicts:
	bgpd/bgp_fsm.c
	ospf6d/ospf6_lsa.c
	ospfd/ospf_vty.c
	zebra/redistribute.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:23:13 +02:00
David Lamparter
b2b6f8f33c Pre-revert nonmergeable changes 
Revert "ospf6d: fix decimal area ID cli"
commit a27cb3cfe9

Revert "bgpd: add back unicast option to 'address-family vpnv(4&6)' Issue #459"
commit 399598bf6b

Revert "Fix the memory leak"
commit d8d58e9839

Revert "zebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous"
commit 83f3561935

Revert "ospf6d: Allow unconfig of unknown lsa's"
commit 5b0747d71d

Revert "Fix the "Dead assignment" of clang SA."
commit 3a6570a1f1

Revert "snapcraft: Improve README.usage.md based on feedback received"
commit 2a3a819a9c

Revert "zebra: stop deregistering static nexthops unless removing the static"
commit 1dac3a9619

All of these changes do not apply on stable/3.0 due to either CLI
changes or another fix already being present.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:09:50 +02:00
David Lamparter
921c2f1ef7 Merge branch 'frr/pull/574' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:39:58 +02:00
David Lamparter
300dfa794d Merge branch 'frr/pull/558' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:38:25 +02:00
David Lamparter
7e467f2d2b Merge branch 'frr/pull/557' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:37:37 +02:00
David Lamparter
303f85d545 Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes") 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:34:50 +02:00
David Lamparter
31d08cde94 Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels") 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:31:05 +02:00
David Lamparter
a70901263f Merge branch 'frr/pull/536' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:30:04 +02:00
David Lamparter
d79d90b297 bgpd: remove bgp_nexthop_afi prototype 
as pointed out by Renato Westphal in #536

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:29:28 +02:00
Quentin Young
32f464d891 ospf6d: fix decimal area ID cli 
Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-05-18 04:39:05 +00:00
Quentin Young
a27cb3cfe9 ospf6d: fix decimal area ID cli 
Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-05-18 04:35:31 +00:00
Renato Westphal
be371e2318 Merge pull request #556 from dslicenc/bgp-fixes 
Bgp fixes
 2017-05-17 21:37:01 -03:00
Donald Sharp
4a07939b68 pimd: Thread changes allow pim to crash a boo 
When we add a thread pointer to thread_add_XXX functions
when the specified function is called, thread.c is setting
the thread pointer to NULL.  This was causing pim to
liberally pull it's zassert grenade pin's.

Additionally clean up code to not set the NULL pointer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-17 20:33:43 -04:00
Timo Teräs
55fd6ee9ca nhrp: improve CIE prefix length handling 
RFC2332 states that prefix length MUST be 0xff for unique bindings.
However, it seems at least some Cisco firmwares use host prefix
length instead (which on wire level makes sense). Relax the handling
of prefix length to treat all value longer than address length as
0xff. Additionally treat 0x00 the same way too, this is required
by the RFC. This also fixes the prefix length address family to be
checked against protocol address.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 2017-05-17 18:36:39 -04:00
Donald Sharp
d258c885bd nhrpd: Fix crash in 'no nhrp event socket..' command 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-17 18:31:02 -04:00
Donald Sharp
201f6271de nhrpd: Fix some missing newlines 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-17 18:30:43 -04:00
David Lamparter
8f58b15143 Merge pull request #562 from dslicenc/small-zebra-fixes 
Small zebra fixes
 2017-05-17 23:35:29 +02:00
David Lamparter
bac7b7b935 Merge pull request #537 from donaldsharp/vrf_stuff 
Vrf stuff
 2017-05-17 22:06:39 +02:00
Lou Berger
201c3dac29 bgpd: fix config of v6 vpn networks tags 
Signed-off-by: Lou Berger <lberger@labn.net>
 2017-05-17 14:56:43 -04:00
Quentin Young
a108e6e40d eigrpd: disambiguate bandwidth command 
eigrpd defines a bandwidth command that takes kilobits instead of
megabits which is problematic when installed in the same node as the
megabits command since (1-100000) and (1-10000000) are ambiguous

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-05-17 18:37:24 +00:00
Renato Westphal
f0913df969 Merge pull request #565 from qlyoung/fix-ldpd-vtysh-3.0 
vtysh: fix ldpd vtysh
 2017-05-17 15:19:04 -03:00
Quentin Young
f14b7abf4f vtysh: fix ldpd vtysh 
ldpd needs a special case to execute the correct exit command for walkup
when using vtysh

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-05-17 17:34:30 +00:00
Renato Westphal
e89f016d3e Merge pull request #561 from donaldsharp/static_config2 
Static config2
 2017-05-17 14:18:51 -03:00
Quentin Young
dbb3cdb601 lib: correctly handle EOF when using poll() 
Descriptor owner should handle EOF, not thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-05-17 15:05:42 +00:00