Changeset 1567

Timestamp:

01/26/10 04:21:47 (6 months ago)

Author:

marek

Message:

batctl: omit log lines which don't start with the correct tag

All batman-adv log messages start with a distinct tag ("batman-adv:" at the
moment) which we can use to strip the kernel log and only show batman-adv
related messages.

Location:

trunk/batctl

Files:

• functions.c (modified) (2 diffs)
• sys.c (modified) (1 diff)

trunk/batctl/functions.c

@@ -36 +36 @@
 #include "bat-hosts.h"
 
+#define BATMAN_ADV_TAG "batman-adv:"
 
 static struct timeval start_time;
@@ -179 +180 @@
                         break;
 
+                if (read_opt & LOG_MODE) {
+                        /* omit log lines which don't start with the correct tag */
+                        if (strncmp(line_ptr, BATMAN_ADV_TAG, strlen(BATMAN_ADV_TAG)) != 0)
+                                continue;
+                }
+
                 if (!(read_opt & USE_BAT_HOSTS)) {
                         printf("%s", line_ptr);

trunk/batctl/sys.c

@@ -69 +69 @@
                 return read_file("", argv[found_args], read_opt);
         else
-                return read_file("", "/dev/stdin", read_opt);
+                return read_file("", "/proc/self/fd/0", read_opt);
 }