From 768a38de0f1d2c703b619791417304a213c420c2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Jul 2009 02:22:46 +0000
Subject: fix wprobe-export
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16727 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/wprobe/src/exporter/wprobe-export.c | 5 +++--
package/wprobe/src/user/wprobe-lib.c | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'package')
diff --git a/package/wprobe/src/exporter/wprobe-export.c b/package/wprobe/src/exporter/wprobe-export.c
index b09260692..48be5f36b 100644
--- a/package/wprobe/src/exporter/wprobe-export.c
+++ b/package/wprobe/src/exporter/wprobe-export.c
@@ -194,6 +194,7 @@ int main ( int argc, char **argv )
int port = IPFIX_PORTNO;
int verbose_level = 0;
int opt, i = 10;
+ char *err = NULL;
while ((opt = getopt(argc, argv, "hi:c:p:vstu")) != EOF) {
switch (opt) {
@@ -252,9 +253,9 @@ int main ( int argc, char **argv )
return -1;
}
- dev = wprobe_get_auto(ifname);
+ dev = wprobe_get_auto(ifname, &err);
if (!dev || (list_empty(&dev->global_attr) && list_empty(&dev->link_attr))) {
- fprintf(stderr, "Cannot connect to wprobe on interface '%s'\n", ifname);
+ fprintf(stderr, "Cannot connect to wprobe on interface '%s': %s\n", ifname, (err ? err : "Unknown error"));
return -1;
}
diff --git a/package/wprobe/src/user/wprobe-lib.c b/package/wprobe/src/user/wprobe-lib.c
index a3b0fb5e5..a1a52f205 100644
--- a/package/wprobe/src/user/wprobe-lib.c
+++ b/package/wprobe/src/user/wprobe-lib.c
@@ -795,7 +795,8 @@ wprobe_get_auto(const char *arg, char **err)
free(devstr);
return wprobe_get_dev(arg);
#else
- *err = "Invalid argument";
+ if (err)
+ *err = "Invalid argument";
goto out;
#endif
}
--
cgit v1.2.3