Changeset 1180:773498f59520 in freeDiameter for libfdcore/cnxctx.c

Timestamp:

Jun 5, 2013, 4:02:29 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Preparing for future DTLS/SCTP support

File:

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

libfdcore/cnxctx.c

@@ -1534 +1534 @@
 #else /* DISABLE_SCTP */
                 /* Initialize the wrapper, start the demux thread */
-                CHECK_FCT( fd_sctps_init(conn) );
+                CHECK_FCT( fd_sctp3436_init(conn) );
 #endif /* DISABLE_SCTP */
         } else {
@@ -1594 +1594 @@
 #ifndef DISABLE_SCTP
                 /* Start reading the messages from the master session. That way, if the remote peer closed, we are not stuck inside handshake */
-                CHECK_FCT(fd_sctps_startthreads(conn, 0));
+                CHECK_FCT(fd_sctp3436_startthreads(conn, 0));
 
                 /* Resume all additional sessions from the master one. */
-                CHECK_FCT(fd_sctps_handshake_others(conn, priority, alt_creds));
+                CHECK_FCT(fd_sctp3436_handshake_others(conn, priority, alt_creds));
 
                 /* Start decrypting the messages from all threads and queuing them in target queue */
-                CHECK_FCT(fd_sctps_startthreads(conn, 1));
+                CHECK_FCT(fd_sctp3436_startthreads(conn, 1));
 #endif /* DISABLE_SCTP */
         } else {
@@ -1761 +1761 @@
                                                 ssize_t ret;
                                                 size_t sent = 0;
-                                                ASSERT(conn->cc_sctps_data.array != NULL);
+                                                ASSERT(conn->cc_sctp3436_data.array != NULL);
                                                 do {
-                                                        CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctps_data.array[conn->cc_sctp_para.next].session, buf + sent, len - sent), );
+                                                        CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctp3436_data.array[conn->cc_sctp_para.next].session, buf + sent, len - sent), );
                                                         if (ret <= 0)
                                                                 return ENOTCONN;
@@ -1810 +1810 @@
                         if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
                                 /* and other stream pairs */
-                                fd_sctps_bye(conn);
+                                fd_sctp3436_bye(conn);
                         }
 
                         if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
                                 /* Now wait for all decipher threads to terminate */
-                                fd_sctps_waitthreadsterm(conn);
+                                fd_sctp3436_waitthreadsterm(conn);
                         } else {
                                 /* Abord the threads, the connection is dead already */
-                                fd_sctps_stopthreads(conn);
+                                fd_sctp3436_stopthreads(conn);
                         }
 
                         /* Deinit gnutls resources */
-                        fd_sctps_gnutls_deinit_others(conn);
+                        fd_sctp3436_gnutls_deinit_others(conn);
                         if (conn->cc_tls_para.session) {
                                 GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) );
@@ -1829 +1829 @@
                         
                         /* Destroy the wrapper (also stops the demux thread) */
-                        fd_sctps_destroy(conn);
+                        fd_sctp3436_destroy(conn);
 
                 } else {
 #endif /* DISABLE_SCTP */
-                /* We are TLS, but not using the sctps wrapper layer */
+                /* We are TLS, but not using the sctp3436 wrapper layer */
                         if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
                                 /* Master session */