Changeset 4968 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

Dec 18, 2014 4:40:35 AM (9 years ago)

Author:

riza

Message:

Re #1806: Implement SSL/TLS setting to set protocol operation.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -186 +186 @@
 
 
+static pj_uint32_t ssl_get_proto(pjsip_ssl_method ssl_method, pj_uint32_t proto)
+{
+    pj_uint32_t out_proto;
+
+    if (proto)
+        return proto;
+
+    if (ssl_method == PJSIP_SSL_UNSPECIFIED_METHOD)
+        ssl_method = PJSIP_SSL_DEFAULT_METHOD;
+
+    switch(ssl_method) {
+    case PJSIP_SSLV2_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_SSL2;
+        break;
+    case PJSIP_SSLV3_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_SSL3;
+        break;
+    case PJSIP_TLSV1_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_TLS1;
+        break;
+    case PJSIP_TLSV1_1_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_TLS1_1;
+        break;
+    case PJSIP_TLSV1_2_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_TLS1_2;
+        break;
+    case PJSIP_SSLV23_METHOD:
+        out_proto = PJ_SSL_SOCK_PROTO_SSL23;
+        break;
+    default:
+        out_proto = PJ_SSL_SOCK_PROTO_DEFAULT;
+        break;
+    }   
+    return out_proto;
+}
+
+
 static void tls_init_shutdown(struct tls_transport *tls, pj_status_t status)
 {
@@ -276 +313 @@
     pj_bool_t is_ipv6;
     int af, sip_ssl_method;
+    pj_uint32_t sip_ssl_proto;
     struct tls_listener *listener;
     pj_ssl_sock_param ssock_param;
@@ -369 +407 @@
 
     sip_ssl_method = listener->tls_setting.method;
-    if (sip_ssl_method==PJSIP_SSL_UNSPECIFIED_METHOD)
-        sip_ssl_method = PJSIP_SSL_DEFAULT_METHOD;
-
-    switch(sip_ssl_method) {
-    case PJSIP_TLSV1_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_TLS1;
-        break;
-    case PJSIP_SSLV2_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL2;
-        break;
-    case PJSIP_SSLV3_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL3;
-        break;
-    case PJSIP_SSLV23_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL23;
-        break;
-    default:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_DEFAULT;
-        break;
-    }
+    sip_ssl_proto = listener->tls_setting.proto;
+    ssock_param.proto = ssl_get_proto(sip_ssl_method, sip_ssl_proto); 
 
     /* Create group lock */
@@ -964 +984 @@
     struct tls_transport *tls;
     int sip_ssl_method;
+    pj_uint32_t sip_ssl_proto;
     pj_pool_t *pool;
     pj_grp_lock_t *glock;
@@ -1028 +1049 @@
 
     sip_ssl_method = listener->tls_setting.method;
-    if (sip_ssl_method==PJSIP_SSL_UNSPECIFIED_METHOD)
-        sip_ssl_method = PJSIP_SSL_DEFAULT_METHOD;
-
-    switch(sip_ssl_method) {
-    case PJSIP_TLSV1_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_TLS1;
-        break;
-    case PJSIP_SSLV2_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL2;
-        break;
-    case PJSIP_SSLV3_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL3;
-        break;
-    case PJSIP_SSLV23_METHOD:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_SSL23;
-        break;
-    default:
-        ssock_param.proto = PJ_SSL_SOCK_PROTO_DEFAULT;
-        break;
-    }
+    sip_ssl_proto = listener->tls_setting.proto;
+    ssock_param.proto = ssl_get_proto(sip_ssl_method, sip_ssl_proto);
 
     /* Create group lock */