Commit Graph

7205 Commits

Author SHA1 Message Date
Timo Teräs
0ca036b456 nhrpd: implement 'show ip nhrp nhs' 2017-04-25 08:32:46 -04:00
Donald Sharp
22d289d393 *: Move the cumulus/etc/rt_protos.d/frr.conf
Moving cumulus/etc/rt_protos.d/frr.conf to tools/etc/rt_protos.d/frr.conf

Requested in Review.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-25 07:37:00 -04:00
Martin Winter
3d7746c340 Merge pull request #400 from dwalton76/default-frr-conf
vtysh: "Command incomplete: log syslog"
2017-04-24 20:11:11 -07:00
Renato Westphal
01d1458f6a ldpd: remove two unused imsg types
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-24 20:30:58 -03:00
Renato Westphal
03e5758c65 ldpd: call openzlog() in the child processes as well
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-24 20:30:58 -03:00
Renato Westphal
a9916d2bf3 ldpd: fix log level of log_warn() and log_warnx()
The log_warn() and log_warnx() functions indicate non-critical warnings
and errors, so use LOG_ERR instead of LOG_CRIT.

Keep using LOG_CRIT only in fatal() and fatalx() since these functions
indicate critical errors (when the program needs to exit).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-24 20:30:58 -03:00
Renato Westphal
fa68f9da9e ldpd: split log.c into two files
This is basically to keep in sync with OpenBSD's ldpd(8) where the same
change was done.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-24 20:30:58 -03:00
Donald Sharp
c24c910866 ospfd: Remove unused function
ospf_if_is_configured is never used, remove.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-24 19:29:30 -04:00
Renato Westphal
94f6a203b7 Merge pull request #345 from chiragshah6/pim_dev
pimd: Pim ECMP changes along with nexthop tracking using cached DB
2017-04-24 16:59:58 -03:00
Daniel Walton
27821f6a5a vtysh: "Command incomplete: log syslog"
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Before
======
root@spine-1[~]# cat /etc/frr/frr.conf
no log monitor
!
service integrated-vtysh-config
!
log syslog
!
log syslog informational
!
line vty
!
root@spine-1[~]#
root@spine-1[~]# vtysh -m -f /etc/frr/frr.conf
no log monitor
!
service integrated-vtysh-config
!
line 5: % Command incomplete: log syslog

root@spine-1[~]#

After
=====
root@spine-1[~]# vtysh -m -f /etc/frr/frr.conf
no log monitor
!
service integrated-vtysh-config
!
log syslog
!
log syslog informational
!
line vty
!
end
root@spine-1[~]#
2017-04-24 18:22:29 +00:00
Donald Sharp
9a09fb8e95 Merge pull request #391 from opensourcerouting/fix-no-router-ospf6
ospf6d: fix "no router ospf6"
2017-04-22 17:55:26 -04:00
Renato Westphal
34288970c4 ospf6d: fix "no router ospf6"
The "no router ospf6" command wasn't working.

Regression introduced by commit 16cedbb.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-22 17:51:14 -03:00
Donald Sharp
e9e27161c3 Merge pull request #388 from opensourcerouting/snap-fixes-3.0
Snap fixes 3.0
2017-04-21 20:13:31 -04:00
Martin Winter
97b0200793 doc: Add nhrpd to relevant section in Building_FRR_on_xxxx doc
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-21 17:43:17 -04:00
Phil Huang
aa1322f9f6 Clean installation guide with Debian/Ubuntu
Signed-off-by: Phil Huang <phil_huang@edge-core.com>
2017-04-21 17:43:17 -04:00
Phil Huang
02f3b0512a Add user frr into group frrvty
Signed-off-by: Phil Huang <phil_huang@edge-core.com>
2017-04-21 17:43:17 -04:00
Martin Winter
d851b2fc0d snapcraft: Add FPM module with command to set mode or disable it
- New snap command:
    frr.set fpm {disable | protobuf | netlink}

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-21 02:49:39 -07:00
Martin Winter
80b4df3b08 lib: Add CLI option --moduledir to override default module location (needed for snap support)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-21 02:37:11 -07:00
Dinesh G Dutt
23b1f33451 Add source of route as protocol string in ip route pushed into kernel
Ticket: CM-14313
Reviewed By:
Testing Done: bgpmin, ospfmin, bgp_kitchen_sink_test

'ip route show' displays all routes as belonging to protocol zebra.
The user has to run an additional command (in vtysh) to get the actual
source of a route (bgp/ospf/static etc.). This patch addresses that by
pushing the appropriate protocol string into the protocol field of the
netlink route update message. Now you can see routes with the correct
origin as well as filter on them (ip route show proto ospf).

'ospf' is used for both IPv4 and IPv6 routes, even though the OSPF
version is different in both cases.

Sample output (old):
9.9.12.13 via 69.254.2.38 dev swp3.2  proto zebra  metric 20
9.9.13.3  proto zebra  metric 20
        nexthop via 69.254.2.30  dev swp1.2 weight 1
        nexthop via 69.254.2.34  dev swp2.2 weight 1
        nexthop via 69.254.2.38  dev swp3.2 weight 1

Sample output (new):
9.9.12.13 via 69.254.2.38 dev swp3.2  proto bgp  metric 20
9.9.13.3  proto bgp  metric 20
        nexthop via 69.254.2.30  dev swp1.2 weight 1
        nexthop via 69.254.2.34  dev swp2.2 weight 1
        nexthop via 69.254.2.38  dev swp3.2 weight 1
2017-04-20 21:24:31 -04:00
Martin Winter
ae49894874 snapcraft: Add nhrpd to snap
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-20 18:18:40 -07:00
Martin Winter
5ae4018e5d snapcraft: Fix another old leftover of ubuntu-core in build doc
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-20 17:24:12 -07:00
Martin Winter
6f2a494a83 snapcraft: Update snapcraft requirements for FRR 3.0 (from 2.0)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-20 16:58:24 -07:00
Donald Sharp
38d9651ab7 Merge pull request #382 from opensourcerouting/snap-doc-fixes-3.0
snapcraft: Improve README.usage.md based on feedback received
2017-04-20 18:55:21 -04:00
Martin Winter
f4c14c3a80 snapcraft: Improve README.usage.md based on feedback received
- Fix snap connect (it's now called core, not ubuntu-core)
- Add section on MPLS configuration
- Add FAQ topic on ospfd/ospf6d crashing before privs are assigned to snap
- Add pointer to official webpage

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-20 15:44:44 -07:00
Donald Sharp
e3a55f03bf pimd: Tweak pim_ifchannel_compare to be faster
Tweak the ifchannel compare to sort based upon
interface first

Ticket: CM-15629
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-20 16:00:21 -04:00
Donald Sharp
b5e6281b65 pimd: Convert pim_ifchannel_list to use up->ifchannels
We have a bunch of places where we iterate over
the pim_ifchannel_list to find those ifchannels
that match a certain upstream.  Since we already
know in the upstream the list of ifchannels
associated with it, just look at those instead.

Functions changed:

forward_on
forward_off
pim_upstream_rpf_interface_changed
pim_upstream_update_could_assert
pim_upstream_update_my_assert_metric
pim_upstream_update_assert_tracking_desired
pim_upstream_is_sg_rpt

Ticket: CM-15629
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-20 15:59:57 -04:00
Donald Sharp
2a28f7a0b9 pimd: Add ability for upstream to know it's ifchannels
Add a list structure to track the ifchannels associated
with a particular upstream.

We are not doing anything with this particular knowledge
yet but it will be come useful in the near future.

Ticket: CM-15629
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-20 15:59:12 -04:00
Donald Sharp
c8fc07cb03 pimd: Limit search to relevant ifchannels in some cases
When we are determining an inherited_olist, let's be allot
smarter about what we look at.  Before this code change
we are looping over the entirety of all ifchannels in
the system to find the relevant ones.  Convert the
code to *find*(hash table lookup) the specific ifchannels we
are interested in.

Ticket: CM-15629
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-20 15:59:01 -04:00
Donald Sharp
cf528e4f26 pimd: When loosing *,G igmp report notify S,G too
When we have a S,G that was created due to the *,G IGMP
report going away, safely remove the S,G as well.

Ticket: CM-15838
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
2017-04-20 15:57:00 -04:00
Donald Sharp
df94f9a91d pimd: Add prefix list handling to spt-switchover
To the 'ip pim spt-switchover infinity-and-beyond' command
add 'prefix-list <PLIST>'. To the command.

Use this as the basis to deny (Not immediate switchover)
or permit (Immediate switchover), based upon matching
the group address and the prefix-list.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-20 15:55:50 -04:00
Donald Sharp
9134c9e958 Merge remote-tracking branch 'origin/stable/3.0' 2017-04-19 07:43:30 -04:00
Russ White
d0c91da4e8 Merge pull request #373 from qlyoung/fix-no-pim-rp
pimd: fix some pim commands
2017-04-19 07:16:22 -04:00
Russ White
ae73184340 Merge pull request #374 from qlyoung/pqueue-linear-remove
lib: add removal by item to pqueue
2017-04-19 07:04:04 -04:00
Russ White
54cd060799 Merge pull request #379 from pguibert6WIND/frrouting_issue309_2
vtysh: remove deprecated HAVE_EVPN flag
2017-04-19 06:58:48 -04:00
Philippe Guibert
d2c1e06d83 vtysh: remove deprecated HAVE_EVPN flag
This flag prevents from entering into evpn address-family node, when
calling command from vtysh.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2017-04-19 09:40:08 +02:00
Donald Sharp
de72643d15 Merge pull request #315 from LabNConsulting/working/master/patch/bgp-startup
Restore functionality broken/overridden by 857b544649
2017-04-18 12:14:58 -04:00
Don Slice
ef01549170 zebra: stop crash on process termination due to stale ifp->node
Problem reported that crash occurred when stopping quagga in certain
circumstances.  Determined that this was due to a stale pointer on the
ifp for a deleted interface.  The ifp->node had been freed but the ifp
still kept a pointer to it, and when later the process was stopped, it
attempted to delete it again.

Ticket: CM-15550
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-18 09:46:19 -04:00
Donald Sharp
0f5ec54a69 Merge remote-tracking branch 'origin/stable/3.0' 2017-04-17 19:12:44 -04:00
Martin Winter
3060be2af5 Merge pull request #371 from donaldsharp/as_path_fix_3.0
bgpd: Fix 'set as-path prepend last-as 10'
2017-04-17 14:47:08 -07:00
Martin Winter
6491e6303e Merge pull request #370 from donaldsharp/as_path_fix
bgpd: Fix 'set as-path prepend last-as 10'
2017-04-17 14:46:28 -07:00
Quentin Young
9ea49d61d2 pimd: fix 'show ip msdp sa ...'
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-04-17 19:24:28 +00:00
Donald Sharp
be81f27278 eigrpd: Save whether or not a interface is passive.
Save whether or not a interface is passive in EIGRP.
More work is needed to actual respect that.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-17 10:01:51 -04:00
Quentin Young
6cbc63316b lib: add removal by item to pqueue
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-04-17 00:06:02 +00:00
Donald Sharp
dbc56a10d4 eigrpd: Cleanup cli
The eigrp cli was using a define that was causing some issues
surrounding interface names and detailed information.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 14:20:57 -04:00
Donald Sharp
7abc04e686 zebra: Add some more checks to fec [un]registration
Be a bit more rigoruous about what we can receive
from another protocol and attempt to make the code
less likely to crash and to just safely bail
out when an error is received.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00
Donald Sharp
9fbea8d56d bgpd: Fix up several issues in bgp_route.c
1) Some commands were installed in the wrong node
2) Fix output to show labeled information to correctly display
3) Whitespace issue in route-map command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00
Donald Sharp
9db2da6c59 zebra: Fix whitespace issue with if statement
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00
Donald Sharp
bf995813b2 zebra: Allow explicit-null as a label option
When entering 'mpls label bind ...' command
allow the explicit-null as an option.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00
Donald Sharp
95169c2f78 zebra: Fix crash with dereference of NULL pointer
We only create the v4 and v6 mpls fec tables currently.
Follow the code pattern for the rest of the code and
ensure that the table exists before we attempt to access it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00
Donald Sharp
b3b3879c3e lib, bgpd: Remove UNDEFINED_NODE
Remove the UNDEFINED_NODE as that it's implementation breaks
our ability in BGP to figure out where we are by allowing
default: in the switch statement.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-15 13:26:56 -04:00