projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79cbf44
)
Include current configuration into settings
author
Marcel Holtmann
<marcel@holtmann.org>
Sat, 19 Dec 2009 21:35:58 +0000
(13:35 -0800)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sat, 19 Dec 2009 21:35:58 +0000
(13:35 -0800)
src/service.c
patch
|
blob
|
history
diff --git
a/src/service.c
b/src/service.c
index
0fb4453
..
03f364b
100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-385,10
+385,11
@@
static void apn_changed(struct connman_service *service)
static void append_settings(DBusMessageIter *iter, void *user_data)
{
static void append_settings(DBusMessageIter *iter, void *user_data)
{
-
const char *str = "dhcp"
;
+
struct connman_service *service = user_data
;
- connman_dbus_dict_append_basic(iter, "Method",
- DBUS_TYPE_STRING, &str);
+ if (service->ipconfig != NULL)
+ __connman_ipconfig_append_ipv4(service->ipconfig,
+ iter, "IPv4.");
}
static void settings_changed(struct connman_service *service)
}
static void settings_changed(struct connman_service *service)
@@
-531,10
+532,6
@@
static DBusMessage *get_properties(DBusConnection *conn,
connman_dbus_dict_append_dict(&dict, "Settings",
append_settings, service);
connman_dbus_dict_append_dict(&dict, "Settings",
append_settings, service);
- if (service->ipconfig != NULL)
- __connman_ipconfig_append_ipv4(service->ipconfig,
- &dict, "IPv4.");
-
connman_dbus_dict_close(&array, &dict);
return reply;
connman_dbus_dict_close(&array, &dict);
return reply;