aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-07-07 02:22:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-07-07 02:22:46 +0000
commit5a5f24ac230a0cc8b885858134c1c219b77954f8 (patch)
treeded7a80db667a1ccedcca9076bde24105e2e8978
parent05672efde88459824d446feade3f0f824b9e535a (diff)
downloadupstream-5a5f24ac230a0cc8b885858134c1c219b77954f8.tar.gz
upstream-5a5f24ac230a0cc8b885858134c1c219b77954f8.tar.bz2
upstream-5a5f24ac230a0cc8b885858134c1c219b77954f8.zip
fix wprobe-export
SVN-Revision: 16727
-rw-r--r--package/wprobe/src/exporter/wprobe-export.c5
-rw-r--r--package/wprobe/src/user/wprobe-lib.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/package/wprobe/src/exporter/wprobe-export.c b/package/wprobe/src/exporter/wprobe-export.c
index b092606920..48be5f36bc 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 a3b0fb5e5e..a1a52f2054 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
}