mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

fix wprobe-export 

SVN-Revision: 16727
This commit is contained in:
Felix Fietkau 2009-07-07 02:22:46 +00:00
parent 05672efde8
commit 5a5f24ac23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/wprobe/src/exporter/wprobe-export.c
View File

@ -194,6 +194,7 @@ int main ( int argc, char **argv )
int port = IPFIX_PORTNO; int port = IPFIX_PORTNO;
int verbose_level = 0; int verbose_level = 0;
int opt, i = 10; int opt, i = 10;
char *err = NULL;
while ((opt = getopt(argc, argv, "hi:c:p:vstu")) != EOF) { while ((opt = getopt(argc, argv, "hi:c:p:vstu")) != EOF) {
switch (opt) { switch (opt) {
@ -252,9 +253,9 @@ int main ( int argc, char **argv )
return -1; 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))) { 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; return -1;
} }

3
package/wprobe/src/user/wprobe-lib.c
View File

@ -795,7 +795,8 @@ wprobe_get_auto(const char *arg, char **err)
free(devstr); free(devstr);
return wprobe_get_dev(arg); return wprobe_get_dev(arg);
#else #else
*err = "Invalid argument"; if (err)
*err = "Invalid argument";
goto out; goto out;
#endif #endif
} }