Changeset 1180:773498f59520 in freeDiameter for libfdcore
- Timestamp:
- Jun 5, 2013, 4:02:29 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libfdcore
- Files:
-
- 5 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
libfdcore/CMakeLists.txt
r1159 r1180 39 39 40 40 IF(NOT DISABLE_SCTP) 41 SET(FDCORE_SRC ${FDCORE_SRC} sctp.c sctp s.c)41 SET(FDCORE_SRC ${FDCORE_SRC} sctp.c sctp3436.c) 42 42 ENDIF(NOT DISABLE_SCTP) 43 43 -
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 */ -
libfdcore/cnxctx.h
r1127 r1180 78 78 /* If both conditions */ 79 79 struct { 80 struct sctp s_ctx *array; /* an array of cc_sctp_para.pairs elements -- the #0 is special (session is outside)*/80 struct sctp3436_ctx *array; /* an array of cc_sctp_para.pairs elements -- the #0 is special (session is outside)*/ 81 81 struct sr_store *sess_store; /* Session data of the master session, to resume the children sessions */ 82 } cc_sctp s_data;82 } cc_sctp3436_data; 83 83 }; 84 84 … … 121 121 122 122 /* TLS over SCTP (multi-stream) */ 123 struct sctp s_ctx {123 struct sctp3436_ctx { 124 124 struct cnxctx *parent; /* for info such as socket, conn name, event list */ 125 125 uint16_t strid; /* Stream # of this session */ … … 134 134 }; 135 135 136 int fd_sctp s_init(struct cnxctx * conn);137 int fd_sctp s_handshake_others(struct cnxctx * conn, char * priority, void * alt_creds);138 int fd_sctp s_startthreads(struct cnxctx * conn, int others);139 void fd_sctp s_bye(struct cnxctx * conn);140 void fd_sctp s_waitthreadsterm(struct cnxctx * conn);141 void fd_sctp s_gnutls_deinit_others(struct cnxctx * conn);142 void fd_sctp s_stopthreads(struct cnxctx * conn);143 void fd_sctp s_destroy(struct cnxctx * conn);136 int fd_sctp3436_init(struct cnxctx * conn); 137 int fd_sctp3436_handshake_others(struct cnxctx * conn, char * priority, void * alt_creds); 138 int fd_sctp3436_startthreads(struct cnxctx * conn, int others); 139 void fd_sctp3436_bye(struct cnxctx * conn); 140 void fd_sctp3436_waitthreadsterm(struct cnxctx * conn); 141 void fd_sctp3436_gnutls_deinit_others(struct cnxctx * conn); 142 void fd_sctp3436_stopthreads(struct cnxctx * conn); 143 void fd_sctp3436_destroy(struct cnxctx * conn); 144 144 145 145 #endif /* DISABLE_SCTP */ -
libfdcore/fdd.l
r979 r1180 246 246 (?i:"Port") { return PORT; } 247 247 (?i:"SecPort") { return SECPORT; } 248 (?i:"SctpSec3436") { return SEC3436; } 248 249 (?i:"No_IPv6") { return NOIP6; } 249 250 (?i:"No_IP") { return NOIP; } -
libfdcore/fdd.y
r1012 r1180 98 98 %token PORT 99 99 %token SECPORT 100 %token SEC3436 100 101 %token NOIP 101 102 %token NOIP6 … … 133 134 | conffile port 134 135 | conffile secport 136 | conffile sec3436 135 137 | conffile sctpstreams 136 138 | conffile listenon … … 203 205 { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } ); 204 206 conf->cnf_port_tls = (uint16_t)$3; 207 } 208 ; 209 210 sec3436: SEC3436 '=' INTEGER ';' 211 { 212 CHECK_PARAMS_DO( ($3 >= 0) && ($3 < 1<<16), 213 { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } ); 214 conf->cnf_port_3436 = (uint16_t)$3; 205 215 } 206 216 ; … … 453 463 fddpi.config.pic_flags.sec |= PI_SEC_NONE; 454 464 } 465 | peerparams SEC3436 ';' 466 { 467 fddpi.config.pic_flags.sctpsec |= PI_SCTPSEC_3436; 468 } 455 469 | peerparams REALM '=' QSTRING ';' 456 470 { -
libfdcore/sctp3436.c
r1127 r1180 84 84 ASSERT( conn->cc_proto == IPPROTO_SCTP ); 85 85 ASSERT( fd_cnx_target_queue(conn) ); 86 ASSERT( conn->cc_sctp s_data.array );86 ASSERT( conn->cc_sctp3436_data.array ); 87 87 88 88 do { … … 92 92 /* Demux this message to the appropriate fifo, another thread will pull, gnutls process, and send to target queue */ 93 93 if (strid < conn->cc_sctp_para.pairs) { 94 CHECK_FCT_DO(fd_event_send(conn->cc_sctp s_data.array[strid].raw_recv, event, bufsz, buf), goto fatal );94 CHECK_FCT_DO(fd_event_send(conn->cc_sctp3436_data.array[strid].raw_recv, event, bufsz, buf), goto fatal ); 95 95 } else { 96 96 TRACE_DEBUG(INFO, "Received packet (%zd bytes) on out-of-range stream #%d from %s, discarded.", bufsz, strid, conn->cc_remid); … … 120 120 /* Signal termination of the connection to all decipher threads */ 121 121 for (strid = 0; strid < conn->cc_sctp_para.pairs; strid++) { 122 if (conn->cc_sctp s_data.array[strid].raw_recv) {123 CHECK_FCT_DO(fd_event_send(conn->cc_sctp s_data.array[strid].raw_recv, FDEVP_CNX_ERROR, 0, NULL), goto fatal );122 if (conn->cc_sctp3436_data.array[strid].raw_recv) { 123 CHECK_FCT_DO(fd_event_send(conn->cc_sctp3436_data.array[strid].raw_recv, FDEVP_CNX_ERROR, 0, NULL), goto fatal ); 124 124 } 125 125 } … … 137 137 static void * decipher(void * arg) 138 138 { 139 struct sctp s_ctx * ctx = arg;139 struct sctp3436_ctx * ctx = arg; 140 140 struct cnxctx *cnx; 141 141 … … 165 165 166 166 /* Send data over the connection, called by gnutls */ 167 static ssize_t sctp s_push(gnutls_transport_ptr_t tr, const void * data, size_t len)168 { 169 struct sctp s_ctx * ctx = (struct sctps_ctx *) tr;167 static ssize_t sctp3436_push(gnutls_transport_ptr_t tr, const void * data, size_t len) 168 { 169 struct sctp3436_ctx * ctx = (struct sctp3436_ctx *) tr; 170 170 171 171 TRACE_ENTRY("%p %p %zd", tr, data, len); … … 178 178 179 179 /* Retrieve data received on a stream and already demultiplexed */ 180 static ssize_t sctp s_pull(gnutls_transport_ptr_t tr, void * buf, size_t len)181 { 182 struct sctp s_ctx * ctx = (struct sctps_ctx *) tr;180 static ssize_t sctp3436_pull(gnutls_transport_ptr_t tr, void * buf, size_t len) 181 { 182 struct sctp3436_ctx * ctx = (struct sctp3436_ctx *) tr; 183 183 size_t pulled = 0; 184 184 int emptied; … … 229 229 GCC_DIAG_OFF("-Wdeprecated-declarations") 230 230 #endif /* !GNUTLS_VERSION_300 */ 231 static void set_sess_transport(gnutls_session_t session, struct sctp s_ctx *ctx)231 static void set_sess_transport(gnutls_session_t session, struct sctp3436_ctx *ctx) 232 232 { 233 233 /* Set the transport pointer passed to push & pull callbacks */ … … 241 241 242 242 /* Set the push and pull callbacks */ 243 GNUTLS_TRACE( gnutls_transport_set_pull_function(session, sctp s_pull) );244 GNUTLS_TRACE( gnutls_transport_set_push_function(session, sctp s_push) );243 GNUTLS_TRACE( gnutls_transport_set_pull_function(session, sctp3436_pull) ); 244 GNUTLS_TRACE( gnutls_transport_set_push_function(session, sctp3436_push) ); 245 245 246 246 return; … … 272 272 { 273 273 TRACE_ENTRY("%p", conn); 274 CHECK_PARAMS( conn && !conn->cc_sctp s_data.sess_store );275 276 CHECK_MALLOC( conn->cc_sctp s_data.sess_store = malloc(sizeof(struct sr_store)) );277 memset(conn->cc_sctp s_data.sess_store, 0, sizeof(struct sr_store));278 279 fd_list_init(&conn->cc_sctp s_data.sess_store->list, NULL);280 CHECK_POSIX( pthread_rwlock_init(&conn->cc_sctp s_data.sess_store->lock, NULL) );281 conn->cc_sctp s_data.sess_store->parent = conn;274 CHECK_PARAMS( conn && !conn->cc_sctp3436_data.sess_store ); 275 276 CHECK_MALLOC( conn->cc_sctp3436_data.sess_store = malloc(sizeof(struct sr_store)) ); 277 memset(conn->cc_sctp3436_data.sess_store, 0, sizeof(struct sr_store)); 278 279 fd_list_init(&conn->cc_sctp3436_data.sess_store->list, NULL); 280 CHECK_POSIX( pthread_rwlock_init(&conn->cc_sctp3436_data.sess_store->lock, NULL) ); 281 conn->cc_sctp3436_data.sess_store->parent = conn; 282 282 283 283 return 0; … … 291 291 CHECK_PARAMS_DO( conn, return ); 292 292 293 if (!conn->cc_sctp s_data.sess_store)293 if (!conn->cc_sctp3436_data.sess_store) 294 294 return; 295 295 296 CHECK_POSIX_DO( pthread_rwlock_destroy(&conn->cc_sctp s_data.sess_store->lock), /* continue */ );297 298 while (!FD_IS_LIST_EMPTY(&conn->cc_sctp s_data.sess_store->list)) {299 struct sr_data * sr = (struct sr_data *) conn->cc_sctp s_data.sess_store->list.next;296 CHECK_POSIX_DO( pthread_rwlock_destroy(&conn->cc_sctp3436_data.sess_store->lock), /* continue */ ); 297 298 while (!FD_IS_LIST_EMPTY(&conn->cc_sctp3436_data.sess_store->list)) { 299 struct sr_data * sr = (struct sr_data *) conn->cc_sctp3436_data.sess_store->list.next; 300 300 fd_list_unlink( &sr->chain ); 301 301 free(sr->key.data); … … 304 304 } 305 305 306 free(conn->cc_sctp s_data.sess_store);307 conn->cc_sctp s_data.sess_store = NULL;306 free(conn->cc_sctp3436_data.sess_store); 307 conn->cc_sctp3436_data.sess_store = NULL; 308 308 return; 309 309 } … … 455 455 GNUTLS_TRACE( gnutls_db_set_remove_function (session, sr_remove)); 456 456 GNUTLS_TRACE( gnutls_db_set_store_function (session, sr_store)); 457 GNUTLS_TRACE( gnutls_db_set_ptr (session, conn->cc_sctp s_data.sess_store));457 GNUTLS_TRACE( gnutls_db_set_ptr (session, conn->cc_sctp3436_data.sess_store)); 458 458 459 459 return; … … 463 463 static void * handshake_resume_th(void * arg) 464 464 { 465 struct sctp s_ctx * ctx = (struct sctps_ctx *) arg;465 struct sctp3436_ctx * ctx = (struct sctp3436_ctx *) arg; 466 466 int resumed; 467 467 … … 504 504 505 505 /* Initialize the wrapper for the connection */ 506 int fd_sctp s_init(struct cnxctx * conn)506 int fd_sctp3436_init(struct cnxctx * conn) 507 507 { 508 508 uint16_t i; 509 509 510 510 TRACE_ENTRY("%p", conn); 511 CHECK_PARAMS( conn && (conn->cc_sctp_para.pairs > 1) && (!conn->cc_sctp s_data.array) );511 CHECK_PARAMS( conn && (conn->cc_sctp_para.pairs > 1) && (!conn->cc_sctp3436_data.array) ); 512 512 513 513 /* First, alloc the array and initialize the non-TLS data */ 514 CHECK_MALLOC( conn->cc_sctp s_data.array = calloc(conn->cc_sctp_para.pairs, sizeof(struct sctps_ctx)) );514 CHECK_MALLOC( conn->cc_sctp3436_data.array = calloc(conn->cc_sctp_para.pairs, sizeof(struct sctp3436_ctx)) ); 515 515 for (i = 0; i < conn->cc_sctp_para.pairs; i++) { 516 conn->cc_sctp s_data.array[i].parent = conn;517 conn->cc_sctp s_data.array[i].strid = i;518 CHECK_FCT( fd_fifo_new(&conn->cc_sctp s_data.array[i].raw_recv, 10) );516 conn->cc_sctp3436_data.array[i].parent = conn; 517 conn->cc_sctp3436_data.array[i].strid = i; 518 CHECK_FCT( fd_fifo_new(&conn->cc_sctp3436_data.array[i].raw_recv, 10) ); 519 519 } 520 520 521 521 /* Set push/pull functions in the master session, using fifo in array[0] */ 522 set_sess_transport(conn->cc_tls_para.session, &conn->cc_sctp s_data.array[0]);522 set_sess_transport(conn->cc_tls_para.session, &conn->cc_sctp3436_data.array[0]); 523 523 524 524 /* For server side, we also initialize the resuming capabilities */ … … 539 539 540 540 /* Handshake other streams, after full handshake on the master session */ 541 int fd_sctp s_handshake_others(struct cnxctx * conn, char * priority, void * alt_creds)541 int fd_sctp3436_handshake_others(struct cnxctx * conn, char * priority, void * alt_creds) 542 542 { 543 543 uint16_t i; … … 546 546 547 547 TRACE_ENTRY("%p %p", conn, priority); 548 CHECK_PARAMS( conn && (conn->cc_sctp_para.pairs > 1) && conn->cc_sctp s_data.array );548 CHECK_PARAMS( conn && (conn->cc_sctp_para.pairs > 1) && conn->cc_sctp3436_data.array ); 549 549 550 550 /* Server side: we set all the parameters, the resume callback will take care of resuming the session */ … … 566 566 for (i = 1; i < conn->cc_sctp_para.pairs; i++) { 567 567 /* Set credentials and priority */ 568 CHECK_FCT( fd_tls_prepare(&conn->cc_sctp s_data.array[i].session, conn->cc_tls_para.mode, priority, alt_creds) );568 CHECK_FCT( fd_tls_prepare(&conn->cc_sctp3436_data.array[i].session, conn->cc_tls_para.mode, priority, alt_creds) ); 569 569 570 570 /* additional initialization for gnutls 3.x */ … … 573 573 574 574 /* fd_tls_verify_credentials_2 uses the connection */ 575 gnutls_session_set_ptr (conn->cc_sctp s_data.array[i].session, (void *) conn);575 gnutls_session_set_ptr (conn->cc_sctp3436_data.array[i].session, (void *) conn); 576 576 577 577 if ((conn->cc_tls_para.cn != NULL) && (conn->cc_tls_para.mode == GNUTLS_CLIENT)) { 578 578 /* this might allow virtual hosting on the remote peer */ 579 CHECK_GNUTLS_DO( gnutls_server_name_set (conn->cc_sctp s_data.array[i].session, GNUTLS_NAME_DNS, conn->cc_tls_para.cn, strlen(conn->cc_tls_para.cn)), /* ignore failure */);579 CHECK_GNUTLS_DO( gnutls_server_name_set (conn->cc_sctp3436_data.array[i].session, GNUTLS_NAME_DNS, conn->cc_tls_para.cn, strlen(conn->cc_tls_para.cn)), /* ignore failure */); 580 580 } 581 581 … … 583 583 584 584 #ifdef GNUTLS_VERSION_310 585 GNUTLS_TRACE( gnutls_handshake_set_timeout( conn->cc_sctp s_data.array[i].session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));585 GNUTLS_TRACE( gnutls_handshake_set_timeout( conn->cc_sctp3436_data.array[i].session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT)); 586 586 #endif /* GNUTLS_VERSION_310 */ 587 587 588 588 /* For the client, copy data from master session; for the server, set session resuming pointers */ 589 589 if (conn->cc_tls_para.mode == GNUTLS_CLIENT) { 590 CHECK_GNUTLS_DO( gnutls_session_set_data(conn->cc_sctp s_data.array[i].session, master_data.data, master_data.size), return ENOMEM );590 CHECK_GNUTLS_DO( gnutls_session_set_data(conn->cc_sctp3436_data.array[i].session, master_data.data, master_data.size), return ENOMEM ); 591 591 } else { 592 set_resume_callbacks(conn->cc_sctp s_data.array[i].session, conn);592 set_resume_callbacks(conn->cc_sctp3436_data.array[i].session, conn); 593 593 } 594 594 595 595 /* Set transport parameters */ 596 set_sess_transport(conn->cc_sctp s_data.array[i].session, &conn->cc_sctps_data.array[i]);596 set_sess_transport(conn->cc_sctp3436_data.array[i].session, &conn->cc_sctp3436_data.array[i]); 597 597 598 598 /* Start the handshake thread */ 599 CHECK_POSIX( pthread_create( &conn->cc_sctp s_data.array[i].thr, NULL, handshake_resume_th, &conn->cc_sctps_data.array[i] ) );599 CHECK_POSIX( pthread_create( &conn->cc_sctp3436_data.array[i].thr, NULL, handshake_resume_th, &conn->cc_sctp3436_data.array[i] ) ); 600 600 } 601 601 … … 608 608 for (i = 1; i < conn->cc_sctp_para.pairs; i++) { 609 609 void * ret; 610 CHECK_POSIX( pthread_join(conn->cc_sctp s_data.array[i].thr, &ret) );611 conn->cc_sctp s_data.array[i].thr = (pthread_t) NULL;610 CHECK_POSIX( pthread_join(conn->cc_sctp3436_data.array[i].thr, &ret) ); 611 conn->cc_sctp3436_data.array[i].thr = (pthread_t) NULL; 612 612 if (ret == NULL) { 613 613 errors++; /* Handshake failed on this stream */ … … 625 625 626 626 /* Receive messages from others ? all other stream pairs : the master pair */ 627 int fd_sctp s_startthreads(struct cnxctx * conn, int others)627 int fd_sctp3436_startthreads(struct cnxctx * conn, int others) 628 628 { 629 629 uint16_t i; 630 630 631 631 TRACE_ENTRY("%p", conn); 632 CHECK_PARAMS( conn && conn->cc_sctp s_data.array );632 CHECK_PARAMS( conn && conn->cc_sctp3436_data.array ); 633 633 634 634 if (others) { … … 636 636 637 637 /* Start the decipher thread */ 638 CHECK_POSIX( pthread_create( &conn->cc_sctp s_data.array[i].thr, NULL, decipher, &conn->cc_sctps_data.array[i] ) );638 CHECK_POSIX( pthread_create( &conn->cc_sctp3436_data.array[i].thr, NULL, decipher, &conn->cc_sctp3436_data.array[i] ) ); 639 639 } 640 640 } else { 641 CHECK_POSIX( pthread_create( &conn->cc_sctp s_data.array[0].thr, NULL, decipher, &conn->cc_sctps_data.array[0] ) );641 CHECK_POSIX( pthread_create( &conn->cc_sctp3436_data.array[0].thr, NULL, decipher, &conn->cc_sctp3436_data.array[0] ) ); 642 642 } 643 643 return 0; … … 645 645 646 646 /* Initiate a "bye" on all stream pairs */ 647 void fd_sctp s_bye(struct cnxctx * conn)647 void fd_sctp3436_bye(struct cnxctx * conn) 648 648 { 649 649 uint16_t i; 650 650 651 CHECK_PARAMS_DO( conn && conn->cc_sctp s_data.array, return );651 CHECK_PARAMS_DO( conn && conn->cc_sctp3436_data.array, return ); 652 652 653 653 /* End all TLS sessions, in series (not as efficient as paralel, but simpler) */ 654 654 for (i = 1; i < conn->cc_sctp_para.pairs; i++) { 655 655 if ( ! fd_cnx_teststate(conn, CC_STATUS_ERROR)) { 656 CHECK_GNUTLS_DO( gnutls_bye(conn->cc_sctp s_data.array[i].session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) );656 CHECK_GNUTLS_DO( gnutls_bye(conn->cc_sctp3436_data.array[i].session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) ); 657 657 } 658 658 } … … 660 660 661 661 /* After "bye" was sent on all streams, read from sessions until an error is received */ 662 void fd_sctp s_waitthreadsterm(struct cnxctx * conn)662 void fd_sctp3436_waitthreadsterm(struct cnxctx * conn) 663 663 { 664 664 uint16_t i; 665 665 666 666 TRACE_ENTRY("%p", conn); 667 CHECK_PARAMS_DO( conn && conn->cc_sctp s_data.array, return );667 CHECK_PARAMS_DO( conn && conn->cc_sctp3436_data.array, return ); 668 668 669 669 for (i = 0; i < conn->cc_sctp_para.pairs; i++) { 670 if (conn->cc_sctp s_data.array[i].thr != (pthread_t)NULL) {671 CHECK_POSIX_DO( pthread_join(conn->cc_sctp s_data.array[i].thr, NULL), /* continue */ );672 conn->cc_sctp s_data.array[i].thr = (pthread_t)NULL;670 if (conn->cc_sctp3436_data.array[i].thr != (pthread_t)NULL) { 671 CHECK_POSIX_DO( pthread_join(conn->cc_sctp3436_data.array[i].thr, NULL), /* continue */ ); 672 conn->cc_sctp3436_data.array[i].thr = (pthread_t)NULL; 673 673 } 674 674 } … … 677 677 678 678 /* Free gnutls resources of all sessions */ 679 void fd_sctp s_gnutls_deinit_others(struct cnxctx * conn)679 void fd_sctp3436_gnutls_deinit_others(struct cnxctx * conn) 680 680 { 681 681 uint16_t i; 682 682 683 683 TRACE_ENTRY("%p", conn); 684 CHECK_PARAMS_DO( conn && conn->cc_sctp s_data.array, return );684 CHECK_PARAMS_DO( conn && conn->cc_sctp3436_data.array, return ); 685 685 686 686 for (i = 1; i < conn->cc_sctp_para.pairs; i++) { 687 if (conn->cc_sctp s_data.array[i].session) {688 GNUTLS_TRACE( gnutls_deinit(conn->cc_sctp s_data.array[i].session) );689 conn->cc_sctp s_data.array[i].session = NULL;687 if (conn->cc_sctp3436_data.array[i].session) { 688 GNUTLS_TRACE( gnutls_deinit(conn->cc_sctp3436_data.array[i].session) ); 689 conn->cc_sctp3436_data.array[i].session = NULL; 690 690 } 691 691 } … … 694 694 695 695 /* Stop all receiver threads */ 696 void fd_sctp s_stopthreads(struct cnxctx * conn)696 void fd_sctp3436_stopthreads(struct cnxctx * conn) 697 697 { 698 698 uint16_t i; 699 699 700 700 TRACE_ENTRY("%p", conn); 701 CHECK_PARAMS_DO( conn && conn->cc_sctp s_data.array, return );701 CHECK_PARAMS_DO( conn && conn->cc_sctp3436_data.array, return ); 702 702 703 703 for (i = 0; i < conn->cc_sctp_para.pairs; i++) { 704 CHECK_FCT_DO( fd_thr_term(&conn->cc_sctp s_data.array[i].thr), /* continue */ );704 CHECK_FCT_DO( fd_thr_term(&conn->cc_sctp3436_data.array[i].thr), /* continue */ ); 705 705 } 706 706 return; … … 708 708 709 709 /* Destroy a wrapper context */ 710 void fd_sctp s_destroy(struct cnxctx * conn)710 void fd_sctp3436_destroy(struct cnxctx * conn) 711 711 { 712 712 uint16_t i; 713 713 714 CHECK_PARAMS_DO( conn && conn->cc_sctp s_data.array, return );714 CHECK_PARAMS_DO( conn && conn->cc_sctp3436_data.array, return ); 715 715 716 716 /* Terminate all receiving threads in case we did not do it yet */ 717 fd_sctp s_stopthreads(conn);717 fd_sctp3436_stopthreads(conn); 718 718 719 719 /* Now, stop the demux thread */ … … 722 722 /* Free remaining data in the array */ 723 723 for (i = 0; i < conn->cc_sctp_para.pairs; i++) { 724 if (conn->cc_sctp s_data.array[i].raw_recv)725 fd_event_destroy( &conn->cc_sctp s_data.array[i].raw_recv, free );726 free(conn->cc_sctp s_data.array[i].partial.buf);727 if (conn->cc_sctp s_data.array[i].session) {728 GNUTLS_TRACE( gnutls_deinit(conn->cc_sctp s_data.array[i].session) );729 conn->cc_sctp s_data.array[i].session = NULL;724 if (conn->cc_sctp3436_data.array[i].raw_recv) 725 fd_event_destroy( &conn->cc_sctp3436_data.array[i].raw_recv, free ); 726 free(conn->cc_sctp3436_data.array[i].partial.buf); 727 if (conn->cc_sctp3436_data.array[i].session) { 728 GNUTLS_TRACE( gnutls_deinit(conn->cc_sctp3436_data.array[i].session) ); 729 conn->cc_sctp3436_data.array[i].session = NULL; 730 730 } 731 731 } 732 732 733 733 /* Free the array itself now */ 734 free(conn->cc_sctp s_data.array);735 conn->cc_sctp s_data.array = NULL;734 free(conn->cc_sctp3436_data.array); 735 conn->cc_sctp3436_data.array = NULL; 736 736 737 737 /* Delete the store of sessions */
Note: See TracChangeset
for help on using the changeset viewer.