[Olsr-commit] OLSR.org main repository branch, nhdp, updated. 63d156096758435e6ccf660abc49d0c52f2605fd

[root]

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=63d156096758435e6ccf660abc49d0c52f2605fd
        for a web version of the last commit.

The branch, nhdp has been updated
       via  63d156096758435e6ccf660abc49d0c52f2605fd (commit)
       via  0fbf5bc18048008f434db35b8076635ab3f31798 (commit)
       via  6b99699cf62b17a5b1d182f2b515b9a5f6c7ff76 (commit)
       via  0b23e7d84b909f049d4df81979e39213017765a0 (commit)
       via  817811b47bae081ab1cc206b9e002cfb29192d9f (commit)
       via  8a837ef834da0c2ff5f2e12f7d917adf643a8cbf (commit)
       via  59566a10b89d0ecfa68d669d939b6a492fdaf048 (commit)
       via  44b9b1fdad6373ae467482592b073d02ac967b85 (commit)
       via  50e5797cc71376d5f0f7722b611c59fdbca420a0 (commit)
       via  2e68e605f3e8975db1a9aab3a16e958b13914554 (commit)
       via  da310996c49119d416be675bdb1a67122f39d9e0 (commit)
       via  bb5ff3fe4e7190ac2eb5aa4074a9bfa557435a21 (commit)
       via  2193cfc7583e30aaa54c49ea47439a07f8393a30 (commit)
       via  9e6fec2892f0ac4ae71bbad034c654d21acd4cd3 (commit)
       via  e0c94a5be81a3a3b7c266b36fcdeec4030c8aa5f (commit)
      from  b40a3143e54e97db661824b9d0057fd8b9d04bb9 (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 63d156096758435e6ccf660abc49d0c52f2605fd
Merge: b40a3143e54e97db661824b9d0057fd8b9d04bb9 0fbf5bc18048008f434db35b8076635ab3f31798
Author: Henning Rogge <(spam-protected)>
Date:   Sat Jul 24 10:08:29 2010 +0200

    Merge branch 'master' into nhdp

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

Summary of changes:
 Makefile.inc                      |   10 +-
 lib/bmf/src/Address.c             |    4 +-
 lib/bmf/src/Bmf.c                 |    4 +-
 lib/bmf/src/NetworkInterfaces.c   |   40 +-
 lib/bmf/src/Packet.c              |   16 +-
 lib/bmf/src/PacketHistory.c       |    2 +-
 lib/httpinfo/src/olsrd_httpinfo.c |   36 +-
 lib/mdns/src/NetworkInterfaces.c  |   10 +-
 lib/mdns/src/Packet.c             |   16 +-
 lib/mdns/src/mdns.c               |    8 +-
 lib/nameservice/src/mapwrite.c    |    8 +-
 lib/nameservice/src/nameservice.c |   12 +-
 lib/secure/src/olsrd_secure.c     |   10 +-
 src/bsd/kernel_routes.c           |    6 -
 src/bsd/net.c                     |   81 +---
 src/common/avl_olsr_comp.c        |  183 ++++++++
 src/common/avl_olsr_comp.h        |    7 +
 src/defs.h                        |    2 +-
 src/hna_set.c                     |    4 +-
 src/interfaces.c                  |   23 +-
 src/interfaces.h                  |   20 +-
 src/ipcalc.c                      |   41 ++-
 src/ipcalc.h                      |   64 +++
 src/kernel_routes.h               |   18 +-
 src/linux/kernel_routes.c         |  859 ++++++++++++++++++++++---------------
 src/linux/net.c                   |  169 +-------
 src/main.c                        |   29 +-
 src/mid_set.c                     |    4 +-
 src/neighbor_table.c              |   16 +-
 src/neighbor_table.h              |    1 -
 src/net_olsr.c                    |   41 +--
 src/net_os.h                      |    8 +-
 src/olsr_cfg.c                    |   66 ++--
 src/olsr_cfg.h                    |   38 ++-
 src/olsr_cfg_gen.c                |    6 +-
 src/olsr_cookie.c                 |    4 +-
 src/olsr_types.h                  |    8 +
 src/parser.c                      |    4 +-
 src/pbb_handler.c                 |   14 +-
 src/process_package.c             |    4 +-
 src/process_routes.c              |   67 +---
 src/routing_table.c               |  194 +--------
 src/routing_table.h               |    7 -
 src/scheduler.c                   |   19 +-
 src/tc_set.c                      |    4 +-
 src/unix/ifnet.c                  |  136 +++----
 src/win32/compat.c                |    2 +-
 src/win32/dlfcn.h                 |    2 +-
 src/win32/ifnet.c                 |  145 +------
 src/win32/kernel_routes.c         |   10 +-
 src/win32/net.c                   |   24 +-
 51 files changed, 1178 insertions(+), 1328 deletions(-)


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