fix wprobe-export

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16727 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/wprobe/src/exporter/wprobe-export.c b/package/wprobe/src/exporter/wprobe-export.c
index b09260692047b0128089dd199b0b4008c28eb9cd..48be5f36bcc4218ff77632ccb942abd013edab10 100644 (file)
--- 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 a3b0fb5e5e21dd73618905fa48ea3e103b2d9317..a1a52f2054c25f8366fb9b1e4584a3e475764beb 100644 (file)
--- 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
        }