Patchwork [6/7] Adding autoscan module named exponential

login
register
mail settings
Submitter Tomasz Bursztyka
Date June 26, 2012, 8:05 a.m.
Message ID <1340697952-4209-7-git-send-email-tomasz.bursztyka@linux.intel.com>
Download mbox | patch
Permalink /patch/167333/
State Accepted
Commit c0fba2b38de5134675bf979728e164e42fd6b9e5
Headers show

Comments

Tomasz Bursztyka - June 26, 2012, 8:05 a.m.
This module will compute the interval on a base exponential.
Thus, params to this module are following this format: <base>:<limit>

Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 wpa_supplicant/Makefile               |    6 ++
 wpa_supplicant/autoscan.c             |    7 ++
 wpa_supplicant/autoscan_exponential.c |  100 +++++++++++++++++++++++++++++++++
 wpa_supplicant/defconfig              |    3 +
 wpa_supplicant/wpa_supplicant.conf    |    4 +
 5 files changed, 120 insertions(+), 0 deletions(-)
 create mode 100644 wpa_supplicant/autoscan_exponential.c
Jouni Malinen - June 26, 2012, 4:50 p.m.
On Tue, Jun 26, 2012 at 11:05:51AM +0300, Tomasz Bursztyka wrote:
> This module will compute the interval on a base exponential.
> Thus, params to this module are following this format: <base>:<limit>

> diff --git a/wpa_supplicant/autoscan_exponential.c b/wpa_supplicant/autoscan_exponential.c
> +	if (data->interval <= 0)
> +		data->interval = data->base;
> +
> +	data->interval = data->interval * data->base;

This initializes data->interval to base^2, not base. I would assume this
was not the goal here. In addition, the first call here that goes beyond
data->limit can return a value larger than the limit. I would assume
that that was also not the purpose since the following call will limit
this to a smaller value.

Patch

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index d06a15b..e088685 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1321,6 +1321,12 @@  CFLAGS += -DCONFIG_BGSCAN
 OBJS += bgscan.o
 endif
 
+ifdef CONFIG_AUTOSCAN_EXPONENTIAL
+CFLAGS += -DCONFIG_AUTOSCAN_EXPONENTIAL
+OBJS += autoscan_exponential.o
+NEED_AUTOSCAN=y
+endif
+
 ifdef NEED_AUTOSCAN
 CFLAGS += -DCONFIG_AUTOSCAN
 OBJS += autoscan.o
diff --git a/wpa_supplicant/autoscan.c b/wpa_supplicant/autoscan.c
index ba0f699..4abf62a 100644
--- a/wpa_supplicant/autoscan.c
+++ b/wpa_supplicant/autoscan.c
@@ -15,7 +15,14 @@ 
 #include "scan.h"
 #include "autoscan.h"
 
+#ifdef CONFIG_AUTOSCAN_EXPONENTIAL
+extern const struct autoscan_ops autoscan_exponential_ops;
+#endif /* CONFIG_AUTOSCAN_EXPONENTIAL */
+
 static const struct autoscan_ops * autoscan_modules[] = {
+#ifdef CONFIG_AUTOSCAN_EXPONENTIAL
+	&autoscan_exponential_ops,
+#endif /* CONFIG_AUTOSCAN_EXPONENTIAL */
 	NULL
 };
 
diff --git a/wpa_supplicant/autoscan_exponential.c b/wpa_supplicant/autoscan_exponential.c
new file mode 100644
index 0000000..e96de4e
--- /dev/null
+++ b/wpa_supplicant/autoscan_exponential.c
@@ -0,0 +1,100 @@ 
+/*
+ * WPA Supplicant - auto scan exponential module
+ * Copyright (c) 2012, Intel Corporation. All rights reserved.
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README and COPYING for more details.
+ */
+
+#include "includes.h"
+
+#include "common.h"
+#include "wpa_supplicant_i.h"
+#include "autoscan.h"
+
+struct autoscan_exponential_data {
+	struct wpa_supplicant *wpa_s;
+	int base;
+	int limit;
+	int interval;
+};
+
+
+static int autoscan_exponential_get_params(struct autoscan_exponential_data *data,
+					   const char *params)
+{
+	const char *pos;
+
+	if (params == NULL)
+		return -1;
+
+	data->base = atoi(params);
+
+	pos = os_strchr(params, ':');
+	if (pos == NULL)
+		return -1;
+
+	pos++;
+	data->limit = atoi(pos);
+
+	return 0;
+}
+
+
+static void * autoscan_exponential_init(struct wpa_supplicant *wpa_s,
+					const char *params)
+{
+	struct autoscan_exponential_data *data;
+
+	data = os_zalloc(sizeof(struct autoscan_exponential_data));
+	if (data == NULL)
+		return NULL;
+
+	if (autoscan_exponential_get_params(data, params) < 0) {
+		os_free(data);
+		return NULL;
+	}
+
+	wpa_printf(MSG_DEBUG, "autoscan exponential: base exponential is %d "
+		   "and limit is %d", data->base, data->limit);
+
+	data->wpa_s = wpa_s;
+
+	return data;
+}
+
+
+static void autoscan_exponential_deinit(void *priv)
+{
+	struct autoscan_exponential_data *data = priv;
+
+	os_free(data);
+}
+
+
+static int autoscan_exponential_notify_scan(void *priv,
+					    struct wpa_scan_results *scan_res)
+{
+	struct autoscan_exponential_data *data = priv;
+
+	wpa_printf(MSG_DEBUG, "autoscan exponential: scan result notification");
+
+	if (data->interval >= data->limit)
+		return data->limit;
+
+	if (data->interval <= 0)
+		data->interval = data->base;
+
+	data->interval = data->interval * data->base;
+
+	return data->interval;
+
+}
+
+
+const struct autoscan_ops autoscan_exponential_ops = {
+	.name = "exponential",
+	.init = autoscan_exponential_init,
+	.deinit = autoscan_exponential_deinit,
+	.notify_scan = autoscan_exponential_notify_scan,
+};
diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index 026ebee..c007909 100644
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -505,3 +505,6 @@  CONFIG_PEERKEY=y
 # This can be used to enable automatic scan support in wpa_supplicant. 
 # See wpa_supplicant.conf for more information on autoscan usage.
 #CONFIG_AUTOSCAN=y
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+#CONFIG_AUTOSCAN_EXPONENTIAL=y
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index 52e6581..4557467 100644
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -230,6 +230,10 @@  fast_reauth=1
 # within an interface in following format:
 #autoscan=<autoscan module name>:<module parameters>
 # autoscan is like bgscan but on disconnected or inactive state.
+# For instance, on exponential module parameters would be <base>:<limit>
+#autoscan=exponential:3:300
+# Which means a delay between scans on a base exponential of 3,
+# up to the limit of 300 seconds (3, 9, 27 ... 300)
 
 # filter_ssids - SSID-based scan result filtering
 # 0 = do not filter scan results (default)