Changeset 1180:773498f59520 in freeDiameter for libfdcore/cnxctx.c
- Timestamp:
- Jun 5, 2013, 4:02:29 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdcore/cnxctx.c
r1145 r1180 1534 1534 #else /* DISABLE_SCTP */ 1535 1535 /* Initialize the wrapper, start the demux thread */ 1536 CHECK_FCT( fd_sctp s_init(conn) );1536 CHECK_FCT( fd_sctp3436_init(conn) ); 1537 1537 #endif /* DISABLE_SCTP */ 1538 1538 } else { … … 1594 1594 #ifndef DISABLE_SCTP 1595 1595 /* Start reading the messages from the master session. That way, if the remote peer closed, we are not stuck inside handshake */ 1596 CHECK_FCT(fd_sctp s_startthreads(conn, 0));1596 CHECK_FCT(fd_sctp3436_startthreads(conn, 0)); 1597 1597 1598 1598 /* Resume all additional sessions from the master one. */ 1599 CHECK_FCT(fd_sctp s_handshake_others(conn, priority, alt_creds));1599 CHECK_FCT(fd_sctp3436_handshake_others(conn, priority, alt_creds)); 1600 1600 1601 1601 /* Start decrypting the messages from all threads and queuing them in target queue */ 1602 CHECK_FCT(fd_sctp s_startthreads(conn, 1));1602 CHECK_FCT(fd_sctp3436_startthreads(conn, 1)); 1603 1603 #endif /* DISABLE_SCTP */ 1604 1604 } else { … … 1761 1761 ssize_t ret; 1762 1762 size_t sent = 0; 1763 ASSERT(conn->cc_sctp s_data.array != NULL);1763 ASSERT(conn->cc_sctp3436_data.array != NULL); 1764 1764 do { 1765 CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctp s_data.array[conn->cc_sctp_para.next].session, buf + sent, len - sent), );1765 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), ); 1766 1766 if (ret <= 0) 1767 1767 return ENOTCONN; … … 1810 1810 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) { 1811 1811 /* and other stream pairs */ 1812 fd_sctp s_bye(conn);1812 fd_sctp3436_bye(conn); 1813 1813 } 1814 1814 1815 1815 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) { 1816 1816 /* Now wait for all decipher threads to terminate */ 1817 fd_sctp s_waitthreadsterm(conn);1817 fd_sctp3436_waitthreadsterm(conn); 1818 1818 } else { 1819 1819 /* Abord the threads, the connection is dead already */ 1820 fd_sctp s_stopthreads(conn);1820 fd_sctp3436_stopthreads(conn); 1821 1821 } 1822 1822 1823 1823 /* Deinit gnutls resources */ 1824 fd_sctp s_gnutls_deinit_others(conn);1824 fd_sctp3436_gnutls_deinit_others(conn); 1825 1825 if (conn->cc_tls_para.session) { 1826 1826 GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) ); … … 1829 1829 1830 1830 /* Destroy the wrapper (also stops the demux thread) */ 1831 fd_sctp s_destroy(conn);1831 fd_sctp3436_destroy(conn); 1832 1832 1833 1833 } else { 1834 1834 #endif /* DISABLE_SCTP */ 1835 /* We are TLS, but not using the sctp swrapper layer */1835 /* We are TLS, but not using the sctp3436 wrapper layer */ 1836 1836 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) { 1837 1837 /* Master session */
Note: See TracChangeset
for help on using the changeset viewer.