[APR-2053]wlbt: NAN R2 integration fxes
[GitHub/MotorolaMobilityLLC/hardware-samsung_slsi-scsc_wifibt-wifi_hal.git] / gscan.cpp
index 3da86961115e83c33b5a016122ee94b1347dd6a7..e3227e1b47a601210676d4d23b0aafb6b06406bd 100755 (executable)
--- a/gscan.cpp
+++ b/gscan.cpp
-\r
-#include <stdint.h>\r
-#include <fcntl.h>\r
-#include <sys/socket.h>\r
-#include <netlink/genl/genl.h>\r
-#include <netlink/genl/family.h>\r
-#include <netlink/genl/ctrl.h>\r
-#include <linux/rtnetlink.h>\r
-#include <netpacket/packet.h>\r
-#include <linux/filter.h>\r
-#include <linux/errqueue.h>\r
-\r
-#include <linux/pkt_sched.h>\r
-#include <netlink/object-api.h>\r
-#include <netlink/netlink.h>\r
-#include <netlink/socket.h>\r
-#include <netlink/handlers.h>\r
-\r
-#include "sync.h"\r
-\r
-#define LOG_TAG  "WifiHAL"\r
-\r
-#include <utils/Log.h>\r
-\r
-#include "wifi_hal.h"\r
-#include "common.h"\r
-#include "cpp_bindings.h"\r
-\r
-typedef enum {\r
-\r
-    GSCAN_ATTRIBUTE_NUM_BUCKETS = 10,\r
-    GSCAN_ATTRIBUTE_BASE_PERIOD,\r
-    GSCAN_ATTRIBUTE_BUCKETS_BAND,\r
-    GSCAN_ATTRIBUTE_BUCKET_ID,\r
-    GSCAN_ATTRIBUTE_BUCKET_PERIOD,\r
-    GSCAN_ATTRIBUTE_BUCKET_NUM_CHANNELS,\r
-    GSCAN_ATTRIBUTE_BUCKET_CHANNELS,\r
-    GSCAN_ATTRIBUTE_NUM_AP_PER_SCAN,\r
-    GSCAN_ATTRIBUTE_REPORT_THRESHOLD,\r
-    GSCAN_ATTRIBUTE_NUM_SCANS_TO_CACHE,\r
-    GSCAN_ATTRIBUTE_BAND = GSCAN_ATTRIBUTE_BUCKETS_BAND,\r
-\r
-    GSCAN_ATTRIBUTE_ENABLE_FEATURE = 20,\r
-    GSCAN_ATTRIBUTE_SCAN_RESULTS_COMPLETE,              /* indicates no more results */\r
-    GSCAN_ATTRIBUTE_REPORT_EVENTS,\r
-\r
-    /* remaining reserved for additional attributes */\r
-    GSCAN_ATTRIBUTE_NUM_OF_RESULTS = 30,\r
-    GSCAN_ATTRIBUTE_SCAN_RESULTS,                       /* flat array of wifi_scan_result */\r
-    GSCAN_ATTRIBUTE_NUM_CHANNELS,\r
-    GSCAN_ATTRIBUTE_CHANNEL_LIST,\r
-\r
-    /* remaining reserved for additional attributes */\r
-\r
-    GSCAN_ATTRIBUTE_SSID = 40,\r
-    GSCAN_ATTRIBUTE_BSSID,\r
-    GSCAN_ATTRIBUTE_CHANNEL,\r
-    GSCAN_ATTRIBUTE_RSSI,\r
-    GSCAN_ATTRIBUTE_TIMESTAMP,\r
-    GSCAN_ATTRIBUTE_RTT,\r
-    GSCAN_ATTRIBUTE_RTTSD,\r
-\r
-    /* remaining reserved for additional attributes */\r
-\r
-    GSCAN_ATTRIBUTE_HOTLIST_BSSIDS = 50,\r
-    GSCAN_ATTRIBUTE_RSSI_LOW,\r
-    GSCAN_ATTRIBUTE_RSSI_HIGH,\r
-    GSCAN_ATTRIBUTE_HOTLIST_ELEM,\r
-    GSCAN_ATTRIBUTE_HOTLIST_FLUSH,\r
-    GSCAN_ATTRIBUTE_CHANNEL_NUMBER,\r
-\r
-    /* remaining reserved for additional attributes */\r
-    GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE = 60,\r
-    GSCAN_ATTRIBUTE_LOST_AP_SAMPLE_SIZE,\r
-    GSCAN_ATTRIBUTE_MIN_BREACHING,\r
-    GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS,\r
-\r
-    GSCAN_ATTRIBUTE_MAX\r
-\r
-} GSCAN_ATTRIBUTE;\r
-\r
-\r
-class GetCapabilitiesCommand : public WifiCommand\r
-{\r
-    wifi_gscan_capabilities *mCapabilities;\r
-public:\r
-    GetCapabilitiesCommand(wifi_interface_handle iface, wifi_gscan_capabilities *capabitlites)\r
-        : WifiCommand(iface, 0), mCapabilities(capabitlites)\r
-    {\r
-        memset(mCapabilities, 0, sizeof(*mCapabilities));\r
-    }\r
-\r
-    virtual int create() {\r
-        ALOGD("Creating message to get scan capablities; iface = %d", mIfaceInfo->id);\r
-\r
-        int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_CAPABILITIES);\r
-        if (ret < 0) {\r
-           ALOGD("NL message creation failed");\r
-            return ret;\r
-        }\r
-\r
-        return ret;\r
-    }\r
-\r
-protected:\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-\r
-        ALOGD("In GetCapabilities::handleResponse");\r
-\r
-        if (reply.get_cmd() != NL80211_CMD_VENDOR) {\r
-            ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());\r
-            return NL_SKIP;\r
-        }\r
-\r
-        int id = reply.get_vendor_id();\r
-        int subcmd = reply.get_vendor_subcmd();\r
-\r
-        void *data = reply.get_vendor_data();\r
-        int len = reply.get_vendor_data_len();\r
-\r
-        ALOGD("Id = %0x, subcmd = %d, len = %d, expected len = %d", id, subcmd, len,\r
-                    sizeof(*mCapabilities));\r
-\r
-        memcpy(mCapabilities, data, min(len, (int) sizeof(*mCapabilities)));\r
-\r
-        return NL_OK;\r
-    }\r
-};\r
-\r
-\r
-wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,\r
-        wifi_gscan_capabilities *capabilities)\r
-{\r
-    GetCapabilitiesCommand command(handle, capabilities);\r
-    return (wifi_error) command.requestResponse();\r
-}\r
-\r
-class GetChannelListCommand : public WifiCommand\r
-{\r
-    wifi_channel *channels;\r
-    int max_channels;\r
-    int *num_channels;\r
-    int band;\r
-public:\r
-    GetChannelListCommand(wifi_interface_handle iface, wifi_channel *channel_buf, int *ch_num,\r
-        int num_max_ch, int band)\r
-        : WifiCommand(iface, 0), channels(channel_buf), max_channels(num_max_ch), num_channels(ch_num),\r
-        band(band)\r
-    {\r
-        memset(channels, 0, sizeof(wifi_channel) * max_channels);\r
-    }\r
-    virtual int create() {\r
-        ALOGD("Creating message to get channel list; iface = %d", mIfaceInfo->id);\r
-\r
-        int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_VALID_CHANNELS);\r
-        if (ret < 0) {\r
-            return ret;\r
-        }\r
-\r
-        nlattr *data = mMsg.attr_start(NL80211_ATTR_VENDOR_DATA);\r
-        ret = mMsg.put_u32(GSCAN_ATTRIBUTE_BAND, band);\r
-        if (ret < 0) {\r
-            return ret;\r
-        }\r
-\r
-        mMsg.attr_end(data);\r
-\r
-        return ret;\r
-    }\r
-\r
-protected:\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-\r
-        ALOGD("In GetChannelList::handleResponse");\r
-\r
-        if (reply.get_cmd() != NL80211_CMD_VENDOR) {\r
-            ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());\r
-            return NL_SKIP;\r
-        }\r
-\r
-        int id = reply.get_vendor_id();\r
-        int subcmd = reply.get_vendor_subcmd();\r
-        int num_channels_to_copy = 0;\r
-\r
-        nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);\r
-        int len = reply.get_vendor_data_len();\r
-\r
-        ALOGD("Id = %0x, subcmd = %d, len = %d", id, subcmd, len);\r
-        if (vendor_data == NULL || len == 0) {\r
-            ALOGE("no vendor data in GetChannelList response; ignoring it");\r
-            return NL_SKIP;\r
-        }\r
-\r
-        for (nl_iterator it(vendor_data); it.has_next(); it.next()) {\r
-            if (it.get_type() == GSCAN_ATTRIBUTE_NUM_CHANNELS) {\r
-                num_channels_to_copy = it.get_u32();\r
-                ALOGD("Got channel list with %d channels", num_channels_to_copy);\r
-                if(num_channels_to_copy > max_channels)\r
-                    num_channels_to_copy = max_channels;\r
-                *num_channels = num_channels_to_copy;\r
-            } else if (it.get_type() == GSCAN_ATTRIBUTE_CHANNEL_LIST && num_channels_to_copy) {\r
-                memcpy(channels, it.get_data(), sizeof(int) * num_channels_to_copy);\r
-            } else {\r
-                ALOGW("Ignoring invalid attribute type = %d, size = %d",\r
-                        it.get_type(), it.get_len());\r
-            }\r
-        }\r
-\r
-        return NL_OK;\r
-    }\r
-};\r
-\r
-wifi_error wifi_get_valid_channels(wifi_interface_handle handle,\r
-        int band, int max_channels, wifi_channel *channels, int *num_channels)\r
-{\r
-    GetChannelListCommand command(handle, channels, num_channels,\r
-                                        max_channels, band);\r
-    return (wifi_error) command.requestResponse();\r
-}\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-/* helper functions */\r
-\r
-static int parseScanResults(wifi_scan_result *results, int num, nlattr *attr)\r
-{\r
-    memset(results, 0, sizeof(wifi_scan_result) * num);\r
-\r
-    int i = 0;\r
-    for (nl_iterator it(attr); it.has_next() && i < num; it.next(), i++) {\r
-\r
-        int index = it.get_type();\r
-        ALOGD("retrieved scan result %d", index);\r
-        nlattr *sc_data = (nlattr *) it.get_data();\r
-        wifi_scan_result *result = results + i;\r
-\r
-        for (nl_iterator it2(sc_data); it2.has_next(); it2.next()) {\r
-            int type = it2.get_type();\r
-            if (type == GSCAN_ATTRIBUTE_SSID) {\r
-                strncpy(result->ssid, (char *) it2.get_data(), it2.get_len());\r
-                result->ssid[it2.get_len()] = 0;\r
-            } else if (type == GSCAN_ATTRIBUTE_BSSID) {\r
-                memcpy(result->bssid, (byte *) it2.get_data(), sizeof(mac_addr));\r
-            } else if (type == GSCAN_ATTRIBUTE_TIMESTAMP) {\r
-                result->ts = it2.get_u64();\r
-            } else if (type == GSCAN_ATTRIBUTE_CHANNEL) {\r
-                result->ts = it2.get_u16();\r
-            } else if (type == GSCAN_ATTRIBUTE_RSSI) {\r
-                result->rssi = it2.get_u8();\r
-            } else if (type == GSCAN_ATTRIBUTE_RTT) {\r
-                result->rtt = it2.get_u64();\r
-            } else if (type == GSCAN_ATTRIBUTE_RTTSD) {\r
-                result->rtt_sd = it2.get_u64();\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    if (i >= num) {\r
-        ALOGE("Got too many results; skipping some");\r
-    }\r
-\r
-    return i;\r
-}\r
-\r
-int createFeatureRequest(WifiRequest& request, int subcmd) {\r
-\r
-    int result = request.create(GOOGLE_OUI, subcmd);\r
-    if (result < 0) {\r
-        return result;\r
-    }\r
-\r
-    return WIFI_SUCCESS;\r
-}\r
-\r
-class ScanCommand : public WifiCommand\r
-{\r
-    wifi_scan_cmd_params *mParams;\r
-    wifi_scan_result_handler mHandler;\r
-    static unsigned mGlobalFullScanBuckets;\r
-    bool mLocalFullScanBuckets;\r
-public:\r
-    ScanCommand(wifi_interface_handle iface, int id, wifi_scan_cmd_params *params,\r
-                wifi_scan_result_handler handler)\r
-        : WifiCommand(iface, id), mParams(params), mHandler(handler),\r
-          mLocalFullScanBuckets(0)\r
-    { }\r
-\r
-    int createSetupRequest(WifiRequest& request) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);\r
-        result = request.put_u32(GSCAN_ATTRIBUTE_BASE_PERIOD, mParams->base_period);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-       result = request.put_u32(GSCAN_ATTRIBUTE_NUM_AP_PER_SCAN, mParams->max_ap_per_scan);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = request.put_u32(GSCAN_ATTRIBUTE_REPORT_THRESHOLD, mParams->report_threshold);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = request.put_u32(GSCAN_ATTRIBUTE_NUM_BUCKETS, mParams->num_buckets);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        for (int i = 0; i < mParams->num_buckets; i++) {\r
-            nlattr * bucket = request.attr_start(i);    // next bucket\r
-            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_ID, mParams->buckets[i].bucket);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_PERIOD, mParams->buckets[i].period);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKETS_BAND,\r
-                    mParams->buckets[i].band);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-\r
-            result = request.put_u32(GSCAN_ATTRIBUTE_REPORT_EVENTS,\r
-                    mParams->buckets[i].report_events);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-\r
-            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_NUM_CHANNELS,\r
-                    mParams->buckets[i].num_channels);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-\r
-            if (mParams->buckets[i].num_channels) {\r
-                nlattr *channels = request.attr_start(GSCAN_ATTRIBUTE_BUCKET_CHANNELS);\r
-                for (int j = 0; j < mParams->buckets[i].num_channels; j++) {\r
-                    result = request.put_u32(j, mParams->buckets[i].channels[j].channel);\r
-                    if (result < 0) {\r
-                        return result;\r
-                    }\r
-                }\r
-                request.attr_end(channels);\r
-            }\r
-\r
-            request.attr_end(bucket);\r
-        }\r
-\r
-        request.attr_end(data);\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    int createStartRequest(WifiRequest& request) {\r
-        return createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);\r
-    }\r
-\r
-    int createStopRequest(WifiRequest& request) {\r
-        return createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_DEL_GSCAN);\r
-    }\r
-\r
-    int start() {\r
-        ALOGD(" sending scan req to driver");\r
-        WifiRequest request(familyId(), ifaceId());\r
-        int result = createSetupRequest(request);\r
-        if (result != WIFI_SUCCESS) {\r
-            ALOGE("failed to create setup request; result = %d", result);\r
-            return result;\r
-        }\r
-        ALOGD("Starting scan");\r
-\r
-        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);\r
-        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);\r
-\r
-        int nBuckets = 0;\r
-        for (int i = 0; i < mParams->num_buckets; i++) {\r
-            if (mParams->buckets[i].report_events == 2) {\r
-                nBuckets++;\r
-            }\r
-        }\r
-\r
-        if (nBuckets != 0) {\r
-           ALOGI("Full scan requested with nBuckets = %d", nBuckets);\r
-           registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS);\r
-        }\r
-        result = requestResponse(request);\r
-        if (result != WIFI_SUCCESS) {\r
-            ALOGE("failed to start scan; result = %d", result);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);\r
-            return result;\r
-        }\r
-\r
-      \r
-        return result;\r
-    }\r
-\r
-    virtual int cancel() {\r
-        ALOGD("Stopping scan");\r
-\r
-        WifiRequest request(familyId(), ifaceId());\r
-        int result = createStopRequest(request);\r
-        if (result != WIFI_SUCCESS) {\r
-            ALOGE("failed to create stop request; result = %d", result);\r
-        } else {\r
-            result = requestResponse(request);\r
-            if (result != WIFI_SUCCESS) {\r
-                ALOGE("failed to stop scan; result = %d", result);\r
-            }\r
-        }\r
-\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS);\r
-\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-        /* Nothing to do on response! */\r
-        return NL_SKIP;\r
-    }\r
-\r
-    virtual int handleEvent(WifiEvent& event) {\r
-        ALOGD("Got a scan results event");\r
-\r
-        event.log();\r
-\r
-        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);\r
-        int len = event.get_vendor_data_len();\r
-        int event_id = event.get_vendor_subcmd();\r
-        ALOGD("handleEvent, event_id = %d", event_id);\r
-\r
-        if(event_id == GSCAN_EVENT_COMPLETE_SCAN) {\r
-            if (vendor_data == NULL || len != 4) {\r
-                ALOGD("Scan complete type not mentioned!");\r
-                return NL_SKIP;\r
-            }\r
-            wifi_scan_event evt_type;\r
-\r
-            evt_type = (wifi_scan_event) event.get_u32(NL80211_ATTR_VENDOR_DATA);\r
-            ALOGD("Scan complete: Received event type %d", evt_type);\r
-            if(*mHandler.on_scan_event)\r
-                (*mHandler.on_scan_event)(evt_type, evt_type);\r
-        } else if(event_id == GSCAN_EVENT_FULL_SCAN_RESULTS) {\r
-           if (vendor_data == NULL || len < sizeof(wifi_scan_result)) {\r
-               ALOGD("No scan results found");\r
-               return NL_SKIP;\r
-           }\r
-           wifi_scan_result *result = (wifi_scan_result *)event.get_vendor_data();\r
-\r
-           if(*mHandler.on_full_scan_result)\r
-               (*mHandler.on_full_scan_result)(id(), result);\r
-\r
-           ALOGD("%-32s\t", result->ssid);\r
-\r
-           ALOGD("%02x:%02x:%02x:%02x:%02x:%02x ", result->bssid[0], result->bssid[1],\r
-                   result->bssid[2], result->bssid[3], result->bssid[4], result->bssid[5]);\r
-\r
-           ALOGD("%d\t", result->rssi);\r
-           ALOGD("%d\t", result->channel);\r
-           ALOGD("%lld\t", result->ts);\r
-           ALOGD("%lld\t", result->rtt);\r
-           ALOGD("%lld\n", result->rtt_sd);\r
-        } else {\r
-\r
-            if (vendor_data == NULL || len != 4) {\r
-                ALOGD("No scan results found");\r
-                return NL_SKIP;\r
-            }\r
-\r
-            int num = event.get_u32(NL80211_ATTR_VENDOR_DATA);\r
-            ALOGD("Found %d scan results", num);\r
-            if(*mHandler.on_scan_results_available)\r
-                (*mHandler.on_scan_results_available)(id(), num);\r
-        }\r
-        return NL_SKIP;\r
-    }\r
-};\r
-\r
-unsigned ScanCommand::mGlobalFullScanBuckets = 0;\r
-\r
-wifi_error wifi_start_gscan(\r
-        wifi_request_id id,\r
-        wifi_interface_handle iface,\r
-        wifi_scan_cmd_params params,\r
-        wifi_scan_result_handler handler)\r
-{\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    ALOGD("Starting GScan, halHandle = %p", handle);\r
-\r
-    ScanCommand *cmd = new ScanCommand(iface, id, &params, handler);\r
-    wifi_register_cmd(handle, id, cmd);\r
-    return (wifi_error)cmd->start();\r
-}\r
-\r
-wifi_error wifi_stop_gscan(wifi_request_id id, wifi_interface_handle iface)\r
-{\r
-    ALOGD("Stopping GScan");\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    if(id == -1) {\r
-        wifi_scan_result_handler handler;\r
-        wifi_scan_cmd_params dummy_params;\r
-        wifi_handle handle = getWifiHandle(iface);\r
-        memset(&handler, 0, sizeof(handler));\r
-\r
-        ScanCommand *cmd = new ScanCommand(iface, id, &dummy_params, handler);\r
-        cmd->cancel();\r
-        cmd->releaseRef();\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-\r
-    WifiCommand *cmd = wifi_unregister_cmd(handle, id);\r
-    if (cmd) {\r
-        cmd->cancel();\r
-        cmd->releaseRef();\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    return WIFI_ERROR_INVALID_ARGS;\r
-}\r
-\r
-class GetScanResultsCommand : public WifiCommand {\r
-    wifi_scan_result *mResults;\r
-    int mMax;\r
-    int *mNum;\r
-    int mRetrieved;\r
-    byte mFlush;\r
-    int mCompleted;\r
-public:\r
-    GetScanResultsCommand(wifi_interface_handle iface, byte flush,\r
-            wifi_scan_result *results, int max, int *num)\r
-        : WifiCommand(iface, -1), mResults(results), mMax(max), mNum(num),\r
-                mRetrieved(0), mFlush(flush), mCompleted(0)\r
-    { }\r
-\r
-    int createRequest(WifiRequest& request, int num, byte flush) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_SCAN_RESULTS);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);\r
-        result = request.put_u32(GSCAN_ATTRIBUTE_NUM_OF_RESULTS, num);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        request.attr_end(data);\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    int execute() {\r
-        WifiRequest request(familyId(), ifaceId());\r
-        ALOGD("retrieving %d scan results", mMax);\r
-\r
-        for (int i = 0; i < 10 && mRetrieved < mMax; i++) {\r
-            int result = createRequest(request, (mMax - mRetrieved), mFlush);\r
-            if (result < 0) {\r
-                ALOGE("failed to create request");\r
-                return result;\r
-            }\r
-\r
-            int prev_retrieved = mRetrieved;\r
-\r
-            result = requestResponse(request);\r
-\r
-            if (result != WIFI_SUCCESS) {\r
-                ALOGE("failed to retrieve scan results; result = %d", result);\r
-                return result;\r
-            }\r
-\r
-            if (mRetrieved == prev_retrieved || mCompleted) {\r
-                /* no more items left to retrieve */\r
-                break;\r
-            }\r
-\r
-            request.destroy();\r
-        }\r
-\r
-        ALOGE("GetScanResults read %d results", mRetrieved);\r
-        *mNum = mRetrieved;\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-        ALOGD("In GetScanResultsCommand::handleResponse");\r
-\r
-        if (reply.get_cmd() != NL80211_CMD_VENDOR) {\r
-            ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());\r
-            return NL_SKIP;\r
-        }\r
-\r
-        int id = reply.get_vendor_id();\r
-        int subcmd = reply.get_vendor_subcmd();\r
-\r
-        ALOGD("Id = %0x, subcmd = %d", id, subcmd);\r
-\r
-        nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);\r
-        int len = reply.get_vendor_data_len();\r
-\r
-        if (vendor_data == NULL || len == 0) {\r
-            ALOGE("no vendor data in GetScanResults response; ignoring it");\r
-            return NL_SKIP;\r
-        }\r
-\r
-        for (nl_iterator it(vendor_data); it.has_next(); it.next()) {\r
-            if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS_COMPLETE) {\r
-                mCompleted = it.get_u8();\r
-                ALOGD("retrieved mCompleted flag : %d", mCompleted);\r
-            } else if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS || it.get_type() == 0) {\r
-                for (nl_iterator it2(it.get()); it2.has_next(); it2.next()) {\r
-                    int num = 0;\r
-                    if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS) {\r
-                        num = it2.get_len() / sizeof(wifi_scan_result);\r
-                        num = min(*mNum - mRetrieved, num);\r
-                        memcpy(mResults + mRetrieved, it2.get_data(),\r
-                                sizeof(wifi_scan_result) * num);\r
-                        ALOGD("Retrieved %d scan results", num);\r
-                        wifi_scan_result *results = (wifi_scan_result *)it2.get_data();\r
-                        for (int i = 0; i < num; i++) {\r
-                            wifi_scan_result *result = results + i;\r
-                            ALOGD("%02d  %-32s  %02x:%02x:%02x:%02x:%02x:%02x  %04d", i,\r
-                                result->ssid, result->bssid[0], result->bssid[1], result->bssid[2],\r
-                                result->bssid[3], result->bssid[4], result->bssid[5],\r
-                                result->rssi);\r
-                        }\r
-                        mRetrieved += num;\r
-                    } else {\r
-                        ALOGW("Ignoring invalid attribute type = %d, size = %d",\r
-                                it.get_type(), it.get_len());\r
-                    }\r
-                }\r
-            } else {\r
-                ALOGW("Ignoring invalid attribute type = %d, size = %d",\r
-                        it.get_type(), it.get_len());\r
-            }\r
-        }\r
-\r
-        return NL_OK;\r
-    }\r
-};\r
-\r
-wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface, byte flush,\r
-        int max, wifi_scan_result *results, int *num) {\r
-\r
-    ALOGD("Getting cached scan results, iface handle = %p, num = %d", iface, *num);\r
-\r
-    GetScanResultsCommand *cmd = new GetScanResultsCommand(iface, flush, results, max, num);\r
-    return (wifi_error)cmd->execute();\r
-}\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-class BssidHotlistCommand : public WifiCommand\r
-{\r
-private:\r
-    wifi_bssid_hotlist_params mParams;\r
-    wifi_hotlist_ap_found_handler mHandler;\r
-    static const int MAX_RESULTS = 64;\r
-    wifi_scan_result mResults[MAX_RESULTS];\r
-public:\r
-    BssidHotlistCommand(wifi_interface_handle handle, int id,\r
-            wifi_bssid_hotlist_params params, wifi_hotlist_ap_found_handler handler)\r
-        : WifiCommand(handle, id), mParams(params), mHandler(handler)\r
-    { }\r
-\r
-    int createSetupRequest(WifiRequest& request) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_SET_BSSID_HOTLIST);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);\r
-\r
-        result = request.put_u32(GSCAN_ATTRIBUTE_LOST_AP_SAMPLE_SIZE, mParams.lost_ap_sample_size);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        struct nlattr * attr = request.attr_start(GSCAN_ATTRIBUTE_HOTLIST_BSSIDS);\r
-        for (int i = 0; i < mParams.num_ap; i++) {\r
-            nlattr *attr2 = request.attr_start(GSCAN_ATTRIBUTE_HOTLIST_ELEM);\r
-            if (attr2 == NULL) {\r
-                return WIFI_ERROR_OUT_OF_MEMORY;\r
-            }\r
-            result = request.put_addr(GSCAN_ATTRIBUTE_BSSID, mParams.ap[i].bssid);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_HIGH, mParams.ap[i].high);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_LOW, mParams.ap[i].low);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u8(GSCAN_ATTRIBUTE_CHANNEL_NUMBER, mParams.ap[i].channel);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            request.attr_end(attr2);\r
-        }\r
-\r
-        request.attr_end(attr);\r
-        request.attr_end(data);\r
-        return result;\r
-    }\r
-\r
-    int createTeardownRequest(WifiRequest& request) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_RESET_BSSID_HOTLIST);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        return result;\r
-    }\r
-\r
-    int start() {\r
-        ALOGD("Executing hotlist setup request, num = %d", mParams.num_ap);\r
-        WifiRequest request(familyId(), ifaceId());\r
-        int result = createSetupRequest(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = requestResponse(request);\r
-        if (result < 0) {\r
-            ALOGD("Failed to execute hotlist setup request, result = %d", result);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST);\r
-            return result;\r
-        }\r
-\r
-        ALOGD("Successfully set %d APs in the hotlist", mParams.num_ap);\r
-\r
-        result = createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND);\r
-        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST);\r
-\r
-        result = requestResponse(request);\r
-        if (result != WIFI_SUCCESS) {\r
-            ALOGE("failed to start scan; result = %d", result);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND);\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST);\r
-            return result;\r
-        }\r
-\r
-        ALOGD("successfully restarted the scan");\r
-\r
-        return result;\r
-    }\r
-\r
-    virtual int cancel() {\r
-        /* unregister event handler */\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_FOUND);\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_HOTLIST_RESULTS_LOST);\r
-        /* create set hotlist message with empty hotlist */\r
-        WifiRequest request(familyId(), ifaceId());\r
-        int result = createTeardownRequest(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = requestResponse(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        ALOGD("Successfully reset APs in current hotlist");\r
-        return result;\r
-    }\r
-\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-        /* Nothing to do on response! */\r
-        return NL_SKIP;\r
-    }\r
-\r
-    virtual int handleEvent(WifiEvent& event) {\r
-        ALOGD("Hotlist AP event");\r
-        int event_id = event.get_vendor_subcmd();\r
-        event.log();\r
-\r
-        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);\r
-        int len = event.get_vendor_data_len();\r
-\r
-        if (vendor_data == NULL || len == 0) {\r
-            ALOGD("No scan results found");\r
-            return NL_SKIP;\r
-        }\r
-\r
-        memset(mResults, 0, sizeof(wifi_scan_result) * MAX_RESULTS);\r
-\r
-        int num = len / sizeof(wifi_scan_result);\r
-        num = min(MAX_RESULTS, num);\r
-        memcpy(mResults, event.get_vendor_data(), num * sizeof(wifi_scan_result));\r
-\r
-        if (event_id == GSCAN_EVENT_HOTLIST_RESULTS_FOUND) {\r
-            ALOGD("FOUND %d hotlist APs", num);\r
-            if (*mHandler.on_hotlist_ap_found)\r
-                (*mHandler.on_hotlist_ap_found)(id(), num, mResults);\r
-        } else if (event_id == GSCAN_EVENT_HOTLIST_RESULTS_LOST) {\r
-            ALOGD("LOST %d hotlist APs", num);\r
-            if (*mHandler.on_hotlist_ap_lost)\r
-                (*mHandler.on_hotlist_ap_lost)(id(), num, mResults);\r
-        }\r
-        return NL_SKIP;\r
-    }\r
-};\r
-\r
-wifi_error wifi_set_bssid_hotlist(wifi_request_id id, wifi_interface_handle iface,\r
-        wifi_bssid_hotlist_params params, wifi_hotlist_ap_found_handler handler)\r
-{\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    BssidHotlistCommand *cmd = new BssidHotlistCommand(iface, id, params, handler);\r
-    wifi_register_cmd(handle, id, cmd);\r
-    return (wifi_error)cmd->start();\r
-}\r
-\r
-wifi_error wifi_reset_bssid_hotlist(wifi_request_id id, wifi_interface_handle iface)\r
-{\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    WifiCommand *cmd = wifi_unregister_cmd(handle, id);\r
-    if (cmd) {\r
-        cmd->cancel();\r
-        cmd->releaseRef();\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    return WIFI_ERROR_INVALID_ARGS;\r
-}\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-class SignificantWifiChangeCommand : public WifiCommand\r
-{\r
-    typedef struct {\r
-        mac_addr bssid;                     // BSSID\r
-        wifi_channel channel;               // channel frequency in MHz\r
-        int num_rssi;                       // number of rssi samples\r
-        wifi_rssi rssi[8];                   // RSSI history in db\r
-    } wifi_significant_change_result_internal;\r
-\r
-private:\r
-    wifi_significant_change_params mParams;\r
-    wifi_significant_change_handler mHandler;\r
-    static const int MAX_RESULTS = 64;\r
-    wifi_significant_change_result_internal mResultsBuffer[MAX_RESULTS];\r
-    wifi_significant_change_result *mResults[MAX_RESULTS];\r
-public:\r
-    SignificantWifiChangeCommand(wifi_interface_handle handle, int id,\r
-            wifi_significant_change_params params, wifi_significant_change_handler handler)\r
-        : WifiCommand(handle, id), mParams(params), mHandler(handler)\r
-    { }\r
-\r
-    int createSetupRequest(WifiRequest& request) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_SET_SIGNIFICANT_CHANGE);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);\r
-\r
-        result = request.put_u16(GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE, mParams.rssi_sample_size);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-        result = request.put_u16(GSCAN_ATTRIBUTE_LOST_AP_SAMPLE_SIZE, mParams.lost_ap_sample_size);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-        result = request.put_u16(GSCAN_ATTRIBUTE_MIN_BREACHING, mParams.min_breaching);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        struct nlattr * attr = request.attr_start(GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS);\r
-\r
-        for (int i = 0; i < mParams.num_ap; i++) {\r
-\r
-            nlattr *attr2 = request.attr_start(i);\r
-            if (attr2 == NULL) {\r
-                return WIFI_ERROR_OUT_OF_MEMORY;\r
-            }\r
-            result = request.put_addr(GSCAN_ATTRIBUTE_BSSID, mParams.ap[i].bssid);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_HIGH, mParams.ap[i].high);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_LOW, mParams.ap[i].low);\r
-            if (result < 0) {\r
-                return result;\r
-            }\r
-            request.attr_end(attr2);\r
-        }\r
-\r
-        request.attr_end(attr);\r
-        request.attr_end(data);\r
-\r
-        return result;\r
-    }\r
-\r
-    int createTeardownRequest(WifiRequest& request) {\r
-        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_RESET_SIGNIFICANT_CHANGE);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        return result;\r
-    }\r
-\r
-    int start() {\r
-        ALOGD("Set significant wifi change");\r
-        WifiRequest request(familyId(), ifaceId());\r
-\r
-        int result = createSetupRequest(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = requestResponse(request);\r
-        if (result < 0) {\r
-            ALOGD("failed to set significant wifi change %d", result);\r
-            return result;\r
-        }\r
-\r
-        result = createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS);\r
-\r
-        result = requestResponse(request);\r
-        if (result < 0) {\r
-            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS);\r
-            return result;\r
-        }\r
-\r
-        ALOGD("successfully restarted the scan");\r
-        return result;\r
-    }\r
-\r
-    virtual int cancel() {\r
-        /* unregister event handler */\r
-        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS);\r
-\r
-        /* create set significant change monitor message with empty hotlist */\r
-        WifiRequest request(familyId(), ifaceId());\r
-\r
-        int result = createTeardownRequest(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        result = requestResponse(request);\r
-        if (result < 0) {\r
-            return result;\r
-        }\r
-\r
-        ALOGD("successfully reset significant wifi change");\r
-        return result;\r
-    }\r
-\r
-    virtual int handleResponse(WifiEvent& reply) {\r
-        /* Nothing to do on response! */\r
-        return NL_SKIP;\r
-    }\r
-\r
-    virtual int handleEvent(WifiEvent& event) {\r
-        ALOGD("Got a significant wifi change event");\r
-\r
-        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);\r
-        int len = event.get_vendor_data_len();\r
-\r
-        if (vendor_data == NULL || len == 0) {\r
-            ALOGD("No scan results found");\r
-            return NL_SKIP;\r
-        }\r
-\r
-        typedef struct {\r
-            uint16_t channel;\r
-            mac_addr bssid;\r
-            s16 rssi_history[8];\r
-        } ChangeInfo;\r
-\r
-        int num = min(len / sizeof(ChangeInfo), MAX_RESULTS);\r
-        ChangeInfo *ci = (ChangeInfo *)event.get_vendor_data();\r
-\r
-        for (int i = 0; i < num; i++) {\r
-            memcpy(mResultsBuffer[i].bssid, ci[i].bssid, sizeof(mac_addr));\r
-            mResultsBuffer[i].channel = ci[i].channel;\r
-            mResultsBuffer[i].num_rssi = 8;\r
-            for (int j = 0; j < mResultsBuffer[i].num_rssi; j++)\r
-                mResultsBuffer[i].rssi[j] = (int) ci[i].rssi_history[j];\r
-            mResults[i] = reinterpret_cast<wifi_significant_change_result *>(&(mResultsBuffer[i]));\r
-        }\r
-\r
-        ALOGD("Retrieved %d scan results", num);\r
-\r
-        if (num != 0) {\r
-            (*mHandler.on_significant_change)(id(), num, mResults);\r
-        } else {\r
-            ALOGW("No significant change reported");\r
-        }\r
-\r
-        return NL_SKIP;\r
-    }\r
-};\r
-\r
-wifi_error wifi_set_significant_change_handler(wifi_request_id id, wifi_interface_handle iface,\r
-        wifi_significant_change_params params, wifi_significant_change_handler handler)\r
-{\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    SignificantWifiChangeCommand *cmd = new SignificantWifiChangeCommand(\r
-            iface, id, params, handler);\r
-    wifi_register_cmd(handle, id, cmd);\r
-    return (wifi_error)cmd->start();\r
-}\r
-\r
-wifi_error wifi_reset_significant_change_handler(wifi_request_id id, wifi_interface_handle iface)\r
-{\r
-    wifi_handle handle = getWifiHandle(iface);\r
-\r
-    WifiCommand *cmd = wifi_unregister_cmd(handle, id);\r
-    if (cmd) {\r
-        cmd->cancel();\r
-        cmd->releaseRef();\r
-        return WIFI_SUCCESS;\r
-    }\r
-\r
-    return WIFI_ERROR_INVALID_ARGS;\r
-}\r
+#include <stdint.h>
+#include <stddef.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <netlink/genl/ctrl.h>
+#include <linux/rtnetlink.h>
+#include <netpacket/packet.h>
+#include <linux/filter.h>
+#include <linux/errqueue.h>
+
+#include <linux/pkt_sched.h>
+#include <netlink/object-api.h>
+#include <netlink/netlink.h>
+#include <netlink/socket.h>
+#include <netlink/handlers.h>
+
+#include "sync.h"
+
+#include <utils/Log.h>
+
+#include "wifi_hal.h"
+#include "common.h"
+#include "cpp_bindings.h"
+
+typedef enum {
+    EPNO_ATTRIBUTE_MINIMUM_5G_RSSI,
+    EPNO_ATTRIBUTE_MINIMUM_2G_RSSI,
+    EPNO_ATTRIBUTE_INITIAL_SCORE_MAX,
+    EPNO_ATTRIBUTE_CUR_CONN_BONUS,
+    EPNO_ATTRIBUTE_SAME_NETWORK_BONUS,
+    EPNO_ATTRIBUTE_SECURE_BONUS,
+    EPNO_ATTRIBUTE_5G_BONUS,
+    EPNO_ATTRIBUTE_SSID_NUM,
+    EPNO_ATTRIBUTE_SSID_LIST,
+    EPNO_ATTRIBUTE_SSID,
+    EPNO_ATTRIBUTE_SSID_LEN,
+    EPNO_ATTRIBUTE_FLAGS,
+    EPNO_ATTRIBUTE_AUTH,
+    EPNO_ATTRIBUTE_MAX
+} EPNO_ATTRIBUTE;
+
+typedef enum {
+    EPNO_ATTRIBUTE_HS_PARAM_LIST,
+    EPNO_ATTRIBUTE_HS_NUM,
+    EPNO_ATTRIBUTE_HS_ID,
+    EPNO_ATTRIBUTE_HS_REALM,
+    EPNO_ATTRIBUTE_HS_CONSORTIUM_IDS,
+    EPNO_ATTRIBUTE_HS_PLMN,
+    EPNO_ATTRIBUTE_HS_MAX
+} EPNO_HS_ATTRIBUTE;
+
+
+class GetCapabilitiesCommand : public WifiCommand
+{
+    wifi_gscan_capabilities *mCapabilities;
+public:
+    GetCapabilitiesCommand(wifi_interface_handle iface, wifi_gscan_capabilities *capabitlites)
+        : WifiCommand(iface, 0), mCapabilities(capabitlites)
+    {
+        memset(mCapabilities, 0, sizeof(*mCapabilities));
+    }
+
+    virtual int create() {
+        int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_CAPABILITIES);
+        if (ret < 0) {
+            ALOGE("NL message creation failed");
+            return ret;
+        }
+
+        return ret;
+    }
+
+protected:
+    virtual int handleResponse(WifiEvent& reply) {
+
+        if (reply.get_cmd() != NL80211_CMD_VENDOR) {
+            ALOGE("Ignoring reply with cmd = %d", reply.get_cmd());
+            return NL_SKIP;
+        }
+
+        void *data = reply.get_vendor_data();
+        int len = reply.get_vendor_data_len();
+
+        memcpy(mCapabilities, data, min(len, (int) sizeof(*mCapabilities)));
+
+        return NL_OK;
+    }
+};
+
+
+wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
+        wifi_gscan_capabilities *capabilities)
+{
+    GetCapabilitiesCommand command(handle, capabilities);
+    return (wifi_error) command.requestResponse();
+}
+
+class GetChannelListCommand : public WifiCommand
+{
+    wifi_channel *channels;
+    int max_channels;
+    int *num_channels;
+    int band;
+public:
+    GetChannelListCommand(wifi_interface_handle iface, wifi_channel *channel_buf, int *ch_num,
+        int num_max_ch, int band)
+        : WifiCommand(iface, 0), channels(channel_buf), max_channels(num_max_ch), num_channels(ch_num),
+        band(band)
+    {
+        memset(channels, 0, sizeof(wifi_channel) * max_channels);
+    }
+    virtual int create() {
+        int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_VALID_CHANNELS);
+        if (ret < 0) {
+            return ret;
+        }
+
+        nlattr *data = mMsg.attr_start(NL80211_ATTR_VENDOR_DATA);
+        ret = mMsg.put_u32(GSCAN_ATTRIBUTE_BAND, band);
+        if (ret < 0) {
+            return ret;
+        }
+
+        mMsg.attr_end(data);
+
+        return ret;
+    }
+
+protected:
+    virtual int handleResponse(WifiEvent& reply) {
+
+        if (reply.get_cmd() != NL80211_CMD_VENDOR) {
+            ALOGE("Ignoring reply with cmd = %d", reply.get_cmd());
+            return NL_SKIP;
+        }
+
+        int num_channels_to_copy = 0;
+
+        nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);
+        int len = reply.get_vendor_data_len();
+
+        if (vendor_data == NULL || len == 0) {
+            ALOGE("no vendor data in GetChannelList response; ignoring it");
+            return NL_SKIP;
+        }
+
+        for (nl_iterator it(vendor_data); it.has_next(); it.next()) {
+            if (it.get_type() == GSCAN_ATTRIBUTE_NUM_CHANNELS) {
+                num_channels_to_copy = it.get_u32();
+                /*ALOGD("Got channel list with %d channels", num_channels_to_copy);*/
+                if(num_channels_to_copy > max_channels)
+                    num_channels_to_copy = max_channels;
+                *num_channels = num_channels_to_copy;
+            } else if (it.get_type() == GSCAN_ATTRIBUTE_CHANNEL_LIST && num_channels_to_copy) {
+                memcpy(channels, it.get_data(), sizeof(int) * num_channels_to_copy);
+            } else {
+                ALOGW("Ignoring invalid attribute type = %d, size = %d",
+                        it.get_type(), it.get_len());
+            }
+        }
+
+        return NL_OK;
+    }
+};
+
+wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
+        int band, int max_channels, wifi_channel *channels, int *num_channels)
+{
+    GetChannelListCommand command(handle, channels, num_channels,
+                                        max_channels, band);
+    return (wifi_error) command.requestResponse();
+}
+/////////////////////////////////////////////////////////////////////////////
+
+/* helper functions */
+
+/*
+static int parseScanResults(wifi_scan_result *results, int num, nlattr *attr)
+{
+    memset(results, 0, sizeof(wifi_scan_result) * num);
+
+    int i = 0;
+    for (nl_iterator it(attr); it.has_next() && i < num; it.next(), i++) {
+
+        nlattr *sc_data = (nlattr *) it.get_data();
+        wifi_scan_result *result = results + i;
+
+        for (nl_iterator it2(sc_data); it2.has_next(); it2.next()) {
+            int type = it2.get_type();
+            if (type == GSCAN_ATTRIBUTE_SSID) {
+                strncpy(result->ssid, (char *) it2.get_data(), it2.get_len());
+                result->ssid[it2.get_len()] = 0;
+            } else if (type == GSCAN_ATTRIBUTE_BSSID) {
+                memcpy(result->bssid, (byte *) it2.get_data(), sizeof(mac_addr));
+            } else if (type == GSCAN_ATTRIBUTE_TIMESTAMP) {
+                result->ts = it2.get_u64();
+            } else if (type == GSCAN_ATTRIBUTE_CHANNEL) {
+                result->ts = it2.get_u16();
+            } else if (type == GSCAN_ATTRIBUTE_RSSI) {
+                result->rssi = it2.get_u8();
+            } else if (type == GSCAN_ATTRIBUTE_RTT) {
+                result->rtt = it2.get_u64();
+            } else if (type == GSCAN_ATTRIBUTE_RTTSD) {
+                result->rtt_sd = it2.get_u64();
+            }
+        }
+
+    }
+
+    if (i >= num) {
+        ALOGE("Got too many results; skipping some");
+    }
+
+    return i;
+}
+*/
+
+int createFeatureRequest(WifiRequest& request, int subcmd) {
+
+    int result = request.create(GOOGLE_OUI, subcmd);
+    if (result < 0) {
+        return result;
+    }
+
+    return WIFI_SUCCESS;
+}
+
+class ScanCommand : public WifiCommand
+{
+    wifi_scan_cmd_params *mParams;
+    wifi_scan_result_handler mHandler;
+    static unsigned mGlobalFullScanBuckets;
+public:
+    ScanCommand(wifi_interface_handle iface, int id, wifi_scan_cmd_params *params,
+                wifi_scan_result_handler handler)
+        : WifiCommand(iface, id), mParams(params), mHandler(handler)
+    { }
+
+    int createSetupRequest(WifiRequest& request) {
+        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);
+        if (result < 0) {
+            return result;
+        }
+
+        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
+        result = request.put_u32(GSCAN_ATTRIBUTE_BASE_PERIOD, mParams->base_period);
+        if (result < 0) {
+            return result;
+        }
+
+        result = request.put_u32(GSCAN_ATTRIBUTE_NUM_AP_PER_SCAN, mParams->max_ap_per_scan);
+        if (result < 0) {
+            return result;
+        }
+
+        result = request.put_u32(GSCAN_ATTRIBUTE_REPORT_THRESHOLD, mParams->report_threshold_percent);
+        if (result < 0) {
+            return result;
+        }
+
+        result = request.put_u32(GSCAN_ATTRIBUTE_REPORT_THRESHOLD_NUM_SCANS, mParams->report_threshold_num_scans);
+        if (result < 0) {
+            return result;
+        }
+
+        result = request.put_u32(GSCAN_ATTRIBUTE_NUM_BUCKETS, mParams->num_buckets);
+        if (result < 0) {
+            return result;
+        }
+
+        for (int i = 0; i < mParams->num_buckets; i++) {
+            nlattr * bucket = request.attr_start(i);    // next bucket
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_ID, mParams->buckets[i].bucket);
+            if (result < 0) {
+                return result;
+            }
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_PERIOD, mParams->buckets[i].period);
+            if (result < 0) {
+                return result;
+            }
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKETS_BAND,
+                    mParams->buckets[i].band);
+            if (result < 0) {
+                return result;
+            }
+
+            if (mParams->buckets[i].report_events == 0) {
+                mParams->buckets[i].report_events = REPORT_EVENTS_EACH_SCAN;
+            }
+            result = request.put_u32(GSCAN_ATTRIBUTE_REPORT_EVENTS,
+                    mParams->buckets[i].report_events);
+            if (result < 0) {
+                return result;
+            }
+
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_NUM_CHANNELS,
+                    mParams->buckets[i].num_channels);
+            if (result < 0) {
+                return result;
+            }
+
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_EXPONENT,
+                    mParams->buckets[i].base);
+            if (result < 0) {
+                return result;
+            }
+
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_MAX_PERIOD,
+                    mParams->buckets[i].max_period);
+            if (result < 0) {
+                return result;
+            }
+
+            result = request.put_u32(GSCAN_ATTRIBUTE_BUCKET_STEP_COUNT,
+                    mParams->buckets[i].step_count);
+            if (result < 0) {
+                return result;
+            }
+
+            if (mParams->buckets[i].num_channels) {
+                nlattr *channels = request.attr_start(GSCAN_ATTRIBUTE_BUCKET_CHANNELS);
+                for (int j = 0; j < mParams->buckets[i].num_channels; j++) {
+                    result = request.put_u32(j, mParams->buckets[i].channels[j].channel);
+                    if (result < 0) {
+                        return result;
+                    }
+                }
+                request.attr_end(channels);
+            }
+
+            request.attr_end(bucket);
+        }
+
+        request.attr_end(data);
+        return WIFI_SUCCESS;
+    }
+
+    int createStartRequest(WifiRequest& request) {
+        return createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN);
+    }
+
+    int createStopRequest(WifiRequest& request) {
+        return createFeatureRequest(request, SLSI_NL80211_VENDOR_SUBCMD_DEL_GSCAN);
+    }
+
+    int start() {
+        ALOGD("starting Gscan");
+        WifiRequest request(familyId(), ifaceId());
+        int result = createSetupRequest(request);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to create setup request; result = %d", result);
+            return result;
+        }
+
+        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);
+        registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
+
+        int nBuckets = 0;
+        for (int i = 0; i < mParams->num_buckets; i++) {
+            if (mParams->buckets[i].report_events & REPORT_EVENTS_FULL_RESULTS) {
+                nBuckets++;
+            }
+        }
+
+        if (nBuckets != 0) {
+           ALOGI("Full scan requested with nBuckets = %d", nBuckets);
+           registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS);
+        }
+        result = requestResponse(request);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to start scan; result = %d", result);
+            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
+            unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);
+            return result;
+        }
+
+
+        return result;
+    }
+
+    virtual int cancel() {
+        ALOGD("Stopping Gscan");
+
+        WifiRequest request(familyId(), ifaceId());
+        int result = createStopRequest(request);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to create stop request; result = %d", result);
+        } else {
+            result = requestResponse(request);
+            if (result != WIFI_SUCCESS) {
+                ALOGE("failed to stop scan; result = %d", result);
+            }
+        }
+
+        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
+        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);
+        unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_FULL_SCAN_RESULTS);
+
+        return WIFI_SUCCESS;
+    }
+
+    virtual int handleResponse(WifiEvent& reply) {
+        /* Nothing to do on response! */
+        return NL_SKIP;
+    }
+
+    virtual int handleEvent(WifiEvent& event) {
+        //event.log();
+
+        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
+        unsigned int len = event.get_vendor_data_len();
+        int event_id = event.get_vendor_subcmd();
+
+        if(event_id == GSCAN_EVENT_COMPLETE_SCAN) {
+            if (vendor_data == NULL || len != 4) {
+                ALOGE("Scan complete type not mentioned!");
+                return NL_SKIP;
+            }
+            wifi_scan_event evt_type;
+
+            evt_type = (wifi_scan_event) event.get_u32(NL80211_ATTR_VENDOR_DATA);
+            if(*mHandler.on_scan_event)
+                (*mHandler.on_scan_event)(id(), evt_type);
+        } else if(event_id == GSCAN_EVENT_FULL_SCAN_RESULTS) {
+            uint32_t bucket_scanned = 0;
+            wifi_scan_result *scan_result = NULL;
+            for (nl_iterator it(vendor_data); it.has_next(); it.next()) {
+                if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_BUCKET_BIT) {
+                    bucket_scanned = it.get_u32();
+                } else if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS) {
+                    if (it.get_len() >= (int)sizeof(*scan_result))
+                        scan_result = (wifi_scan_result *)it.get_data();
+                }
+            }
+            if (scan_result) {
+                if(*mHandler.on_full_scan_result)
+                    (*mHandler.on_full_scan_result)(id(), scan_result, bucket_scanned);
+/*
+                    ALOGD("%-32s\t", scan_result->ssid);
+                    ALOGD("%02x:%02x:%02x:%02x:%02x:%02x ", scan_result->bssid[0], scan_result->bssid[1],
+                            scan_result->bssid[2], scan_result->bssid[3], scan_result->bssid[4], scan_result->bssid[5]);
+                    ALOGD("%d\t", scan_result->rssi);
+                    ALOGD("%d\t", scan_result->channel);
+                    ALOGD("%lld\t", scan_result->ts);
+                    ALOGD("%lld\t", scan_result->rtt);
+                    ALOGD("%lld\n", scan_result->rtt_sd);
+*/
+            }
+        }
+        return NL_SKIP;
+    }
+};
+
+unsigned ScanCommand::mGlobalFullScanBuckets = 0;
+
+wifi_error wifi_start_gscan(
+        wifi_request_id id,
+        wifi_interface_handle iface,
+        wifi_scan_cmd_params params,
+        wifi_scan_result_handler handler)
+{
+    wifi_handle handle = getWifiHandle(iface);
+
+    ScanCommand *cmd = new ScanCommand(iface, id, &params, handler);
+    wifi_register_cmd(handle, id, cmd);
+    return (wifi_error)cmd->start();
+}
+
+wifi_error wifi_stop_gscan(wifi_request_id id, wifi_interface_handle iface)
+{
+    wifi_handle handle = getWifiHandle(iface);
+
+    if(id == -1) {
+        wifi_scan_result_handler handler;
+        wifi_scan_cmd_params dummy_params;
+        memset(&handler, 0, sizeof(handler));
+
+        ScanCommand *cmd = new ScanCommand(iface, id, &dummy_params, handler);
+        cmd->cancel();
+        cmd->releaseRef();
+        return WIFI_SUCCESS;
+    }
+
+
+    WifiCommand *cmd = wifi_unregister_cmd(handle, id);
+    if (cmd) {
+        cmd->cancel();
+        cmd->releaseRef();
+        return WIFI_SUCCESS;
+    }
+
+    return WIFI_ERROR_INVALID_ARGS;
+}
+
+class GetScanResultsCommand : public WifiCommand {
+    wifi_cached_scan_results *mScans;
+    int mMax;
+    int *mNum;
+    int mRetrieved;
+    byte mFlush;
+    int mCompleted;
+    static const int MAX_RESULTS = 320;
+    wifi_scan_result mScanResults[MAX_RESULTS];
+    int mNextScanResult;
+public:
+    GetScanResultsCommand(wifi_interface_handle iface, byte flush,
+            wifi_cached_scan_results *results, int max, int *num)
+        : WifiCommand(iface, -1), mScans(results), mMax(max), mNum(num),
+                mRetrieved(0), mFlush(flush), mCompleted(0)
+    {
+        memset(mScanResults,0,sizeof(mScanResults));
+        mNextScanResult = 0;
+    }
+
+    int createRequest(WifiRequest& request, int num, byte flush) {
+        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_GET_SCAN_RESULTS);
+        if (result < 0) {
+            return result;
+        }
+
+        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
+        result = request.put_u32(GSCAN_ATTRIBUTE_NUM_OF_RESULTS, num);
+        if (result < 0) {
+            return result;
+        }
+
+        request.attr_end(data);
+        return WIFI_SUCCESS;
+    }
+
+    int execute() {
+        WifiRequest request(familyId(), ifaceId());
+
+        for (int i = 0; i < 10 && mRetrieved < mMax; i++) {
+            int result = createRequest(request, (mMax - mRetrieved), mFlush);
+            if (result < 0) {
+                ALOGE("failed to create request");
+                return result;
+            }
+
+            int prev_retrieved = mRetrieved;
+
+            result = requestResponse(request);
+
+            if (result != WIFI_SUCCESS) {
+                ALOGE("failed to retrieve scan results; result = %d", result);
+                return result;
+            }
+
+            if (mRetrieved == prev_retrieved || mCompleted) {
+                /* no more items left to retrieve */
+                break;
+            }
+
+            request.destroy();
+        }
+
+        ALOGE("GetScanResults read %d results", mRetrieved);
+        *mNum = mRetrieved;
+        return WIFI_SUCCESS;
+    }
+
+    virtual int handleResponse(WifiEvent& reply) {
+
+        if (reply.get_cmd() != NL80211_CMD_VENDOR) {
+            ALOGE("Ignoring reply with cmd = %d", reply.get_cmd());
+            return NL_SKIP;
+        }
+
+        nlattr *vendor_data = reply.get_attribute(NL80211_ATTR_VENDOR_DATA);
+        int len = reply.get_vendor_data_len();
+
+        if (vendor_data == NULL || len == 0) {
+            ALOGE("no vendor data in GetScanResults response; ignoring it");
+            return NL_SKIP;
+        }
+
+        for (nl_iterator it(vendor_data); it.has_next(); it.next()) {
+            if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS_COMPLETE) {
+                mCompleted = it.get_u8();
+                //ALOGD("retrieved mCompleted flag : %d", mCompleted);
+            } else if (it.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS || it.get_type() == 0) {
+                int scan_id = 0, flags = 0, num = 0;
+                for (nl_iterator it2(it.get()); it2.has_next(); it2.next()) {
+                    if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_ID) {
+                        scan_id = it2.get_u32();
+                        //ALOGD("retrieved scan_id : 0x%0x", scan_id);
+                    } else if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_FLAGS) {
+                        flags = it2.get_u8();
+                        //ALOGD("retrieved scan_flags : 0x%0x", flags);
+                    } else if (it2.get_type() == GSCAN_ATTRIBUTE_NUM_OF_RESULTS) {
+                        num = it2.get_u32();
+                        //ALOGD("retrieved num_results: %d", num);
+                    } else if (it2.get_type() == GSCAN_ATTRIBUTE_SCAN_RESULTS) {
+                        if (mRetrieved >= mMax) {
+                            ALOGW("Stored %d scans, ignoring excess results", mRetrieved);
+                            break;
+                        }
+                        num = it2.get_len() / sizeof(wifi_scan_result);
+                        num = min(MAX_RESULTS - mNextScanResult, num);
+                        num = min((int)MAX_AP_CACHE_PER_SCAN, num);
+                        memcpy(mScanResults + mNextScanResult, it2.get_data(),
+                                sizeof(wifi_scan_result) * num);
+                        /*
+                        wifi_scan_result *results = (wifi_scan_result *)it2.get_data();
+                        for (int i = 0; i < num; i++) {
+                            wifi_scan_result *result = results + i;
+                            ALOGD("%02d  %-32s  %02x:%02x:%02x:%02x:%02x:%02x  %04d", i,
+                                result->ssid, result->bssid[0], result->bssid[1], result->bssid[2],
+                                result->bssid[3], result->bssid[4], result->bssid[5],
+                                result->rssi);
+                        }*/
+                        mScans[mRetrieved].scan_id = scan_id;
+                        mScans[mRetrieved].flags = flags;
+                        mScans[mRetrieved].num_results = num;
+                        //ALOGD("Setting result of scan_id : 0x%0x", mScans[mRetrieved].scan_id);
+                        memcpy(mScans[mRetrieved].results,
+                                &(mScanResults[mNextScanResult]), num * sizeof(wifi_scan_result));
+                        mNextScanResult += num;
+                        mRetrieved++;
+                    } else {
+                        ALOGW("Ignoring invalid attribute type = %d, size = %d",
+                                it.get_type(), it.get_len());
+                    }
+                }
+            } else {
+                ALOGW("Ignoring invalid attribute type = %d, size = %d",
+                        it.get_type(), it.get_len());
+            }
+        }
+
+        return NL_OK;
+    }
+};
+
+wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface, byte flush,
+        int max, wifi_cached_scan_results *results, int *num) {
+    GetScanResultsCommand *cmd = new GetScanResultsCommand(iface, flush, results, max, num);
+    return (wifi_error)cmd->execute();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+class ePNOCommand : public WifiCommand
+{
+private:
+    wifi_epno_params  *epno_params;
+    wifi_epno_handler mHandler;
+    wifi_scan_result  mResults;
+public:
+    ePNOCommand(wifi_interface_handle handle, int id,
+            wifi_epno_params *params, wifi_epno_handler handler)
+        : WifiCommand(handle, id), mHandler(handler)
+    {
+        epno_params = params;
+        memset(&mResults,0,sizeof(wifi_scan_result));
+    }
+
+    int createSetupRequest(WifiRequest& request) {
+        int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_SET_EPNO_LIST);
+        if (result < 0) {
+            return result;
+        }
+
+        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
+        if (epno_params == NULL) {
+            result = request.put_u8(EPNO_ATTRIBUTE_SSID_NUM, 0);
+            if (result < 0) {
+                return result;
+            }
+            request.attr_end(data);
+            return result;
+        }
+        result = request.put_u16(EPNO_ATTRIBUTE_MINIMUM_5G_RSSI, epno_params->min5GHz_rssi);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u16(EPNO_ATTRIBUTE_MINIMUM_2G_RSSI, epno_params->min24GHz_rssi);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u16(EPNO_ATTRIBUTE_INITIAL_SCORE_MAX, epno_params->initial_score_max);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u8(EPNO_ATTRIBUTE_CUR_CONN_BONUS, epno_params->current_connection_bonus);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u8(EPNO_ATTRIBUTE_SAME_NETWORK_BONUS, epno_params->same_network_bonus);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u8(EPNO_ATTRIBUTE_SECURE_BONUS, epno_params->secure_bonus);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u8(EPNO_ATTRIBUTE_5G_BONUS, epno_params->band5GHz_bonus);
+        if (result < 0) {
+            return result;
+        }
+        result = request.put_u8(EPNO_ATTRIBUTE_SSID_NUM, epno_params->num_networks);
+        if (result < 0) {
+            return result;
+        }
+
+       ALOGI("ePNO [min5GHz_rssi:%d min24GHz_rssi:%d initial_score_max:%d current_connection_bonus:%d same_network_bonus:%d secure_bonus:%d band5GHz_bonus:%d num_networks:%d]",
+         epno_params->min5GHz_rssi,
+         epno_params->min24GHz_rssi,
+         epno_params->initial_score_max,
+         epno_params->current_connection_bonus,
+         epno_params->same_network_bonus,
+         epno_params->secure_bonus,
+         epno_params->band5GHz_bonus,
+         epno_params->num_networks);
+
+        struct nlattr * attr = request.attr_start(EPNO_ATTRIBUTE_SSID_LIST);
+        for (int i = 0; i < epno_params->num_networks; i++) {
+            nlattr *attr2 = request.attr_start(i);
+            if (attr2 == NULL) {
+                return WIFI_ERROR_OUT_OF_MEMORY;
+            }
+            result = request.put_u16(EPNO_ATTRIBUTE_FLAGS, epno_params->networks[i].flags);
+            if (result < 0) {
+                return result;
+            }
+            result = request.put_u8(EPNO_ATTRIBUTE_AUTH, epno_params->networks[i].auth_bit_field);
+            if (result < 0) {
+                return result;
+            }
+            result = request.put_u8(EPNO_ATTRIBUTE_SSID_LEN, strlen(epno_params->networks[i].ssid));
+            if (result < 0) {
+                return result;
+            }
+            result = request.put(EPNO_ATTRIBUTE_SSID, epno_params->networks[i].ssid, strlen(epno_params->networks[i].ssid));
+            if (result < 0) {
+                return result;
+            }
+            request.attr_end(attr2);
+        }
+
+        request.attr_end(attr);
+        request.attr_end(data);
+        return result;
+    }
+
+    int start() {
+        ALOGI("ePNO num_network=%d", epno_params ? epno_params->num_networks : 0);
+        WifiRequest request(familyId(), ifaceId());
+        int result = createSetupRequest(request);
+        if (result < 0) {
+            return result;
+        }
+
+        result = requestResponse(request);
+        if (result < 0) {
+            ALOGI("Failed: ePNO setup request, result = %d", result);
+            unregisterVendorHandler(GOOGLE_OUI, WIFI_EPNO_EVENT);
+            return result;
+        }
+
+        if (epno_params) {
+            registerVendorHandler(GOOGLE_OUI, WIFI_EPNO_EVENT);
+        }
+        return result;
+    }
+
+    virtual int cancel() {
+        /* unregister event handler */
+        unregisterVendorHandler(GOOGLE_OUI, WIFI_EPNO_EVENT);
+        return 0;
+    }
+
+    virtual int handleResponse(WifiEvent& reply) {
+        /* Nothing to do on response! */
+        return NL_SKIP;
+    }
+
+    virtual int handleEvent(WifiEvent& event) {
+        // event.log();
+
+        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
+        int len = event.get_vendor_data_len();
+
+        if (vendor_data == NULL || len == 0) {
+            ALOGI("No scan results found");
+            return NL_SKIP;
+        }
+
+
+        mResults = *(wifi_scan_result *) event.get_vendor_data();
+        if (*mHandler.on_network_found)
+            (*mHandler.on_network_found)(id(), 1, &mResults);
+        return NL_SKIP;
+    }
+};
+
+wifi_error wifi_set_epno_list(wifi_request_id id,
+                              wifi_interface_handle iface,
+                              const wifi_epno_params *epno_params,
+                              wifi_epno_handler handler)
+{
+    wifi_handle handle = getWifiHandle(iface);
+    ePNOCommand *cmd = new ePNOCommand(iface, id, (wifi_epno_params *)epno_params, handler);
+    wifi_register_cmd(handle, id, cmd);
+    wifi_error result = (wifi_error)cmd->start();
+    if (result != WIFI_SUCCESS) {
+        wifi_unregister_cmd(handle, id);
+    }
+    return result;
+}
+
+wifi_error wifi_reset_epno_list(wifi_request_id id, wifi_interface_handle iface)
+{
+    wifi_handle handle = getWifiHandle(iface);
+    wifi_epno_handler handler;
+
+    handler.on_network_found = NULL;
+    ePNOCommand *cmd = new ePNOCommand(iface, id, NULL, handler);
+    wifi_register_cmd(handle, id, cmd);
+    wifi_error result = (wifi_error)cmd->start();
+    if (result != WIFI_SUCCESS) {
+        wifi_unregister_cmd(handle, id);
+    }
+    return result;
+}
+
+class HsListCommand : public WifiCommand
+{
+    int num_hs;
+    wifi_passpoint_network *mNetworks;
+    wifi_passpoint_event_handler mHandler;
+public:
+    HsListCommand(wifi_request_id id, wifi_interface_handle iface,
+        int num, wifi_passpoint_network *hs_list, wifi_passpoint_event_handler handler)
+        : WifiCommand(iface, id), num_hs(num), mNetworks(hs_list),
+            mHandler(handler)
+    {
+    }
+
+    HsListCommand(wifi_request_id id, wifi_interface_handle iface,
+        int num)
+        : WifiCommand(iface, id), num_hs(num), mNetworks(NULL)
+    {
+        mHandler.on_passpoint_network_found = NULL;
+    }
+
+    int createRequest(WifiRequest& request, int val) {
+        int result;
+
+        if (val) {
+            result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_SET_HS_LIST);
+            result = request.put_u32(EPNO_ATTRIBUTE_HS_NUM, num_hs);
+            if (result < 0) {
+                return result;
+            }
+            nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
+
+            struct nlattr * attr = request.attr_start(EPNO_ATTRIBUTE_HS_PARAM_LIST);
+            for (int i = 0; i < num_hs; i++) {
+                nlattr *attr2 = request.attr_start(i);
+                if (attr2 == NULL) {
+                    return WIFI_ERROR_OUT_OF_MEMORY;
+                }
+                result = request.put_u32(EPNO_ATTRIBUTE_HS_ID, mNetworks[i].id);
+                if (result < 0) {
+                    return result;
+                }
+                result = request.put(EPNO_ATTRIBUTE_HS_REALM, mNetworks[i].realm, 256);
+                if (result < 0) {
+                    return result;
+                }
+                result = request.put(EPNO_ATTRIBUTE_HS_CONSORTIUM_IDS, mNetworks[i].roamingConsortiumIds, 128);
+                if (result < 0) {
+                    return result;
+                }
+                result = request.put(EPNO_ATTRIBUTE_HS_PLMN, mNetworks[i].plmn, 3);
+                if (result < 0) {
+                    return result;
+                }
+                request.attr_end(attr2);
+            }
+            request.attr_end(attr);
+            request.attr_end(data);
+        }else {
+            result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_RESET_HS_LIST);
+            if (result < 0) {
+                return result;
+            }
+        }
+
+        return WIFI_SUCCESS;
+    }
+
+    int start() {
+
+        WifiRequest request(familyId(), ifaceId());
+        int result = createRequest(request, num_hs);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to create request; result = %d", result);
+            return result;
+        }
+
+        registerVendorHandler(GOOGLE_OUI, WIFI_HOTSPOT_MATCH);
+
+        result = requestResponse(request);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to set ANQPO networks; result = %d", result);
+            unregisterVendorHandler(GOOGLE_OUI, WIFI_HOTSPOT_MATCH);
+            return result;
+        }
+
+        return result;
+    }
+
+    virtual int cancel() {
+
+        WifiRequest request(familyId(), ifaceId());
+        int result = createRequest(request, 0);
+        if (result != WIFI_SUCCESS) {
+            ALOGE("failed to create request; result = %d", result);
+        } else {
+            result = requestResponse(request);
+            if (result != WIFI_SUCCESS) {
+                ALOGE("failed to reset ANQPO networks;result = %d", result);
+            }
+        }
+
+        unregisterVendorHandler(GOOGLE_OUI, WIFI_HOTSPOT_MATCH);
+        return WIFI_SUCCESS;
+    }
+
+    virtual int handleResponse(WifiEvent& reply) {
+        /* Nothing to do on response! */
+        return NL_SKIP;
+    }
+
+    virtual int handleEvent(WifiEvent& event) {
+        nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
+        unsigned int len = event.get_vendor_data_len();
+        if (vendor_data == NULL || len < sizeof(wifi_scan_result)) {
+            ALOGE("ERROR: No scan results found");
+            return NL_SKIP;
+        }
+
+        wifi_scan_result *result = (wifi_scan_result *)event.get_vendor_data();
+        byte *anqp = (byte *)result + offsetof(wifi_scan_result, ie_data) + result->ie_length;
+        int networkId = *(int *)anqp;
+        anqp += sizeof(int);
+        int anqp_len = *(u16 *)anqp;
+        anqp += sizeof(u16);
+
+        if(*mHandler.on_passpoint_network_found)
+            (*mHandler.on_passpoint_network_found)(id(), networkId, result, anqp_len, anqp);
+
+        return NL_SKIP;
+    }
+};
+
+wifi_error wifi_set_passpoint_list(wifi_request_id id, wifi_interface_handle iface, int num,
+        wifi_passpoint_network *networks, wifi_passpoint_event_handler handler)
+{
+    wifi_handle handle = getWifiHandle(iface);
+    HsListCommand *cmd = new HsListCommand(id, iface, num, networks, handler);
+
+    wifi_register_cmd(handle, id, cmd);
+    wifi_error result = (wifi_error)cmd->start();
+    if (result != WIFI_SUCCESS) {
+        wifi_unregister_cmd(handle, id);
+    }
+    return result;
+}
+
+wifi_error wifi_reset_passpoint_list(wifi_request_id id, wifi_interface_handle iface)
+{
+    wifi_handle   handle = getWifiHandle(iface);
+    wifi_error    result;
+    HsListCommand *cmd = (HsListCommand *)(wifi_get_cmd(handle, id));
+
+    if (cmd == NULL) {
+        cmd = new HsListCommand(id, iface, 0);
+        wifi_register_cmd(handle, id, cmd);
+    }
+    result = (wifi_error)cmd->cancel();
+    wifi_unregister_cmd(handle, id);
+    return result;
+}