examples/agent_to_peer.map | 32
CONFIG-KEYS | 35
ChangeLog | 65 +
EXAMPLES | 55 +
configure | 2
configure.in | 4
examples/agent_to_peer.map.example | 32
sql/README.mysql | 6
sql/README.pgsql | 4
sql/README.sqlite3 | 6
sql/pmacct-create-db_v8.mysql | 28
sql/pmacct-create-table_v8.sqlite3 | 23
src/bgp/bgp.c | 62 +
src/cfg.h | 3
src/cfg_handlers.c | 56 +
src/cfg_handlers.h | 2
src/classifier.c | 26
src/classifier.h | 3
src/conntrack.h | 3
src/imt_plugin.h | 3
src/mysql_plugin.c | 1
src/mysql_plugin.h | 1
src/network.h | 21
src/nfacctd.c | 230 ++++--
src/nfacctd.h | 1287 +++++++++++++++++++-----------------
src/nfprobe_plugin/netflow5.c | 9
src/nfprobe_plugin/netflow9.c | 853 ++++++++++++++++++-----
src/nfprobe_plugin/nfprobe_plugin.c | 7
src/nfv9_template.c | 50 +
src/nl.c | 1
src/pgsql_plugin.c | 5
src/pgsql_plugin.h | 1
src/pkt_handlers.c | 204 ++++-
src/plugin_hooks.c | 6
src/pmacct-data.h | 2
src/pmacct-defines.h | 16
src/pmacct.c | 40 -
src/pmacctd.c | 2
src/server.c | 11
src/sfacctd.c | 51 -
src/sql_common.c | 15
src/sqlite3_plugin.c | 1
src/sqlite3_plugin.h | 1
src/uacctd.c | 2
src/util.c | 44 +
src/xflow_status.c | 60 +
src/xflow_status.h | 17
47 files changed, 2299 insertions(+), 1089 deletions(-)
New commits:
commit f2da1482efa7dc87819c69e6e86574e8f758d6f6
Author: paolo <paolo>
Date: Tue Dec 28 16:26:02 2010 +0000
* Documentation updated
commit 5c00119ae910c9f27ca46748ea5134b568877547
Author: paolo <paolo>
Date: Tue Dec 21 16:56:51 2010 +0000
* fix, xflow_status.c: status entries were not properly linked to the hash
conflict chain resulting in a minor memory leak. * BGP daemon: BGP peer
information is now linked into the status table for caching purposes. This
optimization results in major CPU saving on bigger deployments.
commit 2b98c78275ca86b1b3e99f58f2f06c00949c318e
Author: paolo <paolo>
Date: Fri Dec 17 13:33:51 2010 +0000
* fix, nfacctd: added check to verify validity of internal status object
for a given NetFlow agent. Only affected version is 0.12.5-cvs (cont.d)
commit 8de021b4e6b1639dfcef92ba475385949ff17d84
Author: paolo <paolo>
Date: Tue Dec 7 21:41:06 2010 +0000
* fix, nfacctd: added check to verify validity of internal status object
for a given NetFlow agent. Only affected version is 0.12.5-cvs. * fix, nfacctd,
sfacctd: daemons were crashing on OpenBSD platform upon setting an
aggregate_filter configuration directive. Patch is courtesy of Manuel Pata.
commit 1edc35c6eadbac96c8338c6a82189ff703d41f08
Author: paolo <paolo>
Date: Sat Nov 27 11:09:29 2010 +0000
* fix, sql_common.c: increased buffer size available for sql_table_schema
from 1KB to 8KB.
commit 32a2fd4ada6778185845d404b6d16ce112803d97
Author: paolo <paolo>
Date: Sun Nov 7 15:11:11 2010 +0000
* BGP daemon: introduced support for IPv6 transport of BGP messaging *
bgp_agent_map has been improved to allow mapping of NetFlow/sFlow agents making
use of IPv6 transport to either a) IPv4 transport address of BGP sessions or b)
32-bit BGP Router IDs * documentation and examples updated
commit d472634a85b339941ff661a23ab47cd97123efde
Author: paolo <paolo>
Date: Wed Nov 3 21:29:26 2010 +0000
* nfacctd: introduced support for 'new' TCP/UDP source/destination ports
(field types 180, 181, 182, 183), as per IPFIX standard, basing on the L4
protocol value (if any, otherwise assume L4 is not TCP/UDP). * nfacctd:
introduced support for egress bytes and packet counters (field types 23, 24)
basing on the direction value (if any, otherwise assume ingress as per RFC3954).
commit e705e0c483025a609e18e6fafeda9935122e4120
Author: paolo <paolo>
Date: Sun Oct 31 22:51:40 2010 +0000
* nfacctd: introduced support for NAT L3/L4 field values via xlate_src and
xlate_dst configuration directives. Implementation follows IPFIX standard for
IPv4 and IPv6 (field types 225, 226, 227, 228, 281 and 282) and is added by a
compatibility glue to support Cisco ASA NetFlow v9 NSEL field types 40001,
40002, 40003, 40004. * nfacctd: added support for IPFIX/Cisco ASA NetFlow v9
NSEL msecs absolute timestamps: field types 152, 153 and 323.
commit dafac14b103068fde27e3b3ffceeab645a0ba881
Author: paolo <paolo>
Date: Thu Oct 28 07:52:42 2010 +0000
* fix, nfacctd, sfacctd: aggregate_filter was not catching L2 primitives
(VLAN, MAC addresses) when performing egress measurements.
commit 519689e9f3af96670e838a7f3eb45b7bfdc99ccc
Author: paolo <paolo>
Date: Tue Oct 26 17:06:40 2010 +0000
* nfprobe: encoding of NetFlow v9 option scope has been improved; nfprobe
source IPv4/IPv6 address, if specified via nfprobe_source_ip directive, is now
being written * fix, sql_common.c: log implicit set of sql_table_type to 'bgp'
if any BGP primitive is part of the aggregation method * Updated relevant
documentation
commit 1dbc5094a7b1c9aab7e7e743f0a7aac65d0ae58b
Author: paolo <paolo>
Date: Mon Oct 25 17:37:48 2010 +0000
* nfprobe: introduced support for application classification via NetFlow v9
field type #95 (application ID) and application name table option. This
mechanism aligns with Cisco NBAR-NetFlow v9 integration feature.
commit 6ef4d0f0caf775c32d2aa79fdf07bc5f455cfc7f
Author: paolo <paolo>
Date: Sat Oct 23 21:47:25 2010 +0000
* nfacctd: introduced support for application classification via NetFlow v9
field type #95 (application ID) and application name table option. This
mechanism aligns with Cisco NBAR-NetFlow v9 integration feature.
commit 156fe2178cc81e076fe42c766baa0dd8469ff7d5
Author: paolo <paolo>
Date: Tue Oct 19 11:50:11 2010 +0000
* fix, util.c: string copies in trim_spaces(), trim_all_spaces() and
strip_quotes() have been rewritten more safely. Patch is courtesy of Dmitry
Koplovich.
commit 0412190f24cdf6b88a87efad596ace0080cd4750
Author: paolo <paolo>
Date: Sun Oct 17 19:42:48 2010 +0000
* [ns]facctd_net: directive can now be specified per-plugin; documentation
updated.
commit ad6cb0526f7c10f10cb2d9f1dbc4b008b398d218
Author: paolo <paolo>
Date: Sat Oct 16 19:05:10 2010 +0000
* nfprobe: egress flowset, examples documentation and enabled compatibility
with Cisco (no use of OUT_BYTES, OUT_OUT_PACKETS) * nfacctd: added support for
egress datalink NetFlow v9 fields basing on direction field
commit c6cb20e1dfb961e7652a4766302be8c8d5c50537
Author: paolo <paolo>
Date: Sat Oct 16 11:58:29 2010 +0000
* nfprobe: introduced egress IPv4/IPv6 NetFlow v9 flowsets
commit 8ca90241151011f2ba256677ea5b984bae681d95
Author: paolo <paolo>
Date: Tue Oct 12 21:41:40 2010 +0000
* nfprobe: introducing egress IPv4/IPv6 NetFlow v9 templates * fixed naming
convention for some mispelled examples documentation. Thanks to Xavier Vitard
for having spotted the issue.
commit a2944163ec86fadb1cce3b07f2aac31ad0656a23
Author: paolo <paolo>
Date: Thu Oct 7 07:25:08 2010 +0000
* sfacctd: interface format merged back into interface value fields so to
ease keeping track of discards (and discard reasons) and multicast fanout *
nfacctd: fixed typo preventing the package to compile when enabling IPv6; only
version affected by the issue is 0.12.5-cvs.
commit 15970e4126a7a09609c21fbea59493849f7b0799
Author: paolo <paolo>
Date: Wed Oct 6 07:26:11 2010 +0000
* MySQL, SQLite3 plugins: sql table version 8 issued to provide common
naming convention when mapping primitives to database fields among the
supported RDBMS base. Thanks to Chris Wilson for his support.
commit ebcd2ce8da59afc08a73d1b30f2c2f94db0defcb
Author: paolo <paolo>
Date: Mon Oct 4 14:35:27 2010 +0000
* pmacct client: numeric variables output converted to unsigned from signed
* nfacctd_net, sfacctd_net: default value changed from null (and related error
message) to 'netflow' for nfacctd_net and 'sflow' for sfacctd_net.
commit 1cdfb4e7b243f46d82fab6ad1cc100257e764e06
Author: paolo <paolo>
Date: Sun Oct 3 20:28:31 2010 +0000
* nfacctd, sfacctd: aggregate_filter can now filter against TCP flags
commit 578b0d367748b7c00a908f945edf73053481c3ab
Author: paolo <paolo>
Date: Sun Oct 3 10:32:04 2010 +0000
* Refreshed building system * Rolled version counters
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=f2da1482efa7dc87819c69e6e86574e8f758d6f6
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=5c00119ae910c9f27ca46748ea5134b568877547
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=2b98c78275ca86b1b3e99f58f2f06c00949c318e
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8de021b4e6b1639dfcef92ba475385949ff17d84
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=1edc35c6eadbac96c8338c6a82189ff703d41f08
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=32a2fd4ada6778185845d404b6d16ce112803d97
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=d472634a85b339941ff661a23ab47cd97123efde
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=e705e0c483025a609e18e6fafeda9935122e4120
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=dafac14b103068fde27e3b3ffceeab645a0ba881
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=519689e9f3af96670e838a7f3eb45b7bfdc99ccc
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=1dbc5094a7b1c9aab7e7e743f0a7aac65d0ae58b
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=6ef4d0f0caf775c32d2aa79fdf07bc5f455cfc7f
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=156fe2178cc81e076fe42c766baa0dd8469ff7d5
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=0412190f24cdf6b88a87efad596ace0080cd4750
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=ad6cb0526f7c10f10cb2d9f1dbc4b008b398d218
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=c6cb20e1dfb961e7652a4766302be8c8d5c50537
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8ca90241151011f2ba256677ea5b984bae681d95
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=a2944163ec86fadb1cce3b07f2aac31ad0656a23
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=15970e4126a7a09609c21fbea59493849f7b0799
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=ebcd2ce8da59afc08a73d1b30f2c2f94db0defcb
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=1cdfb4e7b243f46d82fab6ad1cc100257e764e06
http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=578b0d367748b7c00a908f945edf73053481c3ab
_______________________________________________
svn mailing list
[email protected]
http://mailman.vyatta.com/mailman/listinfo/svn
