]> git.proxmox.com Git - mirror_frr.git/commit
pimd: merge pimd as of 2015-01-19
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 4 Feb 2015 06:01:14 +0000 (07:01 +0100)
committerDonald Sharp <sharpd@cumulusnetwroks.com>
Thu, 26 May 2016 00:38:32 +0000 (20:38 -0400)
commit12e41d03bd49a60da9238694b5d8bd0bde3eff97
treeaf456c2fa25230e9e08e48bb72308f3ac113a15e
parent5b282f59b1b5331d1738414cadc97cc60fbb193e
pimd: merge pimd as of 2015-01-19

Welcome pimd to the Quagga daemon zoo!

This is a merge of commit 77ae369 ("pimd: Log ifindex found for an
interface when zebra lib reports a new connected address."), with
the intermediate "reconnect" changes removed (c9adf00...d274381).
d274381 is replaced with b162ab7, which includes some changes.  In
addition, 4 reconnect-related changes and 1 cosmetic one have been
bumped out.

The rebase command used to produce the branch that is merged here is:
  git rebase --onto b162ab7 c9adf00 77ae369

Note that 3 patches had their author rewritten from
    "Anonymous SR#108542 <>" (which is not a valid git author ID)
to: "Savannah SR#108542 <nbahr@atcorp.com>" (which is the e-mail address
                               listed in the associated Savannah ticket)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
109 files changed:
Makefile.am
SERVICES
configure.ac
doc/Makefile.am
doc/install.texi
doc/pimd.8 [new file with mode: 0644]
lib/command.c
lib/command.h
lib/log.c
lib/log.h
lib/memory.c
lib/memtypes.c
lib/route_types.txt
lib/thread.h
lib/vty.c
lib/zclient.c
lib/zclient.h
pimd/.gitignore [new file with mode: 0644]
pimd/AUTHORS [new file with mode: 0644]
pimd/CAVEATS [new file with mode: 0644]
pimd/COMMANDS [new file with mode: 0644]
pimd/COPYING [new file with mode: 0644]
pimd/DEBUG [new file with mode: 0644]
pimd/LINUX_KERNEL_MROUTE_MFC [new file with mode: 0644]
pimd/Makefile.am [new file with mode: 0644]
pimd/README [new file with mode: 0644]
pimd/TODO [new file with mode: 0644]
pimd/TROUBLESHOOTING [new file with mode: 0644]
pimd/WHY_SSM [new file with mode: 0644]
pimd/git-clone-github.sh [new file with mode: 0755]
pimd/git-clone-savannah.sh [new file with mode: 0755]
pimd/pim_assert.c [new file with mode: 0644]
pimd/pim_assert.h [new file with mode: 0644]
pimd/pim_cmd.c [new file with mode: 0644]
pimd/pim_cmd.h [new file with mode: 0644]
pimd/pim_hello.c [new file with mode: 0644]
pimd/pim_hello.h [new file with mode: 0644]
pimd/pim_iface.c [new file with mode: 0644]
pimd/pim_iface.h [new file with mode: 0644]
pimd/pim_ifchannel.c [new file with mode: 0644]
pimd/pim_ifchannel.h [new file with mode: 0644]
pimd/pim_igmp.c [new file with mode: 0644]
pimd/pim_igmp.h [new file with mode: 0644]
pimd/pim_igmp_join.c [new file with mode: 0644]
pimd/pim_igmp_join.h [new file with mode: 0644]
pimd/pim_igmpv3.c [new file with mode: 0644]
pimd/pim_igmpv3.h [new file with mode: 0644]
pimd/pim_int.c [new file with mode: 0644]
pimd/pim_int.h [new file with mode: 0644]
pimd/pim_join.c [new file with mode: 0644]
pimd/pim_join.h [new file with mode: 0644]
pimd/pim_macro.c [new file with mode: 0644]
pimd/pim_macro.h [new file with mode: 0644]
pimd/pim_main.c [new file with mode: 0644]
pimd/pim_mroute.c [new file with mode: 0644]
pimd/pim_mroute.h [new file with mode: 0644]
pimd/pim_msg.c [new file with mode: 0644]
pimd/pim_msg.h [new file with mode: 0644]
pimd/pim_neighbor.c [new file with mode: 0644]
pimd/pim_neighbor.h [new file with mode: 0644]
pimd/pim_oil.c [new file with mode: 0644]
pimd/pim_oil.h [new file with mode: 0644]
pimd/pim_pim.c [new file with mode: 0644]
pimd/pim_pim.h [new file with mode: 0644]
pimd/pim_rand.c [new file with mode: 0644]
pimd/pim_rand.h [new file with mode: 0644]
pimd/pim_rpf.c [new file with mode: 0644]
pimd/pim_rpf.h [new file with mode: 0644]
pimd/pim_signals.c [new file with mode: 0644]
pimd/pim_signals.h [new file with mode: 0644]
pimd/pim_sock.c [new file with mode: 0644]
pimd/pim_sock.h [new file with mode: 0644]
pimd/pim_ssmpingd.c [new file with mode: 0644]
pimd/pim_ssmpingd.h [new file with mode: 0644]
pimd/pim_str.c [new file with mode: 0644]
pimd/pim_str.h [new file with mode: 0644]
pimd/pim_time.c [new file with mode: 0644]
pimd/pim_time.h [new file with mode: 0644]
pimd/pim_tlv.c [new file with mode: 0644]
pimd/pim_tlv.h [new file with mode: 0644]
pimd/pim_upstream.c [new file with mode: 0644]
pimd/pim_upstream.h [new file with mode: 0644]
pimd/pim_util.c [new file with mode: 0644]
pimd/pim_util.h [new file with mode: 0644]
pimd/pim_version.c [new file with mode: 0644]
pimd/pim_version.h [new file with mode: 0644]
pimd/pim_vty.c [new file with mode: 0644]
pimd/pim_vty.h [new file with mode: 0644]
pimd/pim_zebra.c [new file with mode: 0644]
pimd/pim_zebra.h [new file with mode: 0644]
pimd/pim_zlookup.c [new file with mode: 0644]
pimd/pim_zlookup.h [new file with mode: 0644]
pimd/pimd.c [new file with mode: 0644]
pimd/pimd.conf.sample [new file with mode: 0644]
pimd/pimd.h [new file with mode: 0644]
pimd/quagga-bootstrap.sh [new file with mode: 0755]
pimd/quagga-build-no-vtysh.sh [new file with mode: 0755]
pimd/quagga-build.sh [new file with mode: 0755]
pimd/quagga-configure-no-vtysh.sh [new file with mode: 0755]
pimd/quagga-configure.sh [new file with mode: 0755]
pimd/quagga-git-add.sh [new file with mode: 0755]
pimd/quagga-memtypes.sh [new file with mode: 0755]
pimd/test_igmpv3_join.c [new file with mode: 0644]
ports/Makefile
ports/pkg/DESCR
redhat/quagga.spec.in
vtysh/Makefile.am
vtysh/vtysh.c
vtysh/vtysh.h