qsap: Kill more logspam

Change-Id: I0a32abbf783ffb1534051fd89708d2a49014c6c3

softap/jni/Android.mk

@@ -0,0 +1,20 @@
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SRC_FILES := QWiFiSoftApCfg.c
+
+LOCAL_MODULE := libQWiFiSoftApCfg
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+                    $(JNI_H_INCLUDE)
+
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto
+
+include $(BUILD_SHARED_LIBRARY)

softap/jni/QWiFiSoftApCfg.c

@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2010, The Linux Foundation. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *  * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ *  * Neither the name of The Linux Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "QWiFiSoftApCfg.h"
+
+#define    UPDATE_ERROR_CODE(msg, code) \
+    {    \
+        int rc; \
+        rc = snprintf(resp, sizeof(resp), "failure %s:%s",msg, code); \
+        if ( rc == sizeof(resp)) resp[sizeof(resp)-1] = 0; \
+            ALOGE("%s",resp); \
+    }
+
+static struct sockaddr_nl    rtnl_local;
+static int    rtnl_fd = -1;
+static char   evt_buf[MAX_EVT_BUF_SIZE];
+static int    evt_len;
+
+static void softap_handle_custom_event(char * buf, int len)
+{
+    if (strncmp(buf, "AUTO-SHUT.indication ", strlen("AUTO-SHUT.indication ")) == 0)
+    {
+        ALOGD("EVENT: Custom Event\n");
+        snprintf(evt_buf, sizeof(evt_buf), "105 AP Shutdown");
+    }
+}
+
+static void softap_handle_associated_event(char *mac_addr)
+{
+    snprintf(evt_buf, sizeof(evt_buf), "102 Station " HWA_FORM " Associated",
+                            HWA_ARG(mac_addr));
+}
+
+static void softap_handle_disassociated_event(char *mac_addr)
+{
+    snprintf(evt_buf, sizeof(evt_buf), "103 Station " HWA_FORM " Disassociated",
+                            HWA_ARG(mac_addr));
+}
+
+static void softap_handle_wireless_event(char *atr, int atrlen)
+{
+    int    len = 0;
+    struct iw_event    iwe;
+    char   *buffer = atr + RTA_ALIGN(RTATTRLEN);
+
+    atrlen -= RTA_ALIGN(RTATTRLEN);
+
+    while ((len + (int)IW_EV_LCP_LEN) < atrlen) {
+        memcpy((char *)&iwe, buffer + len, sizeof(struct iw_event));
+
+        if (iwe.len <= IW_EV_LCP_LEN)
+            break;
+
+        ALOGD("Received Wireless Event: cmd=0x%x len=%d", iwe.cmd, iwe.len);
+
+        switch (iwe.cmd) {
+            case IWEVEXPIRED:
+                ALOGD("EVENT: IWEVEXPIRED\n");
+                softap_handle_disassociated_event(iwe.u.addr.sa_data);
+                break;
+
+            case IWEVREGISTERED:
+                ALOGD("EVENT: IWEVREGISTERED\n");
+                softap_handle_associated_event(iwe.u.addr.sa_data);
+                break;
+
+            case IWEVCUSTOM:
+                ALOGD("EVENT: Custom Event\n");
+				softap_handle_custom_event(buffer + len + IW_EV_POINT_LEN, iwe.u.data.length);
+                break;
+
+            default:
+                break;
+        }
+
+        len += iwe.len;
+    }
+
+    return;
+}
+
+void softap_handle_rtm_link_event(struct nlmsghdr *hdr)
+{
+    char   *ptr = (char *)NLMSG_DATA(hdr);
+    struct rtattr        *atr;
+    int    atr_len;
+
+    if ((hdr->nlmsg_len - MSGHDRLEN) < IFINFOLEN) {
+        ALOGD("Message Length Problem1");
+        return;
+    }
+
+    if ((atr_len = hdr->nlmsg_len - NLMSG_ALIGN(IFINFOLEN)) < 0) {
+        ALOGD("Message Length Problem2");
+        return;
+    }
+
+    ptr += NLMSG_ALIGN(IFINFOLEN);
+    atr = (struct rtattr *)ptr;
+
+    while (RTA_OK(atr, atr_len)) {
+        switch (atr->rta_type) {
+            case IFLA_WIRELESS:
+                softap_handle_wireless_event((char *)atr,
+                            atr->rta_len);
+                break;
+
+            default:
+                break;
+        }
+
+        atr = RTA_NEXT(atr, atr_len);
+    }
+
+    return;
+}
+
+static void softap_handle_iface_event(void)
+{
+    int       cnt, mlen = 0;
+    char      *ptr, buffer[MAX_RECV_BUF_SIZE];
+    socklen_t slen;
+    struct nlmsghdr * hdr;
+
+    while (1) {
+        cnt = recvfrom(rtnl_fd, buffer, sizeof(buffer),
+                MSG_DONTWAIT,
+                (struct sockaddr *)&rtnl_local, &slen);
+
+        if (cnt <= 0) {
+            buffer[0] = '\0';
+            ALOGD("recvfrom failed");
+            return;
+        }
+
+        ptr = buffer;
+
+        while (cnt >= MSGHDRLEN) {
+            hdr = (struct nlmsghdr *)ptr;
+
+            mlen = hdr->nlmsg_len;
+
+            if ((mlen > cnt) || ((mlen - MSGHDRLEN) < 0)) {
+                break;
+            }
+
+            switch (hdr->nlmsg_type) {
+                case RTM_NEWLINK:
+                case RTM_DELLINK:
+                    softap_handle_rtm_link_event(hdr);
+                    break;
+            }
+
+            mlen = NLMSG_ALIGN(hdr->nlmsg_len);
+            cnt -= mlen;
+            ptr += mlen;
+        }
+    }
+
+    return;
+}
+
+static inline int softap_rtnl_wait(void)
+{
+    fd_set        fds;
+    int        oldfd, ret;
+
+    if (rtnl_fd < 0) {
+        ALOGD("Netlink Socket Not Available");
+        return -1;
+    }
+
+    /* Initialize fds */
+    FD_ZERO(&fds);
+    FD_SET(rtnl_fd, &fds);
+    oldfd = rtnl_fd;
+
+    /* Wait for some trigger event */
+    ret = select(oldfd + 1, &fds, NULL, NULL, NULL);
+
+    if (ret < 0) {
+        /* Error Occurred */
+        ALOGD("Select on Netlink Socket Failed");
+        return ret;
+    } else if (!ret) {
+        ALOGD("Select on Netlink Socket Timed Out");
+        /* Timeout Occurred */
+        return -1;
+    }
+
+    /* Check if any event is available for us */
+    if (FD_ISSET(rtnl_fd, &fds)) {
+        softap_handle_iface_event();
+    }
+
+    return 0;
+}
+
+static void softap_rtnl_close(void)
+{
+    close(rtnl_fd);
+}
+
+static int softap_rtnl_open(void)
+{
+    int            addr_len;
+
+    rtnl_fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+
+    if (rtnl_fd < 0) {
+        ALOGE("open netlink socket failed");
+        return -1;
+    }
+
+    memset(&rtnl_local, 0, sizeof(rtnl_local));
+    rtnl_local.nl_family = AF_NETLINK;
+    rtnl_local.nl_groups = RTMGRP_LINK;
+
+    if (bind(rtnl_fd, (struct sockaddr*)&rtnl_local,
+                sizeof(rtnl_local)) < 0) {
+        ALOGE("bind netlink socket failed");
+        return -1;
+    }
+
+    addr_len = sizeof(rtnl_local);
+
+    if (getsockname(rtnl_fd, (struct sockaddr*)&rtnl_local,
+            (socklen_t *) &addr_len) < 0) {
+        ALOGE("getsockname failed");
+        return -1;
+    }
+
+    if (addr_len != sizeof(rtnl_local)) {
+        ALOGE("Wrong address length %d\n", addr_len);
+        return -1;
+    }
+
+    if (rtnl_local.nl_family != AF_NETLINK) {
+        ALOGE("Wrong address family %d\n", rtnl_local.nl_family);
+        return -1;
+    }
+
+    return 0;
+}
+
+JNIEXPORT void JNICALL
+    Java_com_qualcomm_wifi_softap_QWiFiSoftApCfg_SapCloseNetlink
+                        (JNIEnv *env, jobject obj)
+{
+    softap_rtnl_close();
+    return;
+}
+
+JNIEXPORT jstring JNICALL
+    Java_com_qualcomm_wifi_softap_QWiFiSoftApCfg_SapWaitForEvent
+                        (JNIEnv *env, jobject obj)
+{
+    int    ret;
+
+    do {
+        evt_len = 0;
+        memset(evt_buf, 0, sizeof(evt_buf));
+
+        ret = softap_rtnl_wait();
+    } while (!strlen(evt_buf));
+
+    return (*env)->NewStringUTF(env, evt_buf);
+}
+
+JNIEXPORT jboolean JNICALL
+    Java_com_qualcomm_wifi_softap_QWiFiSoftApCfg_SapOpenNetlink
+                        (JNIEnv *env, jobject obj)
+{
+    if (softap_rtnl_open() != 0) {
+        ALOGD("Netlink Open Fail");
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
+
+JNIEXPORT jstring JNICALL
+        Java_com_qualcomm_wifi_softap_QWiFiSoftApCfg_SapSendCommand
+                (JNIEnv *env, jobject obj, jstring jcmd)
+{
+    const char *pcmd;
+    char       cmd[MAX_CMD_SIZE];
+    char       resp[MAX_RESP_SIZE];
+    int        sock = -1;
+    int        rc;
+    int        done = 0;
+    char       code[32] = {0};
+    int        connect_retry;
+
+    strncpy(cmd, "softap qccmd ", sizeof(cmd));
+
+    pcmd = (char *) ((*env)->GetStringUTFChars(env, jcmd, NULL));
+
+    if ( pcmd == NULL ) {
+        UPDATE_ERROR_CODE("Command not handled","");
+        goto end;
+    }
+
+    ALOGD("Received Command: %s\n", pcmd);
+
+    if ((strlen(cmd) + strlen(pcmd)) > sizeof(cmd)) {
+        UPDATE_ERROR_CODE("Command length is larger than MAX_CMD_SIZE", "");
+        goto end;
+    }
+
+    strcat(cmd, pcmd);
+
+    connect_retry = 0;
+
+    while ( 1 ) {
+        if ((sock = socket_local_client("netd",
+                    ANDROID_SOCKET_NAMESPACE_RESERVED, 
+                        SOCK_STREAM)) < 0) {
+            if (connect_retry > 3) {
+                UPDATE_ERROR_CODE("Error connecting",
+                        strerror(errno));
+                goto end;
+            }
+
+            ALOGW("Unable to connect to netd, retrying ...\n");
+            sleep(1);
+        } else {
+            break;
+        }
+
+        connect_retry++;
+    }
+
+    if (write(sock, cmd, strlen(cmd) + 1) < 0) {
+        UPDATE_ERROR_CODE("Error Writing to socket", strerror(errno));
+        goto end;
+    }
+
+    while (!done) {
+        int i;
+
+        if ((rc = read(sock, resp, sizeof(resp))) <= 0) {
+            if (rc == 0) {
+                UPDATE_ERROR_CODE("Lost connection to Netd",
+                        strerror(errno));
+            } else {
+                UPDATE_ERROR_CODE("Error reading data",
+                        strerror(errno));
+            }
+
+            done = 1;
+        } else {
+            /* skip broadcase messages */
+            i = 0;
+
+            while(resp[i] && (i<(int)(sizeof(code)-1)) &&
+                (resp[i] != ' ') && (resp[i] != '\t')) {
+                code[i] = resp[i];
+                i++;
+            }
+
+            code[i] = '\0';
+
+            if ( (!strcmp(code, "success")) ||
+                    (!strcmp(code, "failure")) ) {
+                done=1;
+            } else {
+                ALOGW("Code(%s)\n", code);
+                ALOGW("Ignore messages : %s\n", resp);
+            }
+        }
+    }
+
+end:
+    (*env)->ReleaseStringUTFChars(env, jcmd, pcmd);
+
+    if( sock >= 0 ){
+        close(sock);
+        sock = -1;
+    }
+
+    return (*env)->NewStringUTF(env, resp);
+}

softap/jni/QWiFiSoftApCfg.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2010, The Linux Foundation. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *  * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ *  * Neither the name of The Linux Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef __QWIFISOFTAPCFG
+#define __QWIFISOFTAPCFG
+
+#define LOG_TAG "QWIFIAPCFG"
+
+#include "jni.h"
+#include <utils/Log.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <ctype.h>
+
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+
+#include <linux/if.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/wireless.h>
+
+#include <cutils/sockets.h>
+#include <private/android_filesystem_config.h>
+
+typedef unsigned char    u8;
+
+#define HWA_FORM        "%02X:%02X:%02X:%02X:%02X:%02X"
+#define HWA_ARG(x)        *(((u8 *)x + 0)), *(((u8 *)x + 1)), \
+                          *(((u8 *)x + 2)), *(((u8 *)x + 3)), \
+                          *(((u8 *)x + 4)), *(((u8 *)x + 5))
+
+#define MAX_RESP_SIZE       256
+#define MAX_CMD_SIZE        256
+#define MAX_EVT_BUF_SIZE    256
+#define MAX_RECV_BUF_SIZE   256
+
+#define MSGHDRLEN        ((int)(sizeof(struct nlmsghdr)))
+#define IFINFOLEN        ((int)(sizeof(struct ifinfomsg)))
+#define RTATTRLEN        ((int)(sizeof(struct rtattr)))
+
+#ifndef IFLA_WIRELESS
+#define IFLA_WIRELESS    (IFLA_MASTER + 1)
+#endif
+
+#endif

softap/sdk/Android.mk

@@ -1,23 +1,20 @@
 
-ifneq ($(TARGET_USES_LOCAL_QSAP),true)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES := $(TOP)/hardware/libhardware_legacy/wifi $(TOP)/external/libnl/include $(TOP)/external/wpa_supplicant_8/wpa_supplicant/src/drivers
+LOCAL_C_INCLUDES :=
 
 LOCAL_MODULE:= libqsap_sdk
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_VENDOR_MODULE := true
-
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
-LOCAL_USE_VNDK := true
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/qsap_api.h \
-                               $(LOCAL_PATH)/qsap.h
+LOCAL_COPY_HEADERS_TO := sdk/softap/include
+LOCAL_COPY_HEADERS := qsap_api.h
+LOCAL_COPY_HEADERS += qsap.h
 
 ifdef WIFI_DRIVER_MODULE_PATH
 LOCAL_CFLAGS += -DWIFI_DRIVER_MODULE_PATH=\"$(WIFI_DRIVER_MODULE_PATH)\"
@@ -59,22 +56,12 @@ ifdef WIFI_DRIVER_DEF_CONF_FILE
 LOCAL_CFLAGS += -DWIFI_DRIVER_DEF_CONF_FILE=\"$(WIFI_DRIVER_DEF_CONF_FILE)\"
 endif
 
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-
 LOCAL_SRC_FILES := qsap_api.c \
                    qsap.c
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl liblog
-
-LOCAL_HEADER_LIBRARIES := libcutils_headers
+LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libqsap_headers
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_HEADER_LIBRARY)
-endif

softap/sdk/qsap.c

@@ -33,8 +33,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <sched.h>
 
 #include <sys/socket.h>
 #include <linux/if.h>
@@ -48,12 +46,11 @@
 
 #define LOG_TAG "QCLDR-"
 
-#include <log/log.h>
-#include <cutils/memory.h>
-#include <cutils/misc.h>
-#include <cutils/properties.h>
-#include <grp.h>
-#include <pwd.h>
+#include "cutils/log.h"
+#include "cutils/memory.h"
+#include "cutils/misc.h"
+#include "cutils/properties.h"
+#include "private/android_filesystem_config.h"
 
 #include "qsap_api.h"
 #include "qsap.h"
@@ -196,7 +193,9 @@ static const char DRIVER_CFG80211_MODULE_ARG[]   = WIFI_CFG80211_DRIVER_MODULE_A
 
 s32 wifi_qsap_load_driver(void)
 {
+    s32    size;
     s32        ret = -1;
+    s32        retry;
 
 
     if (system(SDIO_POLLING_ON)) {
@@ -291,6 +290,7 @@ s32 qsap_send_init_ap(void)
     int s, ret;
     struct iwreq wrq;
     s32 status = eSUCCESS;
+    u32 *params = (u32 *)&wrq.u;
 
      /* Equivalent to: iwpriv wlan0 initAP */
      if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
@@ -318,6 +318,7 @@ s32 qsap_send_exit_ap(void)
     int s, ret;
     struct iwreq wrq;
     s32 status = eSUCCESS;
+    u32 *params = (u32 *)&wrq.u;
 
      /* Equivalent to: iwpriv wlan0 exitAP */
      if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
@@ -387,6 +388,7 @@ s32 wifi_qsap_stop_bss(void)
     s8  *iface;
     s32 len = 128;
     struct iwreq wrq;
+    struct iw_priv_args *priv_ptr;
 
     if(ENABLE != is_softap_enabled()) {
         ret = eERR_BSS_NOT_STARTED;
@@ -418,7 +420,7 @@ s32 wifi_qsap_stop_bss(void)
     close(sock);
 
     if (ret) {
-        ALOGE("IOCTL stopbss failed: %d", ret);
+        ALOGE("IOCTL stopbss failed: %ld", ret);
         ret = eERR_STOP_BSS;
     } else {
         ALOGD("STOP BSS ISSUED");
@@ -478,6 +480,7 @@ s32 commit(void)
 s32 wifi_qsap_start_softap()
 {
     s32    retry = 4;
+    FILE * fp;
 
     ALOGD("Starting Soft AP...\n");
 
@@ -581,166 +584,3 @@ s32 wifi_qsap_reload_softap()
 
     return eSUCCESS;
 }
-
-static pid_t wigigSoftApPid = 0;
-static const char WIGIG_ENTROPY_FILE[]  = "/data/misc/wifi/wigig_entropy.bin";
-static unsigned char dummy_key[21]      = { 0x02, 0x11, 0xbe, 0x33, 0x43, 0x35,
-                                            0x68, 0x47, 0x84, 0x99, 0xa9, 0x2b,
-                                            0x1c, 0xd3, 0xee, 0xff, 0xf1, 0xe2,
-                                            0xf3, 0xf4, 0xf5 };
-static const char HOSTAPD_BIN_FILE[]     = "/system/bin/hostapd";
-static const char WIGIG_HOSTAPD_CONF_FILE[] = "/data/misc/wifi/wigig_hostapd.conf";
-#define AP_BSS_START_DELAY 200000
-#define AP_BSS_STOP_DELAY  500000
-
-int wigig_ensure_entropy_file_exists()
-{
-    int ret;
-    int destfd;
-    struct passwd *pw;
-    struct group *gr;
-
-    ret = access(WIGIG_ENTROPY_FILE, R_OK|W_OK);
-    if ((ret == 0) || (errno == EACCES)) {
-        if ((ret != 0) &&
-            (chmod(WIGIG_ENTROPY_FILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) != 0)) {
-            ALOGE("Cannot set RW to \"%s\": %s", WIGIG_ENTROPY_FILE, strerror(errno));
-            return -1;
-        }
-        return 0;
-    }
-    destfd = TEMP_FAILURE_RETRY(open(WIGIG_ENTROPY_FILE, O_CREAT|O_RDWR, 0660));
-    if (destfd < 0) {
-        ALOGE("Cannot create \"%s\": %s", WIGIG_ENTROPY_FILE, strerror(errno));
-        return -1;
-    }
-
-    if (TEMP_FAILURE_RETRY(write(destfd, dummy_key, sizeof(dummy_key))) != sizeof(dummy_key)) {
-        ALOGE("Error writing \"%s\": %s", WIGIG_ENTROPY_FILE, strerror(errno));
-        close(destfd);
-        return -1;
-    }
-    close(destfd);
-
-    /* chmod is needed because open() didn't set permisions properly */
-    if (chmod(WIGIG_ENTROPY_FILE, 0660) < 0) {
-        ALOGE("Error changing permissions of %s to 0660: %s",
-              WIGIG_ENTROPY_FILE, strerror(errno));
-        unlink(WIGIG_ENTROPY_FILE);
-        return -1;
-    }
-
-    pw = getpwnam("system");
-    gr = getgrnam("wifi");
-    if (pw && gr) {
-        if (chown(WIGIG_ENTROPY_FILE, pw->pw_uid, gr->gr_gid) < 0) {
-            ALOGE("Error changing group ownership of %s to %d: %s",
-                  WIGIG_ENTROPY_FILE, gr->gr_gid, strerror(errno));
-            unlink(WIGIG_ENTROPY_FILE);
-            return -1;
-        }
-    } else {
-        ALOGE("Cannot get pw_uid or gr_gid : %s", strerror(errno));
-        unlink(WIGIG_ENTROPY_FILE);
-        return -1;
-    }
-    return 0;
-}
-
-s32 wifi_qsap_start_wigig_softap(void)
-{
-    pid_t pid = 1;
-
-    ALOGD("%s", __func__);
-
-    if (wigigSoftApPid) {
-        ALOGE("Wigig SoftAP is already running");
-        return eERR_START_SAP;
-    }
-
-    if (wigig_ensure_entropy_file_exists() < 0) {
-        ALOGE("Wigig entropy file was not created");
-    }
-
-    if ((pid = fork()) < 0) {
-        ALOGE("fork failed (%s)", strerror(errno));
-        return eERR_START_SAP;
-    }
-
-    if (!pid) {
-        if (execl(HOSTAPD_BIN_FILE, HOSTAPD_BIN_FILE,
-                  "-e", WIGIG_ENTROPY_FILE, "-dd",
-                  WIGIG_HOSTAPD_CONF_FILE, (char *) NULL)) {
-            ALOGE("execl failed (%s)", strerror(errno));
-        }
-        ALOGE("Wigig SoftAP failed to start. Exiting child process...");
-        exit(-1);
-    }
-
-    wigigSoftApPid = pid;
-    ALOGD("Wigig SoftAP started successfully");
-    usleep(AP_BSS_START_DELAY);
-
-    return eSUCCESS;
-}
-
-s32 wifi_qsap_stop_wigig_softap(void)
-{
-    ALOGD("%s", __func__);
-
-    if (wigigSoftApPid == 0) {
-        ALOGE("Wigig SoftAP is not running");
-        return eSUCCESS;
-    }
-
-    ALOGD("Stopping the Wigig SoftAP...");
-    kill(wigigSoftApPid, SIGTERM);
-    waitpid(wigigSoftApPid, NULL, 0);
-
-    wigigSoftApPid = 0;
-    ALOGD("Wigig SoftAP stopped successfully");
-    usleep(AP_BSS_STOP_DELAY);
-    return eSUCCESS;
-}
-
-s32 wifi_qsap_set_tx_power(s32 tx_power)
-{
-#define QCSAP_IOCTL_SET_MAX_TX_POWER   (SIOCIWFIRSTPRIV + 22)
-    s32 sock;
-    s32 ret = eERR_SET_TX_POWER;
-    s8  interface[128];
-    s8  *iface;
-    s32 len = 128;
-    struct iwreq wrq;
-
-    if(NULL == (iface = qsap_get_config_value(CONFIG_FILE, &qsap_str[STR_INTERFACE], interface, (u32*)&len))) {
-        ALOGE("%s :interface error \n", __func__);
-        return ret;
-    }
-
-    /* Issue QCSAP_IOCTL_SET_MAX_TX_POWER ioctl */
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-
-    if (sock < 0) {
-        ALOGE("%s :socket error \n", __func__);
-        return eERR_SET_TX_POWER;
-    }
-
-    strlcpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
-    wrq.u.data.length = sizeof(s32);
-    wrq.u.data.pointer = &tx_power;
-    wrq.u.data.flags = 0;
-
-    ret = ioctl(sock, QCSAP_IOCTL_SET_MAX_TX_POWER, &wrq);
-    close(sock);
-
-    if (ret) {
-        ALOGE("%s :IOCTL set tx power failed: %d\n", __func__, ret);
-        ret = eERR_SET_TX_POWER;
-    } else {
-        ALOGD("%s :IOCTL set tx power issued\n", __func__);
-        ret = eSUCCESS;
-    }
-
-    return ret;
-}

softap/sdk/qsap.h

@@ -44,11 +44,8 @@ s32 commit(void);
 s32 is_softap_enabled(void);
 s32 wifi_qsap_start_softap(void);
 s32 wifi_qsap_stop_softap(void);
-s32 wifi_qsap_start_wigig_softap(void);
-s32 wifi_qsap_stop_wigig_softap(void);
 s32 wifi_qsap_reload_softap(void);
 s32 wifi_qsap_unload_wifi_sta_driver(void);
-s32 wifi_qsap_set_tx_power(s32 tx_power);
 
 #ifdef QCOM_WLAN_CONCURRENCY
 s32 wifi_qsap_start_softap_in_concurrency(void);

softap/sdk/qsap_api.h

@@ -34,13 +34,13 @@
 #if __cplusplus
 extern "C" {
 #endif
-#include <android/log.h>
+
 typedef unsigned char      u8;
 typedef char               s8;
 typedef unsigned short int u16;
 typedef signed short int   s16;
-typedef unsigned int       u32;
-typedef signed int         s32;
+typedef unsigned long int  u32;
+typedef signed long int    s32;
 
 /** Success and error messages */
 #define SUCCESS                     "success"
@@ -77,8 +77,7 @@ enum error_val {
     eERR_LOAD_FAILED_SDIOIF,
     eERR_LOAD_FAILED_SOFTAP,
     eERR_SET_CHAN_RANGE,
-    eERR_GET_AUTO_CHAN,
-    eERR_SET_TX_POWER
+    eERR_GET_AUTO_CHAN
 };
 
 #ifndef WIFI_DRIVER_CONF_FILE
@@ -89,37 +88,29 @@ enum error_val {
 #define WIFI_DRIVER_DEF_CONF_FILE        NULL
 #endif
 
-/** Configuration file name for SAP+SAP*/
-#define CONFIG_FILE_2G "/data/vendor/wifi/hostapd/hostapd_dual2g.conf"
-#define CONFIG_FILE_5G "/data/vendor/wifi/hostapd/hostapd_dual5g.conf"
-#define CONFIG_FILE_60G "/data/vendor/wifi/hostapd/hostapd_60g.conf"
-
-/** Configuration file name for OWE-transition */
-#define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf"
-
 /** Configuration file name */
-#define CONFIG_FILE "/data/vendor/wifi/hostapd/hostapd.conf"
+#define CONFIG_FILE "/data/misc/wifi/hostapd.conf"
 
 /** Default configuration file path */
-#define DEFAULT_CONFIG_FILE_PATH "/vendor/etc/hostapd/hostapd_default.conf"
+#define DEFAULT_CONFIG_FILE_PATH "/system/etc/hostapd/hostapd_default.conf"
 
 /** Default Accept list file name */
-#define DEFAULT_ACCEPT_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.accept"
+#define DEFAULT_ACCEPT_LIST_FILE_PATH "/system/etc/hostapd/hostapd.accept"
 
 /** Accept list file name */
-#define ACCEPT_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.accept"
+#define ACCEPT_LIST_FILE "/data/misc/wifi/hostapd.accept"
 
 /** Default Deny list file name */
-#define DEFAULT_DENY_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.deny"
+#define DEFAULT_DENY_LIST_FILE_PATH "/system/etc/hostapd/hostapd.deny"
 
 /** Deny list file name */
-#define DENY_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.deny"
+#define DENY_LIST_FILE "/data/misc/wifi/hostapd.deny"
 
 /** Default Ini file */
 #define DEFAULT_INI_FILE "/persist/qcom/softap/qcom_cfg_default.ini"
 
 /** SDK control interface path */
-#define SDK_CTRL_IF "/data/vendor/wifi/hostapd/ctrl/softap_sdk_ctrl"
+#define SDK_CTRL_IF "/data/misc/wifi/softap_sdk_ctrl"
 
 /** Maximum length of the line in the configuration file */
 #define MAX_CONF_LINE_LEN  (156)
@@ -216,7 +207,7 @@ enum error_val {
 #define MIN_UPC_LEN  (1)
 #define MAX_UPC_LEN  (128)
 
-#define GTK_MIN   (30)
+#define GTK_MIN   (600)
 
 #define MAX_INT_STR (8)
 
@@ -253,16 +244,6 @@ enum eCmd_req {
     eCMD_REQ_LAST
 };
 
-/** config request index - in the array Conf_req[] */
-enum eConf_req {
-    CONF_2g = 0,
-    CONF_5g = 1,
-    CONF_owe = 2,
-    CONF_60g = 3,
-
-    CONF_REQ_LAST
-};
-
 /**
   * Command numbers, these numbers form the index into the array of
   * command names stored in the 'cmd_list'.
@@ -343,31 +324,6 @@ typedef enum esap_cmd {
     eCMD_GET_AUTO_CHANNEL    = 63,
     eCMD_IEEE80211W          = 64,
     eCMD_WPA_KEY_MGMT        = 65,
-    eCMD_SET_MAX_CLIENTS     = 66,
-    eCMD_IEEE80211AC         = 67,
-    eCMD_VHT_OPER_CH_WIDTH   = 68,
-    eCMD_ACS_CHAN_LIST       = 69,
-    eCMD_HT_CAPAB            = 70,
-    eCMD_IEEE80211H          = 71,
-
-    eCMD_ENABLE_WIGIG_SOFTAP = 72,
-    eCMD_INTERFACE           = 73,
-    eCMD_SSID2               = 74,
-    eCMD_BRIDGE              = 75,
-    eCMD_CTRL_INTERFACE      = 76,
-    eCMD_VENDOR_ELEMENT      = 77,
-    eCMD_ASSOCRESP_ELEMENT   = 78,
-    eCMD_ACS_EXCLUDE_DFS     = 79,
-    eCMD_WOWLAN_TRIGGERS     = 80,
-    eCMD_ACCEPT_MAC_FILE     = 81,
-    eCMD_DENY_MAC_FILE       = 82,
-    eCMD_OWE_TRANS_IFNAME    = 83,
-    eCMD_SAE_REQUIRE_MPF     = 84,
-
-    eCMD_IEEE80211AX         = 85,
-
-    eCMD_ENABLE_EDMG         = 86,
-    eCMD_EDMG_CHANNEL        = 87,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;
@@ -432,8 +388,6 @@ enum oper_mode {
     HW_MODE_G_ONLY = 3,
     HW_MODE_N_ONLY = 4,
     HW_MODE_A = 5,
-    HW_MODE_ANY = 6,
-    HW_MODE_AD = 7,
 
     HW_MODE_UNKNOWN
 };
@@ -531,7 +485,7 @@ typedef struct sap_auto_channel_info {
 #define IS_VALID_BSSID(x) (((value == ENABLE) || (value == DISABLE)) ? TRUE: FALSE)
 
 /** Validate the length of the passphrase */
-#define IS_VALID_PASSPHRASE_LEN(x) ((((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) || (x == 0)) ? TRUE: FALSE)
+#define IS_VALID_PASSPHRASE_LEN(x) (((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) ? TRUE: FALSE)
 
 /** Validate the beacon interval */
 #define IS_VALID_BEACON(x) (((x >= BCN_INTERVAL_MIN) && (x <= BCN_INTERVAL_MAX)) ? TRUE: FALSE)
@@ -544,7 +498,7 @@ typedef struct sap_auto_channel_info {
 
 /** Validate the pairwise encryption */
 #define IS_VALID_PAIRWISE(x) (((!strcmp(x, "TKIP")) || (!strcmp(x, "CCMP")) || \
-                    (!strcmp(x, "TKIP CCMP")) || (!strcmp(x, "CCMP TKIP")) || (!strcmp(x, "GCMP"))) ? TRUE : FALSE)
+                    (!strcmp(x, "TKIP CCMP")) || (!strcmp(x, "CCMP TKIP"))) ? TRUE : FALSE)
 
 /** Validate the WMM status */
 #define IS_VALID_WMM_STATE(x) (((x >= WMM_AUTO_IN_INI) && (x <= WMM_DISABLED_IN_INI)) ? TRUE: FALSE)
@@ -621,15 +575,10 @@ typedef struct sap_auto_channel_info {
 /** Validate the AP shutoff time */
 #define IS_VALID_ENERGY_DETECT_TH(x) ((((x >= AP_ENERGY_DETECT_TH_MIN) && (x <= AP_ENERGY_DETECT_TH_MAX)) ||( x == 128)) ? TRUE : FALSE)
 
-/** Validate the 802dot11h state */
-#define IS_VALID_DFS_STATE(x) (((x == ENABLE) || (x == DISABLE)) ? TRUE: FALSE)
-
 /** Function declartion */
-int qsap_hostd_exec(int argc, char ** argv);
 void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen);
 s8 *qsap_get_config_value(s8 *pfile, struct Command *pcmd, s8 *pbuf, u32 *plen);
 int qsapsetSoftap(int argc, char *argv[]);
-int qsap_add_or_remove_interface(const char *iface_name, int create_iface);
 void qsap_del_ctrl_iface(void);
 s16 wifi_qsap_reset_to_default(s8 *pcfgfile, s8 *pdefault);
 void check_for_configuration_files(void);
@@ -637,11 +586,6 @@ void qsap_set_ini_filename(void);
 int qsap_set_channel_range(s8 * cmd);
 int qsap_get_sap_auto_channel_slection(s32 *pautochan);
 int qsap_get_mode(s32 *pmode);
-int qsap_prepare_softap(void);
-int qsap_unprepare_softap(void);
-int qsap_is_fst_enabled(void);
-int qsap_control_bridge(int argc, char ** argv);
-int linux_get_ifhwaddr(const char *ifname, char *addr);
 
 #if __cplusplus
 };  // extern "C"