6:28 p.m.
Users can now start an AP from settings based on a profile
on disk. The only argument is the SSID which will be used to
lookup the profile. If no profile is found a NotFound error
will be returned. Any invalid profiles will result in an
Invalid return.
---
src/ap.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/ap.h | 3 +++
2 files changed, 71 insertions(+), 2 deletions(-)
v2:
* Removed the profile loading from ap_init and squashed that into
this commit.
* This now loads the profiles on the fly when the dbus method is
called. This avoids the need for any special ap_config handling
of transient vs disk profiles.
diff --git a/src/ap.c b/src/ap.c
index f08835f7..4aabcd89 100644
--- a/src/ap.c
+++ b/src/ap.c
@@ -51,6 +51,7 @@
#include "src/wscutil.h"
#include "src/eap-wsc.h"
#include "src/ap.h"
+#include "src/storage.h"
struct ap_state {
struct netdev *netdev;
@@ -231,6 +232,10 @@ void ap_config_free(struct ap_config *config)
explicit_bzero(config->psk, sizeof(config->psk));
l_free(config->authorized_macs);
l_free(config->wsc_name);
+
+ if (config->profile)
+ l_free(config->profile);
+
l_free(config);
}
@@ -2207,6 +2212,30 @@ static void ap_mlme_notify(struct l_genl_msg *msg, void
*user_data)
}
}
+static bool ap_load_profile(struct ap_state *ap)
+{
+ char *passphrase;
+ L_AUTO_FREE_VAR(struct l_settings *, settings) = l_settings_new();
+
+ if (!l_settings_load_from_file(settings, ap->config->profile))
+ return false;
+
+ passphrase = l_settings_get_string(settings, "Security",
"Passphrase");
+ if (passphrase) {
+ if (strlen(passphrase) > 63) {
+ l_error("[Security].Passphrase must not exceed "
+ "63 characters");
+ return false;
+ }
+
+ strcpy(ap->config->passphrase, passphrase);
+ l_free(passphrase);
+ }
+
+ l_info("Loaded AP configuration %s", ap->config->ssid);
+ return true;
+}
+
/*
* Start a simple independent WPA2 AP on given netdev.
*
@@ -2237,8 +2266,8 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config
*config,
if (L_WARN_ON(!config->ssid))
return NULL;
- if (L_WARN_ON(!config->passphrase[0] && util_mem_is_zero(config->psk,
- sizeof(config->psk))))
+ if (L_WARN_ON(!config->profile && !config->passphrase[0] &&
+ util_mem_is_zero(config->psk, sizeof(config->psk))))
return NULL;
ap = l_new(struct ap_state, 1);
@@ -2248,6 +2277,9 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config
*config,
ap->ops = ops;
ap->user_data = user_data;
+ if (config->profile && !ap_load_profile(ap))
+ goto error;
+
if (!config->channel)
/* TODO: Start a Get Survey to decide the channel */
config->channel = 6;
@@ -2698,6 +2730,37 @@ static struct l_dbus_message *ap_dbus_stop(struct l_dbus *dbus,
return NULL;
}
+static struct l_dbus_message *ap_dbus_start_profile(struct l_dbus *dbus,
+ struct l_dbus_message *message,
+ void *user_data)
+{
+ struct ap_if_data *ap_if = user_data;
+ const char *ssid;
+ struct ap_config *config;
+ int err;
+
+ if (ap_if->ap && ap_if->ap->started)
+ return dbus_error_already_exists(message);
+
+ if (ap_if->ap || ap_if->pending)
+ return dbus_error_busy(message);
+
+ if (!l_dbus_message_get_arguments(message, "s", &ssid))
+ return dbus_error_invalid_args(message);
+
+ config = l_new(struct ap_config, 1);
+ config->ssid = l_strdup(ssid);
+ /* This tells ap_start to pull settings from a profile on disk */
+ config->profile = storage_get_path("ap/%s.ap", ssid);
+
+ ap_if->ap = ap_start(ap_if->netdev, config, &ap_dbus_ops, &err, ap_if);
+ if (!ap_if->ap)
+ return dbus_error_from_errno(err, message);
+
+ ap_if->pending = l_dbus_message_ref(message);
+ return NULL;
+}
+
static bool ap_dbus_property_get_started(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
@@ -2716,6 +2779,9 @@ static void ap_setup_interface(struct l_dbus_interface *interface)
l_dbus_interface_method(interface, "Start", 0, ap_dbus_start, "",
"ss", "ssid", "wpa2_passphrase");
l_dbus_interface_method(interface, "Stop", 0, ap_dbus_stop, "",
"");
+ l_dbus_interface_method(interface, "StartProfile", 0,
+ ap_dbus_start_profile, "", "s",
+ "ssid");
l_dbus_interface_property(interface, "Started", 0, "b",
ap_dbus_property_get_started, NULL);
diff --git a/src/ap.h b/src/ap.h
index 1f2d438a..dc57a0bb 100644
--- a/src/ap.h
+++ b/src/ap.h
@@ -63,6 +63,9 @@ struct ap_config {
unsigned int authorized_macs_num;
char *wsc_name;
struct wsc_primary_device_type wsc_primary_device_type;
+
+ char *profile;
+
bool no_cck_rates : 1;
};
--
2.26.2
6:28 p.m.
New subject: [PATCH v2 2/3] ap: allow DHCP settings in provisioning files
Users can now supply an AP provisioning file containing an [IPv4]
section and define various DHCP settings:
[IPv4]
Address=<address>
Netmask=<netmask>
Gateway=<gateway>
IPRange=<start_address>,<end_address>
DNSList=<dns1>,<dns2>,...<dnsN>
LeaseTime=<lease_time>
There are a few notes/requirements to keep in mind when using a
provisioning file:
- All settings are optional but [IPv4].Address is required if the
interface does not already have an address set.
- If no [IPv4].Address is defined in the provisioning file and the AP
interface does not already have an address set, StartWithConfig()
will fail with -EINVAL.
- If a provisioning file is provided it will take precedence, and the
AP will not pull from the IP pool.
- A provisioning file containing an IPv4 section assumes DHCP is being
enabled and will override [General].EnableNetworkConfiguration.
- Any address that AP sets on the interface will be deleted when the AP
is stopped.
---
src/ap.c | 285 +++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 222 insertions(+), 63 deletions(-)
v2:
* Updated to work with loading profiles on the fly.
diff --git a/src/ap.c b/src/ap.c
index 4aabcd89..c8aee0ad 100644
--- a/src/ap.c
+++ b/src/ap.c
@@ -80,9 +80,12 @@ struct ap_state {
struct l_dhcp_server *server;
uint32_t rtnl_add_cmd;
char *own_ip;
+ unsigned int ip_prefix;
bool started : 1;
bool gtk_set : 1;
+ bool cleanup_ip : 1;
+ bool use_ip_pool : 1;
};
struct sta_state {
@@ -315,13 +318,18 @@ static void ap_reset(struct ap_state *ap)
ap->started = false;
- if (ap->own_ip) {
+ /* Delete IP if one was set by IWD */
+ if (ap->cleanup_ip)
l_rtnl_ifaddr4_delete(rtnl, netdev_get_ifindex(netdev),
- pool.prefix, ap->own_ip,
+ ap->ip_prefix, ap->own_ip,
broadcast_from_ip(ap->own_ip),
NULL, NULL, NULL);
- ip_pool_put(ap->own_ip);
+ if (ap->own_ip) {
+ /* Release IP from pool if used */
+ if (ap->use_ip_pool)
+ ip_pool_put(ap->own_ip);
+
l_free(ap->own_ip);
}
@@ -2212,28 +2220,214 @@ static void ap_mlme_notify(struct l_genl_msg *msg, void
*user_data)
}
}
-static bool ap_load_profile(struct ap_state *ap)
+static bool dhcp_load_settings(struct ap_state *ap, struct l_settings *settings)
+{
+ struct l_dhcp_server *server = ap->server;
+ struct in_addr ia;
+
+ L_AUTO_FREE_VAR(char *, netmask) = l_settings_get_string(settings,
+ "IPv4", "Netmask");
+ L_AUTO_FREE_VAR(char *, gateway) = l_settings_get_string(settings,
+ "IPv4", "Gateway");
+ char **dns = l_settings_get_string_list(settings, "IPv4",
+ "DNSList", ',');
+ char **ip_range = l_settings_get_string_list(settings, "IPv4",
+ "IPRange", ',');
+ unsigned int lease_time;
+ bool ret = false;
+
+ if (!l_settings_get_uint(settings, "IPv4", "LeaseTime",
&lease_time))
+ lease_time = 0;
+
+ if (ip_range && l_strv_length(ip_range) != 2)
+ goto parse_error;
+
+ if (netmask && !l_dhcp_server_set_netmask(server, netmask))
+ goto parse_error;
+
+ if (gateway && !l_dhcp_server_set_gateway(server, gateway))
+ goto parse_error;
+
+ if (dns && !l_dhcp_server_set_dns(server, dns))
+ goto parse_error;
+
+ if (ip_range && !l_dhcp_server_set_ip_range(server, ip_range[0],
+ ip_range[1]))
+ goto parse_error;
+
+ if (lease_time && !l_dhcp_server_set_lease_time(server, lease_time))
+ goto parse_error;
+
+ if (netmask && inet_pton(AF_INET, netmask, &ia) > 0)
+ ap->ip_prefix = __builtin_popcountl(ia.s_addr);
+ else
+ ap->ip_prefix = 24;
+
+ ret = true;
+
+parse_error:
+ l_strv_free(dns);
+ l_strv_free(ip_range);
+ return ret;
+}
+
+/*
+ * This will determine the IP being used for DHCP. The IP will be automatically
+ * set to ap->own_ip.
+ *
+ * The address to set (or keep) is determined in this order:
+ * 1. Address defined in provisioning file
+ * 2. Address already set on interface
+ * 3. Address in IP pool.
+ *
+ * Returns: 0 if an IP was successfully selected and needs to be set
+ * -EALREADY if an IP was already set on the interface
+ * -EEXIST if the IP pool ran out of IP's
+ * -EINVAL if there was an error.
+ */
+static int ap_setup_dhcp(struct ap_state *ap, struct l_settings *settings)
+{
+ uint32_t ifindex = netdev_get_ifindex(ap->netdev);
+ struct in_addr ia;
+ uint32_t address = 0;
+ int ret = -EINVAL;
+
+ ap->server = l_dhcp_server_new(ifindex);
+ if (!ap->server) {
+ l_error("Failed to create DHCP server on %u", ifindex);
+ return -EINVAL;;
+ }
+
+ if (getenv("IWD_DHCP_DEBUG"))
+ l_dhcp_server_set_debug(ap->server, do_debug,
+ "[DHCPv4 SERV] ", NULL);
+
+ /* get the current address if there is one */
+ if (l_net_get_address(ifindex, &ia) && ia.s_addr != 0)
+ address = ia.s_addr;
+
+ if (ap->config->profile) {
+ char *addr;
+
+ addr = l_settings_get_string(settings, "IPv4", "Address");
+ if (addr) {
+ if (inet_pton(AF_INET, addr, &ia) < 0)
+ goto free_addr;
+
+ /* Is a matching address already set on interface? */
+ if (ia.s_addr == address)
+ ret = -EALREADY;
+ else
+ ret = 0;
+ } else if (address) {
+ /* No address in config, but interface has one set */
+ addr = l_strdup(inet_ntoa(ia));
+ ret = -EALREADY;
+ } else
+ goto free_addr;
+
+ /* Set the remaining DHCP options in config file */
+ if (!dhcp_load_settings(ap, settings)) {
+ ret = -EINVAL;
+ goto free_addr;
+ }
+
+ if (!l_dhcp_server_set_ip_address(ap->server, addr)) {
+ ret = -EINVAL;
+ goto free_addr;
+ }
+
+ ap->own_ip = l_strdup(addr);
+
+free_addr:
+ l_free(addr);
+
+ return ret;
+ } else if (address) {
+ /* No config file and address is already set */
+ ap->own_ip = l_strdup(inet_ntoa(ia));
+
+ return -EALREADY;
+ } else if (pool.used) {
+ /* No config file, no address set. Use IP pool */
+ ap->own_ip = ip_pool_get();
+ if (!ap->own_ip) {
+ l_error("No more IP's in pool, cannot start AP on %u",
+ ifindex);
+ return -EEXIST;
+ }
+
+ ap->use_ip_pool = true;
+ ap->ip_prefix = pool.prefix;
+
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static int ap_load_profile_and_dhcp(struct ap_state *ap, bool *wait_dhcp)
{
+ uint32_t ifindex = netdev_get_ifindex(ap->netdev);
char *passphrase;
- L_AUTO_FREE_VAR(struct l_settings *, settings) = l_settings_new();
+ L_AUTO_FREE_VAR(struct l_settings *, settings) = NULL;
+ int err;
- if (!l_settings_load_from_file(settings, ap->config->profile))
- return false;
+ /* No profile or DHCP settings */
+ if (!ap->config->profile && !pool.used)
+ return 0;
+
+ if (ap->config->profile) {
+ settings = l_settings_new();
- passphrase = l_settings_get_string(settings, "Security",
"Passphrase");
- if (passphrase) {
- if (strlen(passphrase) > 63) {
- l_error("[Security].Passphrase must not exceed "
- "63 characters");
+ if (!l_settings_load_from_file(settings, ap->config->profile))
+ return -EINVAL;
+
+ passphrase = l_settings_get_string(settings, "Security",
+ "Passphrase");
+ if (passphrase) {
+ if (strlen(passphrase) > 63) {
+ l_error("[Security].Passphrase must not exceed "
+ "63 characters");
+ return -EINVAL;
+ }
+
+ strcpy(ap->config->passphrase, passphrase);
+ l_free(passphrase);
+ }
+
+ if (!l_settings_has_group(settings, "IPv4")) {
+ *wait_dhcp = false;
+ return 0;
+ }
+ }
+
+ err = ap_setup_dhcp(ap, settings);
+ if (err == 0) {
+ /* Address change required */
+ ap->rtnl_add_cmd = l_rtnl_ifaddr4_add(rtnl, ifindex,
+ ap->ip_prefix, ap->own_ip,
+ broadcast_from_ip(ap->own_ip),
+ ap_ifaddr4_added_cb, ap, NULL);
+
+ if (!ap->rtnl_add_cmd) {
+ l_error("Failed to add IPv4 address");
return false;
}
- strcpy(ap->config->passphrase, passphrase);
- l_free(passphrase);
+ ap->cleanup_ip = true;
+
+ *wait_dhcp = true;
+
+ return 0;
+ /* Selected address already set, continue normally */
+ } else if (err == -EALREADY) {
+ *wait_dhcp = false;
+
+ return 0;
}
- l_info("Loaded AP configuration %s", ap->config->ssid);
- return true;
+ return err;
}
/*
@@ -2256,9 +2450,8 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config
*config,
struct wiphy *wiphy = netdev_get_wiphy(netdev);
struct l_genl_msg *cmd;
uint64_t wdev_id = netdev_get_wdev_id(netdev);
- uint32_t ifindex = netdev_get_ifindex(netdev);
- struct in_addr ia;
int err = -EINVAL;
+ bool wait_on_address = false;
if (err_out)
*err_out = err;
@@ -2277,7 +2470,14 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config
*config,
ap->ops = ops;
ap->user_data = user_data;
- if (config->profile && !ap_load_profile(ap))
+ /*
+ * This both loads a profile if required and loads DHCP settings either
+ * by the profile itself or the IP pool (or does nothing in the case
+ * of a profile-less configuration). wait_on_address will be set true
+ * if an address change is required.
+ */
+ err = ap_load_profile_and_dhcp(ap, &wait_on_address);
+ if (err < 0)
goto error;
if (!config->channel)
@@ -2361,54 +2561,13 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config
*config,
if (!ap->mlme_watch)
l_error("Registering for MLME notification failed");
- /* No IP pool initialized, DHCP is not being used */
- if (!pool.used)
- goto done;
-
- ap->server = l_dhcp_server_new(ifindex);
- if (!ap->server) {
- l_error("Failed to create DHCP server on %u", ifindex);
- goto error;
- }
-
- if (getenv("IWD_DHCP_DEBUG"))
- l_dhcp_server_set_debug(ap->server, do_debug,
- "[DHCPv4 SERV] ", NULL);
-
- /*
- * If there is no IP set on the interface use one from the IP pool
- * defined in main.conf.
- */
- if (!l_net_get_address(ifindex, &ia) || ia.s_addr == 0) {
- ap->own_ip = ip_pool_get();
-
- if (!ap->own_ip) {
- l_error("No more IP's in pool, cannot start AP on %u",
- ifindex);
- err = -EEXIST;
- goto error;
- }
-
- ap->rtnl_add_cmd = l_rtnl_ifaddr4_add(rtnl, ifindex,
- pool.prefix, ap->own_ip,
- broadcast_from_ip(ap->own_ip),
- ap_ifaddr4_added_cb, ap, NULL);
-
- if (!ap->rtnl_add_cmd) {
- l_error("Failed to add IPv4 address");
- goto error;
- }
-
-
+ if (wait_on_address) {
if (err_out)
*err_out = 0;
- /* Finish starting AP in added callback */
return ap;
}
- /* Else honor the IP set on the interface prior to calling Start() */
-done:
cmd = ap_build_cmd_start_ap(ap);
if (!cmd)
goto error;
@@ -2876,10 +3035,10 @@ static int ap_init(void)
if (!ip_pool_create(ip_prefix))
return -EINVAL;
-
- rtnl = iwd_get_rtnl();
}
+ rtnl = iwd_get_rtnl();
+
return 0;
}
--
2.26.2
6:28 p.m.
New subject: [PATCH v2 3/3] auto-t: add support for AP StartWithConfig API
If a psk is not provided to start_ap, it is assumed that the
AP is being started with a config file.
---
autotests/util/iwd.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py
index f6ec164f..6f66e8a8 100755
--- a/autotests/util/iwd.py
+++ b/autotests/util/iwd.py
@@ -467,7 +467,7 @@ class Device(IWDDBusAbstract):
error_handler=self._failure)
self._wait_for_async_op()
- def start_ap(self, ssid, psk):
+ def start_ap(self, ssid, psk=None):
try:
self._prop_proxy.Set(IWD_DEVICE_INTERFACE, 'Mode', 'ap')
except Exception as e:
@@ -476,8 +476,12 @@ class Device(IWDDBusAbstract):
self._ap_iface = dbus.Interface(self._bus.get_object(IWD_SERVICE,
self.device_path),
IWD_AP_INTERFACE)
- self._ap_iface.Start(ssid, psk, reply_handler=self._success,
- error_handler=self._failure)
+ if psk:
+ self._ap_iface.Start(ssid, psk, reply_handler=self._success,
+ error_handler=self._failure)
+ else:
+ self._ap_iface.StartProfile(ssid, reply_handler=self._success,
+ error_handler=self._failure)
self._wait_for_async_op()
def stop_ap(self):
--
2.26.2
7:58 p.m.
Hi James,
On 11/2/20 12:28 PM, James Prestwood wrote:
Users can now start an AP from settings based on a profile
on disk. The only argument is the SSID which will be used to
lookup the profile. If no profile is found a NotFound error
will be returned. Any invalid profiles will result in an
Invalid return.
---
src/ap.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/ap.h | 3 +++
2 files changed, 71 insertions(+), 2 deletions(-)
v2:
* Removed the profile loading from ap_init and squashed that into
this commit.
* This now loads the profiles on the fly when the dbus method is
called. This avoids the need for any special ap_config handling
of transient vs disk profiles.
All applied, thanks.
Regards,
-Denis
655
days inactive
655
days old
3 comments
2 participants
participants (2)
-
Denis Kenzior -
James Prestwood