[daemon-fix] fixed querying about name information
[platform/upstream/dbus.git] / tools / dbus-print-message.c
index 43c41c7..75d00ac 100644 (file)
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-print-message.h  Utility function to print out a message
  *
  * Copyright (C) 2003 Philip Blundell <philb@gnu.org>
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-print-message.h"
 
+#include <stdlib.h>
+#include "config.h"
+
 static const char*
 type_to_name (int message_type)
 {
@@ -39,97 +44,366 @@ type_to_name (int message_type)
     }
 }
 
-void
-print_message (DBusMessage *message)
+#define INDENT 3
+
+static void
+indent (int depth)
 {
-  DBusMessageIter iter;
-  const char *sender;
-  int message_type;
+  while (depth-- > 0)
+    printf ("   "); /* INDENT spaces. */
+}
 
-  message_type = dbus_message_get_type (message);
-  sender = dbus_message_get_sender (message); 
+static void
+print_hex (unsigned char *bytes, unsigned int len, int depth)
+{
+  unsigned int i, columns;
 
-  switch (message_type)
+  printf ("array of bytes [\n");
+
+  indent (depth + 1);
+
+  /* Each byte takes 3 cells (two hexits, and a space), except the last one. */
+  columns = (80 - ((depth + 1) * INDENT)) / 3;
+
+  if (columns < 8)
+    columns = 8;
+
+  i = 0;
+
+  while (i < len)
     {
-    case DBUS_MESSAGE_TYPE_METHOD_CALL:
-    case DBUS_MESSAGE_TYPE_SIGNAL:
-      printf ("%s interface=%s; member=%s; sender=%s\n",
-              type_to_name (message_type),
-              dbus_message_get_interface (message),
-              dbus_message_get_member (message),
-              sender ? sender : "(no sender)");
-      break;
-      
-    case DBUS_MESSAGE_TYPE_METHOD_RETURN:
-      printf ("%s; sender=%s\n",
-              type_to_name (message_type),
-              sender ? sender : "(no sender)");
-      break;
+      printf ("%02x", bytes[i]);
+      i++;
 
-    case DBUS_MESSAGE_TYPE_ERROR:
-      printf ("%s name=%s; sender=%s\n",
-              type_to_name (message_type),
-              dbus_message_get_error_name (message),
-              sender ? sender : "(no sender)");
-      break;
+      if (i != len)
+        {
+          if (i % columns == 0)
+            {
+              printf ("\n");
+              indent (depth + 1);
+            }
+          else
+            {
+              printf (" ");
+            }
+        }
+    }
 
-    default:
-      printf ("Message of unknown type %d received\n",
-              message_type);
-      break;
+  printf ("\n");
+  indent (depth);
+  printf ("]\n");
+}
+
+#define DEFAULT_SIZE 100
+
+static void
+print_ay (DBusMessageIter *iter, int depth)
+{
+  /* Not using DBusString because it's not public API. It's 2009, and I'm
+   * manually growing a string chunk by chunk.
+   */
+  unsigned char *bytes = malloc (DEFAULT_SIZE + 1);
+  unsigned int len = 0;
+  unsigned int max = DEFAULT_SIZE;
+  dbus_bool_t all_ascii = TRUE;
+  int current_type;
+
+  while ((current_type = dbus_message_iter_get_arg_type (iter))
+          != DBUS_TYPE_INVALID)
+    {
+      unsigned char val;
+
+      dbus_message_iter_get_basic (iter, &val);
+      bytes[len] = val;
+      len++;
+
+      if (val < 32 || val > 126)
+        all_ascii = FALSE;
+
+      if (len == max)
+        {
+          max *= 2;
+          bytes = realloc (bytes, max + 1);
+        }
+
+      dbus_message_iter_next (iter);
+    }
+
+  if (all_ascii)
+    {
+      bytes[len] = '\0';
+      printf ("array of bytes \"%s\"\n", bytes);
+    }
+  else
+    {
+      print_hex (bytes, len, depth);
     }
-      
-  dbus_message_iter_init (message, &iter);
 
+  free (bytes);
+}
+
+static void
+print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
+{
   do
     {
-      int type = dbus_message_iter_get_arg_type (&iter);
-      char *str;
-      dbus_uint32_t uint32;
-      dbus_int32_t int32;
-      double d;
-      unsigned char byte;
-      dbus_bool_t boolean;
+      int type = dbus_message_iter_get_arg_type (iter);
 
       if (type == DBUS_TYPE_INVALID)
        break;
+      
+      indent(depth);
 
       switch (type)
        {
        case DBUS_TYPE_STRING:
-         str = dbus_message_iter_get_string (&iter);
-         printf ("string:%s\n", str);
-         break;
+         {
+           char *val;
+           dbus_message_iter_get_basic (iter, &val);
+           if (!literal)
+             printf ("string \"");
+           printf ("%s", val);
+           if (!literal)
+             printf ("\"\n");
+           break;
+         }
+
+       case DBUS_TYPE_SIGNATURE:
+         {
+           char *val;
+           dbus_message_iter_get_basic (iter, &val);
+           if (!literal)
+             printf ("signature \"");
+           printf ("%s", val);
+           if (!literal)
+             printf ("\"\n");
+           break;
+         }
+
+       case DBUS_TYPE_OBJECT_PATH:
+         {
+           char *val;
+           dbus_message_iter_get_basic (iter, &val);
+           if (!literal)
+             printf ("object path \"");
+           printf ("%s", val);
+           if (!literal)
+             printf ("\"\n");
+           break;
+         }
+
+       case DBUS_TYPE_INT16:
+         {
+           dbus_int16_t val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("int16 %d\n", val);
+           break;
+         }
+
+       case DBUS_TYPE_UINT16:
+         {
+           dbus_uint16_t val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("uint16 %u\n", val);
+           break;
+         }
 
        case DBUS_TYPE_INT32:
-         int32 = dbus_message_iter_get_int32 (&iter);
-         printf ("int32:%d\n", int32);
-         break;
+         {
+           dbus_int32_t val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("int32 %d\n", val);
+           break;
+         }
 
        case DBUS_TYPE_UINT32:
-         uint32 = dbus_message_iter_get_uint32 (&iter);
-         printf ("int32:%u\n", uint32);
-         break;
+         {
+           dbus_uint32_t val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("uint32 %u\n", val);
+           break;
+         }
+
+       case DBUS_TYPE_INT64:
+         {
+           dbus_int64_t val;
+           dbus_message_iter_get_basic (iter, &val);
+#ifdef DBUS_INT64_PRINTF_MODIFIER
+        printf ("int64 %" DBUS_INT64_PRINTF_MODIFIER "d\n", val);
+#else
+        printf ("int64 (omitted)\n");
+#endif
+           break;
+         }
+
+       case DBUS_TYPE_UINT64:
+         {
+           dbus_uint64_t val;
+           dbus_message_iter_get_basic (iter, &val);
+#ifdef DBUS_INT64_PRINTF_MODIFIER
+        printf ("uint64 %" DBUS_INT64_PRINTF_MODIFIER "u\n", val);
+#else
+        printf ("uint64 (omitted)\n");
+#endif
+           break;
+         }
 
        case DBUS_TYPE_DOUBLE:
-         d = dbus_message_iter_get_double (&iter);
-         printf ("double:%f\n", d);
-         break;
+         {
+           double val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("double %g\n", val);
+           break;
+         }
 
        case DBUS_TYPE_BYTE:
-         byte = dbus_message_iter_get_byte (&iter);
-         printf ("byte:%d\n", byte);
-         break;
+         {
+           unsigned char val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("byte %d\n", val);
+           break;
+         }
 
        case DBUS_TYPE_BOOLEAN:
-         boolean = dbus_message_iter_get_boolean (&iter);
-         printf ("boolean:%s\n", boolean ? "true" : "false");
+         {
+           dbus_bool_t val;
+           dbus_message_iter_get_basic (iter, &val);
+           printf ("boolean %s\n", val ? "true" : "false");
+           break;
+         }
+
+       case DBUS_TYPE_VARIANT:
+         {
+           DBusMessageIter subiter;
+
+           dbus_message_iter_recurse (iter, &subiter);
+
+           printf ("variant ");
+           print_iter (&subiter, literal, depth+1);
+           break;
+         }
+       case DBUS_TYPE_ARRAY:
+         {
+           int current_type;
+           DBusMessageIter subiter;
+
+           dbus_message_iter_recurse (iter, &subiter);
+
+           current_type = dbus_message_iter_get_arg_type (&subiter);
+
+           if (current_type == DBUS_TYPE_BYTE)
+             {
+               print_ay (&subiter, depth);
+               break;
+             }
+
+           printf("array [\n");
+           while (current_type != DBUS_TYPE_INVALID)
+             {
+               print_iter (&subiter, literal, depth+1);
+
+               dbus_message_iter_next (&subiter);
+               current_type = dbus_message_iter_get_arg_type (&subiter);
+
+               if (current_type != DBUS_TYPE_INVALID)
+                 printf (",");
+             }
+           indent(depth);
+           printf("]\n");
+           break;
+         }
+       case DBUS_TYPE_DICT_ENTRY:
+         {
+           DBusMessageIter subiter;
+
+           dbus_message_iter_recurse (iter, &subiter);
+
+           printf("dict entry(\n");
+           print_iter (&subiter, literal, depth+1);
+           dbus_message_iter_next (&subiter);
+           print_iter (&subiter, literal, depth+1);
+           indent(depth);
+           printf(")\n");
+           break;
+         }
+           
+       case DBUS_TYPE_STRUCT:
+         {
+           int current_type;
+           DBusMessageIter subiter;
+
+           dbus_message_iter_recurse (iter, &subiter);
+
+           printf("struct {\n");
+           while ((current_type = dbus_message_iter_get_arg_type (&subiter)) != DBUS_TYPE_INVALID)
+             {
+               print_iter (&subiter, literal, depth+1);
+               dbus_message_iter_next (&subiter);
+               if (dbus_message_iter_get_arg_type (&subiter) != DBUS_TYPE_INVALID)
+                 printf (",");
+             }
+           indent(depth);
+           printf("}\n");
+           break;
+         }
+           
+       default:
+         printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);
+         break;
+       }
+    } while (dbus_message_iter_next (iter));
+}
+
+void
+print_message (DBusMessage *message, dbus_bool_t literal)
+{
+  DBusMessageIter iter;
+  const char *sender;
+  const char *destination;
+  int message_type;
+
+  message_type = dbus_message_get_type (message);
+  sender = dbus_message_get_sender (message);
+  destination = dbus_message_get_destination (message);
+  
+  if (!literal)
+    {
+      printf ("%s sender=%s -> dest=%s",
+             type_to_name (message_type),
+             sender ? sender : "(null sender)",
+             destination ? destination : "(null destination)");
+  
+      switch (message_type)
+       {
+       case DBUS_MESSAGE_TYPE_METHOD_CALL:
+       case DBUS_MESSAGE_TYPE_SIGNAL:
+         printf (" serial=%u path=%s; interface=%s; member=%s\n",
+                  dbus_message_get_serial (message),
+                 dbus_message_get_path (message),
+                 dbus_message_get_interface (message),
+                 dbus_message_get_member (message));
+         break;
+      
+       case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+         printf (" reply_serial=%u\n",
+          dbus_message_get_reply_serial (message));
+         break;
+
+       case DBUS_MESSAGE_TYPE_ERROR:
+         printf (" error_name=%s reply_serial=%u\n",
+                 dbus_message_get_error_name (message),
+          dbus_message_get_reply_serial (message));
          break;
 
        default:
-         printf ("(unknown arg type %d)\n", type);
+         printf ("\n");
          break;
        }
-    } while (dbus_message_iter_next (&iter));
+    }
+
+  dbus_message_iter_init (message, &iter);
+  print_iter (&iter, literal, 1);
+  fflush (stdout);
+  
 }