CONFIG-KEYS | 106 ++++++-- ChangeLog | 88 ++++++ EXAMPLES | 44 +++ FAQS | 17 - TOOLS | 41 +-- configure | 12 configure.in | 10 debian/changelog | 123 +++++++++ docs/INTERNALS | 163 ++++++------ docs/PLUGINS | 65 ++--- docs/SIGNALS | 10 examples/agent_to_peer.map | 9 examples/bgp_md5.lst.example | 8 examples/is_symmetric.map.example | 35 +- examples/lpref.map.example | 36 +- examples/med.map.example | 35 +- examples/peers.map.example | 35 +- examples/pretag.map.example | 259 ++++++++++++-------- sql/README.cos | 13 + sql/README.mysql | 58 +++- sql/README.pgsql | 58 +++- sql/README.sqlite3 | 58 +++- src/Makefile.am | 2 src/Makefile.in | 2 src/addr.c | 8 src/bgp/bgp.c | 101 ++++++-- src/bgp/bgp.h | 1 src/bgp/bgp_packet.h | 4 src/cfg.h | 9 src/cfg_handlers.c | 206 +++++++++++++++- src/cfg_handlers.h | 8 src/ip_frag.c | 6 src/ll.c | 8 src/mysql_plugin.c | 8 src/network.h | 47 +++ src/nfacctd.c | 283 +++++++++++----------- src/nfacctd.h | 84 ++++++ src/nfprobe_plugin/netflow9.c | 47 +++ src/nfprobe_plugin/nfprobe_plugin.c | 398 +++++++++++++++---------------- src/nfprobe_plugin/nfprobe_plugin.h | 6 src/nfv9_template.c | 39 +++ src/once.h | 2 src/pgsql_plugin.c | 3 src/pkt_handlers.c | 454 ++++++++++++++++++++++++------------ src/pkt_handlers.h | 12 src/plugin_hooks.c | 19 + src/plugin_hooks.h | 6 src/pmacct-data.h | 15 + src/pmacct-defines.h | 43 ++- src/pmacct.c | 30 +- src/pmacct.h | 2 src/pmacctd.c | 44 ++- src/pretag-data.h | 11 src/pretag.c | 23 + src/print_plugin.c | 203 +++++++++++----- src/print_plugin.h | 5 src/server.c | 1 src/sfacctd.c | 178 +++++++------- src/sfacctd.h | 1 src/sfprobe_plugin/sflow_agent.c | 15 + src/sfprobe_plugin/sflow_api.h | 2 src/sfprobe_plugin/sflow_sampler.c | 43 +-- src/sfprobe_plugin/sfprobe_plugin.c | 360 +++++++++++++++++----------- src/signals.c | 8 src/sql_common.c | 17 + src/sql_common.h | 1 src/sql_handlers.c | 8 src/tee_plugin/Makefile.in | 44 +++ src/tee_plugin/tee_plugin.c | 342 +++++++++++++++++++++++++++ src/tee_plugin/tee_plugin.h | 44 +++ src/uacctd.c | 48 ++- src/util.c | 56 ++++ src/util.h | 2 73 files changed, 3299 insertions(+), 1293 deletions(-)
New commits: commit 7a91220ddd284d3608e780db4b1bd0f3dc2d889c Author: Stig Thormodsrud <[email protected]> Date: Mon Aug 30 14:06:25 2010 -0700 0.12.3+vyatta+1 commit 4c6402ca27368b58e677f74666008d3168ef577a Author: paolo <paolo> Date: Wed Jul 28 18:09:17 2010 +0000 * sfacctd: added support for egress VLAN and CoS (802.1p) information commit 57894155a04570bb3f225384489e8aadc36dbf6f Author: paolo <paolo> Date: Wed Jul 28 17:40:36 2010 +0000 * fix, sfprobe: Counter Samples index was uninitialized commit 4e530cb9af2810ec0178e767930da09e6c9e301a Author: paolo <paolo> Date: Wed Jul 28 16:44:01 2010 +0000 * Documentation updated commit 793742e4bd8eb3f3ffc021b3fa18481204c99ef3 Author: paolo <paolo> Date: Sun Jul 25 23:25:23 2010 +0000 * fix, nfprobe: nfprobe_ifindex and nfprobe_direction were not working with tag/tag2 setup and NetFlow v5 export due to tags suppression. * fix, sfprobe: sampler process moved into the plugin in order to correctly populate counter samples. commit c6dacd2f7a72239bc671f1bd4b8dc830e2194831 Author: paolo <paolo> Date: Sat Jul 24 17:26:23 2010 +0000 * fix, bgp.c: CPU hog issue was caused by missing cleanup of the select() descriptors vector. * fix, nfprobe: nfprobe_ifindex value was incorrectly evaluated * fix, sfprobe: upon introducing support for multi-interfaces, the linked list of counter samples was found to get corrupted. commit ab220d3009cd2ca944141d236916be0be732aa08 Author: paolo <paolo> Date: Wed Jul 21 17:17:06 2010 +0000 * sfprobe: added support for multi-interface Counter Samples commit 55722c24394c933781be3bb1694f0dede842176d Author: paolo <paolo> Date: Tue Jul 20 20:00:43 2010 +0000 * fix, sfprobe_plugin.c: counter sample showing wrong ifindex when in semi- dynamic mode. commit af6ed958ca78c72c32c4e9c1bbf61f22527748c5 Author: paolo <paolo> Date: Tue Jul 20 19:44:54 2010 +0000 * [ns]fprobe_ifindex now supports semi-dynamic lookups against either 'tag' or 'tag2'. This is in addition to previously implemented static ifIndex support. Updated docs and examples. commit f265a7246989787bf6e7f16b41d04443e74eb98a Author: paolo <paolo> Date: Mon Jul 19 20:16:42 2010 +0000 * nfprobe, sfprobe: introducing concept of traffic direction. As a result, [ns]fprobe_direction and [ns]fprobe_ifindex configuration directives have been implemented. * [ns]fprobe_direction defines traffic direction. Can be statically defined via 'in' and 'out' keywords. It can also be dynamically determined via lookup to either 'tag' or 'tag2' values. * [ns]fprobe_ifindex statically associates an interface index (ifIndex) to a given nfprobe or sfprobe plugin. * sfprobe: sfprobe_ifspeed configuration directive is introduced and aimed at statically associating an interface speed to a given sfprobe plugin. commit 37137081a7164948c33773a60e8d564da44fe588 Author: paolo <paolo> Date: Sun Jul 11 17:31:26 2010 +0000 * cfg_handlers.c: bgp_daemon, bgp_daemon_msglog parsing fixed. * SQL documentation fixes. commit 71a541a9d1b0a22fb713e4e2202685f95a7f1b5c Author: paolo <paolo> Date: Wed Jul 7 18:41:23 2010 +0000 * fix, nfacctd: NetFlow v9 template print out for unknown field types commit 153385c161772ccfe0477948a485154383b30cd4 Author: paolo <paolo> Date: Wed Jul 7 14:14:56 2010 +0000 * fix, pmacct.c: in_iface, out_iface aggregation primitives erroneusly kept within a "#if defined (HAVE_L2)" code section when parsing '-c' option. commit 63303958a75334a428cc810c7d8ce102b1461ae6 Author: paolo <paolo> Date: Wed Jul 7 10:02:47 2010 +0000 * fix, nfacctd: when accounting for IPv6 traffic, wrong network mask fields were grabbed. Field types 29 and 30 are correctly fetched now. commit c2f414358c56463562a105458d7506f614ab73b6 Author: paolo <paolo> Date: Tue Jul 6 21:25:04 2010 +0000 * nfacctd: added support for debugging of NetFlow v9 templates commit 822a3362ecfa73b012ecccb1b7210f8d219a8acd Author: paolo <paolo> Date: Fri Jul 2 11:59:22 2010 +0000 * fix, BGP daemon: support for IPv6 global address + link-local address next-hops as part of MP_REACH_NLRI parsing * Updated documentation commit 173a50ad95b0ea3754a999e27b2665e7c5631bbc Author: paolo <paolo> Date: Wed Jun 30 11:08:03 2010 +0000 * BGP daemon: added support for RFC3107, ie. SAFI=4 label information, to enable receipt of labeled IPv4/IPv6 unicast prefixes. * Documentation updates commit eea1241eb3db6951b4c28ed0dbf632acb8e9e3bb Author: paolo <paolo> Date: Fri Jun 25 16:48:05 2010 +0000 * bgp_daemon_md5_file: map made reloadable at runtime. Existing MD5 keys are removed via setsockopt(), new ones are installed as per the newly supplied map. * bgp_daemon_md5_file: added sample map, 'examples/bgp_md5.lst.example'. commit 77183cd1eddcb5ef546fc569b044c8b2b8e0516c Author: paolo <paolo> Date: Thu Jun 24 12:22:45 2010 +0000 * BGP daemon: TCP MD5 signature implemented. A new 'bgp_daemon_md5_file' configuration directive is added for the purpose of defining BGP peers and their respective MD5 keys, one per line, in CSV format. commit 38575ba6e29f1a38faf484172b913472a514f13b Author: paolo <paolo> Date: Wed Jun 9 16:04:12 2010 +0000 * nfacctd: maximum NetFlow v9 type lifted to 256. * nfprobe, sfprobe: send buffer size is now aligned to plugin_pipe_size if any is specified providing a way to tune it in case of sustained exports. commit 8411187b37c1d296362f809b6f4a084194046b03 Author: paolo <paolo> Date: Mon Jun 7 01:21:55 2010 +0000 * New 'cos' aggregation primitive has been implemented providing support for 802.1p priority bits. Collection is supported via sFlow, libpcap and ULOG; export is supported via sFlow. * sfprobe: partial Switch Extension Header support added. * fix, addr.c: pm_ntohll() and pm_htonll() routines rewritten. These are aimed to change byte ordering of 64-bit variables. Successfully tested against NetFlow 64-bit bytes/packet counters. commit e5505ef523c5244a6587211b5b328cf959b17db4 Author: paolo <paolo> Date: Fri May 28 20:20:39 2010 +0000 * Rolled version counters. commit a7dfab237d40367d7ced1592938e4da89f18b1f5 Author: paolo <paolo> Date: Wed May 26 15:52:17 2010 +0000 * MySQL, MY_create_dyn_table(): errno 1050 (ER_TABLE_EXISTS_ERROR) is being considered valid condition. * Documentation commit 971a724ecbfb16b916794965f6ed935e3b621eb5 Author: paolo <paolo> Date: Sun May 23 10:09:01 2010 +0000 * print_plugin: implemented CSV (comma-separated values) output format, alongside existing tabular one. Introduced a print_output configuration directive to select among available output formats. commit f5583e891c2f990abeace71ee2876c5ce241c713 Author: paolo <paolo> Date: Thu May 20 17:33:58 2010 +0000 * tee_plugin, fix: internal data structure better 64-bit aligned. commit 9d80774446eded5a2e5dca9d3dfc6deaed9fb93e Author: paolo <paolo> Date: Tue May 18 16:31:28 2010 +0000 * nfacctd: NetFlow v9, options parsing polish up. commit 14cb61af80f9218845c3623f7592372bfb36128f Author: paolo <paolo> Date: Mon May 17 16:11:18 2010 +0000 * nfprobe, sfprobe: nfprobe_ipprec and sfprobe_ipprec features introduced to mark self-originated NetFlow and sFlow datagrams with the supplied IP precedence value. * nfprobe: removed unused routines and sanitized logging a bit. commit 1665eba2b2df847904041f74082975be37d5db19 Author: paolo <paolo> Date: Sun May 16 10:24:39 2010 +0000 * fix, sql_common.c: maximum SQL writers warning message was never reached unless a recovery method is specifited. Thanks to Sergio Charpinel Jr for reporting the issue. * Documentation commit aedbafa9b536e7cd15317e64f0736f0a7e923703 Author: paolo <paolo> Date: Fri May 14 15:06:58 2010 +0000 * tee_plugin: implementation wrapped-up. Documentation underway. commit 65ed7304c7b999d5926ffd8d876192cb1a10c1b9 Author: paolo <paolo> Date: Thu May 13 17:30:41 2010 +0000 * tee_plugin: sFlow and NetFlow replication implementation is underway; transparent IPv4/IPv6 replication feature added. commit 624a176bee6e73c8820b5d8a95cb29cb263add95 Author: paolo <paolo> Date: Wed May 12 17:11:26 2010 +0000 * tee_plugin: sFlow and NetFlow replication implementation is underway; tee_receiver, tee_source_ip and tee_transparent features being developed. commit fe066d4992847826b21b96db005fa0d8329db222 Author: paolo <paolo> Date: Fri May 7 16:36:27 2010 +0000 * Inauguration of tee_plugin() commit 84504494b15c224f679436170930511d471f832e Author: paolo <paolo> Date: Wed May 5 15:30:32 2010 +0000 * fix, ip_frag.c: orphan fragment log messages re-classified as debug. * fix, pkt_handlers.c: added explicit trailing '\0' symbol when truncating AS-PATH and BGP community strings due to length constraints. commit 640856640d3ae307776024e6a27c04ec6faca365 Author: paolo <paolo> Date: Tue May 4 11:20:38 2010 +0000 * Building sub-system and directory structure preparations for an upcoming new tee plugin commit e98953c131ed2686d77cfb9eb790420c8b377237 Author: paolo <paolo> Date: Mon May 3 15:55:01 2010 +0000 * Documentation updated * pgsql_plugin.c, PG_create_dyn_table(): PGRES_TUPLES_OK is now considered valid return code in case a SELECT statement is involved (ie. as part of a PL/PGSQL function). Thanks very much to Sergio Charpinel Jr for his support. commit 8ad7fc324de04f5cda261dae9a451655d9bbae60 Author: paolo <paolo> Date: Tue Apr 27 19:25:58 2010 +0000 * Enhanced 802.1ad pmacctd support. While recursing, outer VLAN is always reported as value of the 'vlan' primitive. * Fix, pmacctd: 802.1p was kept integral part of the 'vlan' primitive. Now a 0x0FFF mask is applied in order to return only the VLAN ID. commit 98a4893a8d722e85e3c8db3c226386178fb5d29b Author: paolo <paolo> Date: Wed Apr 21 14:53:35 2010 +0000 * nfprobe, sfprobe: introduced support for export of the BGP next-hop information. Source data selection for BGP next-hop is being linked to [pmacctd_as|uacctd_as] configuration directive. Hence it must be set to 'bgp' in order for this feature to work. commit 8c0f42d8bfa549f94d0ddf262093ff2b6c22a6ea Author: paolo <paolo> Date: Wed Apr 14 14:09:18 2010 +0000 * BGP daemon, bgp_daemon_ipprec: SOL_IP moved to IPPROTO_IP for better portability. Added detection for failure setting IP_TOS socket option. commit 2cb57e61d7ee1e466614f32e71c9788dd30c28a8 Author: paolo <paolo> Date: Wed Apr 14 14:02:15 2010 +0000 * BGP daemon: new bgp_daemon_ipprec feature allows to mark self-originated BGP messages with the supplied IP precedence value. commit ab399ac7aa3d41ad703746ae89dc11f29fe9aad8 Author: paolo <paolo> Date: Fri Apr 9 22:49:46 2010 +0000 * peer_src_ip (IP address/agent ID of the device exporting NetFlow/sFlow datagrams) and peer_dst_ip (BGP next-hop) can now be filled from NetFlow/ sFlow protocols data. To activate, nfacctd_as_new/sfacctd_as_new have to be 'false' (default value), 'true' or 'file'. http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=7a91220ddd284d3608e780db4b1bd0f3dc2d889c http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=4c6402ca27368b58e677f74666008d3168ef577a http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=57894155a04570bb3f225384489e8aadc36dbf6f http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=4e530cb9af2810ec0178e767930da09e6c9e301a http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=793742e4bd8eb3f3ffc021b3fa18481204c99ef3 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=c6dacd2f7a72239bc671f1bd4b8dc830e2194831 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=ab220d3009cd2ca944141d236916be0be732aa08 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=55722c24394c933781be3bb1694f0dede842176d http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=af6ed958ca78c72c32c4e9c1bbf61f22527748c5 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=f265a7246989787bf6e7f16b41d04443e74eb98a http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=37137081a7164948c33773a60e8d564da44fe588 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=71a541a9d1b0a22fb713e4e2202685f95a7f1b5c http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=153385c161772ccfe0477948a485154383b30cd4 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=63303958a75334a428cc810c7d8ce102b1461ae6 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=c2f414358c56463562a105458d7506f614ab73b6 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=822a3362ecfa73b012ecccb1b7210f8d219a8acd http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=173a50ad95b0ea3754a999e27b2665e7c5631bbc http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=eea1241eb3db6951b4c28ed0dbf632acb8e9e3bb http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=77183cd1eddcb5ef546fc569b044c8b2b8e0516c http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=38575ba6e29f1a38faf484172b913472a514f13b http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8411187b37c1d296362f809b6f4a084194046b03 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=e5505ef523c5244a6587211b5b328cf959b17db4 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=a7dfab237d40367d7ced1592938e4da89f18b1f5 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=971a724ecbfb16b916794965f6ed935e3b621eb5 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=f5583e891c2f990abeace71ee2876c5ce241c713 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=9d80774446eded5a2e5dca9d3dfc6deaed9fb93e http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=14cb61af80f9218845c3623f7592372bfb36128f http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=1665eba2b2df847904041f74082975be37d5db19 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=aedbafa9b536e7cd15317e64f0736f0a7e923703 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=65ed7304c7b999d5926ffd8d876192cb1a10c1b9 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=624a176bee6e73c8820b5d8a95cb29cb263add95 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=fe066d4992847826b21b96db005fa0d8329db222 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=84504494b15c224f679436170930511d471f832e http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=640856640d3ae307776024e6a27c04ec6faca365 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=e98953c131ed2686d77cfb9eb790420c8b377237 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8ad7fc324de04f5cda261dae9a451655d9bbae60 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=98a4893a8d722e85e3c8db3c226386178fb5d29b http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=8c0f42d8bfa549f94d0ddf262093ff2b6c22a6ea http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=2cb57e61d7ee1e466614f32e71c9788dd30c28a8 http://suva.vyatta.com/git/?p=pmacct.git;a=commitdiff;h=ab399ac7aa3d41ad703746ae89dc11f29fe9aad8 _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
