diff options
author | Chengyi Zhao <chengyi1.zhao@archermind.com> | 2013-07-11 09:12:01 +0800 |
---|---|---|
committer | Zhang zhengguang <zhengguang.zhang@intel.com> | 2014-07-17 13:01:06 +0800 |
commit | 0093972370906e14d583505e220d6d556d00d8e9 (patch) | |
tree | 30a228824d7e2111cb84b4859cb659b476a83094 | |
parent | 4bc8b61f58ae3b279e72e5bb1192a7f754dc6675 (diff) | |
download | connman-0093972370906e14d583505e220d6d556d00d8e9.tar.gz connman-0093972370906e14d583505e220d6d556d00d8e9.tar.bz2 connman-0093972370906e14d583505e220d6d556d00d8e9.zip |
Tethering: Add open access point support in technology
Change-Id: I86f4a22567f5df2fbd5d0c0c03c6cc5b6fc24a2d
-rw-r--r-- | src/technology.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/technology.c b/src/technology.c index a06efd3a..5c01f617 100644 --- a/src/technology.c +++ b/src/technology.c @@ -245,8 +245,7 @@ static int set_tethering(struct connman_technology *technology, if (!bridge) return -EOPNOTSUPP; - if (technology->type == CONNMAN_SERVICE_TYPE_WIFI && - (!ident || !passphrase)) + if (technology->type == CONNMAN_SERVICE_TYPE_WIFI && (!ident)) return -EINVAL; for (tech_drivers = technology->driver_list; tech_drivers; @@ -912,19 +911,23 @@ static DBusMessage *set_property(DBusConnection *conn, if (technology->type != CONNMAN_SERVICE_TYPE_WIFI) return __connman_error_not_supported(msg); - if (strlen(str) < 8 || strlen(str) > 63) - return __connman_error_passphrase_required(msg); - - if (g_strcmp0(technology->tethering_passphrase, str) != 0) { - g_free(technology->tethering_passphrase); - technology->tethering_passphrase = g_strdup(str); - technology_save(technology); + if (strlen(str) < 8 || strlen(str) > 63) { + if (g_str_equal(str, "")) + technology->tethering_passphrase = NULL; + else + return __connman_error_passphrase_required(msg); + } else { + if (g_strcmp0(technology->tethering_passphrase, str) != 0) { + g_free(technology->tethering_passphrase); + technology->tethering_passphrase = g_strdup(str); + technology_save(technology); - connman_dbus_property_changed_basic(technology->path, - CONNMAN_TECHNOLOGY_INTERFACE, - "TetheringPassphrase", - DBUS_TYPE_STRING, - &technology->tethering_passphrase); + connman_dbus_property_changed_basic(technology->path, + CONNMAN_TECHNOLOGY_INTERFACE, + "TetheringPassphrase", + DBUS_TYPE_STRING, + &technology->tethering_passphrase); + } } } else if (g_str_equal(name, "Powered")) { dbus_bool_t enable; |