commit fbd11c41aeb535723b78a61087fb436e64891055
author jmzhu <jmzhu@marvell.com> Mon Oct 11 16:47:05 2010 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Mon Oct 11 16:51:13 2010 -0700
tree 290fa3786697d9385917f5dc67b4ef0f3efb56ed
parent 56b6d45ebd9a9ae52ec5b75e7096cb02a23af1be

netd: softap: Add sub-ioctl command support

Change-Id: Ieb344fbb8853019e92a7385f7a190aa7451102dc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

SoftapController.cpp

diff --git a/SoftapController.cpp b/SoftapController.cpp
index b81b5b6..3ab6d72 100644
--- a/SoftapController.cpp
+++ b/SoftapController.cpp
@@ -49,11 +49,12 @@
         close(mSock);
 }
 
-int SoftapController::getPrivFuncNum(char *iface, const char *fname) {
+int SoftapController::setCommand(char *iface, const char *fname) {
     char tBuf[SOFTAP_MAX_BUFFER_SIZE];
     struct iwreq wrq;
     struct iw_priv_args *priv_ptr;
-    int i, ret;
+    int i, j, ret;
+    int cmd = 0, sub_cmd = 0;
 
     strncpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
     wrq.u.data.pointer = tBuf;
@@ -63,33 +64,43 @@
         LOGE("SIOCGIPRIV failed: %d", ret);
         return ret;
     }
+
     priv_ptr = (struct iw_priv_args *)wrq.u.data.pointer;
-    for(i=0;(i < wrq.u.data.length);i++) {
-        if (strcmp(priv_ptr[i].name, fname) == 0)
-            return priv_ptr[i].cmd;
+    for(i=0; i < wrq.u.data.length;i++) {
+        if (strcmp(priv_ptr[i].name, fname) == 0) {
+            cmd = priv_ptr[i].cmd;
+            break;
+        }
     }
-    return -1;
-}
 
-int SoftapController::setCommand(char *iface, const char *fname)
-{
-    struct iwreq wrq;
-    int fnum, ret;
-
-    fnum = getPrivFuncNum(iface, fname);
-    if (fnum < 0) {
-        LOGE("Softap %s - function not supported", fname);
+    if (i == wrq.u.data.length) {
+        LOGE("iface:%s, fname: %s - function not supported", iface, fname);
         return -1;
     }
 
+    if (cmd < SIOCDEVPRIVATE) {
+        for(j=0; j < i; j++) {
+            if ((priv_ptr[j].set_args == priv_ptr[i].set_args) &&
+                (priv_ptr[j].get_args == priv_ptr[i].get_args) &&
+                (priv_ptr[j].name[0] == '\0'))
+                break;
+        }
+        if (j == i) {
+            LOGE("iface:%s, fname: %s - invalid private ioctl", iface, fname);
+            return -1;
+        }
+        sub_cmd = cmd;
+        cmd = priv_ptr[j].cmd;
+    }
+
     strncpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
     if (*mBuf != 0)
         wrq.u.data.length = strlen(mBuf) + 1;
     else
         wrq.u.data.length = 0;
     wrq.u.data.pointer = mBuf;
-    wrq.u.data.flags = 0;
-    ret = ioctl(mSock, fnum, &wrq);
+    wrq.u.data.flags = sub_cmd;
+    ret = ioctl(mSock, cmd, &wrq);
     return ret;
 }