2005-06-23 16:20:56 +02:00
|
|
|
$NetBSD: patch-ak,v 1.3 2005/06/23 14:20:56 seb Exp $
|
Update to version 0.67.
Package changes: bl3ify, record build options, remove obsolete
AUTOMAKE_POST_PATTERNS, support new PostgreSQL feature.
Changes since last packaged version:
* 12-4-2003 flow-tools 0.67 released.
* flow-export: pgsql support from wyu@ateneo.edu
* docs: flow-report: Added description of reports.
* ftlib: ftfil.c - match_end_time() broken - noted by
"Joe Loiacono" <jloiacon@csc.com>
* ftlib: fttag.c - better syntax checking for or-src/dst and set-src/dst
* ftlib: ftlib.h FT_TAG_TYPE_MATCH_NEXTHOP duplicated - flow-tag crash
with next-hop type noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: ftstat.c - broken ip-destination-address-source-count. patch from
"Shigeki Taniguchi" <staniguchi@csc.com>
* flow-fanout: filters not loaded - noted by RAR@syssrc.com
* ftlib: missing function prototypes for ftstat_*, rename bind to binding
to prevent shadowing bind(). patch from Bill Fumerola <billf@mu.org>
* flow-fanout, flow-capture. Process SIGTERM like SIGQUIT so flow-tools
will work better under daemontools - req by
Bernhard Weisshuhn <bkw@weisshuhn.de>
* docs: flow-nfilter and flow-cat TIME/DATE parsing section.
* flow-dscan: drp->flags not updated when loading saved state - patch from
Jon Snyder <jon@pdx.edu>
* flow-dscan: allow concurrent -w and -W, patch from
Dan Thorson <dan.thorson@seagate.com>
* docs: flow-print -f24 - noted by
noted by Christian Bauer <Christian.Bauer@NEFkom.de>
* dist: tag.sym and tag.cfg example files reversed - noted by
* ftlib: ftlib.h - FT_TAG_SET and FT_TAG_OR are broken - patch from
Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftrec.c - add 1005to5 translation - patch from
Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* flow-stat -f0 will try to divide by 0 with an empty flow file
- noted by Mike Hunter <mhunter@ack.Berkeley.EDU>
* flow-capture: -u preserve unherited umask - patch from
Everton da Silva Marques <everton@lab.ipaccess.diveo.net.br>
* flow-receive: remove -m and -A.
* flow-capture: remove -m and -A, functionality is now in xlate -x -X.
* flow-xlate: - config file based now.
* docs: flow-report: note which fields are sortable and what the key
field is.
* flow-capture: accept()'s 3rd arg should be casted to socklen_t*, noted
by Alistair.McGlinchy@marks-and-spencer.com
* docs: flow-nfilter, port is 0..65535 not 0..255 - noted by
Mike Hunter <mhunter@ack.Berkeley.EDU>
* ftlib: ftlib.h - set-{dst,src} and or-{dst,src} constants not correct -
patch from Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftchash.c - ftchash_sort() should not try to sort 0 entry table -
noted by "Shane D." <shane.dawalt@wright.edu>
* flow-import: missing !HAVE_STRSEP compatability - patch from
Alistair.McGlinchy@marks-and-spencer.com
* ftlib: ftstat.c - output path not parsed correctly with leading whitespace
-- noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: fttag.c - src->source dst->destination
* ftlib: fttag.c - ip-address, exporter, interface tag actions, requested by
Tim Irwin <tim@arch.bellsouth.net>
* ftlib: ftsym.c - ftsym_new() should handle null filename - noted by
Celso Alves Vieira <celso@telemar.com.br>
* flow-dscan: buf len 64, not 54 - Anil Madhavapeddy <anil@recoil.org>
2004-04-22 17:33:35 +02:00
|
|
|
|
2005-06-23 16:20:56 +02:00
|
|
|
--- src/flow-export.c.orig 2004-03-31 03:11:14.000000000 +0000
|
Update to version 0.67.
Package changes: bl3ify, record build options, remove obsolete
AUTOMAKE_POST_PATTERNS, support new PostgreSQL feature.
Changes since last packaged version:
* 12-4-2003 flow-tools 0.67 released.
* flow-export: pgsql support from wyu@ateneo.edu
* docs: flow-report: Added description of reports.
* ftlib: ftfil.c - match_end_time() broken - noted by
"Joe Loiacono" <jloiacon@csc.com>
* ftlib: fttag.c - better syntax checking for or-src/dst and set-src/dst
* ftlib: ftlib.h FT_TAG_TYPE_MATCH_NEXTHOP duplicated - flow-tag crash
with next-hop type noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: ftstat.c - broken ip-destination-address-source-count. patch from
"Shigeki Taniguchi" <staniguchi@csc.com>
* flow-fanout: filters not loaded - noted by RAR@syssrc.com
* ftlib: missing function prototypes for ftstat_*, rename bind to binding
to prevent shadowing bind(). patch from Bill Fumerola <billf@mu.org>
* flow-fanout, flow-capture. Process SIGTERM like SIGQUIT so flow-tools
will work better under daemontools - req by
Bernhard Weisshuhn <bkw@weisshuhn.de>
* docs: flow-nfilter and flow-cat TIME/DATE parsing section.
* flow-dscan: drp->flags not updated when loading saved state - patch from
Jon Snyder <jon@pdx.edu>
* flow-dscan: allow concurrent -w and -W, patch from
Dan Thorson <dan.thorson@seagate.com>
* docs: flow-print -f24 - noted by
noted by Christian Bauer <Christian.Bauer@NEFkom.de>
* dist: tag.sym and tag.cfg example files reversed - noted by
* ftlib: ftlib.h - FT_TAG_SET and FT_TAG_OR are broken - patch from
Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftrec.c - add 1005to5 translation - patch from
Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* flow-stat -f0 will try to divide by 0 with an empty flow file
- noted by Mike Hunter <mhunter@ack.Berkeley.EDU>
* flow-capture: -u preserve unherited umask - patch from
Everton da Silva Marques <everton@lab.ipaccess.diveo.net.br>
* flow-receive: remove -m and -A.
* flow-capture: remove -m and -A, functionality is now in xlate -x -X.
* flow-xlate: - config file based now.
* docs: flow-report: note which fields are sortable and what the key
field is.
* flow-capture: accept()'s 3rd arg should be casted to socklen_t*, noted
by Alistair.McGlinchy@marks-and-spencer.com
* docs: flow-nfilter, port is 0..65535 not 0..255 - noted by
Mike Hunter <mhunter@ack.Berkeley.EDU>
* ftlib: ftlib.h - set-{dst,src} and or-{dst,src} constants not correct -
patch from Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftchash.c - ftchash_sort() should not try to sort 0 entry table -
noted by "Shane D." <shane.dawalt@wright.edu>
* flow-import: missing !HAVE_STRSEP compatability - patch from
Alistair.McGlinchy@marks-and-spencer.com
* ftlib: ftstat.c - output path not parsed correctly with leading whitespace
-- noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: fttag.c - src->source dst->destination
* ftlib: fttag.c - ip-address, exporter, interface tag actions, requested by
Tim Irwin <tim@arch.bellsouth.net>
* ftlib: ftsym.c - ftsym_new() should handle null filename - noted by
Celso Alves Vieira <celso@telemar.com.br>
* flow-dscan: buf len 64, not 54 - Anil Madhavapeddy <anil@recoil.org>
2004-04-22 17:33:35 +02:00
|
|
|
+++ src/flow-export.c
|
2005-06-23 16:20:56 +02:00
|
|
|
@@ -865,7 +865,7 @@ int format5(struct ftio *ftio, struct op
|
2005-02-18 11:08:33 +01:00
|
|
|
struct ftver ftv;
|
|
|
|
|
char fields[1024], values[1024], query[3*1024];
|
|
|
|
|
char *rec;
|
|
|
|
|
- char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp, *tmp;
|
|
|
|
|
+ char *db_host, *db_name, *db_table, *db_user, *db_pwd, *tmp;
|
|
|
|
|
char *db_port;
|
|
|
|
|
int len;
|
|
|
|
|
|
2005-06-23 16:20:56 +02:00
|
|
|
@@ -892,7 +892,7 @@ int format5(struct ftio *ftio, struct op
|
2005-02-18 11:08:33 +01:00
|
|
|
db_name = strsep(&tmp, ":");
|
|
|
|
|
db_table = strsep(&tmp, ":");
|
|
|
|
|
|
|
|
|
|
- if (!db_user || !db_pwd || !db_host || !db_tmp || !db_name || !db_table) {
|
|
|
|
|
+ if (!db_user || !db_pwd || !db_host || !db_name || !db_table) {
|
|
|
|
|
fterr_warnx("Missing field in dbaseURI, expecting user:pwd:host:port:name:table.");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-06-23 16:20:56 +02:00
|
|
|
@@ -1200,10 +1200,10 @@ int fmt_xfields_val(char *fmt_buf, char
|
2005-02-18 11:08:33 +01:00
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_EXADDR) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->exaddr)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-23 16:20:56 +02:00
|
|
|
@@ -1258,28 +1258,28 @@ int fmt_xfields_val(char *fmt_buf, char
|
2005-02-18 11:08:33 +01:00
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_SRCADDR) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->srcaddr)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_DSTADDR) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->dstaddr)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_NEXTHOP) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->nexthop)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-23 16:20:56 +02:00
|
|
|
@@ -1376,19 +1376,19 @@ int fmt_xfields_val(char *fmt_buf, char
|
2005-02-18 11:08:33 +01:00
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_PEER_NEXTHOP) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->peer_nexthop)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (xfields & FT_XFIELD_ROUTER_SC) {
|
|
|
|
|
if (comma) fmt_buf[len++] = ',';
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->router_sc)),
|
|
|
|
|
FMT_JUST_LEFT);
|
|
|
|
|
- if (quote) fmt_buf[len++] = '"';
|
|
|
|
|
+ if (quote) fmt_buf[len++] = '\'';
|
|
|
|
|
comma = 1;
|
|
|
|
|
}
|
|
|
|
|
|