diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-07 02:22:46 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-07 02:22:46 +0000 |
| commit | 768a38de0f1d2c703b619791417304a213c420c2 (patch) | |
| tree | 685ac1ec7b5b9e9991806aea4f7f1c781631d3c3 /package | |
| parent | 3329f8257c58d2314f13e01b539a26e45e25fb1a (diff) | |
fix wprobe-export
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/wprobe/src/exporter/wprobe-export.c | 5 | ||||
| -rw-r--r-- | package/wprobe/src/user/wprobe-lib.c | 3 |
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 } |