Changeset 1187:436e4342ecd0 in freeDiameter for libfdcore

Timestamp:

Jun 10, 2013, 1:04:50 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Rollback to using TLS/SCTP in release 1.2.0. DTLS dev to happen in freeDiameter-dtls branch

Location:

libfdcore

Files:

• fdd.l (modified) (1 diff)
• p_cnx.c (modified) (1 diff)
• server.c (modified) (3 diffs)

libfdcore/fdd.l

@@ -246 +246 @@
 (?i:"Port")             { return PORT;          }
 (?i:"SecPort")          { return SECPORT;       }
-(?i:"SctpSec3436")      { return SEC3436;       }
+        /* (?i:"SctpSec3436")   { return SEC3436;       } */
 (?i:"No_IPv6")          { return NOIP6;         }
 (?i:"No_IP")            { return NOIP;          }

libfdcore/p_cnx.c

@@ -283 +283 @@
         if (nc->dotls) {
                 CHECK_FCT_DO( fd_cnx_handshake(cnx, GNUTLS_CLIENT, 
-                                                (peer->p_hdr.info.config.pic_flags.sctpsec == PI_SCTPSEC_3436) ? ALGO_HANDSHAKE_3436 : ALGO_HANDSHAKE_DEFAULT,
+                                                ALGO_HANDSHAKE_3436,
                                                 peer->p_hdr.info.config.pic_priority, NULL),
                         {

libfdcore/server.c

@@ -54 +54 @@
         struct cnxctx * conn;           /* server connection context (listening socket) */
         int             proto;          /* IPPROTO_TCP or IPPROTO_SCTP */
-        int             secur;          /* TLS is started immediatly after connection ? 0: no; 1: yes (TLS/TCP or DTLS/SCTP); 2: yes (TLS/TCP or TLS/SCTP) */
+        int             secur;          /* TLS is started immediatly after connection ? 0: no; 2: yes (TLS/TCP or TLS/SCTP) */
         
         pthread_t       thr;            /* The thread listening for new connections */
@@ -361 +361 @@
                 /* Create the server on secure port */
                 if (fd_g_config->cnf_port_tls) {
-                        CHECK_MALLOC( s = new_serv(IPPROTO_SCTP, 1) );
+                        CHECK_MALLOC( s = new_serv(IPPROTO_SCTP, 2 /* Change when DTLS is introduced */) );
                         CHECK_MALLOC( s->conn = fd_cnx_serv_sctp(fd_g_config->cnf_port_tls, empty_conf_ep ? NULL : &fd_g_config->cnf_endpoints) );
                         fd_list_insert_before( &FD_SERVERS, &s->chain );
@@ -368 +368 @@
                 
                 /* Create the other server on 3436 secure port */
-                if (fd_g_config->cnf_port_3436) {
+                /*if (fd_g_config->cnf_port_3436) {
                         CHECK_MALLOC( s = new_serv(IPPROTO_SCTP, 2) );
                         CHECK_MALLOC( s->conn = fd_cnx_serv_sctp(fd_g_config->cnf_port_3436, empty_conf_ep ? NULL : &fd_g_config->cnf_endpoints) );
                         fd_list_insert_before( &FD_SERVERS, &s->chain );
                         CHECK_POSIX( pthread_create( &s->thr, NULL, serv_th, s ) );
-                }
+                }*/
                 
 #endif /* DISABLE_SCTP */