[quagga-dev 11526] [PATCH v2] pimd merge

Everton Marques everton.marques at gmail.com
Wed Sep 24 20:52:14 BST 2014


Hi,

This is version 2 of patchsets for inclusion of pimd into Quagga.
It includes updates for comments from Paul Jakma and Christian Franke.
Please review.

1/3 mrib.v2 - Branch with MRIB/SAFI_MULTICAST changes only
2/3 reconnect.v2 - Branched from mrib.v2, adding only zclient reconnection
changes
3/3 pim-only.v2 - pim-specific changes rebased over reconnect.v2 branch

--xx--

1/3 mrib.v2 - Branch with MRIB/SAFI_MULTICAST changes only
https://github.com/udhos/qpimd/tree/mrib.v2

git diff master mrib.v2 --stat
 lib/zebra.h       |   3 ++-
 zebra/rib.h       |  11 ++++++-----
 zebra/zebra_rib.c |  49 +++++++++++++++++++++++--------------------------
 zebra/zebra_vty.c | 113
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 zebra/zserv.c     |  97
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 226 insertions(+), 47 deletions(-)


2/3 reconnect.v2 - Branched from mrib.v2, adding only zclient reconnection
changes
https://github.com/udhos/qpimd/tree/reconnect.v2

git diff mrib.v2 reconnect.v2 --stat
 lib/if.c      | 12 ++++++++++++
 lib/if.h      |  1 +
 lib/zclient.c |  5 +++++
 lib/zclient.h |  1 +
 4 files changed, 19 insertions(+)


3/3 pim-only.v2 - pim-specific changes rebased over reconnect.v2 branch
https://github.com/udhos/qpimd/tree/pim-only.v2

git diff reconnect.v2 pim-only.v2 --stat | head -40
 Makefile.am                       |    4 +-
 SERVICES                          |    1 +
 configure.ac                      |   55 +-
 doc/Makefile.am                   |    6 +-
 doc/install.texi                  |    1 +
 doc/pimd.8                        |  125 ++
 lib/command.c                     |    2 +
 lib/command.h                     |    1 +
 lib/log.c                         |    1 +
 lib/log.h                         |    1 +
 lib/memory.c                      |   13 +
 lib/memtypes.c                    |   16 +
 lib/route_types.txt               |    2 +
 lib/thread.h                      |    1 -
 lib/vty.c                         |    2 +
 lib/zclient.c                     |    7 +-
 lib/zclient.h                     |    1 +
 pimd/.gitignore                   |   16 +
 pimd/AUTHORS                      |    9 +
 pimd/CAVEATS                      |  178 ++
 pimd/COMMANDS                     |   82 +
 pimd/COPYING                      |  340 +++
 pimd/DEBUG                        |   86 +
 pimd/LINUX_KERNEL_MROUTE_MFC      |   26 +
 pimd/Makefile.am                  |   76 +
 pimd/README                       |  164 ++
 pimd/TODO                         |  426 ++++
 pimd/TROUBLESHOOTING              |   33 +
 pimd/WHY_SSM                      |   32 +
 pimd/git-clone-github.sh          |   27 +
 pimd/git-clone-savannah.sh        |   27 +
 pimd/pim_assert.c                 |  808 +++++++
 pimd/pim_assert.h                 |   75 +
 pimd/pim_cmd.c                    | 4441
+++++++++++++++++++++++++++++++++++++
 pimd/pim_cmd.h                    |   64 +
 pimd/pim_hello.c                  |  529 +++++
 pimd/pim_hello.h                  |   46 +
 pimd/pim_iface.c                  | 1229 ++++++++++
 pimd/pim_iface.h                  |  161 ++
 pimd/pim_ifchannel.c              |  893 ++++++++
 pimd/pim_ifchannel.h              |  145 +++++
 pimd/pim_igmp.c                   | 1421
+++++++++++++++++++++++++++++++++++++++++++++++++
 pimd/pim_igmp.h                   |  176 +++++++
 pimd/pim_igmp_join.c              |   67 +++
 pimd/pim_igmp_join.h              |   32 ++
 pimd/pim_igmpv3.c                 | 1725
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pimd/pim_igmpv3.h                 |  100 ++++
 pimd/pim_int.c                    |   44 ++
 pimd/pim_int.h                    |   31 ++
 pimd/pim_join.c                   |  445 ++++++++++++++++
 pimd/pim_join.h                   |   43 ++
 pimd/pim_macro.c                  |  437 ++++++++++++++++
 pimd/pim_macro.h                  |   44 ++
 pimd/pim_main.c                   |  295 +++++++++++
 pimd/pim_mroute.c                 |  451 ++++++++++++++++
 pimd/pim_mroute.h                 |  173 ++++++
 pimd/pim_msg.c                    |  106 ++++
 pimd/pim_msg.h                    |   52 ++
 pimd/pim_neighbor.c               |  719 +++++++++++++++++++++++++
 pimd/pim_neighbor.h               |   74 +++
 pimd/pim_oil.c                    |  140 +++++
 pimd/pim_oil.h                    |   53 ++
 pimd/pim_pim.c                    |  742 ++++++++++++++++++++++++++
 pimd/pim_pim.h                    |   71 +++
 pimd/pim_rand.c                   |   60 +++
 pimd/pim_rand.h                   |   30 ++
 pimd/pim_rpf.c                    |  260 +++++++++
 pimd/pim_rpf.h                    |   36 ++
 pimd/pim_signals.c                |   86 +++
 pimd/pim_signals.h                |   28 +
 pimd/pim_sock.c                   |  389 ++++++++++++++
 pimd/pim_sock.h                   |   57 ++
 pimd/pim_ssmpingd.c               |  448 ++++++++++++++++
 pimd/pim_ssmpingd.h               |   45 ++
 pimd/pim_str.c                    |   46 ++
 pimd/pim_str.h                    |   32 ++
 pimd/pim_time.c                   |  165 ++++++
 pimd/pim_time.h                   |   40 ++
 pimd/pim_tlv.c                    |  721 +++++++++++++++++++++++++
 pimd/pim_tlv.h                    |  133 +++++
 pimd/pim_upstream.c               |  683 ++++++++++++++++++++++++
 pimd/pim_upstream.h               |  122 +++++
 pimd/pim_util.c                   |  122 +++++
 pimd/pim_util.h                   |   37 ++
 pimd/pim_version.c                |   25 +
 pimd/pim_version.h                |   30 ++
 pimd/pim_vty.c                    |  178 +++++++
 pimd/pim_vty.h                    |   32 ++
 pimd/pim_zebra.c                  | 1284
+++++++++++++++++++++++++++++++++++++++++++++
 pimd/pim_zebra.h                  |   42 ++
 pimd/pim_zlookup.c                |  450 ++++++++++++++++
 pimd/pim_zlookup.h                |   47 ++
 pimd/pimd.c                       |  141 +++++
 pimd/pimd.conf.sample             |   41 ++
 pimd/pimd.h                       |  149 ++++++
 pimd/quagga-bootstrap.sh          |   23 +
 pimd/quagga-build-no-vtysh.sh     |   10 +
 pimd/quagga-build.sh              |   10 +
 pimd/quagga-configure-no-vtysh.sh |   10 +
 pimd/quagga-configure.sh          |   10 +
 pimd/quagga-git-add.sh            |   12 +
 pimd/quagga-memtypes.sh           |   22 +
 pimd/test_igmpv3_join.c           |  149 ++++++
 ports/Makefile                    |    1 +
 ports/pkg/DESCR                   |    1 +
 redhat/quagga.spec.in             |   11 +-
 vtysh/Makefile.am                 |    1 +
 vtysh/vtysh.c                     |    1 +
 vtysh/vtysh.h                     |    4 +-
 109 files changed, 23805 insertions(+), 12 deletions(-)


Thanks,
Everton
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.quagga.net/pipermail/quagga-dev/attachments/20140924/9591b91c/attachment-0001.html>


More information about the Quagga-dev mailing list