[Olsr-commit] OLSR.org main repository branch, nhdp, updated. 4a208b60e052066060b9fb69ea7f5046feb98ce6

root (spam-protected)
Fri Jul 16 19:11:34 CEST 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commit;h=4a208b60e052066060b9fb69ea7f5046feb98ce6
        for a web version of the last commit.

The branch, nhdp has been updated
       via  4a208b60e052066060b9fb69ea7f5046feb98ce6 (commit)
       via  86f27dedeffde5b6e1ec24e467389342806bd4c7 (commit)
       via  2f3fb5d07d193d506471d3b4ba571dbb7f7650b1 (commit)
       via  b33a20e8fefcd526a573262f85e8f9d5624f6aa3 (commit)
       via  7c388172156243f7f4f2f3623ed13f1711888296 (commit)
       via  da13857eb5476a8fd439f64d06e8c497bc470b2e (commit)
      from  c02df64d668bac9373c4b02a599c24b05ca54524 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4a208b60e052066060b9fb69ea7f5046feb98ce6
Author: Henning Rogge <(spam-protected)>
Date:   Fri Jul 16 19:11:15 2010 +0200

    Adapt NHDP testcode for new avl library

commit 86f27dedeffde5b6e1ec24e467389342806bd4c7
Merge: c02df64d668bac9373c4b02a599c24b05ca54524 2f3fb5d07d193d506471d3b4ba571dbb7f7650b1
Author: Henning Rogge <(spam-protected)>
Date:   Fri Jul 16 18:19:04 2010 +0200

    Merge branch 'master' into nhdp

-----------------------------------------------------------------------

Summary of changes:
 lib/bmf/src/NetworkInterfaces.c                    |    4 +-
 lib/cl_roam/src/cl_roam.c                          |   76 +-
 lib/debuginfo/src/olsrd_debuginfo.c                |   48 +-
 lib/debuginfo/src/olsrd_debuginfo.h                |    9 +-
 lib/dot_draw/src/olsrd_dot_draw.c                  |   22 +-
 lib/dyn_gw/src/olsrd_dyn_gw.c                      |    5 +-
 lib/httpinfo/src/olsrd_httpinfo.c                  |   43 +-
 lib/lq_etx_ff/src/lq_plugin_etx_ff.c               |    8 +-
 lib/mdns/src/mdns.c                                |    4 +-
 lib/nameservice/src/mapwrite.c                     |   27 +-
 lib/nameservice/src/nameservice.c                  |  106 +--
 lib/nameservice/src/nameservice.h                  |   10 +-
 lib/obamp/src/list.h                               |  307 ------
 lib/obamp/src/obamp.c                              | 1093 +++++++++-----------
 lib/obamp/src/obamp.h                              |    6 +-
 lib/obamp/src/olsrd_plugin.c                       |    2 +-
 lib/quagga/patches/quagga-0.98.6.diff              |    8 +-
 lib/quagga/src/quagga.c                            |    8 +-
 lib/txtinfo/src/olsrd_txtinfo.c                    |   49 +-
 src/common/avl.c                                   |  584 ++++++-----
 src/common/avl.h                                   |  504 ++++++++--
 src/common/avl_comp.c                              |  122 +++
 .../Main/HnaEntry.cpp => src/common/avl_comp.h     |   32 +-
 src/common/avl_olsr_comp.c                         |   52 +
 src/common/avl_olsr_comp.h                         |   25 +
 .../Main/HnaEntry.h => src/common/container_of.h   |   37 +-
 src/common/list.h                                  |  493 ++++++++--
 src/defs.h                                         |    9 +
 src/duplicate_set.c                                |   24 +-
 src/duplicate_set.h                                |    9 +-
 src/hna_set.c                                      |   36 +-
 src/hna_set.h                                      |    4 +-
 src/interfaces.c                                   |   54 +-
 src/interfaces.h                                   |   22 +-
 src/link_set.c                                     |   40 +-
 src/link_set.h                                     |   17 +-
 src/linux/net.c                                    |    4 +-
 src/lq_mpr.c                                       |   28 +-
 src/main.c                                         |   12 +-
 src/mid_set.c                                      |   46 +-
 src/mid_set.h                                      |    9 +-
 src/neighbor_table.c                               |   74 +-
 src/neighbor_table.h                               |   18 +-
 src/net_olsr.c                                     |   13 +-
 src/net_olsr.h                                     |    4 +-
 src/nhdp.c                                         |   47 +-
 src/nhdp_interface.c                               |   45 +-
 src/nhdp_interface.h                               |   12 +-
 src/nhdp_link.c                                    |   57 +-
 src/nhdp_link.h                                    |   13 +-
 src/nhdp_n1_id.c                                   |   27 +-
 src/nhdp_n1_id.h                                   |   12 +-
 src/nhdp_n2_id.c                                   |   22 +-
 src/nhdp_n2_id.h                                   |   12 +-
 src/nhdp_neighbor.c                                |   24 +-
 src/nhdp_neighbor.h                                |    4 +-
 src/olsr.c                                         |    4 +-
 src/olsr.h                                         |    1 +
 src/olsr_cfg.c                                     |    2 +-
 src/olsr_cfg.h                                     |    2 +-
 src/olsr_cfg_gen.c                                 |    5 +-
 src/olsr_comport.c                                 |   16 +-
 src/olsr_comport.h                                 |    4 +-
 src/olsr_comport_http.c                            |   13 +-
 src/olsr_comport_http.h                            |    4 +-
 src/olsr_comport_txt.c                             |   23 +-
 src/olsr_comport_txt.h                             |    2 -
 src/olsr_cookie.c                                  |   28 +-
 src/olsr_cookie.h                                  |   14 +-
 src/olsr_ip_acl.c                                  |   13 +-
 src/olsr_ip_acl.h                                  |    4 +-
 src/olsr_ip_prefix_list.c                          |   23 +-
 src/olsr_ip_prefix_list.h                          |   28 +-
 src/olsr_spf.c                                     |   48 +-
 src/packetbb_parser.c                              |   19 +-
 src/packetbb_print.c                               |   34 +-
 src/plugin_loader.c                                |   28 +-
 src/plugin_loader.h                                |    4 +-
 src/process_routes.c                               |   59 +-
 src/routing_table.c                                |   69 +-
 src/routing_table.h                                |   14 +-
 src/scheduler.c                                    |   65 +-
 src/scheduler.h                                    |   20 +-
 src/tc_set.c                                       |   94 +-
 src/tc_set.h                                       |   19 +-
 src/unix/ifnet.c                                   |    1 -
 src/win32/ifnet.c                                  |    4 +-
 87 files changed, 2696 insertions(+), 2350 deletions(-)
 delete mode 100644 lib/obamp/src/list.h
 create mode 100644 src/common/avl_comp.c
 copy gui/win32/Main/HnaEntry.cpp => src/common/avl_comp.h (71%)
 create mode 100644 src/common/avl_olsr_comp.c
 create mode 100644 src/common/avl_olsr_comp.h
 copy gui/win32/Main/HnaEntry.h => src/common/container_of.h (73%)


hooks/post-receive
-- 
OLSR.org main repository




More information about the Olsr-commit mailing list