Merge the logic in __connman_service_add_passphrase into the
passphrase verification function as there is no use of an additional
function indirection.
---
src/connman.h | 2 --
src/network.c | 2 +-
src/service.c | 40 +++++++++++-----------------------------
3 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 9fecb28..4262d2e 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -95,8 +95,6 @@ struct connman_peer;
void __connman_agent_cancel(struct connman_service *service);
-int __connman_service_add_passphrase(struct connman_service *service,
- const gchar *passphrase);
typedef void (* authentication_cb_t) (struct connman_service *service,
bool values_received,
const char *name, int name_len,
diff --git a/src/network.c b/src/network.c
index 5beca2f..d3ad83b 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1480,7 +1480,7 @@ int connman_network_connect_hidden(struct connman_network
*network,
__connman_service_set_agent_identity(service, identity);
if (passphrase)
- err = __connman_service_add_passphrase(service, passphrase);
+ err = __connman_service_set_passphrase(service, passphrase);
if (err == -ENOKEY) {
__connman_service_indicate_error(service,
diff --git a/src/service.c b/src/service.c
index 78eb13c..f87bf09 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2833,9 +2833,17 @@ static int check_passphrase(enum
connman_service_security security,
length = strlen(passphrase);
switch (security) {
- case CONNMAN_SERVICE_SECURITY_PSK:
+ case CONNMAN_SERVICE_SECURITY_UNKNOWN:
+ case CONNMAN_SERVICE_SECURITY_NONE:
case CONNMAN_SERVICE_SECURITY_WPA:
case CONNMAN_SERVICE_SECURITY_RSN:
+
+ DBG("service security '%s' (%d) not handled",
+ security2string(security), security);
+
+ return -EOPNOTSUPP;
+
+ case CONNMAN_SERVICE_SECURITY_PSK:
/* A raw key is always 64 bytes length,
* its content is in hex representation.
* A PSK key must be between [8..63].
@@ -2860,8 +2868,7 @@ static int check_passphrase(enum connman_service_security
security,
} else if (length != 5 && length != 13)
return -ENOKEY;
break;
- case CONNMAN_SERVICE_SECURITY_UNKNOWN:
- case CONNMAN_SERVICE_SECURITY_NONE:
+
case CONNMAN_SERVICE_SECURITY_8021X:
break;
}
@@ -5029,31 +5036,6 @@ static void report_error_cb(void *user_context, bool
retry,
}
}
-int __connman_service_add_passphrase(struct connman_service *service,
- const gchar *passphrase)
-{
- int err = 0;
-
- switch (service->security) {
- case CONNMAN_SERVICE_SECURITY_WEP:
- case CONNMAN_SERVICE_SECURITY_PSK:
- case CONNMAN_SERVICE_SECURITY_8021X:
- err = __connman_service_set_passphrase(service, passphrase);
- break;
-
- case CONNMAN_SERVICE_SECURITY_UNKNOWN:
- case CONNMAN_SERVICE_SECURITY_NONE:
- case CONNMAN_SERVICE_SECURITY_WPA:
- case CONNMAN_SERVICE_SECURITY_RSN:
- DBG("service security '%s' (%d) not handled",
- security2string(service->security),
- service->security);
- break;
- }
-
- return err;
-}
-
static int check_wpspin(struct connman_service *service, const char *wpspin)
{
int length;
@@ -5147,7 +5129,7 @@ static void request_input_cb(struct connman_service
*service,
__connman_service_set_agent_identity(service, identity);
if (passphrase)
- err = __connman_service_add_passphrase(service, passphrase);
+ err = __connman_service_set_passphrase(service, passphrase);
done:
if (err >= 0) {
--
1.9.1
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
