Commit Graph

10554 Commits

Author SHA1 Message Date
Quentin Young
d38549c99d
Merge branch 'master' into docs-user
Manually merged these doc commits:

3bb7cd7f56
ff21655441
2018-01-30 15:05:15 -05:00
Chirag Shah
29ab3b60d1 ospfd: fix redistribute running config
Testing:
CL(config)# router ospf
CL(config-router)# redistribute static metric-type 2
CL(config)# router ospf
CL(config-router)# default-information originate always metric-type 2

show running output
router ospf
 redistribute static
 default-information originate always
!

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
2018-01-30 10:05:20 -08:00
Quentin Young
b012cbe2b1
bgpd: improve default shutdown help string
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-30 11:47:34 -05:00
Lou Berger
08951735bd
Merge pull request #1690 from dslicenc/bgpd-vrf-show-cm17377
bgpd: fix output of show bgp vrf all neighbor x.x.x.x
2018-01-30 11:42:26 -05:00
Quentin Young
1e1c1e132b
tools: return exit status in checkpatch.sh
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-30 10:53:35 -05:00
Olivier Dugeon
62c9979094 OSPFd: Clean up Segment Routing patch
- ospfd/ospf_te.c: Remove unregister function and call to
ospf_delete_opaque_functab() following the introduction of
ospf_opaque_term() function in ospfd.c for ospfd termination.
 - ospfd/ospf_sr.c: Set initial index value for node-msd CLI to
avaoid crash when using this command
 - ospfd/ospf_ext.c: Disable call to ospf_sr_update_prefix() if
Segment Routing, thus Extended Link/Prefix, is not enable
 - ospfd/ospf_opaque.c: Correct scheduling of Opaque LSA flooding

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
2018-01-30 16:17:54 +01:00
Quentin Young
8175f54a2d
bgpd: fixup default shutdown
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-30 10:12:19 -05:00
Olivier Dugeon
0cd00cc506 OSPFd: Remove unecessary debug message
- Line 865 in ospfd/ospf_ext.c cause compilation failure when
-werror is set. This line was not necessary and add only for debugging
purpose.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
2018-01-30 14:25:40 +01:00
Don Slice
71aedaa394 bgpd: fix output of show bgp vrf all neighbor x.x.x.x
Problem reported with output of the command "show bgp vrf all
neighbor x.x.x.x" not limiting the output to that peer in any vrf.
This fix corrects the logic to display by neighbor
(ipv4/ipv6/interface) in any vrf.

Ticket: CM-17377
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
2018-01-30 12:30:35 +00:00
Olivier Dugeon
dab8b7a81c Merge remote-tracking 'frr/master' into SR-Routing 2018-01-30 11:43:25 +01:00
Olivier Dugeon
c97dbe20a1 OSPFd: Correct compilation error
- Forget to remove ospf_router_info_unregister in ospfd_ri.c

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
2018-01-30 11:42:02 +01:00
Olivier Dugeon
15fa114fed
Merge pull request #1688 from chiragshah6/mdev
ospfd: Fix default-info and redis cmd options
2018-01-30 11:37:59 +01:00
Donald Sharp
57dac17c57 lib, pimd: Remove PIM_NODE as it is not needed
The PIM_NODE command is only being used to display
default vrf configuration.  Move this into the
vrf display and remove PIM_NODE.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-30 03:21:42 -05:00
Chirag Shah
951da43571 ospfd: Fix default-info and redis cmd options
Fix default-information parsing of metric-type,
route-map.
show running to display metic-type 2.

metric, metric-type and route-map can be configured in
any order, running-config displays in specific order..

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
2018-01-29 21:33:32 -08:00
Donald Sharp
2481e73221 zebra: Fix v6 nexthop-vrf and nexthop confusion
The v6 code had the same issue with how it handled
nexthop-vrf and nexthop when it was entered on the
same line.  This fixes that issue.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-30 00:15:45 -05:00
Donald Sharp
2eb07de3d6 zebra: Fix crash when dereferencing dest->selected_fib
When a rib_unlink() event is directly called for a
route_entry we need to see if the dest->selected_fib
is the same and just unset the dest->selected_fib.

This was happening for redistributed table 10 routes
into BGP.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-29 17:52:15 -05:00
Renato Westphal
941e1c11f2
Merge pull request #1686 from donaldsharp/mem_leaks_zebra
Mem leaks zebra
2018-01-29 20:41:07 -02:00
Renato Westphal
c590446bae
Merge pull request #1684 from donaldsharp/vrf_leak
zebra: Fix to get correct nexthop-vrf
2018-01-29 20:34:02 -02:00
Quentin Young
c1a54c054d
doc: manually finish conversion
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-29 16:38:07 -05:00
Donald Sharp
7d38890de8 zebra: On shutdown actually delete rn's assoc w/ other_tables
Zebra stores routes coming from the kernel for non-default
tables.  This information on shutdown was being leaked
because we never cleaned it up.  Allow for this to happen
now.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-29 16:20:41 -05:00
Donald Sharp
38c64469f3
Merge pull request #1685 from LabNConsulting/working/vpn-doc
doc: minor cleanup of bgp vpnvX and remove encap safi references
2018-01-29 15:51:30 -05:00
Donald Sharp
c7974c0f1a lib: When we shutdown we would leak interface description
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
2018-01-29 15:38:03 -05:00
Donald Sharp
e65dfe7e56 zebra: Cleanup error handling of nexthop vrf and vrf
The error handling of the nexthop vrf and the vrf
for what was specified on the cli was not as clean
as it should have been.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-29 15:18:28 -05:00
Lou Berger
3bb7cd7f56 doc: remove references to encap safi
Signed-off-by: Lou Berger <lberger@labn.net>
2018-01-29 15:03:03 -05:00
Lou Berger
ff21655441 doc: change vpnvX -> ipvX vpn
Signed-off-by: Lou Berger <lberger@labn.net>
2018-01-29 14:55:16 -05:00
Renato Westphal
ec0ffe4878
Merge pull request #1680 from donaldsharp/inet_pton
zebra: Fix failure to parse src
2018-01-29 17:24:33 -02:00
Quentin Young
d1a242fdbf
doc: cleanup multiple
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-29 12:16:20 -05:00
Olivier Dugeon
7743f2f8c0 OSPFd: Update Segment Routing PR following review
Following various review, following files have been modfied:

 - All: Change u_intXX_t typedef to standard uintXX_t types
 - doc/OSPF-SR.rst: Update doc in particular the Linux Kernel configuration
section
 - doc/ospfd.texi: Update CLI
 - ospfd/ospf_dump.[c,h]: Add new 'debug ospf sr' when performing 'sh run'
 - ospfd/ospf_ext.[c, h]: Various bug corrections notably to handle flooding of
Extended Prefix at startup. iFix TLVs size for LAN Adjacency.
Update Licence as per Community.md
 - ospfd/ospf_opaque.c: Add proper termination function call to remove MPLS entries
 - ospfd/ospf_ri.[c,h]: Bug corrections
 - ospfd/ospf_sr.[c,h]: Various bug corrections, notably to determine the nexthop
SR Node. Add support to 'no-php-flag'.
Update Licence as per Community.md
 - ospfd/ospfd.c: Add call to 'ospf_opaque_term()'

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
2018-01-29 17:58:53 +01:00
Quentin Young
50e75a2b82
doc: cleanup kernel.rst
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-29 10:57:13 -05:00
Quentin Young
655cdc3233
doc: fixup routemap.rst
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-29 10:46:35 -05:00
Russ White
983976514f
Merge pull request #1679 from qlyoung/revert-remove-options-directly-connected
Revert "bgpd: disallow invalid config at cli layer"
2018-01-29 08:25:49 -05:00
Donald Sharp
17a217216d zebra: Fix failure to parse src
If src happens to point at all 0's due to not initializing
it and if the address passed in is not a v6 address then
we would not set src in the AF_INET6 call and would
fail the (src.ipv4.s_addr && inet_pton(AF_INET...)
call.  Thus causing us to return a NULL and make
the routemap code think there was an issue.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-27 18:56:30 -05:00
Martin Winter
08c9af9375
Merge pull request #1659 from chiragshah6/ospf_vrf_dev
ospfd: show ip ospf neighbor json output format
2018-01-27 09:17:45 -08:00
Donald Sharp
e6149ab4b8 zebra: Fix to get correct nexthop-vrf
The nexthop_vrf should be looked up as appropriate,
If the nexthop_vrf was specified use that, else
use the vrf context of what was passed in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-27 05:28:51 -05:00
Donald Sharp
38503c0992 doc: Fix Debian 9 build instructions
Using /var/run/frr as a localstate directory will allow
debian9 to just delete that directory on every reboot.
This causes issues for people who are new to the system
in that FRR will just stop working on a reboot.

Instead just point people at a better spot.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-01-27 02:52:13 -05:00
Quentin Young
7ebe625c3a
Revert "bgpd: disallow invalid config at cli layer"
This reverts commit a174be631a.

Turns out we need that variable to accept peer groups.
2018-01-26 17:16:12 -05:00
Quentin Young
ec8404d84b
doc: remove some more @stuff{}
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 17:09:25 -05:00
Russ White
1b0d575cf9
Merge pull request #1671 from donaldsharp/southbound_pointer
Southbound pointer
2018-01-26 16:40:01 -05:00
Quentin Young
a8c90e154f
doc: strip trailing whitespace
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 16:15:48 -05:00
Quentin Young
d50b2aa038
doc: use :abbr:
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 16:15:48 -05:00
Quentin Young
dfab2669d3
doc: use :term:, will add glossary later
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 16:15:48 -05:00
Quentin Young
29adcd5008
doc: fix cli documentation formatting
* Use new 'clicmd' directive / role
* Convert old style range syntax to new style

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 16:15:43 -05:00
Quentin Young
2731b07dba
doc: add clicmd role for frr cli
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 15:51:59 -05:00
Quentin Young
a4c5392863
doc: replace random @cite{RFC...} with :rfc:...
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 14:44:58 -05:00
Quentin Young
07a17e6d4e
doc: shotgun cleanup
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 14:43:21 -05:00
Quentin Young
8fa64b2a3f
doc: @smp{foo} -> `foo`
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 13:50:36 -05:00
Quentin Young
dc5564c76f
doc: cleanup installation instructions
Use program and option directives for CLI options

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 13:29:16 -05:00
Quentin Young
a90cfb7f71
doc: fixup eigrpd.rst
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 12:57:34 -05:00
Chirag Shah
856ae1eb2e ospf6d: Fix redist w/ route-map during restart
Add hook for route-map update event.
Add a delay one shot timer to accomodate route-map
update and reset redist with zebra to process
all redistribute routes with route-map info.

Cleanup route-map, prefix cached date during ospf6 exit.

Ticket:CM-13800
Testing Done:
configure redistribute connected with route-map to define
type-2 routes. Restart frr.service and validated
route-map add,update event, thread is scheduled,
once timer is done redist reset with zebra.
Upon redist add notification, all route map info is cached
in ospf6 and processed as type-2 route and send ASE E2 LSA.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
2018-01-26 09:53:37 -08:00
Quentin Young
fce2ac600e
doc: remove @group / @end group
Don't need these in RST

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-01-26 12:38:08 -05:00