conntrack-tools branch, master, updated. conntrack-tools-1.0.1-12-g81fafa4

[Pablo Neira Ayuso]

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 "conntrack-tools".

The branch, master has been updated
       via  81fafa4dfa6d2d321200ceaf16270c6b2310f5f0 (commit)
       via  1bc31abd16a35f177931b8b8c25a10a6f37ac957 (commit)
       via  304ebcdec96f544cd2e794afce2bf336bce59e14 (commit)
       via  c4cf490a096482bc0472154ce1314539913a4007 (commit)
       via  32187346844faed846fc185eb1a1e287a414fa87 (commit)
       via  0c76c6e9d40fdd9d24995556187994cd2e4986d9 (commit)
       via  651922d97e258a5036939738b1e7654bd9edced5 (commit)
       via  2f04f27be03aa64444348517e2c4e24ddeb99eae (commit)
       via  42c3135ad981133e6e53e332965231977057ed6b (commit)
       via  b9af51a42e902f2a3fef527fd70e4e95e957bed7 (commit)
       via  0190b06320a1f1d98c5cc79b10d3686660b98f0c (commit)
       via  f7704c53975713af67455fbab29c74134172caff (commit)
      from  1f29809eac0b9d8c711c97e8fcec6833fcd30248 (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 81fafa4dfa6d2d321200ceaf16270c6b2310f5f0
Merge: 1f29809eac0b9d8c711c97e8fcec6833fcd30248 1bc31abd16a35f177931b8b8c25a10a6f37ac957
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Jan 10 01:50:11 2012 +0100

    Merge branch 'expect/vyatta'

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

Summary of changes:
 configure.ac                          |    2 +-
 conntrackd.8                          |   12 +-
 doc/manual/conntrack-tools.tmpl       |  161 +++++++++++++++++-
 doc/sync/alarm/conntrackd.conf        |   16 ++
 doc/sync/ftfw/conntrackd.conf         |   16 ++
 doc/sync/notrack/conntrackd.conf      |   16 ++
 include/cache.h                       |   67 ++++++-
 include/conntrackd.h                  |   65 +++++---
 include/external.h                    |   29 +++-
 include/filter.h                      |    9 +-
 include/internal.h                    |   48 ++++--
 include/log.h                         |    2 +
 include/netlink.h                     |    7 +
 include/network.h                     |   57 +++++-
 src/Makefile.am                       |    2 +-
 src/build.c                           |  180 +++++++++++++++-----
 src/{cache_iterators.c => cache-ct.c} |  196 +++++++++++++++------
 src/cache-exp.c                       |  308 +++++++++++++++++++++++++++++++++
 src/cache.c                           |  163 +++++++----------
 src/external_cache.c                  |  135 ++++++++++++---
 src/external_inject.c                 |  132 ++++++++++++--
 src/filter.c                          |   98 +++++++++--
 src/internal_bypass.c                 |  219 +++++++++++++++++++----
 src/internal_cache.c                  |  287 ++++++++++++++++++++++++------
 src/log.c                             |   37 ++++
 src/main.c                            |   81 +++++++--
 src/netlink.c                         |   63 +++++++-
 src/network.c                         |   24 ++-
 src/parse.c                           |  277 +++++++++++++++++++++++++-----
 src/read_config_lex.l                 |    1 +
 src/read_config_yy.y                  |   50 ++++++-
 src/run.c                             |  233 +++++++++++++++++++++----
 src/stats-mode.c                      |   50 +++---
 src/sync-alarm.c                      |   20 +-
 src/sync-ftfw.c                       |   39 ++--
 src/sync-mode.c                       |  254 ++++++++++++++++++++++------
 src/sync-notrack.c                    |   37 ++--
 37 files changed, 2754 insertions(+), 639 deletions(-)
 rename src/{cache_iterators.c => cache-ct.c} (58%)
 create mode 100644 src/cache-exp.c


hooks/post-receive
-- 
conntrack-tools