Fix SSL
authorDan Mihai <Daniel.Mihai@microsoft.com>
Fri, 20 Jan 2017 23:24:08 +0000 (15:24 -0800)
committerKevin Kane <kkane@microsoft.com>
Sat, 21 Jan 2017 01:31:34 +0000 (01:31 +0000)
Fix an apparent incorrect merge from commit
efb16a3d282851cbb70a8de693d2a300ce6f43dd. Provisioningclient wasn't
working anymore.

Change-Id: I990f854bdd96127286d97d1ed00dca10ca9632bd
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16679
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c

index 425db6c..5c359ac 100644 (file)
@@ -1922,23 +1922,20 @@ void CAsetSslAdapterCallbacks(CAPacketReceivedCallback recvCallback,
 
     switch (type)
     {
-        switch (type)
-        {
-            case CA_ADAPTER_IP:
-                g_caSslContext->adapterCallbacks[0].recvCallback = recvCallback;
-                g_caSslContext->adapterCallbacks[0].sendCallback = sendCallback;
-                break;
-            case CA_ADAPTER_TCP:
-                g_caSslContext->adapterCallbacks[1].recvCallback = recvCallback;
-                g_caSslContext->adapterCallbacks[1].sendCallback = sendCallback;
-                break;
-            case CA_ADAPTER_GATT_BTLE:
-                g_caSslContext->adapterCallbacks[2].recvCallback = recvCallback;
-                g_caSslContext->adapterCallbacks[2].sendCallback = sendCallback;
-                break;
-            default:
-                OIC_LOG_V(ERROR, NET_SSL_TAG, "Unsupported adapter: %d", type);
-        }
+        case CA_ADAPTER_IP:
+            g_caSslContext->adapterCallbacks[0].recvCallback = recvCallback;
+            g_caSslContext->adapterCallbacks[0].sendCallback = sendCallback;
+            break;
+        case CA_ADAPTER_TCP:
+            g_caSslContext->adapterCallbacks[1].recvCallback = recvCallback;
+            g_caSslContext->adapterCallbacks[1].sendCallback = sendCallback;
+            break;
+        case CA_ADAPTER_GATT_BTLE:
+            g_caSslContext->adapterCallbacks[2].recvCallback = recvCallback;
+            g_caSslContext->adapterCallbacks[2].sendCallback = sendCallback;
+            break;
+        default:
+            OIC_LOG_V(ERROR, NET_SSL_TAG, "Unsupported adapter: %d", type);
     }
 
     oc_mutex_unlock(g_sslContextMutex);