2007-07-14 02:44:01 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
2003-05-16 20:09:25 +00:00
|
|
|
/* dbus-print-message.h Utility function to print out a message
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2003 Philip Blundell <philb@gnu.org>
|
|
|
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
2009-07-10 19:32:38 -04:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2003-05-16 20:09:25 +00:00
|
|
|
*
|
|
|
|
|
*/
|
2010-03-19 12:36:49 +01:00
|
|
|
|
|
|
|
|
#include <config.h>
|
2003-05-16 20:09:25 +00:00
|
|
|
#include "dbus-print-message.h"
|
|
|
|
|
|
2014-06-27 16:25:23 +01:00
|
|
|
#ifdef DBUS_UNIX
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <sys/un.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
|
#include <netinet/ip.h>
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-10-28 19:40:38 +00:00
|
|
|
#include <stdlib.h>
|
2010-03-22 11:50:24 -04:00
|
|
|
#include "config.h"
|
2009-10-28 19:40:38 +00:00
|
|
|
|
2015-02-13 18:55:31 +00:00
|
|
|
#include "tool-common.h"
|
|
|
|
|
|
2003-08-11 02:11:58 +00:00
|
|
|
static const char*
|
|
|
|
|
type_to_name (int message_type)
|
|
|
|
|
{
|
|
|
|
|
switch (message_type)
|
|
|
|
|
{
|
|
|
|
|
case DBUS_MESSAGE_TYPE_SIGNAL:
|
|
|
|
|
return "signal";
|
|
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_CALL:
|
|
|
|
|
return "method call";
|
|
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
|
|
|
|
|
return "method return";
|
|
|
|
|
case DBUS_MESSAGE_TYPE_ERROR:
|
|
|
|
|
return "error";
|
|
|
|
|
default:
|
|
|
|
|
return "(unknown message type)";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-09 20:58:53 +01:00
|
|
|
#define INDENT 3
|
2006-04-16 18:14:51 +00:00
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
indent (int depth)
|
|
|
|
|
{
|
|
|
|
|
while (depth-- > 0)
|
2009-09-09 20:58:53 +01:00
|
|
|
printf (" "); /* INDENT spaces. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2015-02-13 18:55:31 +00:00
|
|
|
print_hex (const unsigned char *bytes,
|
2015-03-03 21:26:31 +01:00
|
|
|
unsigned int len,
|
2015-02-13 18:55:31 +00:00
|
|
|
int depth)
|
2009-09-09 20:58:53 +01:00
|
|
|
{
|
2010-06-07 15:46:33 +02:00
|
|
|
unsigned int i, columns;
|
2009-09-09 20:58:53 +01:00
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2009-10-28 19:40:38 +00:00
|
|
|
i = 0;
|
2009-09-09 20:58:53 +01:00
|
|
|
|
2009-10-28 19:40:38 +00:00
|
|
|
while (i < len)
|
2009-09-09 20:58:53 +01:00
|
|
|
{
|
2009-10-28 19:40:38 +00:00
|
|
|
printf ("%02x", bytes[i]);
|
|
|
|
|
i++;
|
2009-09-09 20:58:53 +01:00
|
|
|
|
2009-10-28 19:40:38 +00:00
|
|
|
if (i != len)
|
2009-09-09 20:58:53 +01:00
|
|
|
{
|
2009-10-28 19:40:38 +00:00
|
|
|
if (i % columns == 0)
|
2009-09-09 20:58:53 +01:00
|
|
|
{
|
|
|
|
|
printf ("\n");
|
|
|
|
|
indent (depth + 1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf (" ");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf ("\n");
|
|
|
|
|
indent (depth);
|
|
|
|
|
printf ("]\n");
|
2006-04-16 18:14:51 +00:00
|
|
|
}
|
|
|
|
|
|
2009-10-28 19:40:38 +00:00
|
|
|
#define DEFAULT_SIZE 100
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_ay (DBusMessageIter *iter, int depth)
|
|
|
|
|
{
|
2015-02-13 18:55:31 +00:00
|
|
|
/* True if every byte in the bytestring (so far) is printable
|
|
|
|
|
* ASCII, with one exception: the last byte is also allowed to be \0. */
|
2009-10-28 19:40:38 +00:00
|
|
|
dbus_bool_t all_ascii = TRUE;
|
2015-02-13 18:55:31 +00:00
|
|
|
const unsigned char *bytes;
|
|
|
|
|
int len;
|
|
|
|
|
int i;
|
2009-10-28 19:40:38 +00:00
|
|
|
|
2015-02-13 18:55:31 +00:00
|
|
|
dbus_message_iter_get_fixed_array (iter, &bytes, &len);
|
2009-10-28 19:40:38 +00:00
|
|
|
|
2015-02-13 18:55:31 +00:00
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
if ((bytes[i] < 32 || bytes[i] > 126) &&
|
|
|
|
|
(i < len - 1 || bytes[i] != '\0'))
|
2009-10-28 19:40:38 +00:00
|
|
|
{
|
2015-02-13 18:55:31 +00:00
|
|
|
all_ascii = FALSE;
|
|
|
|
|
break;
|
2009-10-28 19:40:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 18:55:31 +00:00
|
|
|
if (all_ascii && len > 0 && bytes[len - 1] == '\0')
|
|
|
|
|
{
|
|
|
|
|
printf ("array of bytes \"%s\" + \\0\n", bytes);
|
|
|
|
|
}
|
|
|
|
|
else if (all_ascii)
|
2009-10-28 19:40:38 +00:00
|
|
|
{
|
2015-02-13 18:55:31 +00:00
|
|
|
unsigned char *copy = dbus_malloc (len + 1);
|
|
|
|
|
|
|
|
|
|
if (copy == NULL)
|
|
|
|
|
tool_oom ("copying bytestring");
|
|
|
|
|
|
|
|
|
|
memcpy (copy, bytes, len);
|
|
|
|
|
copy[len] = '\0';
|
|
|
|
|
printf ("array of bytes \"%s\"\n", copy);
|
|
|
|
|
dbus_free (copy);
|
2009-10-28 19:40:38 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print_hex (bytes, len, depth);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-12 19:03:12 +00:00
|
|
|
#ifdef DBUS_UNIX
|
2014-06-27 16:25:23 +01:00
|
|
|
static void
|
|
|
|
|
print_fd (int fd, int depth)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
struct stat statbuf = {0,};
|
|
|
|
|
union {
|
|
|
|
|
struct sockaddr sa;
|
|
|
|
|
struct sockaddr_storage storage;
|
|
|
|
|
struct sockaddr_un un;
|
|
|
|
|
struct sockaddr_in ipv4;
|
|
|
|
|
struct sockaddr_in6 ipv6;
|
|
|
|
|
} addr, peer;
|
|
|
|
|
char hostip[INET6_ADDRSTRLEN];
|
|
|
|
|
int addrlen = sizeof (addr);
|
|
|
|
|
int peerlen = sizeof (peer);
|
|
|
|
|
int has_peer;
|
|
|
|
|
|
|
|
|
|
/* Don't print the fd number: it is different in every process and since
|
|
|
|
|
* dbus-monitor closes the fd after reading it, the same number would be
|
|
|
|
|
* printed again and again.
|
|
|
|
|
*/
|
|
|
|
|
printf ("file descriptor\n");
|
|
|
|
|
if (fd == -1)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
ret = fstat (fd, &statbuf);
|
|
|
|
|
if (ret == -1)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("inode: %d\n", (int) statbuf.st_ino);
|
|
|
|
|
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("type: ");
|
|
|
|
|
if (S_ISREG(statbuf.st_mode))
|
|
|
|
|
printf ("file\n");
|
|
|
|
|
if (S_ISDIR(statbuf.st_mode))
|
|
|
|
|
printf ("directory\n");
|
|
|
|
|
if (S_ISCHR(statbuf.st_mode))
|
|
|
|
|
printf ("char\n");
|
|
|
|
|
if (S_ISBLK(statbuf.st_mode))
|
|
|
|
|
printf ("block\n");
|
|
|
|
|
if (S_ISFIFO(statbuf.st_mode))
|
|
|
|
|
printf ("fifo\n");
|
|
|
|
|
if (S_ISLNK(statbuf.st_mode))
|
|
|
|
|
printf ("link\n");
|
|
|
|
|
if (S_ISSOCK(statbuf.st_mode))
|
|
|
|
|
printf ("socket\n");
|
|
|
|
|
|
|
|
|
|
/* If it's not a socket, getsockname will just return -1 with errno
|
|
|
|
|
* ENOTSOCK. */
|
|
|
|
|
|
|
|
|
|
memset (&addr, 0, sizeof (addr));
|
|
|
|
|
memset (&peer, 0, sizeof (peer));
|
|
|
|
|
|
|
|
|
|
if (getsockname(fd, &addr.sa, &addrlen))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
has_peer = !getpeername(fd, &peer.sa, &peerlen);
|
|
|
|
|
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("address family: ");
|
|
|
|
|
switch (addr.sa.sa_family)
|
|
|
|
|
{
|
|
|
|
|
case AF_UNIX:
|
|
|
|
|
printf("unix\n");
|
|
|
|
|
if (addr.un.sun_path[0] == '\0')
|
|
|
|
|
{
|
|
|
|
|
/* Abstract socket might not be zero-terminated and length is
|
|
|
|
|
* variable. Who designed this interface?
|
|
|
|
|
* Write the name in the same way as /proc/net/unix
|
|
|
|
|
* See manual page unix(7)
|
|
|
|
|
*/
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("name @%.*s\n",
|
|
|
|
|
(int) (addrlen - sizeof (sa_family_t) - 1),
|
|
|
|
|
&(addr.un.sun_path[1]));
|
|
|
|
|
|
|
|
|
|
if (has_peer)
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("peer @%.*s\n",
|
|
|
|
|
(int) (addrlen - sizeof (sa_family_t) - 1),
|
|
|
|
|
&(addr.un.sun_path[1]));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("name %s\n", addr.un.sun_path);
|
|
|
|
|
if (has_peer)
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("peer %s\n", peer.un.sun_path);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case AF_INET:
|
|
|
|
|
printf ("inet\n");
|
|
|
|
|
if (inet_ntop (AF_INET, &addr.ipv4.sin_addr, hostip, sizeof (hostip)))
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("name %s port %u\n", hostip, ntohs (addr.ipv4.sin_port));
|
|
|
|
|
}
|
|
|
|
|
if (has_peer && inet_ntop (AF_INET, &peer.ipv4.sin_addr, hostip, sizeof (hostip)))
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("peer %s port %u\n", hostip, ntohs (peer.ipv4.sin_port));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
#ifdef AF_INET6
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
printf ("inet6\n");
|
|
|
|
|
if (inet_ntop (AF_INET6, &addr.ipv6.sin6_addr, hostip, sizeof (hostip)))
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("name %s port %u\n", hostip, ntohs (addr.ipv6.sin6_port));
|
|
|
|
|
}
|
|
|
|
|
if (has_peer && inet_ntop (AF_INET6, &peer.ipv6.sin6_addr, hostip, sizeof (hostip)))
|
|
|
|
|
{
|
|
|
|
|
indent (depth+1);
|
|
|
|
|
printf ("peer %s port %u\n", hostip, ntohs (peer.ipv6.sin6_port));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef AF_BLUETOOTH
|
|
|
|
|
case AF_BLUETOOTH:
|
|
|
|
|
printf ("bluetooth\n");
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
printf ("unknown (%d)\n", addr.sa.sa_family);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-03-12 19:03:12 +00:00
|
|
|
#endif
|
2014-06-27 16:25:23 +01:00
|
|
|
|
2005-05-11 18:48:24 +00:00
|
|
|
static void
|
2005-07-06 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
Delete in favor of dbus_g_proxy_begin_call and
dbus_g_proxy_cancel_call.
(DBusGProxyCall, DBusGProxyCallNotify): New.
(dbus_g_proxy_begin_call): Change prototype to take callback, user
data, and destroy function. This replaces
dbus_g_pending_call_set_notify.
(dbus_g_proxy_cancel_call): Prototype.
(DBusGAsyncData): Delete, shouldn't be needed anymore.
* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
pending_calls map.
(struct _DBusGProxyManager): Add bus_proxy member, which is an
internal proxy for calls to the bus. Remove
pending_nameowner_calls, now the internal proxy keeps track.
(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
pending_nameowner_calls.
(got_name_owner_cb): Update prototype, and use
dbus_g_proxy_end_call.
(got_name_owner_cb): Remove reference to pending_nameowner_calls.
(dbus_g_proxy_manager_register): Delete directly libdbus code in
favor of using internal proxy.
(dbus_g_proxy_manager_unregister): Update to use
dbus_g_proxy_cancel_call for any pending GetNameOwner call.
(dbus_g_proxy_init): Initialize pending calls map.
(dbus_g_proxy_constructor): New.
(dbus_g_proxy_class_init): Add get/set property functions,
constructor, and add NAME, PATH, and INTERFACE properties.
(cancel_pending_call): New function.
(dbus_g_proxy_dispose): Iterate over any outstanding calls and
cancel them.
(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
(GPendingNotifyClosure): New structure.
(d_pending_call_notify, d_pending_call_free): Moved here from
dbus-glib.c.
(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
ordering.
(manager_begin_bus_call): New internal function for talking to
internal bus proxy.
(dbus_g_proxy_new): Construct object using GObjet properties.
(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
Create closure of same, and insert call into map of pending calls.
(dbus_g_proxy_end_call_internal): Take call id instead of pending
call. Look up pending call in current set. Remove it when we've
completed.
(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
(dbus_g_proxy_begin_call): Change API to take callback, user data,
and destroy function directly.
(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
(dbus_g_proxy_call): Invoke with NULL callback.
(dbus_g_proxy_cancel_call): New function, replaces
dbus_g_pending_call_cancel.
* glib/dbus-gparser.c (validate_signature): Fix call to
dbus_set_g_error.
* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
New quark for attaching metadata to GType.
(info_hash): Delete.
(lookup_object_info): Look up using quark.
(dbus_g_object_type_install_info): Check that a type is classed,
not that it's an object. Also just install type data using quark
instead of using global hash.
* glib/dbus-glib.c (dbus_g_pending_call_ref)
(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
(GPendingNotifyClosure): Delete.
(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.
* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
client method generation until we can fix it...
* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
(load_from_service_thread_func): Ditto.
* tools/dbus-names-model.c (struct NamesModel): Hold
DBusGProxyCall.
(have_names_notify): Update prototype, use
dbus_g_proxy_cancel_call.
(names_model_reload): Update for new dbus_g_proxy_begin_call API.
* tools/dbus-monitor.c (filter_func): Update for print_message
API change.
* test/glib/test-dbus-glib.c: Add more tests for async
invocations. Update many begin_call/end_call pairs to just use
dbus_g_proxy_call.
* tools/dbus-send.c (main): Add --print-reply=literal mode. This
allows us to dump print-introspect.c.
* tools/dbus-print-message.h (print_message): Add literal argument
to print_message which is intended to allow printing arguments without
metadata like "string=".
* tools/dbus-print-message.c (print_iter): Add literal argument.
(print_message): Allow printing string messages literally.
2005-07-06 21:27:53 +00:00
|
|
|
print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
|
2005-05-11 18:48:24 +00:00
|
|
|
{
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int type = dbus_message_iter_get_arg_type (iter);
|
|
|
|
|
|
|
|
|
|
if (type == DBUS_TYPE_INVALID)
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
2006-04-16 18:14:51 +00:00
|
|
|
|
|
|
|
|
indent(depth);
|
2005-05-11 18:48:24 +00:00
|
|
|
|
|
|
|
|
switch (type)
|
2015-02-17 08:17:00 +01:00
|
|
|
{
|
|
|
|
|
case DBUS_TYPE_STRING:
|
|
|
|
|
{
|
|
|
|
|
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:
|
|
|
|
|
{
|
|
|
|
|
dbus_int32_t val;
|
|
|
|
|
dbus_message_iter_get_basic (iter, &val);
|
|
|
|
|
printf ("int32 %d\n", val);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case DBUS_TYPE_UINT32:
|
|
|
|
|
{
|
|
|
|
|
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);
|
2010-03-22 11:50:24 -04:00
|
|
|
#ifdef DBUS_INT64_PRINTF_MODIFIER
|
2010-03-22 14:33:37 -04:00
|
|
|
printf ("int64 %" DBUS_INT64_PRINTF_MODIFIER "d\n", val);
|
|
|
|
|
#else
|
|
|
|
|
printf ("int64 (omitted)\n");
|
2010-03-22 11:50:24 -04:00
|
|
|
#endif
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
|
|
|
|
}
|
2006-04-16 18:14:51 +00:00
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
case DBUS_TYPE_UINT64:
|
|
|
|
|
{
|
|
|
|
|
dbus_uint64_t val;
|
|
|
|
|
dbus_message_iter_get_basic (iter, &val);
|
2010-03-22 11:50:24 -04:00
|
|
|
#ifdef DBUS_INT64_PRINTF_MODIFIER
|
2010-03-22 14:33:37 -04:00
|
|
|
printf ("uint64 %" DBUS_INT64_PRINTF_MODIFIER "u\n", val);
|
|
|
|
|
#else
|
|
|
|
|
printf ("uint64 (omitted)\n");
|
2010-03-22 11:50:24 -04:00
|
|
|
#endif
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case DBUS_TYPE_DOUBLE:
|
|
|
|
|
{
|
|
|
|
|
double val;
|
|
|
|
|
dbus_message_iter_get_basic (iter, &val);
|
|
|
|
|
printf ("double %g\n", val);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case DBUS_TYPE_BYTE:
|
|
|
|
|
{
|
|
|
|
|
unsigned char val;
|
|
|
|
|
dbus_message_iter_get_basic (iter, &val);
|
|
|
|
|
printf ("byte %d\n", val);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case DBUS_TYPE_BOOLEAN:
|
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-04 12:11:20 +00:00
|
|
|
#ifdef DBUS_UNIX
|
2015-02-17 08:17:00 +01:00
|
|
|
case DBUS_TYPE_UNIX_FD:
|
|
|
|
|
{
|
|
|
|
|
int fd;
|
|
|
|
|
dbus_message_iter_get_basic (iter, &fd);
|
|
|
|
|
|
|
|
|
|
print_fd (fd, depth+1);
|
2014-06-27 16:33:39 +01:00
|
|
|
|
|
|
|
|
/* dbus_message_iter_get_basic() duplicated the fd, we need to
|
|
|
|
|
* close it after use. The original fd will be closed when the
|
|
|
|
|
* DBusMessage is released.
|
|
|
|
|
*/
|
|
|
|
|
close (fd);
|
|
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
|
|
|
|
}
|
2015-03-04 12:11:20 +00:00
|
|
|
#endif
|
2013-10-18 13:46:45 +13:00
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
default:
|
|
|
|
|
printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2005-05-11 18:48:24 +00:00
|
|
|
} while (dbus_message_iter_next (iter));
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-16 20:09:25 +00:00
|
|
|
void
|
2015-02-23 22:00:46 +01:00
|
|
|
print_message (DBusMessage *message, dbus_bool_t literal, long sec, long usec)
|
2003-05-16 20:09:25 +00:00
|
|
|
{
|
|
|
|
|
DBusMessageIter iter;
|
|
|
|
|
const char *sender;
|
2005-01-30 07:44:08 +00:00
|
|
|
const char *destination;
|
2003-08-11 02:11:58 +00:00
|
|
|
int message_type;
|
2003-05-16 20:09:25 +00:00
|
|
|
|
2003-08-11 02:11:58 +00:00
|
|
|
message_type = dbus_message_get_type (message);
|
2005-01-30 07:44:08 +00:00
|
|
|
sender = dbus_message_get_sender (message);
|
|
|
|
|
destination = dbus_message_get_destination (message);
|
2005-07-06 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
Delete in favor of dbus_g_proxy_begin_call and
dbus_g_proxy_cancel_call.
(DBusGProxyCall, DBusGProxyCallNotify): New.
(dbus_g_proxy_begin_call): Change prototype to take callback, user
data, and destroy function. This replaces
dbus_g_pending_call_set_notify.
(dbus_g_proxy_cancel_call): Prototype.
(DBusGAsyncData): Delete, shouldn't be needed anymore.
* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
pending_calls map.
(struct _DBusGProxyManager): Add bus_proxy member, which is an
internal proxy for calls to the bus. Remove
pending_nameowner_calls, now the internal proxy keeps track.
(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
pending_nameowner_calls.
(got_name_owner_cb): Update prototype, and use
dbus_g_proxy_end_call.
(got_name_owner_cb): Remove reference to pending_nameowner_calls.
(dbus_g_proxy_manager_register): Delete directly libdbus code in
favor of using internal proxy.
(dbus_g_proxy_manager_unregister): Update to use
dbus_g_proxy_cancel_call for any pending GetNameOwner call.
(dbus_g_proxy_init): Initialize pending calls map.
(dbus_g_proxy_constructor): New.
(dbus_g_proxy_class_init): Add get/set property functions,
constructor, and add NAME, PATH, and INTERFACE properties.
(cancel_pending_call): New function.
(dbus_g_proxy_dispose): Iterate over any outstanding calls and
cancel them.
(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
(GPendingNotifyClosure): New structure.
(d_pending_call_notify, d_pending_call_free): Moved here from
dbus-glib.c.
(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
ordering.
(manager_begin_bus_call): New internal function for talking to
internal bus proxy.
(dbus_g_proxy_new): Construct object using GObjet properties.
(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
Create closure of same, and insert call into map of pending calls.
(dbus_g_proxy_end_call_internal): Take call id instead of pending
call. Look up pending call in current set. Remove it when we've
completed.
(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
(dbus_g_proxy_begin_call): Change API to take callback, user data,
and destroy function directly.
(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
(dbus_g_proxy_call): Invoke with NULL callback.
(dbus_g_proxy_cancel_call): New function, replaces
dbus_g_pending_call_cancel.
* glib/dbus-gparser.c (validate_signature): Fix call to
dbus_set_g_error.
* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
New quark for attaching metadata to GType.
(info_hash): Delete.
(lookup_object_info): Look up using quark.
(dbus_g_object_type_install_info): Check that a type is classed,
not that it's an object. Also just install type data using quark
instead of using global hash.
* glib/dbus-glib.c (dbus_g_pending_call_ref)
(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
(GPendingNotifyClosure): Delete.
(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.
* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
client method generation until we can fix it...
* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
(load_from_service_thread_func): Ditto.
* tools/dbus-names-model.c (struct NamesModel): Hold
DBusGProxyCall.
(have_names_notify): Update prototype, use
dbus_g_proxy_cancel_call.
(names_model_reload): Update for new dbus_g_proxy_begin_call API.
* tools/dbus-monitor.c (filter_func): Update for print_message
API change.
* test/glib/test-dbus-glib.c: Add more tests for async
invocations. Update many begin_call/end_call pairs to just use
dbus_g_proxy_call.
* tools/dbus-send.c (main): Add --print-reply=literal mode. This
allows us to dump print-introspect.c.
* tools/dbus-print-message.h (print_message): Add literal argument
to print_message which is intended to allow printing arguments without
metadata like "string=".
* tools/dbus-print-message.c (print_iter): Add literal argument.
(print_message): Allow printing string messages literally.
2005-07-06 21:27:53 +00:00
|
|
|
|
|
|
|
|
if (!literal)
|
2003-08-18 22:43:30 +00:00
|
|
|
{
|
2015-02-23 22:00:46 +01:00
|
|
|
if (sec != 0 || usec != 0)
|
|
|
|
|
{
|
2015-02-17 08:26:54 +01:00
|
|
|
printf ("%s time=%ld.%06ld sender=%s -> destination=%s",
|
2015-02-23 22:00:46 +01:00
|
|
|
type_to_name (message_type), sec, usec,
|
|
|
|
|
sender ? sender : "(null sender)",
|
|
|
|
|
destination ? destination : "(null destination)");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2015-02-17 08:26:54 +01:00
|
|
|
printf ("%s sender=%s -> destination=%s",
|
2015-02-23 22:00:46 +01:00
|
|
|
type_to_name (message_type),
|
|
|
|
|
sender ? sender : "(null sender)",
|
|
|
|
|
destination ? destination : "(null destination)");
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-06 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
Delete in favor of dbus_g_proxy_begin_call and
dbus_g_proxy_cancel_call.
(DBusGProxyCall, DBusGProxyCallNotify): New.
(dbus_g_proxy_begin_call): Change prototype to take callback, user
data, and destroy function. This replaces
dbus_g_pending_call_set_notify.
(dbus_g_proxy_cancel_call): Prototype.
(DBusGAsyncData): Delete, shouldn't be needed anymore.
* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
pending_calls map.
(struct _DBusGProxyManager): Add bus_proxy member, which is an
internal proxy for calls to the bus. Remove
pending_nameowner_calls, now the internal proxy keeps track.
(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
pending_nameowner_calls.
(got_name_owner_cb): Update prototype, and use
dbus_g_proxy_end_call.
(got_name_owner_cb): Remove reference to pending_nameowner_calls.
(dbus_g_proxy_manager_register): Delete directly libdbus code in
favor of using internal proxy.
(dbus_g_proxy_manager_unregister): Update to use
dbus_g_proxy_cancel_call for any pending GetNameOwner call.
(dbus_g_proxy_init): Initialize pending calls map.
(dbus_g_proxy_constructor): New.
(dbus_g_proxy_class_init): Add get/set property functions,
constructor, and add NAME, PATH, and INTERFACE properties.
(cancel_pending_call): New function.
(dbus_g_proxy_dispose): Iterate over any outstanding calls and
cancel them.
(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
(GPendingNotifyClosure): New structure.
(d_pending_call_notify, d_pending_call_free): Moved here from
dbus-glib.c.
(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
ordering.
(manager_begin_bus_call): New internal function for talking to
internal bus proxy.
(dbus_g_proxy_new): Construct object using GObjet properties.
(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
Create closure of same, and insert call into map of pending calls.
(dbus_g_proxy_end_call_internal): Take call id instead of pending
call. Look up pending call in current set. Remove it when we've
completed.
(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
(dbus_g_proxy_begin_call): Change API to take callback, user data,
and destroy function directly.
(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
(dbus_g_proxy_call): Invoke with NULL callback.
(dbus_g_proxy_cancel_call): New function, replaces
dbus_g_pending_call_cancel.
* glib/dbus-gparser.c (validate_signature): Fix call to
dbus_set_g_error.
* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
New quark for attaching metadata to GType.
(info_hash): Delete.
(lookup_object_info): Look up using quark.
(dbus_g_object_type_install_info): Check that a type is classed,
not that it's an object. Also just install type data using quark
instead of using global hash.
* glib/dbus-glib.c (dbus_g_pending_call_ref)
(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
(GPendingNotifyClosure): Delete.
(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.
* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
client method generation until we can fix it...
* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
(load_from_service_thread_func): Ditto.
* tools/dbus-names-model.c (struct NamesModel): Hold
DBusGProxyCall.
(have_names_notify): Update prototype, use
dbus_g_proxy_cancel_call.
(names_model_reload): Update for new dbus_g_proxy_begin_call API.
* tools/dbus-monitor.c (filter_func): Update for print_message
API change.
* test/glib/test-dbus-glib.c: Add more tests for async
invocations. Update many begin_call/end_call pairs to just use
dbus_g_proxy_call.
* tools/dbus-send.c (main): Add --print-reply=literal mode. This
allows us to dump print-introspect.c.
* tools/dbus-print-message.h (print_message): Add literal argument
to print_message which is intended to allow printing arguments without
metadata like "string=".
* tools/dbus-print-message.c (print_iter): Add literal argument.
(print_message): Allow printing string messages literally.
2005-07-06 21:27:53 +00:00
|
|
|
switch (message_type)
|
2015-02-17 08:17:00 +01:00
|
|
|
{
|
|
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_CALL:
|
|
|
|
|
case DBUS_MESSAGE_TYPE_SIGNAL:
|
|
|
|
|
printf (" serial=%u path=%s; interface=%s; member=%s\n",
|
2008-08-29 08:48:45 -04:00
|
|
|
dbus_message_get_serial (message),
|
2015-02-17 08:17:00 +01:00
|
|
|
dbus_message_get_path (message),
|
|
|
|
|
dbus_message_get_interface (message),
|
|
|
|
|
dbus_message_get_member (message));
|
|
|
|
|
break;
|
2003-08-18 22:43:30 +00:00
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
|
2015-02-17 08:38:44 +01:00
|
|
|
printf (" serial=%u reply_serial=%u\n",
|
|
|
|
|
dbus_message_get_serial (message),
|
2007-03-10 19:52:30 +00:00
|
|
|
dbus_message_get_reply_serial (message));
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
2003-08-18 22:43:30 +00:00
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
case DBUS_MESSAGE_TYPE_ERROR:
|
|
|
|
|
printf (" error_name=%s reply_serial=%u\n",
|
|
|
|
|
dbus_message_get_error_name (message),
|
2007-03-10 19:52:30 +00:00
|
|
|
dbus_message_get_reply_serial (message));
|
2015-02-17 08:17:00 +01:00
|
|
|
break;
|
2003-08-18 22:43:30 +00:00
|
|
|
|
2015-02-17 08:17:00 +01:00
|
|
|
default:
|
|
|
|
|
printf ("\n");
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-08-18 22:43:30 +00:00
|
|
|
}
|
2003-05-16 20:09:25 +00:00
|
|
|
|
2005-01-30 07:44:08 +00:00
|
|
|
dbus_message_iter_init (message, &iter);
|
2005-07-06 Colin Walters <walters@verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
Delete in favor of dbus_g_proxy_begin_call and
dbus_g_proxy_cancel_call.
(DBusGProxyCall, DBusGProxyCallNotify): New.
(dbus_g_proxy_begin_call): Change prototype to take callback, user
data, and destroy function. This replaces
dbus_g_pending_call_set_notify.
(dbus_g_proxy_cancel_call): Prototype.
(DBusGAsyncData): Delete, shouldn't be needed anymore.
* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
pending_calls map.
(struct _DBusGProxyManager): Add bus_proxy member, which is an
internal proxy for calls to the bus. Remove
pending_nameowner_calls, now the internal proxy keeps track.
(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
pending_nameowner_calls.
(got_name_owner_cb): Update prototype, and use
dbus_g_proxy_end_call.
(got_name_owner_cb): Remove reference to pending_nameowner_calls.
(dbus_g_proxy_manager_register): Delete directly libdbus code in
favor of using internal proxy.
(dbus_g_proxy_manager_unregister): Update to use
dbus_g_proxy_cancel_call for any pending GetNameOwner call.
(dbus_g_proxy_init): Initialize pending calls map.
(dbus_g_proxy_constructor): New.
(dbus_g_proxy_class_init): Add get/set property functions,
constructor, and add NAME, PATH, and INTERFACE properties.
(cancel_pending_call): New function.
(dbus_g_proxy_dispose): Iterate over any outstanding calls and
cancel them.
(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
(GPendingNotifyClosure): New structure.
(d_pending_call_notify, d_pending_call_free): Moved here from
dbus-glib.c.
(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
ordering.
(manager_begin_bus_call): New internal function for talking to
internal bus proxy.
(dbus_g_proxy_new): Construct object using GObjet properties.
(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
Create closure of same, and insert call into map of pending calls.
(dbus_g_proxy_end_call_internal): Take call id instead of pending
call. Look up pending call in current set. Remove it when we've
completed.
(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
(dbus_g_proxy_begin_call): Change API to take callback, user data,
and destroy function directly.
(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
(dbus_g_proxy_call): Invoke with NULL callback.
(dbus_g_proxy_cancel_call): New function, replaces
dbus_g_pending_call_cancel.
* glib/dbus-gparser.c (validate_signature): Fix call to
dbus_set_g_error.
* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
New quark for attaching metadata to GType.
(info_hash): Delete.
(lookup_object_info): Look up using quark.
(dbus_g_object_type_install_info): Check that a type is classed,
not that it's an object. Also just install type data using quark
instead of using global hash.
* glib/dbus-glib.c (dbus_g_pending_call_ref)
(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
(GPendingNotifyClosure): Delete.
(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.
* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
client method generation until we can fix it...
* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
(load_from_service_thread_func): Ditto.
* tools/dbus-names-model.c (struct NamesModel): Hold
DBusGProxyCall.
(have_names_notify): Update prototype, use
dbus_g_proxy_cancel_call.
(names_model_reload): Update for new dbus_g_proxy_begin_call API.
* tools/dbus-monitor.c (filter_func): Update for print_message
API change.
* test/glib/test-dbus-glib.c: Add more tests for async
invocations. Update many begin_call/end_call pairs to just use
dbus_g_proxy_call.
* tools/dbus-send.c (main): Add --print-reply=literal mode. This
allows us to dump print-introspect.c.
* tools/dbus-print-message.h (print_message): Add literal argument
to print_message which is intended to allow printing arguments without
metadata like "string=".
* tools/dbus-print-message.c (print_iter): Add literal argument.
(print_message): Allow printing string messages literally.
2005-07-06 21:27:53 +00:00
|
|
|
print_iter (&iter, literal, 1);
|
2005-08-26 15:41:31 +00:00
|
|
|
fflush (stdout);
|
2005-01-30 07:44:08 +00:00
|
|
|
|
2003-05-16 20:09:25 +00:00
|
|
|
}
|
|
|
|
|
|