CONFIG-KEYS | 54 +++-- ChangeLog | 50 ++++ EXAMPLES | 27 +- UPGRADE | 11 + configure | 365 +++++++++++++++++++---------------- configure.in | 40 +++ debian/changelog | 59 +++++ sql/README.agent_id2 | 16 - sql/README.iface | 18 + sql/README.is_symmetric | 15 + sql/README.mask | 20 + sql/README.mysql | 20 + sql/README.pgsql | 20 + sql/README.sqlite3 | 20 + src/bgp/bgp.c | 2 src/cfg.h | 1 src/cfg_handlers.c | 17 + src/cfg_handlers.h | 3 src/mysql_plugin.c | 2 src/net_aggr.c | 82 +++++++ src/net_aggr.h | 8 src/network.h | 64 +++++- src/nfacctd.c | 12 - src/nfacctd.h | 2 src/nfprobe_plugin/netflow5.c | 8 src/nfprobe_plugin/netflow9.c | 48 ++++ src/nfprobe_plugin/nfprobe_plugin.c | 18 + src/nfprobe_plugin/nfprobe_plugin.h | 1 src/nl.c | 137 +++++++++++++ src/pgsql_plugin.c | 2 src/pkt_handlers.c | 372 ++++++++++++++++++++++++++++++++++-- src/pkt_handlers.h | 14 + src/pmacct-data.h | 8 src/pmacct-defines.h | 24 +- src/pmacct.c | 66 ++++++ src/pmacct.h | 5 src/pmacctd.c | 22 +- src/pretag.h | 2 src/server.c | 6 src/sfacctd.c | 12 - src/sfprobe_plugin/sfprobe_plugin.c | 122 ++++++++--- src/sql_common.c | 62 ++++++ src/sql_common.h | 6 src/sql_handlers.c | 33 +++ src/sqlite3_plugin.c | 2 src/uacctd.c | 54 ++++- 46 files changed, 1616 insertions(+), 336 deletions(-)
New commits: commit 85274d5f2c1498a3cf375845cc277af50b8e69e6 Author: Stig Thormodsrud <[email protected]> Date: Sat May 1 11:54:42 2010 -0700 0.12.2+vyatta+1 commit eaa2e8b9ab77e7cbb4b2d251d8718316c1a94b71 Author: paolo <paolo> Date: Thu Apr 8 11:58:49 2010 +0000 * Rolling version counters commit d73012a1f095587f39a3b0c2853f8fd24db66d3f Author: paolo <paolo> Date: Mon Apr 5 19:07:24 2010 +0000 * Documentation updated * Building sub-system: relax compiler optimizations option added commit 31240174858f7fe9ba9867637f206394662163fd Author: paolo <paolo> Date: Sun Apr 4 21:03:26 2010 +0000 * ChangeLog updated * Documentation updated commit be9b01a3282e91befb1f76defe8f77fb7a7e178f Author: paolo <paolo> Date: Fri Mar 26 22:38:11 2010 +0000 * Building sub-system: PF_RING workaround addendum commit c2f6453bacbeefa61e26497e821dc9b293a95e13 Author: paolo <paolo> Date: Fri Mar 26 22:11:43 2010 +0000 * Building sub-system: PF_RING workaround for pcap_dispatch not found commit 6f12c6154b38e6205890bf4d92732aafeedd6823 Author: paolo <paolo> Date: Wed Mar 17 18:17:37 2010 +0000 * sfprobe: if the MAC layer is not available, change header protocol to 11 (IPv4) or 12 (IPv6) from 1. commit 7ee69860ec4c1c64472c3a93933dc3e8ff126975 Author: paolo <paolo> Date: Tue Mar 16 21:58:28 2010 +0000 * fix, bgp.c: bgp_attr_munge_as4path() return code was not defined for some cases. This was causing some BGP messages to be considered as malformed. commit 60e530328a33b68b8652c255be877907c3bea42e Author: paolo <paolo> Date: Sat Mar 13 10:20:29 2010 +0000 * uacctd: introduced MAC layer support the for Netlink/ULOG socket commit 8b1e450cea1623f5b68539a7f68667d380fdc4a5 Author: paolo <paolo> Date: Fri Mar 12 00:09:16 2010 +0000 * Tunnel inspection generalized: internal structures will allow up to 8 tunnel stacks. Up to 4 tunnel layers per stack are already supported. First matching stack at the first layer, wins. * fix, nfprobe_plugin.c: l2_to_flowrec() was missing variable declaration if the package was configured for compilation with --disable-l2. Thanks to Brent Van Dussen for reporting the issue. commit 3c6433820c948dbafda2ccd5861554879fca8fc1 Author: paolo <paolo> Date: Tue Mar 9 11:56:46 2010 +0000 * Initial implementation of tunnel inspection feature in pmacctd and uacctd daemons. Tunnel handlers might be feeded with options via configuration. Once enabled, the daemon will then account on tunnelled data rather than on the envelope. At this time only supported tunnel protocol is GTP, the GPRS tunnelling protocol (configured as: "tunnel_0: gtp, <UDP port>"). commit 37b7904ff30568c790545c79a1baed7924bd3d75 Author: paolo <paolo> Date: Sat Mar 6 23:43:13 2010 +0000 * sfprobe: network masks are now exported via sFlow v5. 'pmacctd_net' and its equivalents steer how to populate src_mask/dst_mask values. commit 97d464f60fce2430b09970a3826dd68fda86e3ef Author: paolo <paolo> Date: Sat Mar 6 12:10:16 2010 +0000 * nfprobe: network masks are now exported via NetFlow v5/v9. 'pmacctd_net' and its equivalents steer how to populate src_mask/dst_mask values. * cleanup, nfprobe/sfprobe: data source for src_as/dst_as primitives is now expected to be always explicitely defined. The only case affected is getting ASN values out of a Networks File: up to now, it was sufficient to define a networks_file to use it; now 'pmacctd_as: file' needs to be configured aswell. commit 9f7db729469f1b294112789267350090fb58409d Author: paolo <paolo> Date: Fri Mar 5 17:44:48 2010 +0000 * Support for source/destination IP prefix masks is introduced via two new aggregation primitives: src_mask and dst_mask. These are populated as per the [nf|sf|pm|u]acctd_net directive: NetFlow/sFlow protocols, BGP, Network files (networks_file) or static (networks_mask) being valid data sources. * fix, nfacctd.h: source and destination netmasks were twisted within the NetFlow v5 structure. Affected releases are: 0.12.0rc4 and 0.12.0. * Documentation updated. commit b4b0da842d5fce1c98278f9f5a42701ba509af64 Author: paolo <paolo> Date: Sat Feb 27 00:28:34 2010 +0000 * Input/output interfaces (SNMP index) have been implemented natively; it's therefore not required anymore to pass through the tag infrastructure. As a result two aggregation primitives are being introduced: 'in_iface' and 'out_iface'. * Updated documentation. Also added sql/README.iface to describe usage of 'in_iface' and 'out_iface' primitives; added sql/README.is_symmetric to describe usage of 'is_symmetric' primitive. http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=85274d5f2c1498a3cf375845cc277af50b8e69e6 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=eaa2e8b9ab77e7cbb4b2d251d8718316c1a94b71 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=d73012a1f095587f39a3b0c2853f8fd24db66d3f http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=31240174858f7fe9ba9867637f206394662163fd http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=be9b01a3282e91befb1f76defe8f77fb7a7e178f http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=c2f6453bacbeefa61e26497e821dc9b293a95e13 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=6f12c6154b38e6205890bf4d92732aafeedd6823 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=7ee69860ec4c1c64472c3a93933dc3e8ff126975 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=60e530328a33b68b8652c255be877907c3bea42e http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8b1e450cea1623f5b68539a7f68667d380fdc4a5 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=3c6433820c948dbafda2ccd5861554879fca8fc1 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=37b7904ff30568c790545c79a1baed7924bd3d75 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=97d464f60fce2430b09970a3826dd68fda86e3ef http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=9f7db729469f1b294112789267350090fb58409d http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=b4b0da842d5fce1c98278f9f5a42701ba509af64 _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
