commit 07dbbc99c8ffb0e71a88aab0d1aa7f0fcf6ccf15
author Amar Singhal <asinghal@qca.qualcomm.com> Thu Jan 24 16:02:56 2013 -0800
committer Madan Mohan Koyyalamudi <mkoyya@codeaurora.org> Tue Feb 05 21:28:48 2013 -0800
tree 6dc9fc7c44b0f59c5ac127e1f35b31c787a50fc0
parent 034f7d685ae444882b78eb88e50b3e7770d11b47

Generalise support for SSID type for PNO

Include non-ascii characters in SSID defined for PNO

CRs-fixed: 435824
Change-Id: I2a5746eac43789f04facb77b31b35e02e47076dc
(cherry picked from commit 751e607863809bd67b36f3855e89888ea8f0f050)

CORE/HDD/src/wlan_hdd_wext.c

diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 34094e9..a752455 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -5494,23 +5494,34 @@
     /*Advance to SSID*/
     ptr += nOffset;
 
-    ucParams = sscanf(ptr,"%32s %lu %lu %hhu %n",
-           pnoRequest.aNetworks[i].ssId.ssId,
-           &(pnoRequest.aNetworks[i].authentication),
-           &(pnoRequest.aNetworks[i].encryption),
-           &(pnoRequest.aNetworks[i].ucChannelCount),
-           &nOffset);
+ memcpy(pnoRequest.aNetworks[i].ssId.ssId, ptr,
+           pnoRequest.aNetworks[i].ssId.length);
+    ptr += pnoRequest.aNetworks[i].ssId.length;
+
+    ucParams = sscanf(ptr,"%lu %lu %hhu %n",
+                      &(pnoRequest.aNetworks[i].authentication),
+                      &(pnoRequest.aNetworks[i].encryption),
+                      &(pnoRequest.aNetworks[i].ucChannelCount),
+                      &nOffset);
 
     VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
-            "PNO len %d ssid %s auth %d encry %d channel count %d offset %d",
-            pnoRequest.aNetworks[i].ssId.length,
-            pnoRequest.aNetworks[i].ssId.ssId,
-            pnoRequest.aNetworks[i].authentication,
-            pnoRequest.aNetworks[i].encryption,
-            pnoRequest.aNetworks[i].ucChannelCount,
-            nOffset );
+              "PNO len %d ssid 0x%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx"
+              "auth %d encry %d channel count %d offset %d",
+              pnoRequest.aNetworks[i].ssId.length,
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[0]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[4]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[8]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[12]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[16]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[20]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[24]),
+              *((v_U32_t *) &pnoRequest.aNetworks[i].ssId.ssId[28]),
+              pnoRequest.aNetworks[i].authentication,
+              pnoRequest.aNetworks[i].encryption,
+              pnoRequest.aNetworks[i].ucChannelCount,
+              nOffset );
 
-    if ( 4 != ucParams )
+    if ( 3 != ucParams )
     {
       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
                 "Incorrect cmd");