Ticket #8850: 0003-eap-Clean-up-EAP-define-naming.patch

File 0003-eap-Clean-up-EAP-define-naming.patch, 1.9 KB (added by kallisti5, 11 years ago)

wpa_supplicant change v1

  • wpa_supplicant/main_haiku.cpp 

    From b4d46a41baa19699ccc43c1b782dcbbe87f8efbe Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 17 Jul 2013 20:13:06 -0500
Subject: [PATCH 3/4] eap: Clean up EAP define naming.

---
 wpa_supplicant/main_haiku.cpp |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wpa_supplicant/main_haiku.cpp b/wpa_supplicant/main_haiku.cpp
index 0f3cf1e..83b2af8 100644
    a b WPASupplicantApp::_JoinNetwork(BMessage *message)  
    459459    if (status != B_OK)
    460460        return status;
    461461
    462     uint32 encapMode = B_NETWORK_ENCAP_NONE;
     462    uint32 encapMode = B_NETWORK_EAP_ENCAPSULATION_NONE;
    463463    if (authMode == B_NETWORK_AUTHENTICATION_EAP)
    464464        message->FindUInt32("encapsulation", &encapMode);
    465465
    466466    const char *username = NULL;
    467     if (encapMode > B_NETWORK_ENCAP_NONE) {
     467    if (encapMode > B_NETWORK_EAP_ENCAPSULATION_NONE) {
    468468        status = message->FindString("username", &username);
    469469        if (status != B_OK)
    470470            return status;
    … … WPASupplicantApp::_JoinNetwork(BMessage *message)  
    520520                "CCMP TKIP WEP104 WEP40", 5);
    521521        }
    522522        if (result == 0) {
    523             if (encapMode > B_NETWORK_ENCAP_NONE) {
     523            if (encapMode > B_NETWORK_EAP_ENCAPSULATION_NONE) {
    524524                switch (encapMode) {
    525                     case B_NETWORK_ENCAP_PEAP:
     525                    case B_NETWORK_EAP_ENCAPSULATION_PEAP:
    526526                        result = wpa_config_set(network, "eap", "PEAP", 6);
    527527                        break;
    528                     case B_NETWORK_ENCAP_TLS:
     528                    case B_NETWORK_EAP_ENCAPSULATION_TLS:
    529529                        result = wpa_config_set(network, "eap", "TLS", 6);
    530530                        break;
    531531                }
    … … WPASupplicantApp::_JoinNetwork(BMessage *message)  
    558558            value += password;
    559559            value += "\"";
    560560            result = wpa_config_set(network, "password", value.String(), 10);
    561             if (encapMode > B_NETWORK_ENCAP_NONE) {
     561            if (encapMode > B_NETWORK_EAP_ENCAPSULATION_NONE) {
    562562                value = "\"";
    563563                value += username;
    564564                value += "\"";