
jch at pps
Feb 24, 2012, 11:56 AM
Post #1 of 5
(370 views)
Permalink
|
|
Pull request: babeld merge
|
|
Dear Paul, I have just finished merging the babeld code into the master branch of Quagga. Please pull from git://github.com/Quagga-RE/quagga-RE.git babeld-master The complete list of commits that I cherry-picked is available on http://www.pps.jussieu.fr/~jch/software/babel/babel-quagga-20120224.text The only patch that's not specific to Babel is 10a1705. (Denis, there are two commits more than the list you provided me with -- a96cb3c and 170bc9f.) Thanks, -- Juliusz ---------------------------------------------------------------- Ang Way Chuang (1): vtysh: fix regexp for install_element() in babeld Denis Ovsienko (12): babeld: address FreeBSD "struct route" issue babeld: address some compilation warnings babeld: address remaining -Wcast-qual warnings lib: update proto_redistnum() for Babel babeld: bring babel_usage() into focus babeld: add handling of "-z" cmdline arg babeld: implement "show babel interface" command babeld: add MP-specific zclient API fix babeld: dismiss babel_redistribute_unset() babeld: justify "running-config" meaning in CLI babeld: drive interface_config_write() forward babeld: 3 more timing statements in config text Juliusz Chroboczek (25): babeld: Replace the babeld.conf.sample file by one that actually works. vtysh: Vtysh support for babeld. babeld: Fix typo in hello interval command. babeld: Error handling and tweaks for babeld commands. babeld: Indentation fix. doc: Document babeld. babeld: Don't use an ifindex when installing IPv4 routes. babeld: Use quagga_gettime. zebra: Display uptime of Babel routes in show ip[v6] route. babeld: refactor filtering stubs. babeld: Add support for blackhole routes. Resynchronise with babeld-1.3.1. babeld: remove port and group setting commands. babeld: vty commands (hello-interval, update-interval, resend-delay). babeld: display update-interval and resend-delay in show commands" doc: fix Makefile dependencies for babeld. doc: update babeld documentation. Remove dead variable reboot_time. babeld: remove remains of standalone babeld's configuration code. babeld: fix documentation. babeld: more helpful sample conf file. babeld: set interface flags eagerly, not at interface up. babeld: fix typo in kernel_route_add_v6. babeld: consolidate zebra interface into fewer functions. babeld: remove "parasitic" mode. Matthieu Boutier (30): babeld initial import, for Babel routing protocol. babeld: clean kernel_zebra (old functions, fields...). babeld: address some other compilation warnings. babeld: fix bug concerning pidfile. babeld: change fprintf(stderr) in term of zlog_err. babeld: avoid segfault (bug 706). babeld: add command: "show_babel_neighbour". babeld: add command: "show_babel_database". babeld: add command: "show_babel_running_config". babeld: use zlog_debug instead of do_debugf, for debugf. babeld: place the babel-state file in the quagga vars directory. babeld: fix commands informations messages. memory: install babel memory informations. babeld: remove useless variable, make local another. babeld: add command (config) to set debug flags. babeld: fix bug due to v4mapped addresses. babeld: change the modify route system. babeld: remove unused variable. babeld: babelz merge. babeld: Replace redistribution strings with route_types.h defines. babeld: "return CMD_SUCCESS" was missing for command 'no debug'. babeld: fix eui64 features. babeld: state-file was loaded too early. Initial seqno too. babeld: fix interface bug, simplify code. doc: fix typo in babeld. babeld: remove some unused functions' arguments. ripngd: Replace redistribution strings with route_types.h defines. ripd: add babel for redistribution. babeld: fix wire{d,less} commands name. doc: fix typo. Makefile.am | 4 +- babeld/.gitignore | 7 + babeld/LICENCE | 19 + babeld/Makefile.am | 29 + babeld/babel_filter.c | 107 ++++ babeld/babel_filter.h | 33 + babeld/babel_interface.c | 1005 +++++++++++++++++++++++++++++ babeld/babel_interface.h | 136 ++++ babeld/babel_main.c | 515 +++++++++++++++ babeld/babel_main.h | 41 ++ babeld/babel_zebra.c | 362 +++++++++++ babeld/babel_zebra.h | 34 + babeld/babeld.c | 711 +++++++++++++++++++++ babeld/babeld.conf.sample | 30 + babeld/babeld.h | 125 ++++ babeld/kernel.c | 59 ++ babeld/kernel.h | 53 ++ babeld/kernel_zebra.c | 259 ++++++++ babeld/message.c | 1544 +++++++++++++++++++++++++++++++++++++++++++++ babeld/message.h | 95 +++ babeld/neighbour.c | 327 ++++++++++ babeld/neighbour.h | 50 ++ babeld/net.c | 223 +++++++ babeld/net.h | 28 + babeld/resend.c | 314 +++++++++ babeld/resend.h | 61 ++ babeld/route.c | 1003 +++++++++++++++++++++++++++++ babeld/route.h | 119 ++++ babeld/source.c | 164 +++++ babeld/source.h | 51 ++ babeld/util.c | 429 +++++++++++++ babeld/util.h | 149 +++++ babeld/xroute.c | 221 +++++++ babeld/xroute.h | 43 ++ configure.ac | 16 +- doc/Makefile.am | 10 +- doc/babeld.texi | 118 ++++ doc/ipv6.texi | 2 +- doc/quagga.texi | 2 + lib/command.c | 2 + lib/command.h | 1 + lib/distribute.c | 37 +- lib/distribute.h | 3 + lib/log.c | 9 +- lib/log.h | 3 +- lib/memory.c | 14 + lib/memtypes.c | 7 + lib/route_types.txt | 2 + lib/routemap.h | 1 + lib/thread.h | 2 + lib/vty.c | 2 + lib/zclient.h | 3 + ripd/rip_zebra.c | 3 +- ripngd/ripng_zebra.c | 198 +++---- vtysh/Makefile.am | 1 + vtysh/extract.pl.in | 3 +- vtysh/vtysh.c | 23 + vtysh/vtysh.h | 7 +- vtysh/vtysh_config.c | 2 + zebra/client_main.c | 1 + zebra/zebra_rib.c | 26 +- zebra/zebra_vty.c | 4 + 62 files changed, 8681 insertions(+), 171 deletions(-) create mode 100644 babeld/.gitignore create mode 100644 babeld/LICENCE create mode 100644 babeld/Makefile.am create mode 100644 babeld/babel_filter.c create mode 100644 babeld/babel_filter.h create mode 100644 babeld/babel_interface.c create mode 100644 babeld/babel_interface.h create mode 100644 babeld/babel_main.c create mode 100644 babeld/babel_main.h create mode 100644 babeld/babel_zebra.c create mode 100644 babeld/babel_zebra.h create mode 100644 babeld/babeld.c create mode 100644 babeld/babeld.conf.sample create mode 100644 babeld/babeld.h create mode 100644 babeld/kernel.c create mode 100644 babeld/kernel.h create mode 100644 babeld/kernel_zebra.c create mode 100644 babeld/message.c create mode 100644 babeld/message.h create mode 100644 babeld/neighbour.c create mode 100644 babeld/neighbour.h create mode 100644 babeld/net.c create mode 100644 babeld/net.h create mode 100644 babeld/resend.c create mode 100644 babeld/resend.h create mode 100644 babeld/route.c create mode 100644 babeld/route.h create mode 100644 babeld/source.c create mode 100644 babeld/source.h create mode 100644 babeld/util.c create mode 100644 babeld/util.h create mode 100644 babeld/xroute.c create mode 100644 babeld/xroute.h create mode 100644 doc/babeld.texi _______________________________________________ Quagga-dev mailing list Quagga-dev [at] lists http://lists.quagga.net/mailman/listinfo/quagga-dev
|