← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wpasupplicant/vivid

« back to all changes in this revision

Viewing changes to events.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2006-10-05 08:04:01 UTC
  • mfrom: (1.1.5 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061005080401-r8lqlix4390yos7b
Tags: 0.5.5-2
http://bugs.debian.org/388316
* Update madwifi headers to latest SVN. (Closes: #388316)
* Remove failed attempt at action locking. [debian/functions.sh,
  debian/wpa_action.sh]
* Add hysteresis checking functions, to avoid "event loops" while
  using wpa-roam. [debian/functions.sh, debian/wpa_action.sh]
* Change of co-maintainer email address.
* Add ishex() function to functions.sh to determine wpa-psk value type in
  plaintext or hex. This effectively eliminates the need for the bogus and
  somewhat confusing wpa-passphrase contruct specific to our scripts and
  allows wpa-psk to work with either a 8 to 63 character long plaintext
  string or 64 character long hex string.
* Adjust README.modes to not refer to the redundant wpa-passphrase stuff.
* Add big fat NOTE about acceptable wpa-psk's to top of example gallery.
* Strip surrounding quotes from wpa-ssid if present, instead of just whining
  about them.
* Update email address in copyright blurb of functions.sh, ifupdown.sh and
  wpa_action.sh.  

Show diffs side-by-side

added added

removed removed

Lines of Context:
events.c
27
27
#include "pmksa_cache.h"
28
28
#include "wpa_ctrl.h"
29
29
#include "eap.h"
 
30
#include "ctrl_iface_dbus.h"
30
31
 
31
32
 
32
33
static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
412
413
                             memcmp(bss->bssid, ssid->bssid, ETH_ALEN) == 0) &&
413
414
                            ((ssid->key_mgmt & WPA_KEY_MGMT_NONE) ||
414
415
                             (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA))
415
 
                            && bss->wpa_ie_len == 0 && bss->rsn_ie_len == 0 &&
 
416
                            &&
 
417
                            (!(ssid->key_mgmt &
 
418
                               (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK)) ||
 
419
                             (bss->wpa_ie_len == 0 && bss->rsn_ie_len == 0)) &&
416
420
                            wpa_supplicant_match_privacy(bss, ssid) &&
417
421
                            !(bss->caps & IEEE80211_CAP_IBSS))
418
422
                        {
447
451
                timeout = 1;
448
452
                goto req_scan;
449
453
        }
 
454
 
 
455
        wpa_supplicant_dbus_notify_scan_results(wpa_s);
 
456
 
450
457
        if (wpa_s->conf->ap_scan == 2)
451
458
                return;
452
459
        results = wpa_s->scan_results;
655
662
                /* Timeout for receiving the first EAPOL packet */
656
663
                wpa_supplicant_req_auth_timeout(wpa_s, 10, 0);
657
664
        }
 
665
        wpa_supplicant_cancel_scan(wpa_s);
658
666
}
659
667
 
660
668
 
685
693
                bssid = wpa_s->pending_bssid;
686
694
        wpa_blacklist_add(wpa_s, bssid);
687
695
        wpa_sm_notify_disassoc(wpa_s->wpa);
688
 
        wpa_supplicant_mark_disassoc(wpa_s);
689
696
        wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "- Disconnect event - "
690
697
                "remove keys");
691
698
        if (wpa_supplicant_dynamic_keys(wpa_s)) {
692
699
                wpa_s->keys_cleared = 0;
693
700
                wpa_clear_keys(wpa_s, wpa_s->bssid);
694
701
        }
 
702
        wpa_supplicant_mark_disassoc(wpa_s);
695
703
}
696
704
 
697
705