Changeset 1181:22de21feec64 in freeDiameter for libfdcore/server.c

Timestamp:

Jun 5, 2013, 8:22:26 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Preparing for DTLS support

File:

• libfdcore/server.c (modified) (5 diffs)

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 ? */
+        int             secur;          /* TLS is started immediatly after connection ? 0: no; 1: yes (TLS/TCP or DTLS/SCTP); 2: yes (TLS/TCP or TLS/SCTP) */
         
         pthread_t       thr;            /* The thread listening for new connections */
@@ -105 +105 @@
                 
                 if (details) {
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s", s, fd_cnx_getid(s->conn), 
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s(%d), %s", s, fd_cnx_getid(s->conn), 
                                         IPPROTO_NAME( s->proto ),
-                                        s->secur ? "Secur" : "NotSecur",
+                                        s->secur ? "Secur" : "NotSecur", s->secur,
                                         (st == NOT_CREATED) ? "Thread not created" :
                                         ((st == RUNNING) ? "Thread running" :
@@ -147 +147 @@
         TRACE_ENTRY("%p", c);
         
+        memset(&rcv_data, 0, sizeof(rcv_data));
+        
         CHECK_PARAMS_DO(c && c->conn && c->chain.head, goto fatal_error );
+        
         
         s = c->chain.head->o;
@@ -156 +159 @@
         /* Handshake if we are a secure server port, or start clear otherwise */
         if (s->secur) {
-                int ret = fd_cnx_handshake(c->conn, GNUTLS_SERVER, NULL, NULL);
+                int ret = fd_cnx_handshake(c->conn, GNUTLS_SERVER, (s->secur == 1) ? ALGO_HANDSHAKE_DEFAULT : ALGO_HANDSHAKE_3436, NULL, NULL);
                 if (ret != 0) {
                         char buf[1024];
@@ -360 +363 @@
                         CHECK_MALLOC( s = new_serv(IPPROTO_SCTP, 1) );
                         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 );
+                        CHECK_POSIX( pthread_create( &s->thr, NULL, serv_th, s ) );
+                }
+                
+                /* Create the other server on 3436 secure port */
+                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 ) );