summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1013 from donaldsharp/versionsDonnie Savage2017-08-203-23/+0
|\ | | | | Changes look fine
| * isisd: Remove unused versionDonald Sharp2017-08-201-2/+0
| | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * ospf6d: Remove ospf6d version stringDonald Sharp2017-08-202-21/+0
| | | | | | | | | | | | | | | | This version string has not been updated in over 11 years. I cannot see any viable reason that we should use or update or anything with this value, remove. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | Merge pull request #1014 from diivious/ext-crashDonald Sharp2017-08-202-6/+32
|\ \ | |/ |/| Fixed issue with eigrp crashing when an external is received
| * eigrpd: fix crash when external route is receivedDonnie Savage (dsavage)2017-08-202-6/+32
|/ | | | | | | | | When an external route is received, eigrpd will crash. For now, quietly discard the TLV. Work must be done to handle tlv processing and changes needed to FSM so it understands an external should not be chooses if an internal exist. Signed-off-by: Donnie Savage <diivious@hotmail.com>
* Merge pull request #1011 from donaldsharp/tlv_crashDonnie Savage2017-08-208-78/+122
|\ | | | | Tlv crash
| * eigrpd: Pass in actual used parameter to header creationDonald Sharp2017-08-198-21/+23
| | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * eigrpd: Allow eigrp_update_send to recognize a full packetDonald Sharp2017-08-191-25/+65
| | | | | | | | | | | | | | | | Modify code to allow the eigrp_update_send function to recognize that we have a full packet and to do the right thing from there. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * eigrpd: Fix memory leak in eigrp_updateDonald Sharp2017-08-191-51/+53
|/ | | | | | | | | | | When we send packets to a nbr, make a duplicate copy as that each packet sent is assumed to be a complete to itself. Also clean up indentation in loop over figuring out what to send. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* Merge pull request #1010 from donaldsharp/reliable_eigrpDonnie Savage2017-08-192-26/+22
|\ | | | | Reliable eigrp
| * eigrpd: When generating packets only put one on send queue at a timeDonald Sharp2017-08-181-2/+3
| | | | | | | | | | | | | | When we generate update packets to go to our neighbor, Only put one packet at a time on the send queue. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * eigrpd: Only put 1 packet at a time on send queueDonald Sharp2017-08-181-24/+19
|/ | | | | | | | When we have received an ack for the last reliable packet we must only put 1 packet onto the send queue. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* Merge pull request #1003 from donaldsharp/pim_mem_leakJafar Al-Gharaibeh2017-08-181-0/+2
|\ | | | | pimd: Fix memory leak on failure case
| * pimd: Fix memory leak on failure caseDonald Sharp2017-08-171-0/+2
| | | | | | | | | | | | | | When we fail to create upstream we were not properly cleaning up all memory. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | Merge pull request #1001 from dwalton76/pimd-CMD-WARNINGJafar Al-Gharaibeh2017-08-181-1/+1
|\ \ | | | | | | pimd: "No Path to RP address specified" should exit 0
| * | pimd: "No Path to RP address specified" should exit 0Daniel Walton2017-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com> This could happen if routing isn't up yet but the command did take so we should exit 0 here. Testing: root@cel-redxp-10[frr-dwalton76]# vtysh -c 'conf t' -c' ip pim rp 11.11.11.11' % No Path to RP address specified: 11.11.11.11 root@cel-redxp-10[frr-dwalton76]# echo $? 0 root@cel-redxp-10[frr-dwalton76]#
* | | Merge pull request #1000 from donaldsharp/eigrp_packet_stuffJafar Al-Gharaibeh2017-08-1810-114/+79
|\ \ \ | |_|/ |/| | Eigrp packet stuff
| * | eigrpd: and More Debugging CleanupDonald Sharp2017-08-183-10/+2
| | | | | | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | eigrpd: Cleanup some more debugsDonald Sharp2017-08-182-3/+1
| | | | | | | | | | | | | | | | | | Properly place a few more debugs. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | eigrpd: Cleanup FIFODonald Sharp2017-08-188-56/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FIFO really was a LIFO for some reason. Push new packets onto the top, always pull from the bottom. This allows eigrp neighbors to come up. Topotests eigrp-topo1( in a topotest PR ) now form neighbors with itself. With this commit. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | eigrpd: Rework ack sent to neighborDonald Sharp2017-08-171-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EIGRP schedules and builds packets to send in the future. Before those packets are being sent, we are receiving update information from our peer. At that time we need to reach into the built packet and reset the outgoing ack to a better value. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | eigrpd: Store nbr in packet dataDonald Sharp2017-08-179-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | Store the neighbor information( if available ) in the packet data that we are sending. This will allow in a future commit the ability to fixup the outgoing ack we are sending. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | eigrpd: Remove extra newline in debugDonald Sharp2017-08-171-1/+1
| | | | | | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | | Merge pull request #999 from fabled/masterDonald Sharp2017-08-171-1/+1
|\ \ \ | |/ / |/| | nhrpd: use hop count 1 for registration requests
| * | nhrpd: use hop count 1 for registration requestsTimo Teräs2017-08-171-1/+1
|/ / | | | | | | | | | | | | | | | | Cisco has a bug that it rejects packets with zero hop count. Use one to avoid potential forwarding of registration requests. Fixes #951 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
* | Merge pull request #994 from dwalton76/ospfd-show-neighborDavid Lamparter2017-08-171-6/+12
|\ \ | | | | | | ospfd: "show ip ospf neighbor" options not passed
| * | ospfd: "show ip ospf neighbor" options not passedDaniel Walton2017-08-161-6/+12
| |/ | | | | | | Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
* | Merge pull request #989 from qlyoung/if-area-dfDavid Lamparter2017-08-162-2/+10
|\ \ | | | | | | ospfd: remember area-id format for ifaces
| * | ospfd: remember area-id format for ifacesQuentin Young2017-08-162-2/+10
| | | | | | | | | | | | | | | | | | | | | Display dotted quad or decimal back in the config depending on what the user enters. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
* | | Merge pull request #984 from donaldsharp/debuggingDavid Lamparter2017-08-162-17/+68
|\ \ \ | | | | | | | | Some Small Pim Issues
| * | | pimd: Add 'show ip msdp vrf all sa ...' commandDonald Sharp2017-08-151-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | Allow the ability to iterate over all vrfs. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | | pimd: Rename duplicate JSON keyDonald Sharp2017-08-151-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | | pimd: Add more vrf debugging to pim_upstream.cDonald Sharp2017-08-151-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup a few missed spots of debugging to know what vrf we are talking about. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | | pimd: Allow user to specify ip address for 'no ip pim use-source'Donald Sharp2017-08-151-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | | | Merge pull request #990 from donaldsharp/eigrp_cleanupRuss White2017-08-164-54/+52
|\ \ \ \ | | | | | | | | | | Eigrp cleanup
| * | | | eigrpd: Cleanup eigrp_get_fsm_eventDonald Sharp2017-08-161-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make this function a bit more legible Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | | | eigrpd: Make eigrp_get_fsm_event use metric changedDonald Sharp2017-08-161-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor eigrp_get_fsm_event a tiny bit to let all the states get the new metric. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| * | | | eigrpd: cleanup eigrp_topology_update_distanceDonald Sharp2017-08-163-17/+22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup eigrp_topology_update_distance to return an enum of whether or not the metric has changed or not. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | | | Merge pull request #979 from donaldsharp/ifchannel_fixDavid Lamparter2017-08-161-0/+3
|\ \ \ \ | | | | | | | | | | pimd: Ensure cleanup of S,G on ifchannel failure to create
| * | | | pimd: Ensure cleanup of S,G on ifchannel failure to createDonald Sharp2017-08-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There exists a path for ifchannel creation that if a S,G fails to create and a corresponding *,G ifchannel is there, the S,G will be deleted but we were leaving the S,G in the *,G ifchannel sources list. Remove from the list in this case Ticket: CM-17605 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
* | | | | Merge pull request #972 from chiragshah6/mdevDavid Lamparter2017-08-162-21/+44
|\ \ \ \ \ | |_|_|_|/ |/| | | | Pim Bfd related changes
| * | | | pimd: pim bfd vrf awareChirag Shah2017-08-141-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BFD replay for all interfaces was only considering VRF_DEFAULT interface list. The change will walk all VRFs, interface list per VRF to register pim neighbor with BFD. Signed-off-by: Chirag shah <chirag@cumulusnetworks.com>
| * | | | pimd: Fix pim bfd config order dependecnyChirag Shah2017-08-141-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon frr restart vtysh replays pim bfd configuration cli before pim sm command, this results in failure of pim bfd config on the VIF as it is not pim enabled yet. Inside pim bfd configuration, call to create PIM vif handler if it is not created yet. no ip pim bfd, if pim is not enabled display warning and return. Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
* | | | | Merge pull request #985 from chiragshah6/mdev2Martin Winter2017-08-161-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | ospfd: Fix ospfd crash in free_nexthop
| * | | | ospfd: Fix ospfd crash in free_nexthopChirag Shah2017-08-151-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ANVL-OSPF-5.1 reported ospfd crash. vertex_nexthop_free was added as valgrind reported potential memory leak, but in some cases nexthop would not be available freed. The actual nexthop free is part of ospf_canonical_nexthops_free(), upon trying to free, qfree checks mtype count becomes 0 and asserts. Removing vertex_nexthop_free() from ospf_spf_flush_parents(). Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
* | | | Merge pull request #983 from opensourcerouting/vtysh-watchfrr-no-confDonald Sharp2017-08-151-0/+7
|\ \ \ \ | | | | | | | | | | vtysh: don't collect config from watchfrr
| * | | | vtysh: don't collect config from watchfrrDavid Lamparter2017-08-151-0/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This results in some hardcoded watchfrr logging config ending up in the integrated config otherwise. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
* | | | Merge pull request #982 from opensourcerouting/buildfix-parallel-tests-clippyQuentin Young2017-08-152-2/+2
|\ \ \ \ | |/ / / |/| | | tests: fix clippy include paths / double-build
| * | | tests: fix clippy include paths / double-buildDavid Lamparter2017-08-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mismatch between the make rule and the include path causes dependency tracking to try to build the clippy.c file twice (at the same time), which results in spurious build failures. Fixes: #971 Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
* | | | Merge pull request #935 from donaldsharp/kernel_metricDavid Lamparter2017-08-157-28/+35
|\ \ \ \ | | | | | | | | | | zebra: Pay attention to metric from kernel