Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / tools / dbus-monitor.c

diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index 41a7039..a4b5478 100644 (file)
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -35,6 +35,8 @@
 
 #include "dbus-print-message.h"
 
+#define EAVESDROPPING_RULE "eavesdrop=true"
+
 #ifdef DBUS_WIN
 
 /* gettimeofday is not defined on windows */
@@ -44,7 +46,10 @@
 #ifdef DBUS_WINCE
 
 #ifndef _IOLBF
-#define _IOLBF 1
+#define _IOLBF 0x40
+#endif
+#ifndef _IONBF
+#define _IONBF 0x04
 #endif
 
 void
@@ -73,6 +78,13 @@ gettimeofday (struct timeval *__p,
 }
 #endif
 
+inline static void
+oom (const char *doing)
+{
+  fprintf (stderr, "OOM while %s\n", doing);
+  exit (1);
+}
+
 static DBusHandlerResult
 monitor_filter_func (DBusConnection     *connection,
                     DBusMessage        *message,
@@ -92,7 +104,11 @@ monitor_filter_func (DBusConnection     *connection,
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
+#ifdef __APPLE__
+#define PROFILE_TIMED_FORMAT "%s\t%lu\t%d"
+#else
 #define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
+#endif
 #define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
 
 typedef enum
@@ -208,12 +224,19 @@ usage (char *name, int ecode)
   exit (ecode);
 }
 
-static dbus_bool_t sigint_received = FALSE;
-
 static void
-sigint_handler (int signum)
+only_one_type (dbus_bool_t *seen_bus_type,
+               char        *name)
 {
-  sigint_received = TRUE;
+  if (*seen_bus_type)
+    {
+      fprintf (stderr, "I only support monitoring one bus at a time!\n");
+      usage (name, 1);
+    }
+  else
+    {
+      *seen_bus_type = TRUE;
+    }
 }
 
 int
@@ -224,6 +247,7 @@ main (int argc, char *argv[])
   DBusBusType type = DBUS_BUS_SESSION;
   DBusHandleMessageFunction filter_func = monitor_filter_func;
   char *address = NULL;
+  dbus_bool_t seen_bus_type = FALSE;
   
   int i = 0, j = 0, numFilters = 0;
   char **filters = NULL;
@@ -232,26 +256,39 @@ main (int argc, char *argv[])
    * do dbus-monitor > file, then send SIGINT via Control-C, they
    * don't lose the last chunk of messages.
    */
+
+#ifdef DBUS_WIN
+  setvbuf (stdout, NULL, _IONBF, 0);
+#else
   setvbuf (stdout, NULL, _IOLBF, 0);
+#endif
 
   for (i = 1; i < argc; i++)
     {
       char *arg = argv[i];
 
       if (!strcmp (arg, "--system"))
-       type = DBUS_BUS_SYSTEM;
+        {
+          only_one_type (&seen_bus_type, argv[0]);
+          type = DBUS_BUS_SYSTEM;
+        }
       else if (!strcmp (arg, "--session"))
-       type = DBUS_BUS_SESSION;
+        {
+          only_one_type (&seen_bus_type, argv[0]);
+          type = DBUS_BUS_SESSION;
+        }
       else if (!strcmp (arg, "--address"))
-       {
-         if (i+1 < argc)
-           {
-             address = argv[i+1];
-             i++;
-           }
-         else
-           usage (argv[0], 1);
-       }
+        {
+          only_one_type (&seen_bus_type, argv[0]);
+
+          if (i+1 < argc)
+            {
+              address = argv[i+1];
+              i++;
+            }
+          else
+            usage (argv[0], 1);
+        }
       else if (!strcmp (arg, "--help"))
        usage (argv[0], 0);
       else if (!strcmp (arg, "--monitor"))
@@ -263,11 +300,21 @@ main (int argc, char *argv[])
       else if (arg[0] == '-')
        usage (argv[0], 1);
       else {
-       numFilters++;
-       filters = (char **)realloc(filters, numFilters * sizeof(char *));
-       filters[j] = (char *)malloc((strlen(arg) + 1) * sizeof(char *));
-       snprintf(filters[j], strlen(arg) + 1, "%s", arg);
-       j++;
+          unsigned int filter_len;
+          numFilters++;
+          /* Prepend a rule (and a comma) to enable the monitor to eavesdrop.
+           * Prepending allows the user to add eavesdrop=false at command line
+           * in order to disable eavesdropping when needed */
+          filter_len = strlen (EAVESDROPPING_RULE) + 1 + strlen (arg) + 1;
+
+          filters = (char **) realloc (filters, numFilters * sizeof (char *));
+          if (filters == NULL)
+            oom ("adding a new filter slot");
+          filters[j] = (char *) malloc (filter_len * sizeof (char *));
+          if (filters[j] == NULL)
+            oom ("adding a new filter");
+          snprintf (filters[j], filter_len, "%s,%s", EAVESDROPPING_RULE, arg);
+          j++;
       }
     }
 
@@ -333,22 +380,22 @@ main (int argc, char *argv[])
   else
     {
       dbus_bus_add_match (connection,
-                         "type='signal'",
+                         EAVESDROPPING_RULE ",type='signal'",
                          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-                         "type='method_call'",
+                         EAVESDROPPING_RULE ",type='method_call'",
                          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-                         "type='method_return'",
+                         EAVESDROPPING_RULE ",type='method_return'",
                          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-                         "type='error'",
+                         EAVESDROPPING_RULE ",type='error'",
                          &error);
       if (dbus_error_is_set (&error))
         goto lose;