[pkg-wpa-devel] r977 - in /wpasupplicant/trunk: debian/ debian/patches/ src/drivers/ src/rsn_supp/ src/utils/ wpa_supplicant/ wpa_supplicant/wpa_gui-qt4/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jan 2 03:16:20 UTC 2008
Author: kelmo-guest
Date: Wed Jan 2 03:16:20 2008
New Revision: 977
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=977
Log:
Import new git snapshot.
Cleanup changelog entries that represented transient changes.
Drop patch applied upstream.
Removed:
wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
wpasupplicant/trunk/debian/patches/series
wpasupplicant/trunk/src/drivers/driver.h
wpasupplicant/trunk/src/drivers/scan_helpers.c
wpasupplicant/trunk/src/rsn_supp/preauth.c
wpasupplicant/trunk/src/utils/common.c
wpasupplicant/trunk/src/utils/common.h
wpasupplicant/trunk/wpa_supplicant/ctrl_iface.c
wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c
wpasupplicant/trunk/wpa_supplicant/events.c
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
wpasupplicant/trunk/wpa_supplicant/wpas_glue.c
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jan 2 03:16:20 2008
@@ -1,4 +1,4 @@
-wpasupplicant (0.6.2~git20080101.5da67aa-1) UNRELEASED; urgency=low
+wpasupplicant (0.6.2~git20080102.ffa1af2-1) UNRELEASED; urgency=low
* New upstream git snapshot.
* Allow "wpa-key-mgmt NONE" to form a network block via the wpa_cli calls in
@@ -23,7 +23,7 @@
package in a stable release, no longer need to handle its removal in
postrm anymore.
* Activate support for PC/SC interface for smartcards along with SIM and AKA
- EAP methods. Build-depend on libpcsclite-dev.
+ EAP methods. Build-depend on libpcsclite-dev. Suggest pcscd.
* Update email address in debian/ifupdown/wpa_action.8 manpage.
* Sanitize whitepsace in debian/README.modes, swapping tabs for 8 spaces,
improving layout of basic tables. Fix a couple of typo's too.
@@ -47,25 +47,17 @@
wpa_supplicant with wpa_cli and wpa_gui".
* Activate CONFIG_IEEE80211R, CONFIG_IEEE80211W and CONFIG_EAP_WSC in the
default build configuration.
- * Add an empty ssid field to the associate-to-any-open network block in the
- template wpa-roam example.
- * Add debian/patches/30_id_str_wpa_gui_qt3.patch to enhance the QT3 wpa_gui
- with a Network ID field to represent the id_str field when adding a
- network block.
* Log wpa_supplicant output to /var/log/wpa_supplicant.$IFACE.log per
default when using ifupdown to manage wpa_supplicant. wpa_supplicant
supports logging somewhere via -f cli option. (Closes: #317180)
- * Add support for managing debug level of wpa_supplicant via thye ifupdown
- scripts. wpa-debug-level n (for n in 1 2 3).
+ * Add support for managing debug level of wpa_supplicant via the ifupdown
+ scripts.
* Enhance README.modes with new supplicant debugging methods.
* Build the wpa_gui-qt4 variant now that it doesn't require qt3 support
code. It also closes all child windows on File->Exit. (Closes: #426924)
* wpasupplicant now Suggests wpagui.
- * Add debian/patches/30_qt4_combo_box_additem.patch to fix population of
- wpa_gui-qt4 combo box lists by using qt4's addItem function to append new
- items.
-
- -- Kel Modderman <kel at otaku42.de> Wed, 02 Jan 2008 10:51:14 +1000
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 02 Jan 2008 13:09:08 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Wed Jan 2 03:16:20 2008
@@ -12,7 +12,7 @@
Package: wpasupplicant
Architecture: any
Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6), adduser
-Suggests: wpagui, libengine-pkcs11-openssl, guessnet, iproute, wireless-tools
+Suggests: wpagui, pcscd, libengine-pkcs11-openssl, guessnet, iproute, wireless-tools
Recommends: dhcp3-client
Description: Client support for WPA and WPA2 (IEEE 802.11i)
WPA and WPA2 are methods for securing wireless networks, the former
Modified: wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch Wed Jan 2 03:16:20 2008
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/wpa_supplicant/examples/wpa-roam.conf
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,85 @@
+######################## Debian wpa-roam Template #############################
+#
+# Template configuration for wpa-roam mode of Debian's wpasupplicant package.
@@ -84,6 +84,5 @@
+# networks can be configured with wpa_cli/wpa_gui.
+#
+network={
-+ ssid=""
+ key_mgmt=NONE
+}
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Wed Jan 2 03:16:20 2008
@@ -3,4 +3,3 @@
02_dbus_group_policy.patch
20_madwifi_headers.patch
21_config_driver_madwifi.patch
-30_qt4_combo_box_additem.patch
Modified: wpasupplicant/trunk/src/drivers/driver.h
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/drivers/driver.h?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/src/drivers/driver.h (original)
+++ wpasupplicant/trunk/src/drivers/driver.h Wed Jan 2 03:16:20 2008
@@ -1202,10 +1202,12 @@
void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
const u8 *buf, size_t len);
-u8 * wpa_scan_get_ie(struct wpa_scan_res *res, u8 ie);
+const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie);
#define WPA_IE_VENDOR_TYPE 0x0050f201
-u8 * wpa_scan_get_vendor_ie(struct wpa_scan_res *res, u32 vendor_type);
-int wpa_scan_get_max_rate(struct wpa_scan_res *res);
+#define WPS_IE_VENDOR_TYPE 0x0050f204
+const u8 * wpa_scan_get_vendor_ie(const struct wpa_scan_res *res,
+ u32 vendor_type);
+int wpa_scan_get_max_rate(const struct wpa_scan_res *res);
void wpa_scan_results_free(struct wpa_scan_results *res);
void wpa_scan_sort_results(struct wpa_scan_results *res);
Modified: wpasupplicant/trunk/src/drivers/scan_helpers.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/drivers/scan_helpers.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/src/drivers/scan_helpers.c (original)
+++ wpasupplicant/trunk/src/drivers/scan_helpers.c Wed Jan 2 03:16:20 2008
@@ -19,11 +19,11 @@
#include "ieee802_11_defs.h"
-u8 * wpa_scan_get_ie(struct wpa_scan_res *res, u8 ie)
+const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
{
- u8 *end, *pos;
+ const u8 *end, *pos;
- pos = (u8 *) (res + 1);
+ pos = (const u8 *) (res + 1);
end = pos + res->ie_len;
while (pos + 1 < end) {
@@ -38,11 +38,12 @@
}
-u8 * wpa_scan_get_vendor_ie(struct wpa_scan_res *res, u32 vendor_type)
+const u8 * wpa_scan_get_vendor_ie(const struct wpa_scan_res *res,
+ u32 vendor_type)
{
- u8 *end, *pos;
+ const u8 *end, *pos;
- pos = (u8 *) (res + 1);
+ pos = (const u8 *) (res + 1);
end = pos + res->ie_len;
while (pos + 1 < end) {
@@ -58,10 +59,10 @@
}
-int wpa_scan_get_max_rate(struct wpa_scan_res *res)
+int wpa_scan_get_max_rate(const struct wpa_scan_res *res)
{
int rate = 0;
- u8 *ie;
+ const u8 *ie;
int i;
ie = wpa_scan_get_ie(res, WLAN_EID_SUPP_RATES);
Modified: wpasupplicant/trunk/src/rsn_supp/preauth.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/rsn_supp/preauth.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/src/rsn_supp/preauth.c (original)
+++ wpasupplicant/trunk/src/rsn_supp/preauth.c Wed Jan 2 03:16:20 2008
@@ -446,7 +446,7 @@
pmksa_candidate_free(sm);
for (i = results->num - 1; i >= 0; i--) {
- u8 *ssid, *rsn;
+ const u8 *ssid, *rsn;
r = results->res[i];
Modified: wpasupplicant/trunk/src/utils/common.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/utils/common.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/src/utils/common.c (original)
+++ wpasupplicant/trunk/src/utils/common.c Wed Jan 2 03:16:20 2008
@@ -310,7 +310,7 @@
* time, i.e., this is not re-entrant and the returned buffer must be used
* before calling this again.
*/
-const char * wpa_ssid_txt(u8 *ssid, size_t ssid_len)
+const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len)
{
static char ssid_txt[33];
char *pos;
Modified: wpasupplicant/trunk/src/utils/common.h
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/utils/common.h?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/src/utils/common.h (original)
+++ wpasupplicant/trunk/src/utils/common.h Wed Jan 2 03:16:20 2008
@@ -426,7 +426,7 @@
#define wpa_strdup_tchar(s) strdup((s))
#endif /* CONFIG_NATIVE_WINDOWS */
-const char * wpa_ssid_txt(u8 *ssid, size_t ssid_len);
+const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len);
#include "wpa_debug.h"
Modified: wpasupplicant/trunk/wpa_supplicant/ctrl_iface.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/ctrl_iface.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/ctrl_iface.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/ctrl_iface.c Wed Jan 2 03:16:20 2008
@@ -509,12 +509,62 @@
}
+/* Format one result on one text line into a buffer. */
+static int wpa_supplicant_ctrl_iface_scan_result(
+ const struct wpa_scan_res *res, char *buf, size_t buflen)
+{
+ char *pos, *end;
+ int ret;
+ const u8 *ie, *ie2;
+
+ pos = buf;
+ end = buf + buflen;
+
+ ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
+ MAC2STR(res->bssid), res->freq, res->level);
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ ie = wpa_scan_get_vendor_ie(res, WPA_IE_VENDOR_TYPE);
+ if (ie)
+ pos = wpa_supplicant_ie_txt(pos, end, "WPA", ie, 2 + ie[1]);
+ ie2 = wpa_scan_get_ie(res, WLAN_EID_RSN);
+ if (ie2)
+ pos = wpa_supplicant_ie_txt(pos, end, "WPA2", ie2, 2 + ie2[1]);
+ if (!ie && !ie2 && res->caps & IEEE80211_CAP_PRIVACY) {
+ ret = os_snprintf(pos, end - pos, "[WEP]");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
+ if (res->caps & IEEE80211_CAP_IBSS) {
+ ret = os_snprintf(pos, end - pos, "[IBSS]");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
+
+ ie = wpa_scan_get_ie(res, WLAN_EID_SSID);
+ ret = os_snprintf(pos, end - pos, "\t%s",
+ ie ? wpa_ssid_txt(ie + 2, ie[1]) : "");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+
+ ret = os_snprintf(pos, end - pos, "\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+
+ return pos - buf;
+}
+
+
static int wpa_supplicant_ctrl_iface_scan_results(
struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
{
char *pos, *end;
struct wpa_scan_res *res;
- u8 *ie, *ie2;
int ret;
size_t i;
@@ -532,42 +582,8 @@
for (i = 0; i < wpa_s->scan_res->num; i++) {
res = wpa_s->scan_res->res[i];
- ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
- MAC2STR(res->bssid), res->freq, res->level);
- if (ret < 0 || ret >= end - pos)
- return pos - buf;
- pos += ret;
- ie = wpa_scan_get_vendor_ie(res, WPA_IE_VENDOR_TYPE);
- if (ie) {
- pos = wpa_supplicant_ie_txt(pos, end, "WPA",
- ie, 2 + ie[1]);
- }
- ie2 = wpa_scan_get_ie(res, WLAN_EID_RSN);
- if (ie2) {
- pos = wpa_supplicant_ie_txt(pos, end, "WPA2",
- ie2, 2 + ie2[1]);
- }
- if (!ie && !ie2 && res->caps & IEEE80211_CAP_PRIVACY) {
- ret = os_snprintf(pos, end - pos, "[WEP]");
- if (ret < 0 || ret >= end - pos)
- return pos - buf;
- pos += ret;
- }
- if (res->caps & IEEE80211_CAP_IBSS) {
- ret = os_snprintf(pos, end - pos, "[IBSS]");
- if (ret < 0 || ret >= end - pos)
- return pos - buf;
- pos += ret;
- }
-
- ie = wpa_scan_get_ie(res, WLAN_EID_SSID);
- ret = os_snprintf(pos, end - pos, "\t%s",
- ie ? wpa_ssid_txt(ie + 2, ie[1]) : "");
- if (ret < 0 || ret >= end - pos)
- return pos - buf;
- pos += ret;
-
- ret = os_snprintf(pos, end - pos, "\n");
+ ret = wpa_supplicant_ctrl_iface_scan_result(res, pos,
+ end - pos);
if (ret < 0 || ret >= end - pos)
return pos - buf;
pos += ret;
Modified: wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c Wed Jan 2 03:16:20 2008
@@ -379,9 +379,9 @@
struct wpa_scan_res *res)
{
DBusMessage *reply = NULL;
- char *bssid_data, *ssid_data, *wpa_ie_data, *rsn_ie_data;
+ char *bssid_data;
DBusMessageIter iter, iter_dict;
- u8 *ie;
+ const u8 *ie;
size_t len;
/* dbus needs the address of a pointer to the actual value
@@ -402,9 +402,10 @@
ie = wpa_scan_get_ie(res, WLAN_EID_SSID);
if (ie) {
+ const char *ssid_data;
len = ie[1];
ie += 2;
- ssid_data = (char *) &ie;
+ ssid_data = (const char *) &ie;
if (!wpa_dbus_dict_append_byte_array(&iter_dict, "ssid",
ssid_data, len))
goto error;
@@ -412,8 +413,9 @@
ie = wpa_scan_get_vendor_ie(res, WPA_IE_VENDOR_TYPE);
if (ie) {
+ const char *wpa_ie_data;
len = 2 + ie[1];
- wpa_ie_data = (char *) &ie;
+ wpa_ie_data = (const char *) &ie;
if (!wpa_dbus_dict_append_byte_array(&iter_dict, "wpaie",
wpa_ie_data, len))
goto error;
@@ -421,10 +423,21 @@
ie = wpa_scan_get_ie(res, WLAN_EID_RSN);
if (ie) {
+ const char *rsn_ie_data;
len = 2 + ie[1];
- rsn_ie_data = (char *) &ie;
+ rsn_ie_data = (const char *) &ie;
if (!wpa_dbus_dict_append_byte_array(&iter_dict, "rsnie",
rsn_ie_data, len))
+ goto error;
+ }
+
+ ie = wpa_scan_get_vendor_ie(res, WPS_IE_VENDOR_TYPE);
+ if (ie) {
+ const char *wps_ie_data;
+ len = 2 + ie[1];
+ wps_ie_data = (const char *) &ie;
+ if (!wpa_dbus_dict_append_byte_array(&iter_dict, "wpsie",
+ wps_ie_data, len))
goto error;
}
Modified: wpasupplicant/trunk/wpa_supplicant/events.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/events.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/events.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/events.c Wed Jan 2 03:16:20 2008
@@ -270,7 +270,7 @@
{
struct wpa_ie_data ie;
int proto_match = 0;
- u8 *rsn_ie, *wpa_ie;
+ const u8 *rsn_ie, *wpa_ie;
rsn_ie = wpa_scan_get_ie(bss, WLAN_EID_RSN);
while ((ssid->proto & WPA_PROTO_RSN) && rsn_ie) {
@@ -368,7 +368,7 @@
struct wpa_scan_res *bss, *selected = NULL;
size_t i;
struct wpa_blacklist *e;
- u8 *ie;
+ const u8 *ie;
wpa_printf(MSG_DEBUG, "Selecting BSS from priority group %d",
group->priority);
@@ -378,7 +378,7 @@
/* First, try to find WPA-enabled AP */
wpa_printf(MSG_DEBUG, "Try to find WPA-enabled AP");
for (i = 0; i < wpa_s->scan_res->num && !selected; i++) {
- u8 *ssid_;
+ const u8 *ssid_;
u8 wpa_ie_len, rsn_ie_len, ssid_len;
bss = wpa_s->scan_res->res[i];
@@ -442,7 +442,7 @@
* allows this. */
wpa_printf(MSG_DEBUG, "Try to find non-WPA AP");
for (i = 0; i < wpa_s->scan_res->num && !selected; i++) {
- u8 *ssid_;
+ const u8 *ssid_;
u8 wpa_ie_len, rsn_ie_len, ssid_len;
bss = wpa_s->scan_res->res[i];
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp Wed Jan 2 03:16:20 2008
@@ -110,12 +110,12 @@
encrSelect->removeItem(0);
if (sel == AUTH_NONE || sel == AUTH_IEEE8021X) {
- encrSelect->insertItem(-1, "None");
- encrSelect->insertItem(-1, "WEP");
+ encrSelect->addItem("None");
+ encrSelect->addItem("WEP");
encrSelect->setCurrentIndex(sel == AUTH_NONE ? 0 : 1);
} else {
- encrSelect->insertItem(-1, "TKIP");
- encrSelect->insertItem(-1, "CCMP");
+ encrSelect->addItem("TKIP");
+ encrSelect->addItem("CCMP");
encrSelect->setCurrentIndex((sel == AUTH_WPA2_PSK ||
sel == AUTH_WPA2_EAP) ? 1 : 0);
}
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp Wed Jan 2 03:16:20 2008
@@ -273,7 +273,7 @@
#endif
adapterSelect->clear();
- adapterSelect->insertItem(-1, ctrl_iface);
+ adapterSelect->addItem(ctrl_iface);
adapterSelect->setCurrentIndex(0);
len = sizeof(buf) - 1;
@@ -286,7 +286,7 @@
if (pos2)
*pos2 = '\0';
if (strcmp(pos, ctrl_iface) != 0)
- adapterSelect->insertItem(-1, pos);
+ adapterSelect->addItem(pos);
if (pos2)
pos = pos2 + 1;
else
@@ -475,7 +475,7 @@
QString network(id);
network.append(": ");
network.append(ssid);
- networkSelect->insertItem(-1, network);
+ networkSelect->addItem(network);
if (strstr(flags, "[CURRENT]")) {
networkSelect->setCurrentIndex(networkSelect->count() -
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c Wed Jan 2 03:16:20 2008
@@ -710,7 +710,7 @@
{
struct wpa_ie_data ie;
int sel, proto;
- u8 *bss_wpa, *bss_rsn;
+ const u8 *bss_wpa, *bss_rsn;
if (bss) {
bss_wpa = wpa_scan_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
@@ -897,7 +897,7 @@
#ifdef CONFIG_IEEE80211R
const u8 *md = NULL;
#endif /* CONFIG_IEEE80211R */
- u8 *ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
+ const u8 *ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
wpa_msg(wpa_s, MSG_INFO, "Trying to associate with " MACSTR
" (SSID='%s' freq=%d MHz)", MAC2STR(bss->bssid),
ie ? wpa_ssid_txt(ie + 2, ie[1]) : "", bss->freq);
@@ -1019,7 +1019,7 @@
wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING);
os_memset(¶ms, 0, sizeof(params));
if (bss) {
- u8 *ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
+ const u8 *ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
params.bssid = bss->bssid;
params.ssid = ie ? ie + 2 : (u8 *) "";
params.ssid_len = ie ? ie[1] : 0;
Modified: wpasupplicant/trunk/wpa_supplicant/wpas_glue.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpas_glue.c?rev=977&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpas_glue.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpas_glue.c Wed Jan 2 03:16:20 2008
@@ -287,7 +287,7 @@
int ret = 0;
struct wpa_scan_res *curr = NULL;
struct wpa_ssid *ssid = wpa_s->current_ssid;
- u8 *ie;
+ const u8 *ie;
if (wpa_s->scan_res == NULL)
return -1;
More information about the Pkg-wpa-devel
mailing list