#include "wpas_glue.h"
#include "eapol_supp/eapol_supp_sm.h"
#include "wps_supplicant.h"
+#include "wpa.h"
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
DBusMessage *reply;
reply = dbus_message_new_error(message, WPAS_ERROR_INVALID_OPTS,
- "Did not receive correct message "
- "arguments.");
+ "Did not receive correct message "
+ "arguments.");
if (arg != NULL)
dbus_message_append_args(reply, DBUS_TYPE_STRING, &arg,
DBUS_TYPE_INVALID);
static void wpas_dbus_free_wpa_interface(struct wpa_interface *iface)
{
- free((char *) iface->driver);
- free((char *) iface->driver_param);
- free((char *) iface->confname);
- free((char *) iface->bridge_ifname);
+ os_free((char *) iface->driver);
+ os_free((char *) iface->driver_param);
+ os_free((char *) iface->confname);
+ os_free((char *) iface->bridge_ifname);
}
DBusMessage *reply = NULL;
DBusMessageIter iter;
- memset(&iface, 0, sizeof(iface));
+ os_memset(&iface, 0, sizeof(iface));
dbus_message_iter_init(message, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
goto error;
dbus_message_iter_get_basic(&iter, &ifname);
- if (!strlen(ifname))
+ if (!os_strlen(ifname))
goto error;
iface.ifname = ifname;
return reply;
}
+
/**
* wpas_dbus_global_set_debugparams- Set the debug params
* @message: Pointer to incoming dbus message
DBUS_TYPE_BOOLEAN, &debug_timestamp,
DBUS_TYPE_BOOLEAN, &debug_show_keys,
DBUS_TYPE_INVALID)) {
- reply = wpas_dbus_new_invalid_opts_error(message, NULL);
- goto out;
+ return wpas_dbus_new_invalid_opts_error(message, NULL);
}
- /* check for allowed debuglevels */
- if (debug_level != MSG_MSGDUMP &&
- debug_level != MSG_DEBUG &&
- debug_level != MSG_INFO &&
- debug_level != MSG_WARNING &&
- debug_level != MSG_ERROR) {
- reply = wpas_dbus_new_invalid_opts_error(message, NULL);
- goto out;
+ if (wpa_supplicant_set_debug_params(global, debug_level,
+ debug_timestamp ? 1 : 0,
+ debug_show_keys ? 1 : 0)) {
+ return wpas_dbus_new_invalid_opts_error(message, NULL);
}
- wpa_debug_level = debug_level;
- wpa_debug_timestamp = debug_timestamp ? 1 : 0;
- wpa_debug_show_keys = debug_show_keys ? 1 : 0;
reply = wpas_dbus_new_success_reply(message);
-out:
return reply;
}
+
/**
* wpas_dbus_iface_scan - Request a wireless scan on an interface
* @message: Pointer to incoming dbus message
/* Construct the object path for this network. Note that ':'
* is not a valid character in dbus object paths.
*/
- snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
- "%s/" WPAS_DBUS_BSSIDS_PART "/"
- WPAS_DBUS_BSSID_FORMAT,
- wpa_supplicant_get_dbus_path(wpa_s),
- MAC2STR(res->bssid));
+ os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
+ "%s/" WPAS_DBUS_BSSIDS_PART "/"
+ WPAS_DBUS_BSSID_FORMAT,
+ wpa_supplicant_get_dbus_path(wpa_s),
+ MAC2STR(res->bssid));
dbus_message_iter_append_basic(&sub_iter,
DBUS_TYPE_OBJECT_PATH, &path);
- free(path);
+ os_free(path);
}
dbus_message_iter_close_container(&iter, &sub_iter);
/* free returned method array */
while (eap_methods[i])
- free(eap_methods[i++]);
- free(eap_methods);
+ os_free(eap_methods[i++]);
+ os_free(eap_methods);
if (!success)
goto error;
wpa_config_set_network_defaults(ssid);
/* Construct the object path for this network. */
- snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
- "%s/" WPAS_DBUS_NETWORKS_PART "/%d",
- wpa_supplicant_get_dbus_path(wpa_s),
- ssid->id);
+ os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
+ "%s/" WPAS_DBUS_NETWORKS_PART "/%d",
+ wpa_supplicant_get_dbus_path(wpa_s),
+ ssid->id);
reply = dbus_message_new_method_return(message);
dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH,
&path, DBUS_TYPE_INVALID);
out:
- free(path);
+ os_free(path);
return reply;
}
reply = wpas_dbus_new_invalid_network_error(message);
goto out;
}
+
/* Ensure the network is actually a child of this interface */
if (strcmp(iface, wpa_supplicant_get_dbus_path(wpa_s)) != 0) {
reply = wpas_dbus_new_invalid_network_error(message);
reply = wpas_dbus_new_success_reply(message);
out:
- free(iface);
- free(net_id);
+ os_free(iface);
+ os_free(net_id);
return reply;
}
"bssid", NULL
};
+
static dbus_bool_t should_quote_opt(const char *key)
{
int i = 0;
return TRUE;
}
+
/**
* wpas_dbus_iface_set_network - Set options for a configured network
* @message: Pointer to incoming dbus message
if (value == NULL)
goto error;
ret = wpa_snprintf_hex(value, size,
- (u8 *) entry.bytearray_value,
- entry.array_len);
+ (u8 *) entry.bytearray_value,
+ entry.array_len);
if (ret <= 0)
goto error;
} else if (entry.type == DBUS_TYPE_STRING) {
if (should_quote_opt(entry.key)) {
- size = strlen(entry.str_value);
+ size = os_strlen(entry.str_value);
/* Zero-length option check */
if (size <= 0)
goto error;
value = os_zalloc(size);
if (value == NULL)
goto error;
- ret = snprintf(value, size, "\"%s\"",
- entry.str_value);
+ ret = os_snprintf(value, size, "\"%s\"",
+ entry.str_value);
if (ret < 0 || (size_t) ret != (size - 1))
goto error;
} else {
- value = strdup(entry.str_value);
+ value = os_strdup(entry.str_value);
if (value == NULL)
goto error;
}
value = os_zalloc(size);
if (value == NULL)
goto error;
- ret = snprintf(value, size, "%u", entry.uint32_value);
+ ret = os_snprintf(value, size, "%u",
+ entry.uint32_value);
if (ret <= 0)
goto error;
} else if (entry.type == DBUS_TYPE_INT32) {
value = os_zalloc(size);
if (value == NULL)
goto error;
- ret = snprintf(value, size, "%d", entry.int32_value);
+ ret = os_snprintf(value, size, "%d",
+ entry.int32_value);
if (ret <= 0)
goto error;
} else
if (wpa_config_set(ssid, entry.key, value, 0) < 0)
goto error;
- if ((strcmp(entry.key, "psk") == 0 &&
+ if ((os_strcmp(entry.key, "psk") == 0 &&
value[0] == '"' && ssid->ssid_len) ||
- (strcmp(entry.key, "ssid") == 0 && ssid->passphrase))
+ (os_strcmp(entry.key, "ssid") == 0 && ssid->passphrase))
wpa_config_update_psk(ssid);
- free(value);
+ os_free(value);
wpa_dbus_dict_entry_clear(&entry);
continue;
error:
- free(value);
+ os_free(value);
reply = wpas_dbus_new_invalid_opts_error(message, entry.key);
wpa_dbus_dict_entry_clear(&entry);
break;
struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
- if (wpa_s->current_ssid == NULL && ssid->disabled) {
- /*
- * Try to reassociate since there is no current configuration
- * and a new network was made available.
- */
- wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, 0);
- }
- ssid->disabled = 0;
-
+ wpa_supplicant_enable_network(wpa_s, ssid);
return wpas_dbus_new_success_reply(message);
}
struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
- if (ssid == wpa_s->current_ssid)
- wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
- ssid->disabled = 1;
-
+ wpa_supplicant_disable_network(wpa_s, ssid);
return wpas_dbus_new_success_reply(message);
}
char *iface_obj_path = NULL;
char *network = NULL;
- if (strlen(dbus_message_get_signature(message)) == 0) {
+ if (os_strlen(dbus_message_get_signature(message)) == 0) {
/* Any network */
- ssid = wpa_s->conf->ssid;
- while (ssid) {
- ssid->disabled = 0;
- ssid = ssid->next;
- }
- wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, 0);
+ ssid = NULL;
} else {
const char *obj_path;
int nid;
}
/* Ensure the object path really points to this interface */
obj_path = wpa_supplicant_get_dbus_path(wpa_s);
- if (strcmp(iface_obj_path, obj_path) != 0) {
+ if (os_strcmp(iface_obj_path, obj_path) != 0) {
reply = wpas_dbus_new_invalid_network_error(message);
goto out;
}
reply = wpas_dbus_new_invalid_network_error(message);
goto out;
}
-
- /* Finally, associate with the network */
- if (ssid != wpa_s->current_ssid && wpa_s->current_ssid)
- wpa_supplicant_disassociate(
- wpa_s, WLAN_REASON_DEAUTH_LEAVING);
-
- /* Mark all other networks disabled and trigger reassociation
- */
- ssid = wpa_s->conf->ssid;
- while (ssid) {
- ssid->disabled = (nid != ssid->id);
- ssid = ssid->next;
- }
- wpa_s->disconnected = 0;
- wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, 0);
}
+ /* Finally, associate with the network */
+ wpa_supplicant_select_network(wpa_s, ssid);
+
reply = wpas_dbus_new_success_reply(message);
out:
- free(iface_obj_path);
- free(network);
+ os_free(iface_obj_path);
+ os_free(network);
return reply;
}
goto out;
}
- if (ap_scan > 2) {
+ if (wpa_supplicant_set_ap_scan(wpa_s, ap_scan)) {
reply = wpas_dbus_new_invalid_opts_error(message, NULL);
goto out;
}
- wpa_s->conf->ap_scan = ap_scan;
+
reply = wpas_dbus_new_success_reply(message);
out:
wpa_s->conf->pkcs11_module_path = pkcs11_module_path;
#endif /* EAP_TLS_OPENSSL */
+ wpa_sm_set_eapol(wpa_s->wpa, NULL);
eapol_sm_deinit(wpa_s->eapol);
+ wpa_s->eapol = NULL;
wpa_supplicant_init_eapol(wpa_s);
+ wpa_sm_set_eapol(wpa_s->wpa, wpa_s->eapol);
return wpas_dbus_new_success_reply(message);
return wpas_dbus_new_invalid_opts_error(message, NULL);
}
+
/**
* wpas_dbus_iface_get_state - Get interface state
* @message: Pointer to incoming dbus message
* Asks wpa_supplicant to remove one or more previously stored binary blobs.
*/
DBusMessage * wpas_dbus_iface_remove_blobs(DBusMessage *message,
- struct wpa_supplicant *wpa_s)
+ struct wpa_supplicant *wpa_s)
{
DBusMessageIter iter, array;
char *err_msg = NULL;
const char *name;
dbus_message_iter_get_basic(&array, &name);
- if (!strlen(name))
+ if (!os_strlen(name))
err_msg = "Invalid blob name.";
if (wpa_config_remove_blob(wpa_s->conf, name) != 0)
dbus_message_iter_next(&array);
}
- if (err_msg) {
+ if (err_msg)
return dbus_message_new_error(message, WPAS_ERROR_REMOVE_ERROR,
err_msg);
- }
return wpas_dbus_new_success_reply(message);
}
DBUS_TYPE_INVALID);
} else {
char npin[9];
- sprintf(npin, "%08d", ret);
+ os_snprintf(npin, sizeof(npin), "%08d", ret);
dbus_message_append_args(reply, DBUS_TYPE_STRING, &npin,
DBUS_TYPE_INVALID);
}
projects / libeap.git / blobdiff