]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
7 years agoMerge branch 'stable/3.0' into pim_dev_3_0
Jafar Al-Gharaibeh [Fri, 28 Apr 2017 15:38:05 +0000 (10:38 -0500)]
Merge branch 'stable/3.0' into pim_dev_3_0

7 years agoMerge pull request #381 from donaldsharp/pimmerino
Jafar Al-Gharaibeh [Fri, 28 Apr 2017 15:13:39 +0000 (10:13 -0500)]
Merge pull request #381 from donaldsharp/pimmerino

Pimmerino

7 years agoMerge pull request #425 from opensourcerouting/bgpd-clear-fix
Donald Sharp [Fri, 28 Apr 2017 14:47:05 +0000 (10:47 -0400)]
Merge pull request #425 from opensourcerouting/bgpd-clear-fix

bgpd: fix "clear bgp" commands

7 years agoMerge pull request #424 from opensourcerouting/snap-fix-distfile
Donald Sharp [Fri, 28 Apr 2017 14:02:03 +0000 (10:02 -0400)]
Merge pull request #424 from opensourcerouting/snap-fix-distfile

More snapcraft cleanups

7 years agobgpd: fix "clear bgp" commands
Renato Westphal [Fri, 28 Apr 2017 13:22:28 +0000 (10:22 -0300)]
bgpd: fix "clear bgp" commands

The use of VTY_DECLVAR_CONTEXT(bgp, bgp) here is wrong as we are not
inside the "router bgp" configuration node. This was making the clear
commands always fail with a "Current configuration object was deleted
by another process" error, which doesn't make any sense.

Also, the bgp_clear() function will already check for us if the given
peer-group or neighbor exists or not, there's no need to duplicate this
logic here.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agosnapcraft: Clean up old no longer used configure flags
Martin Winter [Fri, 28 Apr 2017 10:11:51 +0000 (03:11 -0700)]
snapcraft: Clean up old no longer used configure flags

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agosnapcraft: Add support for extra version information
Martin Winter [Fri, 28 Apr 2017 06:41:04 +0000 (23:41 -0700)]
snapcraft: Add support for extra version information

- frr.version snap command will now show the contents of
  extra_version_info.txt in addition to the zebra --version output

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agosnapcraft: Fix missing files in "make dist" target
Martin Winter [Fri, 28 Apr 2017 06:26:20 +0000 (23:26 -0700)]
snapcraft: Fix missing files in "make dist" target

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoMerge pull request #413 from dwalton76/address-family-argv-argc-stable-30
Renato Westphal [Thu, 27 Apr 2017 12:21:20 +0000 (09:21 -0300)]
Merge pull request #413 from dwalton76/address-family-argv-argc-stable-30

Problem with DEFUNSH in vtysh, issue #358

7 years agoProblem with DEFUNSH in vtysh, issue #358
Daniel Walton [Wed, 26 Apr 2017 22:39:10 +0000 (22:39 +0000)]
Problem with DEFUNSH in vtysh, issue #358

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agopimd: fix pimd crashes around pim rpf
Chirag Shah [Tue, 25 Apr 2017 05:32:23 +0000 (22:32 -0700)]
pimd: fix pimd crashes around pim rpf

During neighbor down event, all upstream entries rpf lookup may result
into nhop address with 0.0.0.0 and rpf interface info being NULL.
Put preventin check where rpf interface info is accessed.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agopimd: Fix WG/SGRpt & WG J/P processing
Chirag Shah [Fri, 21 Apr 2017 22:08:03 +0000 (15:08 -0700)]
pimd: Fix WG/SGRpt & WG J/P processing

During processing of Join/Prune,
for a S,G entry, current state is SGRpt, when only *,G is
received, need to clear SGRpt and add/inherit the *,G OIF to S,G so
it can forward traffic to downstream where *,G is received.
Upon receiving SGRpt prune remove the inherited *,G OIF.

Testing Done:
Trigger SPT switchover, *,G path received SGRpt later data
traffic stopped S,G ages out from LHR, sends only
*,G join to upstream, verified S,G entry inherit the OIF.
Upon receiving SGRpt deletes inherited oif and retains in SGRpt state.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agopimd: Enable igmp on igmp version change cli
Chirag Shah [Tue, 25 Apr 2017 05:01:34 +0000 (22:01 -0700)]
pimd: Enable igmp on igmp version change cli

Execute ip igmp version 3 under swp interface,
verified show running displayed 'ip igmp' configuration.
Continuous sending group membership, performed 'no ip igmp'
and verified, group membership flushed. Performed
'ip igmp version 3', verified 'show ip igmp groups'
displaying igmp membership re-populated.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agopimd: Pim Nexthop Tracking support with ECMP
Chirag Shah [Wed, 5 Apr 2017 20:14:12 +0000 (13:14 -0700)]
pimd: Pim Nexthop Tracking support with ECMP

In this patch, PIM nexthop tracking uses locally populated nexthop cached list
to determine ECMP based nexthop (w/ ECMP knob enabled), otherwise picks
the first nexthop as RPF.
Introduced '[no] ip pim ecmp' command to enable/disable PIM ECMP knob.
By default, PIM ECMP is disabled.
Intorudced '[no] ip pim ecmp rebalance' command to provide existing mcache
entry to switch new path based on hash chosen path.
Introduced, show command to display pim registered addresses and respective nexthops.
Introuduce, show command to find nexthop and out interface for (S,G) or (RP,G).
Re-Register an address with nexthop when Interface UP event received,
to ensure the PIM nexthop cache is updated (being PIM enabled).
During PIM neighbor UP, traverse all RPs and Upstreams nexthop and determine, if
any of nexthop's IPv4 address changes/resolves due to neigbor UP event.

Testing Done: Run various LHR, RP and FHR related cases to resolve RPF using
nexthop cache with ECMP knob disabled, performed interface/PIM neighbor flap events.
Executed pim-smoke with knob disabled.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
(cherry picked from commit cba444817883b8b3b22a7ed9958dc9ed77f76230)

7 years agoMerge pull request #399 from donaldsharp/is_configured
Jafar Al-Gharaibeh [Tue, 25 Apr 2017 15:13:40 +0000 (10:13 -0500)]
Merge pull request #399 from donaldsharp/is_configured

ospfd: Remove unused function

7 years agoMerge pull request #403 from donaldsharp/nhrpd2
Russ White [Tue, 25 Apr 2017 14:24:23 +0000 (10:24 -0400)]
Merge pull request #403 from donaldsharp/nhrpd2

Nhrpd2

7 years agonhrpd: Fix cli changes missed
Donald Sharp [Tue, 25 Apr 2017 13:07:05 +0000 (09:07 -0400)]
nhrpd: Fix cli changes missed

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agonhrp: parse and log command response errors from strongSwan
Timo Teräs [Fri, 21 Apr 2017 11:58:17 +0000 (14:58 +0300)]
nhrp: parse and log command response errors from strongSwan

helps to debug configuration problems

7 years agonhrp: fix potential crash when vici profile name is not configured
Timo Teräs [Fri, 21 Apr 2017 11:57:57 +0000 (14:57 +0300)]
nhrp: fix potential crash when vici profile name is not configured

7 years agonhrp: notify 'tunnel protection' changes
Timo Teräs [Fri, 21 Apr 2017 11:56:45 +0000 (14:56 +0300)]
nhrp: notify 'tunnel protection' changes

to triggers refresh of IKE SAs immediately on this command

7 years agonhrp: explicitly cast ints to size_t for vici_request_vc va_list handling
Timo Teräs [Fri, 21 Apr 2017 10:57:28 +0000 (13:57 +0300)]
nhrp: explicitly cast ints to size_t for vici_request_vc va_list handling

7 years agonhrp: fix protocol address family parsing on receive
Timo Teräs [Thu, 20 Apr 2017 13:24:14 +0000 (16:24 +0300)]
nhrp: fix protocol address family parsing on receive

See bugzilla #948

7 years agonhrp: implement 'no ip nhrp map' command
Timo Teräs [Fri, 21 Apr 2017 10:37:07 +0000 (13:37 +0300)]
nhrp: implement 'no ip nhrp map' command

was accidentally not implemented earlier

7 years agonhrpd: implement 'show ip nhrp nhs'
Timo Teräs [Sat, 25 Mar 2017 15:27:24 +0000 (17:27 +0200)]
nhrpd: implement 'show ip nhrp nhs'

7 years agoMerge pull request #400 from dwalton76/default-frr-conf
Martin Winter [Tue, 25 Apr 2017 03:11:11 +0000 (20:11 -0700)]
Merge pull request #400 from dwalton76/default-frr-conf

vtysh: "Command incomplete: log syslog"

7 years agoospfd: Remove unused function
Donald Sharp [Mon, 24 Apr 2017 23:08:05 +0000 (19:08 -0400)]
ospfd: Remove unused function

ospf_if_is_configured is never used, remove.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agovtysh: "Command incomplete: log syslog"
Daniel Walton [Mon, 24 Apr 2017 18:22:29 +0000 (18:22 +0000)]
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[~]#

7 years agoMerge pull request #391 from opensourcerouting/fix-no-router-ospf6
Donald Sharp [Sat, 22 Apr 2017 21:55:26 +0000 (17:55 -0400)]
Merge pull request #391 from opensourcerouting/fix-no-router-ospf6

ospf6d: fix "no router ospf6"

7 years agoospf6d: fix "no router ospf6"
Renato Westphal [Sat, 22 Apr 2017 20:41:54 +0000 (17:41 -0300)]
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>
7 years agoMerge pull request #388 from opensourcerouting/snap-fixes-3.0
Donald Sharp [Sat, 22 Apr 2017 00:13:31 +0000 (20:13 -0400)]
Merge pull request #388 from opensourcerouting/snap-fixes-3.0

Snap fixes 3.0

7 years agodoc: Add nhrpd to relevant section in Building_FRR_on_xxxx doc
Martin Winter [Fri, 21 Apr 2017 10:55:14 +0000 (03:55 -0700)]
doc: Add nhrpd to relevant section in Building_FRR_on_xxxx doc

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoClean installation guide with Debian/Ubuntu
Phil Huang [Thu, 13 Apr 2017 13:20:53 +0000 (21:20 +0800)]
Clean installation guide with Debian/Ubuntu

Signed-off-by: Phil Huang <phil_huang@edge-core.com>
7 years agoAdd user `frr` into group `frrvty`
Phil Huang [Thu, 13 Apr 2017 10:11:28 +0000 (18:11 +0800)]
Add user `frr` into group `frrvty`

Signed-off-by: Phil Huang <phil_huang@edge-core.com>
7 years agosnapcraft: Add FPM module with command to set mode or disable it
Martin Winter [Fri, 21 Apr 2017 09:49:39 +0000 (02:49 -0700)]
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>
7 years agolib: Add CLI option --moduledir to override default module location (needed for snap...
Martin Winter [Fri, 21 Apr 2017 06:03:03 +0000 (23:03 -0700)]
lib: Add CLI option --moduledir to override default module location (needed for snap support)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agosnapcraft: Add nhrpd to snap
Martin Winter [Fri, 21 Apr 2017 01:18:40 +0000 (18:18 -0700)]
snapcraft: Add nhrpd to snap

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agosnapcraft: Fix another old leftover of ubuntu-core in build doc
Martin Winter [Fri, 21 Apr 2017 00:24:12 +0000 (17:24 -0700)]
snapcraft: Fix another old leftover of ubuntu-core in build doc

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agosnapcraft: Update snapcraft requirements for FRR 3.0 (from 2.0)
Martin Winter [Thu, 20 Apr 2017 23:58:24 +0000 (16:58 -0700)]
snapcraft: Update snapcraft requirements for FRR 3.0 (from 2.0)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoMerge pull request #382 from opensourcerouting/snap-doc-fixes-3.0
Donald Sharp [Thu, 20 Apr 2017 22:55:21 +0000 (18:55 -0400)]
Merge pull request #382 from opensourcerouting/snap-doc-fixes-3.0

snapcraft: Improve README.usage.md based on feedback received

7 years agosnapcraft: Improve README.usage.md based on feedback received
Martin Winter [Wed, 12 Apr 2017 23:00:43 +0000 (16:00 -0700)]
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>
7 years agopimd: Tweak pim_ifchannel_compare to be faster
Donald Sharp [Thu, 20 Apr 2017 16:21:02 +0000 (12:21 -0400)]
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>
7 years agopimd: Convert pim_ifchannel_list to use up->ifchannels
Donald Sharp [Thu, 20 Apr 2017 14:12:41 +0000 (10:12 -0400)]
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>
7 years agopimd: Add ability for upstream to know it's ifchannels
Donald Sharp [Thu, 20 Apr 2017 11:48:27 +0000 (07:48 -0400)]
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>
7 years agopimd: Limit search to relevant ifchannels in some cases
Donald Sharp [Thu, 20 Apr 2017 13:03:47 +0000 (09:03 -0400)]
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>
7 years agopimd: When loosing *,G igmp report notify S,G too
Donald Sharp [Tue, 18 Apr 2017 13:01:00 +0000 (09:01 -0400)]
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>
7 years agopimd: Add prefix list handling to spt-switchover
Donald Sharp [Fri, 7 Apr 2017 14:16:23 +0000 (10:16 -0400)]
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>
7 years agoMerge pull request #379 from pguibert6WIND/frrouting_issue309_2
Russ White [Wed, 19 Apr 2017 10:58:48 +0000 (06:58 -0400)]
Merge pull request #379 from pguibert6WIND/frrouting_issue309_2

vtysh: remove deprecated HAVE_EVPN flag

7 years agovtysh: remove deprecated HAVE_EVPN flag
Philippe Guibert [Wed, 12 Apr 2017 13:22:41 +0000 (15:22 +0200)]
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>
7 years agoMerge pull request #371 from donaldsharp/as_path_fix_3.0
Martin Winter [Mon, 17 Apr 2017 21:47:08 +0000 (14:47 -0700)]
Merge pull request #371 from donaldsharp/as_path_fix_3.0

bgpd: Fix 'set as-path prepend last-as 10'

7 years agobgpd: 'show .... bgp regexp WORD' fixed
Donald Sharp [Sat, 15 Apr 2017 00:39:56 +0000 (20:39 -0400)]
bgpd: 'show .... bgp regexp WORD' fixed

The command was always just returning as part of the
bgp_regexp_show function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Fix 'set as-path prepend last-as 10'
Donald Sharp [Sat, 15 Apr 2017 00:13:26 +0000 (20:13 -0400)]
bgpd: Fix 'set as-path prepend last-as 10'

1) Fix missing newline in help string
2) Make the ability to have 10 be consistent with the stable/2.0 branch.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #359 from opensourcerouting/bgpd_largecomm_fix
Donald Sharp [Mon, 10 Apr 2017 23:21:05 +0000 (19:21 -0400)]
Merge pull request #359 from opensourcerouting/bgpd_largecomm_fix

bgpd: fixes for the "show bgp large-community" command

7 years agoMerge pull request #351 from donaldsharp/ospf_fix
Renato Westphal [Mon, 10 Apr 2017 22:06:17 +0000 (19:06 -0300)]
Merge pull request #351 from donaldsharp/ospf_fix

Some Issues fixed

7 years agobgpd: fixes for the "show bgp large-community" command
Renato Westphal [Mon, 10 Apr 2017 15:28:45 +0000 (12:28 -0300)]
bgpd: fixes for the "show bgp large-community" command

* Fix a segfault when the "show bgp large-community" command is given
  without any optional large communities;
* Fix parsing of optional large communities. Without this fix a
  "Large-community malformed" error is shown even for valid large
  communities.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoripd: fix argv index numbers in the redistribute command
Renato Westphal [Sat, 8 Apr 2017 20:52:57 +0000 (17:52 -0300)]
ripd: fix argv index numbers in the redistribute command

Fixes Issue#350

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agolib: Fix debugs to be guarded.
Donald Sharp [Sat, 8 Apr 2017 12:55:40 +0000 (08:55 -0400)]
lib: Fix debugs to be guarded.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoospfd: Fix the 'show ip ospf int ...' command
Donald Sharp [Sat, 8 Apr 2017 12:47:59 +0000 (08:47 -0400)]
ospfd: Fix the 'show ip ospf int ...' command

Fixed output:

robot.cumulusnetworks.com# show ip ospf int
enp0s3 is up
  ifindex 2, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 10.0.2.15/24, Broadcast 10.0.2.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 9.611s
  Neighbor Count is 0, Adjacent neighbor count is 0
enp0s10 is up
  ifindex 7, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 192.168.201.146/24, Broadcast 192.168.201.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 7.241s
  Neighbor Count is 0, Adjacent neighbor count is 0

robot.cumulusnetworks.com# show ip ospf int enp0s3
enp0s3 is up
  ifindex 2, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 10.0.2.15/24, Broadcast 10.0.2.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 2.915s
  Neighbor Count is 0, Adjacent neighbor count is 0

robot.cumulusnetworks.com# show ip ospf int enp0s10 json
{
  "enp0s10":{
    "ifUp":true,
    "ifIndex":7,
    "mtuBytes":1500,
    "bandwidthMbit":0,
    "ifFlags":"<UP,BROADCAST,RUNNING,MULTICAST>",
    "ospfEnabled":true,
    "ipAddress":"192.168.201.146",
    "ipAddressPrefixlen":24,
    "ospfIfType":"Broadcast",
    "localIfUsed":"192.168.201.255",
    "area":"0.0.0.0",
    "routerId":"192.168.0.1",
    "networkType":"BROADCAST",
    "cost":10,
    "transmitDelayMsecs":1000,
    "state":"Waiting",
    "priority":1,
    "mcastMemberOspfAllRouters":true,
    "timerMsecs":100,
    "timerDeadMsecs":25,
    "timerWaitMsecs":25,
    "timerRetransmit":200,
    "timerHelloInMsecs":2106,
    "nbrCount":0,
    "nbrAdjacentCount":0
  }
}
robot.cumulusnetworks.com#

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #338 from donaldsharp/3.0_fixes
Jafar Al-Gharaibeh [Thu, 6 Apr 2017 18:38:29 +0000 (13:38 -0500)]
Merge pull request #338 from donaldsharp/3.0_fixes

3.0 fixes

7 years ago*: Switchover to 3.0
Donald Sharp [Thu, 6 Apr 2017 03:18:12 +0000 (23:18 -0400)]
*: Switchover to 3.0

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Fix missing help strings
Donald Sharp [Thu, 6 Apr 2017 03:08:19 +0000 (23:08 -0400)]
lib: Fix missing help strings

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #337 from donaldsharp/more_spt_more
David Lamparter [Wed, 5 Apr 2017 20:32:46 +0000 (22:32 +0200)]
Merge pull request #337 from donaldsharp/more_spt_more

More spt more

7 years agoMerge pull request #333 from donaldsharp/frr
David Lamparter [Wed, 5 Apr 2017 20:29:39 +0000 (22:29 +0200)]
Merge pull request #333 from donaldsharp/frr

Frr

7 years agopimd: Add the ability to never SPT switchover
Donald Sharp [Wed, 5 Apr 2017 16:08:53 +0000 (12:08 -0400)]
pimd: Add the ability to never SPT switchover

Add the ability to allow pim to determine if we should
allow spt-switchover or not on the LHR.

Signed-off-by: Donald Sharp
7 years agopimd: Fix crash when failure to create upstream
Donald Sharp [Thu, 30 Mar 2017 14:50:04 +0000 (10:50 -0400)]
pimd: Fix crash when failure to create upstream

When we have a *,G mroute that starts receiving any particular
S,G, we will get wholepkt callbacks due to the pimreg in the
OIL for the *,G.

So we need to do SPT switchover, but this can fail if we
do not have a path to the S( but we do to the RP!).

In this case fail gracefully.

Ticket: CM-15621
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: Allow SPT switchover
Donald Sharp [Thu, 23 Mar 2017 01:07:57 +0000 (21:07 -0400)]
pimd: Allow SPT switchover

This allows SPT switchover for S,G upon receipt of packets
on the LHR.

1) When we create a *,G from a IGMP Group Report, install
the *,G route with the pimreg device on the OIL.

2) When a packet hits the LHR that matches the *,G, we will
get a WHOLEPKT callback from the kernel and if we cannot
find the S,G, that means we have matched it on the LHR via
the *,G mroute.  Create the S,G start the KAT and run
inherited_olist.

3) When the S,G times out, safely remove the S,G via
the KAT expiry

4) When the *,G is removed, remove any S,G associated
with it via the LHR flag.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: Add # of ifchannels to 'show ip pim int'
Donald Sharp [Fri, 24 Mar 2017 19:10:11 +0000 (15:10 -0400)]
pimd: Add # of ifchannels to 'show ip pim int'

Add the ability to see the number of ifchannels
associated with a particular interface.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agodoc: Cleanup 'Build the Software'
Donald Sharp [Wed, 5 Apr 2017 00:36:16 +0000 (20:36 -0400)]
doc: Cleanup 'Build the Software'

The frrouting.org web page:
https://frrouting.org/manual/Build-the-Software.html#Build-the-Software
is built from doc/install.texi.  The output on this page is a bit
missleading, let's clean it up some.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years ago*: Clean up some wrong references
Donald Sharp [Wed, 5 Apr 2017 00:18:24 +0000 (20:18 -0400)]
*: Clean up some wrong references

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #332 from opensourcerouting/snmp-fix
Donald Sharp [Tue, 4 Apr 2017 20:39:56 +0000 (16:39 -0400)]
Merge pull request #332 from opensourcerouting/snmp-fix

fix SNMP build

7 years agoMerge pull request #331 from dwalton76/quagga-reload
David Lamparter [Tue, 4 Apr 2017 19:47:01 +0000 (21:47 +0200)]
Merge pull request #331 from dwalton76/quagga-reload

tools: quagga-reload.py fails to change max-paths

7 years agoMerge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail
David Lamparter [Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)]
Merge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail

ospfd: "no log-adjacency-changes detail" disables log-adjacency-changes

7 years agoMerge pull request #329 from dwalton76/debug-zebra-nht
David Lamparter [Tue, 4 Apr 2017 19:44:28 +0000 (21:44 +0200)]
Merge pull request #329 from dwalton76/debug-zebra-nht

zebra: "debug zebra nht" is not in the config

7 years agovtysh: Fix build for non-snmp case
Donald Sharp [Tue, 4 Apr 2017 19:20:52 +0000 (15:20 -0400)]
vtysh: Fix build for non-snmp case

The snmp code is being included in the build of the vtysh_cmd.c
irrelevant of whether or not it is needed.  Be a bit smarter
about what files to include.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agobuild: fix CFLAGS for snmp modules
David Lamparter [Tue, 4 Apr 2017 19:25:19 +0000 (21:25 +0200)]
build: fix CFLAGS for snmp modules

The SNMP modules include <net-snmp/net-snmp-config.h>, which won't be
found in off-searchpath directories without SNMP_CFLAGS.  Unfortunately
in my tests the files were on the search path even without the flags.

(SNMP_LIBS is not needed because only libfrrsnmp calls into net-snmp
functions.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agotools: quagga-reload.py fails to change max-paths
Daniel Walton [Tue, 4 Apr 2017 18:51:32 +0000 (18:51 +0000)]
tools: quagga-reload.py fails to change max-paths

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoospfd: "no log-adjacency-changes detail" disables log-adjacency-changes
Daniel Walton [Tue, 4 Apr 2017 18:13:43 +0000 (18:13 +0000)]
ospfd: "no log-adjacency-changes detail" disables log-adjacency-changes

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: "debug zebra nht" is not in the config
Daniel Walton [Tue, 4 Apr 2017 18:11:04 +0000 (18:11 +0000)]
zebra: "debug zebra nht" is not in the config

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge branch 'master'
David Lamparter [Tue, 4 Apr 2017 18:04:07 +0000 (20:04 +0200)]
Merge branch 'master'

7 years agobuild: remove wildcards from snapcraft/Makefile.am
David Lamparter [Tue, 4 Apr 2017 16:37:47 +0000 (18:37 +0200)]
build: remove wildcards from snapcraft/Makefile.am

automake does not support globs.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge branch 'stable/2.0'
David Lamparter [Tue, 4 Apr 2017 16:34:08 +0000 (18:34 +0200)]
Merge branch 'stable/2.0'

Fixed minor conflicts from "defaults" change on stable.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #294 from opensourcerouting/modules
Donald Sharp [Tue, 4 Apr 2017 15:55:00 +0000 (11:55 -0400)]
Merge pull request #294 from opensourcerouting/modules

Loadable module support

7 years agovtysh: handle "show modules" like "show memory"
David Lamparter [Tue, 4 Apr 2017 14:12:59 +0000 (16:12 +0200)]
vtysh: handle "show modules" like "show memory"

Preface with line identifying which daemon it applies to.
[Also fixes a missed "plugin" -> "module" replace.]

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #322 from qlyoung/fix-distance-commands
David Lamparter [Tue, 4 Apr 2017 13:59:12 +0000 (15:59 +0200)]
Merge pull request #322 from qlyoung/fix-distance-commands

ospfd, ospf6d: fix distance commands

7 years agoMerge pull request #321 from donaldsharp/speed
David Lamparter [Tue, 4 Apr 2017 13:58:11 +0000 (15:58 +0200)]
Merge pull request #321 from donaldsharp/speed

Speedy McSpeederson

7 years agoMerge pull request #314 from donaldsharp/scan-build
David Lamparter [Tue, 4 Apr 2017 13:57:00 +0000 (15:57 +0200)]
Merge pull request #314 from donaldsharp/scan-build

Scan build

7 years agoMerge pull request #324 from opensourcerouting/zebra-v4v6-typos
Donald Sharp [Tue, 4 Apr 2017 13:55:58 +0000 (09:55 -0400)]
Merge pull request #324 from opensourcerouting/zebra-v4v6-typos

zebra: fix v4/v6 typos in some show commands

7 years agozebra: Fix printf formatting
Donald Sharp [Tue, 4 Apr 2017 11:50:31 +0000 (07:50 -0400)]
zebra: Fix printf formatting

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: fix v4/v6 typos in some show commands
Renato Westphal [Tue, 4 Apr 2017 00:14:18 +0000 (21:14 -0300)]
zebra: fix v4/v6 typos in some show commands

This fixes a few problems like this one:
vtysh# show ipv6 route ospf6
Unknown route type

Also, replace SAFI_UNICAST with SAFI_MULTICAST in the "show ipv6 mroute
vrf all" command.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoMerge pull request #323 from LabNConsulting/working/master/patch/install1
Donald Sharp [Mon, 3 Apr 2017 22:55:30 +0000 (18:55 -0400)]
Merge pull request #323 from LabNConsulting/working/master/patch/install1

Fix a couple of centos related install issues

7 years agolib, zebra: Fix CR comments
Donald Sharp [Mon, 3 Apr 2017 22:28:26 +0000 (18:28 -0400)]
lib, zebra: Fix CR comments

lib -> Add a bit of documentation about what units we are in.
zebra -> Fix failure case to be a bit better.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoredhat/frr.spec.in: fix typo
Lou Berger [Mon, 3 Apr 2017 21:32:03 +0000 (17:32 -0400)]
redhat/frr.spec.in: fix typo

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agodoc: fix some omissions in centos instructions
Lou Berger [Mon, 3 Apr 2017 21:30:31 +0000 (17:30 -0400)]
doc: fix some omissions in centos instructions

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agoospfd, ospf6d: fix distance commands
Quentin Young [Mon, 3 Apr 2017 20:17:12 +0000 (20:17 +0000)]
ospfd, ospf6d: fix distance commands

OSPF distance commands were broken in a variety of ways. Fix 'em.

* `distance ospf` and `distance ospf6` were accepted commands
* Inconsistent doc strings
* Make use of {keyword|tokens}
* Add ability to reset specific distance without specifying a value
  Ex: ~# no distance ospf6 intra

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #316 from qlyoung/fix-logc
Jafar Al-Gharaibeh [Mon, 3 Apr 2017 19:43:50 +0000 (14:43 -0500)]
Merge pull request #316 from qlyoung/fix-logc

lib: fix proto_redistnum() oversight from #257

7 years agozebra: Display new speed information in 'show int..' command
Donald Sharp [Thu, 30 Mar 2017 20:54:15 +0000 (16:54 -0400)]
zebra: Display new speed information in 'show int..' command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Retrieve interface speed when creating interface
Donald Sharp [Thu, 30 Mar 2017 19:51:29 +0000 (15:51 -0400)]
zebra: Retrieve interface speed when creating interface

When we get notification from the kernel about the creation
of a new interface, retrieve the speed of it from the kernel

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib, zebra: Add ability to pass interface speed up from zebra
Donald Sharp [Thu, 30 Mar 2017 19:37:22 +0000 (15:37 -0400)]
lib, zebra: Add ability to pass interface speed up from zebra

This is a prepatory commit for future improvements.

Add a change to the zapi to pass the interface speed up.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #311 from opensourcerouting/ldpd-vty-simpl
Donald Sharp [Mon, 3 Apr 2017 17:49:30 +0000 (13:49 -0400)]
Merge pull request #311 from opensourcerouting/ldpd-vty-simpl

ldpd: simplify CLI code + small fixes

7 years agolib: fix proto_redistnum() oversight from #257
Quentin Young [Sun, 2 Apr 2017 23:21:09 +0000 (23:21 +0000)]
lib: fix proto_redistnum() oversight from #257

proto_redistnum() now accepts full protocol strings and not partial
names per #10

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoRelease: FRR-2.0 frr-2.0
Martin Winter [Sun, 2 Apr 2017 05:22:47 +0000 (22:22 -0700)]
Release: FRR-2.0

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>