Changeset 14240


Ignore:
Timestamp:
2009-01-28T14:48:22+01:00 (7 years ago)
Author:
juhosg
Message:

[package] wpa_supplicant: update to 0.6.7

Location:
trunk/package/wpa_supplicant
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/wpa_supplicant/Makefile

    r13723 r14240  
    11# 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=wpa_supplicant 
    12 PKG_VERSION:=0.6.6 
     12PKG_VERSION:=0.6.7 
    1313PKG_RELEASE:=1 
    14 PKG_MD5SUM:=cd0b386bdf4b0b3b01516e36cb6977d1 
     14PKG_MD5SUM:=b61f6e94b63f92173f4286b5e6a84140 
    1515 
    1616PKG_SOURCE_URL:=http://hostap.epitest.fi/releases 
     
    4646 
    4747define Package/wpa-cli/Description 
    48  WPA Supplicant control utility  
     48 WPA Supplicant control utility 
    4949endef 
    5050 
  • trunk/package/wpa_supplicant/patches/110-roaming.patch

    r14239 r14240  
    22--- a/wpa_supplicant/events.c 
    33+++ b/wpa_supplicant/events.c 
    4 @@ -807,7 +807,7 @@ static void wpa_supplicant_event_assoc(s 
     4@@ -846,7 +846,7 @@ static void wpa_supplicant_event_assoc(s 
    55                wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); 
    66        } else if (!ft_completed) { 
     
    1313--- a/wpa_supplicant/scan.c 
    1414+++ b/wpa_supplicant/scan.c 
    15 @@ -145,6 +145,7 @@ static void wpa_supplicant_scan(void *el 
    16                 return; 
     15@@ -189,6 +189,7 @@ static void wpa_supplicant_scan(void *el 
    1716        } 
     17 #endif /* CONFIG_WPS */ 
    1818  
    1919+       wpa_drv_flush_pmkid(wpa_s); 
     
    2121                ieee80211_sta_set_probe_req_ie(wpa_s, extra_ie, extra_ie_len); 
    2222                ret = ieee80211_sta_req_scan(wpa_s, ssid ? ssid->ssid : NULL, 
    23 @@ -157,7 +158,7 @@ static void wpa_supplicant_scan(void *el 
     23@@ -203,7 +204,7 @@ static void wpa_supplicant_scan(void *el 
    2424  
    2525        if (ret) { 
     
    3232--- a/wpa_supplicant/wpa_supplicant.c 
    3333+++ b/wpa_supplicant/wpa_supplicant.c 
    34 @@ -1118,10 +1118,10 @@ void wpa_supplicant_associate(struct wpa 
     34@@ -1160,10 +1160,10 @@ void wpa_supplicant_associate(struct wpa 
    3535  
    3636                if (assoc_failed) { 
  • trunk/package/wpa_supplicant/patches/120-ssid_scan.patch

    r14239 r14240  
    33--- a/wpa_supplicant/scan.c 
    44+++ b/wpa_supplicant/scan.c 
    5 @@ -48,11 +48,23 @@ static void wpa_supplicant_scan(void *el 
    6         int enabled, scan_req = 0, ret; 
     5@@ -73,6 +73,7 @@ static void wpa_supplicant_scan(void *el 
     6        struct wpabuf *wps_ie = NULL; 
    77        const u8 *extra_ie = NULL; 
    88        size_t extra_ie_len = 0; 
    99+       int scan_ssid_all = 1; 
    10   
    11         if (wpa_s->disconnected && !wpa_s->scan_req) 
     10        int wps = 0; 
     11 #ifdef CONFIG_WPS 
     12        enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO; 
     13@@ -82,6 +83,17 @@ static void wpa_supplicant_scan(void *el 
    1214                return; 
    1315  
     
    2729        while (ssid) { 
    2830                if (!ssid->disabled) { 
    29 @@ -125,6 +137,10 @@ static void wpa_supplicant_scan(void *el 
     31@@ -154,6 +166,10 @@ static void wpa_supplicant_scan(void *el 
    3032                return; 
    3133        } 
  • trunk/package/wpa_supplicant/patches/130-scanning.patch

    r14239 r14240  
    1818--- a/wpa_supplicant/config_file.c 
    1919+++ b/wpa_supplicant/config_file.c 
    20 @@ -313,6 +313,13 @@ static int wpa_config_process_ap_scan(st 
     20@@ -306,6 +306,13 @@ static int wpa_config_parse_int(const st 
    2121        return 0; 
    2222 } 
     
    3030+ 
    3131  
    32  static int wpa_config_process_fast_reauth(struct wpa_config *config, char *pos) 
    33  { 
    34 @@ -446,6 +453,9 @@ static int wpa_config_process_global(str 
    35         if (os_strncmp(pos, "ap_scan=", 8) == 0) 
    36                 return wpa_config_process_ap_scan(config, pos + 8); 
    37   
    38 +       if (os_strncmp(pos, "scan_cache=", 11) == 0) 
    39 +               return wpa_config_process_scan_cache(config, pos + 11); 
    40 + 
    41         if (os_strncmp(pos, "fast_reauth=", 12) == 0) 
    42                 return wpa_config_process_fast_reauth(config, pos + 12); 
    43   
    44 @@ -819,6 +829,8 @@ static void wpa_config_write_global(FILE 
     32 static int wpa_config_parse_str(const struct global_parse_data *data, 
     33                                struct wpa_config *config, int line, 
     34@@ -433,6 +440,7 @@ static const struct global_parse_data gl 
     35 #endif /* CONFIG_CTRL_IFACE */ 
     36        { INT_RANGE(eapol_version, 1, 2) }, 
     37        { INT(ap_scan) }, 
     38+       { INT(scan_cache) }, 
     39        { INT(fast_reauth) }, 
     40 #ifdef EAP_TLS_OPENSSL 
     41        { STR(opensc_engine_path) }, 
     42@@ -834,6 +842,8 @@ static void wpa_config_write_global(FILE 
    4543                fprintf(f, "eapol_version=%d\n", config->eapol_version); 
    4644        if (config->ap_scan != DEFAULT_AP_SCAN) 
     
    5351--- a/wpa_supplicant/events.c 
    5452+++ b/wpa_supplicant/events.c 
    55 @@ -601,6 +601,9 @@ static void wpa_supplicant_event_scan_re 
    56         if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected) 
     53@@ -633,6 +633,9 @@ static void wpa_supplicant_event_scan_re 
     54            wpa_s->disconnected) 
    5755                return; 
    5856  
     
    6361                for (prio = 0; prio < wpa_s->conf->num_prio; prio++) { 
    6462                        selected = wpa_supplicant_select_bss( 
    65 @@ -613,6 +616,7 @@ static void wpa_supplicant_event_scan_re 
     63@@ -645,6 +648,7 @@ static void wpa_supplicant_event_scan_re 
    6664                        wpa_printf(MSG_DEBUG, "No APs found - clear blacklist " 
    6765                                   "and try again"); 
     
    7169                        break; 
    7270                } 
    73 @@ -640,10 +644,12 @@ static void wpa_supplicant_event_scan_re 
     71@@ -679,10 +683,12 @@ static void wpa_supplicant_event_scan_re 
    7472                rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res); 
    7573        } else { 
     
    8583  
    8684 req_scan: 
    87 @@ -847,6 +853,9 @@ static void wpa_supplicant_event_disasso 
     85@@ -886,6 +892,9 @@ static void wpa_supplicant_event_disasso 
    8886        } 
    8987        if (wpa_s->wpa_state >= WPA_ASSOCIATED) 
     
    9795--- a/wpa_supplicant/wpa_supplicant_i.h 
    9896+++ b/wpa_supplicant/wpa_supplicant_i.h 
    99 @@ -334,6 +334,7 @@ struct wpa_supplicant { 
     97@@ -349,6 +349,7 @@ struct wpa_supplicant { 
    10098        struct wpa_client_mlme mlme; 
    10199        int use_client_mlme; 
     
    105103        int pending_mic_error_report; 
    106104        int pending_mic_error_pairwise; 
    107 @@ -385,6 +386,7 @@ int wpa_supplicant_scard_init(struct wpa 
     105@@ -402,6 +403,7 @@ int wpa_supplicant_scard_init(struct wpa 
    108106  
    109107 /* scan.c */ 
     
    132130+} 
    133131  
    134  static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) 
    135  { 
    136 @@ -150,8 +162,9 @@ static void wpa_supplicant_scan(void *el 
    137         } else 
    138                 wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; 
     132 #ifdef CONFIG_WPS 
     133 static int wpas_wps_in_use(struct wpa_config *conf, 
     134@@ -183,8 +195,9 @@ static void wpa_supplicant_scan(void *el 
     135        wps = wpas_wps_in_use(wpa_s->conf, &req_type); 
     136 #endif /* CONFIG_WPS */ 
    139137  
    140138-       if (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 && 
    141 -           !wpa_s->use_client_mlme) { 
     139-           !wpa_s->use_client_mlme && wps != 2) { 
    142140+       if (!wpa_supplicant_may_scan(wpa_s) || 
    143 +               (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 && 
    144 +           !wpa_s->use_client_mlme)) { 
     141+           (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 && 
     142+           !wpa_s->use_client_mlme && wps != 2)) { 
    145143                wpa_s->scan_res_tried++; 
    146144                wpa_s->scan_req = scan_req; 
     
    148146--- a/wpa_supplicant/wpa_supplicant.c 
    149147+++ b/wpa_supplicant/wpa_supplicant.c 
    150 @@ -1441,6 +1441,9 @@ void wpa_supplicant_rx_eapol(void *ctx,  
     148@@ -1491,6 +1491,9 @@ void wpa_supplicant_rx_eapol(void *ctx,  
    151149 { 
    152150        struct wpa_supplicant *wpa_s = ctx; 
  • trunk/package/wpa_supplicant/patches/140-quality.patch

    r14239 r14240  
    11--- a/wpa_supplicant/wpa_supplicant.c 
    22+++ b/wpa_supplicant/wpa_supplicant.c 
    3 @@ -1206,7 +1206,7 @@ static int wpa_supplicant_get_scan_resul 
     3@@ -1248,7 +1248,7 @@ static int wpa_supplicant_get_scan_resul 
    44 { 
    55 #define SCAN_AP_LIMIT 128 
     
    1010  
    1111        results = os_malloc(SCAN_AP_LIMIT * sizeof(struct wpa_scan_result)); 
    12 @@ -1303,6 +1303,21 @@ static int wpa_supplicant_get_scan_resul 
     12@@ -1345,6 +1345,21 @@ static int wpa_supplicant_get_scan_resul 
    1313                res->res[res->num++] = r; 
    1414        } 
Note: See TracChangeset for help on using the changeset viewer.