Imported Upstream version 1.35

[platform/upstream/connman.git] / client / dbus_helpers.c

diff --git a/client/dbus_helpers.c b/client/dbus_helpers.c
index 826111f..6ca407d 100644 (file)
--- a/client/dbus_helpers.c
+++ b/client/dbus_helpers.c
@@ -22,12 +22,13 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <glib.h>
 
 #include "input.h"
 #include "dbus_helpers.h"
 
-#define TIMEOUT         60000
+#define TIMEOUT         120000
 
 void __connmanctl_dbus_print(DBusMessageIter *iter, const char *pre,
                const char *dict, const char *sep)
@@ -38,6 +39,7 @@ void __connmanctl_dbus_print(DBusMessageIter *iter, const char *pre,
        dbus_uint16_t u16;
        dbus_uint32_t u;
        dbus_int32_t i;
+       dbus_uint64_t u64;
        double d;
 
        char *str;
@@ -113,6 +115,11 @@ void __connmanctl_dbus_print(DBusMessageIter *iter, const char *pre,
                        fprintf(stdout, "%d", i);
                        break;
 
+               case DBUS_TYPE_UINT64:
+                       dbus_message_iter_get_basic(iter, &u64);
+                       fprintf(stdout, "%"PRIu64, u64);
+                       break;
+
                case DBUS_TYPE_DOUBLE:
                        dbus_message_iter_get_basic(iter, &d);
                        fprintf(stdout, "%f", d);
@@ -145,6 +152,7 @@ static void dbus_method_reply(DBusPendingCall *call, void *user_data)
        __connmanctl_save_rl();
 
        reply = dbus_pending_call_steal_reply(call);
+       dbus_pending_call_unref(call);
        if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
                DBusError err;
 
@@ -213,6 +221,9 @@ static int append_variant(DBusMessageIter *iter, const char *property,
         case DBUS_TYPE_STRING:
                 type_str = DBUS_TYPE_STRING_AS_STRING;
                 break;
+       case DBUS_TYPE_INT32:
+               type_str = DBUS_TYPE_INT32_AS_STRING;
+               break;
        default:
                return -EOPNOTSUPP;
        }