This email list is read-only. Emails sent to this list will be discarded ---------------------------------- include/element.h | 2 +- scripts/dhclient-script.c | 2 ++ scripts/udhcpc-script.c | 16 ++++++++++++++++ src/element.c | 4 ++-- src/network.c | 17 +++++++++++++++-- 5 files changed, 36 insertions(+), 5 deletions(-)
New commits: commit e6de96640ddfad332fa033f98863644c83343c4a Author: Marcel Holtmann <[email protected]> Date: Wed Dec 31 08:47:08 2008 +0100 Handle missing environment variables commit 35475b9c854895dbb365d78d47b93fef97e31267 Author: Marcel Holtmann <[email protected]> Date: Wed Dec 31 08:35:42 2008 +0100 Fix documentation spelling mistakes commit c1ed62089c08b960fd7d16cdaa15e3215710af6c Author: Marcel Holtmann <[email protected]> Date: Wed Dec 31 08:34:14 2008 +0100 Add dbus_connection_flush() to DHCP scripts commit d482ccc485f98416b0df5bbcad97110bc390c35c Author: Marcel Holtmann <[email protected]> Date: Wed Dec 31 08:12:48 2008 +0100 Fix network types for Bluetooth and Cellular devices Diff in this email is a maximum of 400 lines. diff --git a/include/element.h b/include/element.h index afe7b0c..812ac30 100644 --- a/include/element.h +++ b/include/element.h @@ -74,7 +74,7 @@ enum connman_element_subtype { CONNMAN_ELEMENT_SUBTYPE_ETHERNET = 3, CONNMAN_ELEMENT_SUBTYPE_WIFI = 4, CONNMAN_ELEMENT_SUBTYPE_WIMAX = 5, - CONNMAN_ELEMENT_SUBTYPE_MODEM = 6, + CONNMAN_ELEMENT_SUBTYPE_CELLULAR = 6, CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 7, }; diff --git a/scripts/dhclient-script.c b/scripts/dhclient-script.c index 68b755a..bf2316d 100644 --- a/scripts/dhclient-script.c +++ b/scripts/dhclient-script.c @@ -118,6 +118,8 @@ int main(int argc, char *argv[]) if (dbus_connection_send(conn, msg, NULL) == FALSE) fprintf(stderr, "Failed to send message\n"); + dbus_connection_flush(conn); + dbus_message_unref(msg); dbus_connection_unref(conn); diff --git a/scripts/udhcpc-script.c b/scripts/udhcpc-script.c index 0448760..e5ac3e9 100644 --- a/scripts/udhcpc-script.c +++ b/scripts/udhcpc-script.c @@ -51,10 +51,24 @@ int main(int argc, char *argv[]) interface = getenv("interface"); address = getenv("ip"); + if (address == NULL) + address = ""; + netmask = getenv("subnet"); + if (netmask == NULL) + netmask = ""; + broadcast = getenv("broadcast"); + if (broadcast == NULL) + broadcast = ""; + gateway = getenv("router"); + if (gateway == NULL) + gateway = ""; + dns = getenv("dns"); + if (dns == NULL) + dns = ""; dbus_error_init(&error); @@ -89,6 +103,8 @@ int main(int argc, char *argv[]) if (dbus_connection_send(conn, msg, NULL) == FALSE) fprintf(stderr, "Failed to send message\n"); + dbus_connection_flush(conn); + dbus_message_unref(msg); dbus_connection_unref(conn); diff --git a/src/element.c b/src/element.c index 42e4e87..5e79589 100644 --- a/src/element.c +++ b/src/element.c @@ -138,8 +138,8 @@ static const char *subtype2string(enum connman_element_subtype type) return "wifi"; case CONNMAN_ELEMENT_SUBTYPE_WIMAX: return "wimax"; - case CONNMAN_ELEMENT_SUBTYPE_MODEM: - return "modem"; + case CONNMAN_ELEMENT_SUBTYPE_CELLULAR: + return "cellular"; case CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH: return "bluetooth"; } diff --git a/src/network.c b/src/network.c index fe5f399..a54049b 100644 --- a/src/network.c +++ b/src/network.c @@ -256,6 +256,19 @@ struct connman_network *connman_network_create(const char *identifier, network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK; network->element.index = -1; + switch (type) { + case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: + case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: + network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH; + break; + case CONNMAN_NETWORK_TYPE_HSO: + network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_CELLULAR; + break; + default: + network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; + break; + } + network->element.network = network; network->element.destruct = network_destruct; @@ -342,7 +355,7 @@ void connman_network_set_index(struct connman_network *network, int index) /** * connman_network_get_index: - * @device: network structure + * @network: network structure * * Get index number of network */ @@ -353,7 +366,7 @@ int connman_network_get_index(struct connman_network *network) /** * connman_network_set_connected: - * @netowrk: network structure + * @network: network structure * @connected: connected state * * Change connected state of network _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
