mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-23 03:33:34 -04:00
95 lines
3.0 KiB
Plaintext
95 lines
3.0 KiB
Plaintext
$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;
|
|
}
|
|
|