b2f5605b10
Package changes: Use PKG_OPTIONS_GROUP framework Add package option 'python' to support the new python scripts flow-rpt2rrd, flow-log2rrd and flow-rptfmt. Changes since last packaged version (0.67): * 5-11-2005 flow-tools 0.68 released. * added flow-rpt2rrd - post process flow-report into RRD's. * added flow-log2rrd - post process logs from * added flow-rptfmt - post process flow-report into readable and HTML. * ftstat.c s/psizr256/psize256/ - uebelacker@tuhh.de * rec_v5->engine_id not set properly in ftdecode.c - baldwinL@mynetwatchman.com * --enable-lfs set flags for large file support - alexbrennen@gmail.com * Added CryptoPAn support to flow-xlate req by Abilene * mailing list archive is available at mail-archive.com req by spork@bway.net * flow-cat.c: progress debug output - weinhold@berbee.com * portability: gcc no longer supports goto label which label is at the end of a compound statement - Andreas Jochens <aj@andaco.de> * flow-stat.c: protect from divize by zero - should only happen on invalid flows - - Espen.Breivik@uninett.no * flow-filter.c: exaddr filter - Espen.Breivik@uninett.no * ftxlate.c: tag-mask eval_tag_mask() not using correct offsets - Cougar <cougar@random.ee> & kgraham@valueclick.com * flow-send: default tx_delay to 0 like flow-fanout - rjd@merit.edu * flow-export: debug should be global - dwatanab@uci.edu * flow-report: path will accept spaces, ie |flow-rpt2rrd -p rrd -k 25 * flow-report: records is in rec1 * flow-fanout: did not set address family for receive fd - noted by fingers@fingers.co.za * docs: add FILES section to man pages * flow-report: -hh to list available reports * flow-report, flow-tag, flow-xlate, flow-nfilter. Run-time variable expansion of the form @VAR or @{VAR:default} for config files. * flow-receive: dropped inline tagging and nfilter support
94 lines
3 KiB
Text
94 lines
3 KiB
Text
$NetBSD: patch-ak,v 1.3 2005/06/23 14:20:56 seb Exp $
|
|
|
|
--- src/flow-export.c.orig 2004-03-31 03:11:14.000000000 +0000
|
|
+++ src/flow-export.c
|
|
@@ -865,7 +865,7 @@ int format5(struct ftio *ftio, struct op
|
|
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;
|
|
|
|
@@ -892,7 +892,7 @@ int format5(struct ftio *ftio, struct op
|
|
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;
|
|
}
|
|
@@ -1200,10 +1200,10 @@ int fmt_xfields_val(char *fmt_buf, char
|
|
|
|
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;
|
|
}
|
|
|
|
@@ -1258,28 +1258,28 @@ int fmt_xfields_val(char *fmt_buf, char
|
|
|
|
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;
|
|
}
|
|
|
|
@@ -1376,19 +1376,19 @@ int fmt_xfields_val(char *fmt_buf, char
|
|
|
|
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;
|
|
}
|
|
|