freeDiameter: libfdcore/cnxctx.c annotate

annotate libfdcore/cnxctx.c @ 1540:407e0a889c7e

SCTP ConnectPeer: sctp_bindx() to local endpoints When connecting to an SCTP peer using sctp_connectx() with local addresses configured with ListenOn, bind to the ListenOn addresses using sctp_bindx() so that the SCTP INIT only contains the configured local addresses, matching what is advertised in the CER, and disable SCTP_AUTO_ASCONF. If no local addresses are configured with ListenOn, the previous behaviour of sctp_connectx() and enable SCTP_AUTO_ASCONF is used.

author	Luke Mewburn <luke@mewburn.net>
date	Fri, 01 May 2020 18:20:33 +1000
parents	89cbb08d3189
children	566bb46cc73f

rev	line source
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	1 /*********************************************************************************************************
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	2 * Software License Agreement (BSD License) *
740 4a9f08d6b6ba Updated my mail address Sebastien Decugis <sdecugis@nict.go.jp> parents: 730 diff changeset	3 * Author: Sebastien Decugis <sdecugis@freediameter.net> *
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	4 * *
1281 ab6457399be2 Updated copyright information Sebastien Decugis <sdecugis@freediameter.net> parents: 1268 diff changeset	5 * Copyright (c) 2015, WIDE Project and NICT *
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	6 * All rights reserved. *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	7 * *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	8 * Redistribution and use of this software in source and binary forms, with or without modification, are *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	9 * permitted provided that the following conditions are met: *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	10 * *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	11 * * Redistributions of source code must retain the above *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	12 * copyright notice, this list of conditions and the *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	13 * following disclaimer. *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	14 * *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	15 * * Redistributions in binary form must reproduce the above *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	16 * copyright notice, this list of conditions and the *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	17 * following disclaimer in the documentation and/or other *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	18 * materials provided with the distribution. *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	19 * *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	20 * * Neither the name of the WIDE Project or NICT nor the *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	21 * names of its contributors may be used to endorse or *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	22 * promote products derived from this software without *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	23 * specific prior written permission of WIDE Project and *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	24 * NICT. *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	25 * *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	27 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	28 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	29 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	30 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	34 *********************************************************************************************************/
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	35
658 f198d16fa7f4 Initial commit for 1.1.0: Sebastien Decugis <sdecugis@nict.go.jp> parents: 591 diff changeset	36 #include "fdcore-internal.h"
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	37 #include "cnxctx.h"
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	38
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	39 #include <net/if.h>
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	40 #include <ifaddrs.h> /* for getifaddrs */
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	41 #include <sys/uio.h> /* writev */
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	42
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	43 /* The maximum size of Diameter message we accept to receive (<= 2^24) to avoid too big mallocs in case of trashed headers */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	44 #ifndef DIAMETER_MSG_SIZE_MAX
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	45 #define DIAMETER_MSG_SIZE_MAX 65535 /* in bytes */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	46 #endif /* DIAMETER_MSG_SIZE_MAX */
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	47
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	48
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	49 /* Connections contexts (cnxctx) in freeDiameter are wrappers around the sockets and TLS operations .
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	50 * They are used to hide the details of the processing to the higher layers of the daemon.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	51 * They are always oriented on connections (TCP or SCTP), connectionless modes (UDP or SCTP) are not supported.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	52 */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	53
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	54 /* Lifetime of a cnxctx object:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	55 * 1) Creation
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	56 * a) a server socket:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	57 * - create the object with fd_cnx_serv_tcp or fd_cnx_serv_sctp
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	58 * - start listening incoming connections: fd_cnx_serv_listen
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	59 * - accept new clients with fd_cnx_serv_accept.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	60 * b) a client socket:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	61 * - connect to a remote server with fd_cnx_cli_connect
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	62 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	63 * 2) Initialization
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	64 * - if TLS is started first, call fd_cnx_handshake
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	65 * - otherwise to receive clear messages, call fd_cnx_start_clear. fd_cnx_handshake can be called later.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	66 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	67 * 3) Usage
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	68 * - fd_cnx_receive, fd_cnx_send : exchange messages on this connection (send is synchronous, receive is not, but blocking).
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	69 * - fd_cnx_recv_setaltfifo : when a message is received, the event is sent to an external fifo list. fd_cnx_receive does not work when the alt_fifo is set.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	70 * - fd_cnx_getid : retrieve a descriptive string for the connection (for debug)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	71 * - fd_cnx_getremoteid : identification of the remote peer (IP address or fqdn)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	72 * - fd_cnx_getcred : get the remote peer TLS credentials, after handshake
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	73 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	74 * 4) End
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	75 * - fd_cnx_destroy
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	76 */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	77
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	78 /*******************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	79 /* Creation of a connection object */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	80 /*******************************************/
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	81
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	82 /* Initialize a context structure */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	83 static struct cnxctx * fd_cnx_init(int full)
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	84 {
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	85 struct cnxctx * conn = NULL;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	86
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	87 TRACE_ENTRY("%d", full);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	88
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	89 CHECK_MALLOC_DO( conn = malloc(sizeof(struct cnxctx)), return NULL );
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	90 memset(conn, 0, sizeof(struct cnxctx));
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	91
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	92 if (full) {
767 c47c16436f71 Added a limit on fifo queues to avoid memory exaustion when messages are received faster than handled Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	93 CHECK_FCT_DO( fd_fifo_new ( &conn->cc_incoming, 5 ), return NULL );
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	94 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	95
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	96 return conn;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	97 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	98
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	99 #define CC_ID_HDR "{----} "
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	100
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	101 /* Create and bind a server socket to the given endpoint and port */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	102 struct cnxctx * fd_cnx_serv_tcp(uint16_t port, int family, struct fd_endpoint * ep)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	103 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	104 struct cnxctx * cnx = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	105 sSS dummy;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	106 sSA * sa = (sSA *) &dummy;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	107
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	108 TRACE_ENTRY("%hu %d %p", port, family, ep);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	109
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	110 CHECK_PARAMS_DO( port, return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	111 CHECK_PARAMS_DO( ep \|\| family, return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	112 CHECK_PARAMS_DO( (! family) \|\| (family == AF_INET) \|\| (family == AF_INET6), return NULL );
730 e21d79595045 minor improvements Sebastien Decugis <sdecugis@nict.go.jp> parents: 711 diff changeset	113 CHECK_PARAMS_DO( (! ep) \|\| (ep->ss.ss_family == AF_INET) \|\| (ep->ss.ss_family == AF_INET6), return NULL );
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	114 CHECK_PARAMS_DO( (! ep) \|\| (!family) \|\| (ep->ss.ss_family == family), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	115
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	116 /* The connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	117 CHECK_MALLOC_DO( cnx = fd_cnx_init(0), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	118
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	119 /* Prepare the socket address information */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	120 if (ep) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	121 memcpy(sa, &ep->ss, sizeof(sSS));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	122 } else {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	123 memset(&dummy, 0, sizeof(dummy));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	124 sa->sa_family = family;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	125 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	126 if (sa->sa_family == AF_INET) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	127 ((sSA4 *)sa)->sin_port = htons(port);
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	128 cnx->cc_family = AF_INET;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	129 } else {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	130 ((sSA6 *)sa)->sin6_port = htons(port);
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	131 cnx->cc_family = AF_INET6;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	132 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	133
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	134 /* Create the socket */
246 6418a188c1b5 getnameinfo is also more sensitive on freeBSD Sebastien Decugis <sdecugis@nict.go.jp> parents: 245 diff changeset	135 CHECK_FCT_DO( fd_tcp_create_bind_server( &cnx->cc_socket, sa, sSAlen(sa) ), goto error );
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	136
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	137 /* Generate the name for the connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	138 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	139 char addrbuf[INET6_ADDRSTRLEN];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	140 int rc;
247 f89b5a12d2af Forgot a couple of getnameinfo Sebastien Decugis <sdecugis@nict.go.jp> parents: 246 diff changeset	141 rc = getnameinfo(sa, sSAlen(sa), addrbuf, sizeof(addrbuf), NULL, 0, NI_NUMERICHOST);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	142 if (rc)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	143 snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	144 snprintf(cnx->cc_id, sizeof(cnx->cc_id), CC_ID_HDR "TCP srv [%s]:%hu (%d)", addrbuf, port, cnx->cc_socket);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	145 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	146
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	147 cnx->cc_proto = IPPROTO_TCP;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	148
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	149 return cnx;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	150
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	151 error:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	152 fd_cnx_destroy(cnx);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	153 return NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	154 }
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	155
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	156 /* Same function for SCTP, with a list of local endpoints to bind to */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	157 struct cnxctx * fd_cnx_serv_sctp(uint16_t port, struct fd_list * ep_list)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	158 {
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	159 #ifdef DISABLE_SCTP
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	160 TRACE_DEBUG(INFO, "This function should never been called when SCTP is disabled...");
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	161 ASSERT(0);
709 19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	162 CHECK_FCT_DO( ENOTSUP, );
19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	163 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	164 #else /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	165 struct cnxctx * cnx = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	166
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	167 TRACE_ENTRY("%hu %p", port, ep_list);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	168
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	169 CHECK_PARAMS_DO( port, return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	170
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	171 /* The connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	172 CHECK_MALLOC_DO( cnx = fd_cnx_init(0), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	173
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	174 if (fd_g_config->cnf_flags.no_ip6) {
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	175 cnx->cc_family = AF_INET;
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	176 } else {
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	177 cnx->cc_family = AF_INET6; /* can create socket for both IP and IPv6 */
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	178 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	179
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	180 /* Create the socket */
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	181 CHECK_FCT_DO( fd_sctp_create_bind_server( &cnx->cc_socket, cnx->cc_family, ep_list, port ), goto error );
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	182
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	183 /* Generate the name for the connection object */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	184 snprintf(cnx->cc_id, sizeof(cnx->cc_id), CC_ID_HDR "SCTP srv :%hu (%d)", port, cnx->cc_socket);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	185
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	186 cnx->cc_proto = IPPROTO_SCTP;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	187
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	188 return cnx;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	189
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	190 error:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	191 fd_cnx_destroy(cnx);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	192 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	193 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	194 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	195
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	196 /* Allow clients to connect on the server socket */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	197 int fd_cnx_serv_listen(struct cnxctx * conn)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	198 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	199 CHECK_PARAMS( conn );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	200
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	201 switch (conn->cc_proto) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	202 case IPPROTO_TCP:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	203 CHECK_FCT(fd_tcp_listen(conn->cc_socket));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	204 break;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	205
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	206 #ifndef DISABLE_SCTP
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	207 case IPPROTO_SCTP:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	208 CHECK_FCT(fd_sctp_listen(conn->cc_socket));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	209 break;
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	210 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	211
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	212 default:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	213 CHECK_PARAMS(0);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	214 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	215
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	216 return 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	217 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	218
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	219 /* Accept a client (blocking until a new client connects) -- cancelable */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	220 struct cnxctx * fd_cnx_serv_accept(struct cnxctx * serv)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	221 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	222 struct cnxctx * cli = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	223 sSS ss;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	224 socklen_t ss_len = sizeof(ss);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	225 int cli_sock = 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	226
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	227 TRACE_ENTRY("%p", serv);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	228 CHECK_PARAMS_DO(serv, return NULL);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	229
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	230 /* Accept the new connection -- this is blocking until new client enters or until cancellation */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	231 CHECK_SYS_DO( cli_sock = accept(serv->cc_socket, (sSA *)&ss, &ss_len), return NULL );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	232
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	233 CHECK_MALLOC_DO( cli = fd_cnx_init(1), { shutdown(cli_sock, SHUT_RDWR); close(cli_sock); return NULL; } );
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	234 cli->cc_socket = cli_sock;
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	235 cli->cc_family = serv->cc_family;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	236 cli->cc_proto = serv->cc_proto;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	237
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	238 /* Set the timeout */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	239 fd_cnx_s_setto(cli->cc_socket);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	240
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	241 /* Generate the name for the connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	242 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	243 char addrbuf[INET6_ADDRSTRLEN];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	244 char portbuf[10];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	245 int rc;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	246
711 f7c665948e0c Use size returned by accept Sebastien Decugis <sdecugis@nict.go.jp> parents: 710 diff changeset	247 rc = getnameinfo((sSA *)&ss, ss_len, addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST \| NI_NUMERICSERV);
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	248 if (rc) {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	249 snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	250 portbuf[0] = '\0';
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	251 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	252
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	253 /* Numeric values for debug... */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	254 snprintf(cli->cc_id, sizeof(cli->cc_id), CC_ID_HDR "%s from [%s]:%s (%d<-%d)",
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	255 IPPROTO_NAME(cli->cc_proto), addrbuf, portbuf, serv->cc_socket, cli->cc_socket);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	256
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	257
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	258 /* ...Name for log messages */
711 f7c665948e0c Use size returned by accept Sebastien Decugis <sdecugis@nict.go.jp> parents: 710 diff changeset	259 rc = getnameinfo((sSA *)&ss, ss_len, cli->cc_remid, sizeof(cli->cc_remid), NULL, 0, 0);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	260 if (rc)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	261 snprintf(cli->cc_remid, sizeof(cli->cc_remid), "[err:%s]", gai_strerror(rc));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	262 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	263
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	264 LOG_D("Incoming connection: '%s' <- '%s' {%s}", fd_cnx_getid(serv), cli->cc_remid, cli->cc_id);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	265
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	266 #ifndef DISABLE_SCTP
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	267 /* SCTP-specific handlings */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	268 if (cli->cc_proto == IPPROTO_SCTP) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	269 /* Retrieve the number of streams */
407 7029e6b587ac Fix warning Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	270 CHECK_FCT_DO( fd_sctp_get_str_info( cli->cc_socket, &cli->cc_sctp_para.str_in, &cli->cc_sctp_para.str_out, NULL ), {fd_cnx_destroy(cli); return NULL;} );
396 918fbb92eb8b Attempt to fix #6 Sebastien Decugis <sdecugis@nict.go.jp> parents: 378 diff changeset	271 if (cli->cc_sctp_para.str_out < cli->cc_sctp_para.str_in)
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	272 cli->cc_sctp_para.pairs = cli->cc_sctp_para.str_out;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	273 else
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	274 cli->cc_sctp_para.pairs = cli->cc_sctp_para.str_in;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	275
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	276 LOG_A( "%s : client '%s' (SCTP:%d, %d/%d streams)", fd_cnx_getid(serv), fd_cnx_getid(cli), cli->cc_socket, cli->cc_sctp_para.str_in, cli->cc_sctp_para.str_out);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	277 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	278 #endif /* DISABLE_SCTP */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	279
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	280 return cli;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	281 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	282
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	283 /* Client side: connect to a remote server -- cancelable */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	284 struct cnxctx * fd_cnx_cli_connect_tcp(sSA * sa /* contains the port already */, socklen_t addrlen)
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	285 {
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	286 int sock = 0;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	287 struct cnxctx * cnx = NULL;
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	288 char sa_buf[sSA_DUMP_STRLEN];
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	289
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	290 TRACE_ENTRY("%p %d", sa, addrlen);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	291 CHECK_PARAMS_DO( sa && addrlen, return NULL );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	292
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	293 fd_sa_sdump_numeric(sa_buf, sa);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	294
1198 8c4dd4b693c6 Some cleanups in the traces Sebastien Decugis <sdecugis@freediameter.net> parents: 1192 diff changeset	295 LOG_D("Connecting to TCP %s...", sa_buf);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	296
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	297 /* Create the socket and connect, which can take some time and/or fail */
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	298 {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	299 int ret = fd_tcp_client( &sock, sa, addrlen );
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	300 if (ret != 0) {
1198 8c4dd4b693c6 Some cleanups in the traces Sebastien Decugis <sdecugis@freediameter.net> parents: 1192 diff changeset	301 LOG_D("TCP connection to %s failed: %s", sa_buf, strerror(ret));
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	302 return NULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	303 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	304 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	305
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	306 /* Once the socket is created successfuly, prepare the remaining of the cnx */
182 9ed2e3ce4434 Cleaner error handling Sebastien Decugis <sdecugis@nict.go.jp> parents: 156 diff changeset	307 CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	308
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	309 cnx->cc_socket = sock;
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	310 cnx->cc_family = sa->sa_family;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	311 cnx->cc_proto = IPPROTO_TCP;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	312
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	313 /* Set the timeout */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	314 fd_cnx_s_setto(cnx->cc_socket);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	315
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	316 /* Generate the names for the object */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	317 {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	318 int rc;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	319
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	320 snprintf(cnx->cc_id, sizeof(cnx->cc_id), CC_ID_HDR "TCP,#%d->%s", cnx->cc_socket, sa_buf);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	321
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	322 /* ...Name for log messages */
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	323 rc = getnameinfo(sa, addrlen, cnx->cc_remid, sizeof(cnx->cc_remid), NULL, 0, 0);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	324 if (rc)
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	325 snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	326 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	327
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	328 LOG_A("TCP connection to %s succeed (socket:%d).", sa_buf, sock);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	329
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	330 return cnx;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	331 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	332
1540 407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	333 /* Same for SCTP, accepts a list of remote addresses to connect to (see sctp_connectx for how they are used).
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	334 * If src_list is not NULL and not empty, list of local addresses to connect from via sctp_bindx(). */
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	335 struct cnxctx * fd_cnx_cli_connect_sctp(int no_ip6, uint16_t port, struct fd_list * list, struct fd_list * src_list)
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	336 {
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	337 #ifdef DISABLE_SCTP
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	338 TRACE_DEBUG(INFO, "This function should never be called when SCTP is disabled...");
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	339 ASSERT(0);
709 19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	340 CHECK_FCT_DO( ENOTSUP, );
19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	341 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	342 #else /* DISABLE_SCTP */
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	343 int sock = 0;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	344 struct cnxctx * cnx = NULL;
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	345 char sa_buf[sSA_DUMP_STRLEN];
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	346 sSS primary;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	347
1540 407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	348 TRACE_ENTRY("%p %p", list, src_list);
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	349 CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	350
1540 407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	351 /* Log SCTP association source and destination endpoints */
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	352 {
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	353 char * buf = NULL;
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	354 size_t len = 0, offset = 0;
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	355 CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, "Connecting SCTP endpoints"), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	356 CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, " source: "), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	357 if (src_list && !FD_IS_LIST_EMPTY(src_list)) {
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	358 CHECK_MALLOC_DO( fd_ep_dump( &buf, &len, &offset, 0, 0, src_list ), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	359 } else {
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	360 CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, "(ANY)"), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	361 }
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	362 CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, ", destination: "), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	363 CHECK_MALLOC_DO( fd_ep_dump( &buf, &len, &offset, 0, 0, list ), );
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	364 LOG_D("%s", buf ?: "Error determining SCTP endpoints");
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	365 free(buf);
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	366 }
407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	367
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	368 fd_sa_sdump_numeric(sa_buf, &((struct fd_endpoint *)(list->next))->sa);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	369
1198 8c4dd4b693c6 Some cleanups in the traces Sebastien Decugis <sdecugis@freediameter.net> parents: 1192 diff changeset	370 LOG_D("Connecting to SCTP %s:%hu...", sa_buf, port);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	371
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	372 {
1540 407e0a889c7e SCTP ConnectPeer: sctp_bindx() to local endpoints Luke Mewburn <luke@mewburn.net> parents: 1419 diff changeset	373 int ret = fd_sctp_client( &sock, no_ip6, port, list, src_list );
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	374 if (ret != 0) {
1198 8c4dd4b693c6 Some cleanups in the traces Sebastien Decugis <sdecugis@freediameter.net> parents: 1192 diff changeset	375 LOG_D("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	376 return NULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	377 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	378 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	379
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	380 /* Once the socket is created successfuly, prepare the remaining of the cnx */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	381 CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	382
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	383 cnx->cc_socket = sock;
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	384 cnx->cc_family = no_ip6 ? AF_INET : AF_INET6;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	385 cnx->cc_proto = IPPROTO_SCTP;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	386
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	387 /* Set the timeout */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	388 fd_cnx_s_setto(cnx->cc_socket);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	389
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	390 /* Retrieve the number of streams and primary address */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	391 CHECK_FCT_DO( fd_sctp_get_str_info( sock, &cnx->cc_sctp_para.str_in, &cnx->cc_sctp_para.str_out, &primary ), goto error );
402 1e1dc47ef241 Fix remaining problem, closes #6 Sebastien Decugis <sdecugis@nict.go.jp> parents: 396 diff changeset	392 if (cnx->cc_sctp_para.str_out < cnx->cc_sctp_para.str_in)
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	393 cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_out;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	394 else
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	395 cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_in;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	396
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	397 fd_sa_sdump_numeric(sa_buf, (sSA *)&primary);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	398
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	399 /* Generate the names for the object */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	400 {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	401 int rc;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	402
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	403 snprintf(cnx->cc_id, sizeof(cnx->cc_id), CC_ID_HDR "SCTP,#%d->%s", cnx->cc_socket, sa_buf);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	404
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	405 /* ...Name for log messages */
247 f89b5a12d2af Forgot a couple of getnameinfo Sebastien Decugis <sdecugis@nict.go.jp> parents: 246 diff changeset	406 rc = getnameinfo((sSA *)&primary, sSAlen(&primary), cnx->cc_remid, sizeof(cnx->cc_remid), NULL, 0, 0);
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	407 if (rc)
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	408 snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	409 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	410
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	411 LOG_A("SCTP connection to %s succeed (socket:%d, %d/%d streams).", sa_buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	412
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	413 return cnx;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	414
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	415 error:
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	416 fd_cnx_destroy(cnx);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	417 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	418 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	419 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	420
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	421 /* Return a string describing the connection, for debug */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	422 char * fd_cnx_getid(struct cnxctx * conn)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	423 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	424 CHECK_PARAMS_DO( conn, return "" );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	425 return conn->cc_id;
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	426 }
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	427
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	428 /* Return the protocol of a connection */
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	429 int fd_cnx_getproto(struct cnxctx * conn)
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	430 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	431 CHECK_PARAMS_DO( conn, return 0 );
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	432 return conn->cc_proto;
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	433 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	434
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	435 /* Set the hostname to check during handshake */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	436 void fd_cnx_sethostname(struct cnxctx * conn, DiamId_t hn)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	437 {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	438 CHECK_PARAMS_DO( conn, return );
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	439 conn->cc_tls_para.cn = hn;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	440 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	441
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	442 /* We share a lock with many threads but we hold it only very short time so it is OK */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	443 static pthread_mutex_t state_lock = PTHREAD_MUTEX_INITIALIZER;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	444 uint32_t fd_cnx_getstate(struct cnxctx * conn)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	445 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	446 uint32_t st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	447 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	448 st = conn->cc_state;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	449 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	450 return st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	451 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	452 int fd_cnx_teststate(struct cnxctx * conn, uint32_t flag)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	453 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	454 uint32_t st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	455 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	456 st = conn->cc_state;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	457 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	458 return st & flag;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	459 }
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	460 void fd_cnx_update_id(struct cnxctx * conn) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	461 if (conn->cc_state & CC_STATUS_CLOSING)
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	462 conn->cc_id[1] = 'C';
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	463 else
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	464 conn->cc_id[1] = '-';
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	465
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	466 if (conn->cc_state & CC_STATUS_ERROR)
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	467 conn->cc_id[2] = 'E';
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	468 else
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	469 conn->cc_id[2] = '-';
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	470
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	471 if (conn->cc_state & CC_STATUS_SIGNALED)
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	472 conn->cc_id[3] = 'S';
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	473 else
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	474 conn->cc_id[3] = '-';
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	475
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	476 if (conn->cc_state & CC_STATUS_TLS)
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	477 conn->cc_id[4] = 'T';
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	478 else
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	479 conn->cc_id[4] = '-';
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	480 }
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	481 void fd_cnx_addstate(struct cnxctx * conn, uint32_t orstate)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	482 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	483 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	484 conn->cc_state \|= orstate;
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	485 fd_cnx_update_id(conn);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	486 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	487 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	488 void fd_cnx_setstate(struct cnxctx * conn, uint32_t abstate)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	489 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	490 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	491 conn->cc_state = abstate;
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	492 fd_cnx_update_id(conn);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	493 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	494 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	495
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	496
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	497 /* Return the TLS state of a connection */
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	498 int fd_cnx_getTLS(struct cnxctx * conn)
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	499 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	500 CHECK_PARAMS_DO( conn, return 0 );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	501 return fd_cnx_teststate(conn, CC_STATUS_TLS);
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	502 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	503
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	504 /* Mark the connection to tell if OOO delivery is permitted (only for SCTP) */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	505 int fd_cnx_unordered_delivery(struct cnxctx * conn, int is_allowed)
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	506 {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	507 CHECK_PARAMS( conn );
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	508 conn->cc_sctp_para.unordered = is_allowed;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	509 return 0;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	510 }
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	511
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	512 /* Return true if the connection supports unordered delivery of messages */
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	513 int fd_cnx_is_unordered_delivery_supported(struct cnxctx * conn)
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	514 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	515 CHECK_PARAMS_DO( conn, return 0 );
709 19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	516 #ifndef DISABLE_SCTP
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	517 if (conn->cc_proto == IPPROTO_SCTP)
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	518 return (conn->cc_sctp_para.str_out > 1);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	519 #endif /* DISABLE_SCTP */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	520 return 0;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	521 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	522
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	523
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	524 /* Get the list of endpoints (IP addresses) of the local and remote peers on this connection */
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	525 int fd_cnx_getremoteeps(struct cnxctx * conn, struct fd_list * eps)
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	526 {
1027 0117a7746b21 Fix a number of errors and warnings introduced/highlighted by recent commits Sebastien Decugis <sdecugis@freediameter.net> parents: 999 diff changeset	527 TRACE_ENTRY("%p %p", conn, eps);
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	528 CHECK_PARAMS(conn && eps);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	529
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	530 /* Check we have a full connection object, not a listening socket (with no remote) */
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	531 CHECK_PARAMS( conn->cc_incoming );
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	532
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	533 /* Retrieve the peer endpoint(s) of the connection */
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	534 switch (conn->cc_proto) {
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	535 case IPPROTO_TCP: {
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	536 sSS ss;
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	537 socklen_t sl;
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	538 CHECK_FCT(fd_tcp_get_remote_ep(conn->cc_socket, &ss, &sl));
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	539 CHECK_FCT(fd_ep_add_merge( eps, (sSA *)&ss, sl, EP_FL_LL \| EP_FL_PRIMARY ));
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	540 }
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	541 break;
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	542
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	543 #ifndef DISABLE_SCTP
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	544 case IPPROTO_SCTP: {
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	545 CHECK_FCT(fd_sctp_get_remote_ep(conn->cc_socket, eps));
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	546 }
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	547 break;
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	548 #endif /* DISABLE_SCTP */
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	549
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	550 default:
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	551 CHECK_PARAMS(0);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	552 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	553
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	554 return 0;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	555 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	556
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	557 /* Get a string describing the remote peer address (ip address or fqdn) */
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	558 char * fd_cnx_getremoteid(struct cnxctx * conn)
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	559 {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	560 CHECK_PARAMS_DO( conn, return "" );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	561 return conn->cc_remid;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	562 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	563
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	564 static int fd_cnx_may_dtls(struct cnxctx * conn);
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	565
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	566 /* Get a short string representing the connection */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	567 int fd_cnx_proto_info(struct cnxctx * conn, char * buf, size_t len)
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	568 {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	569 CHECK_PARAMS( conn );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	570
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	571 if (fd_cnx_teststate(conn, CC_STATUS_TLS)) {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	572 snprintf(buf, len, "%s,%s,soc#%d", IPPROTO_NAME(conn->cc_proto), fd_cnx_may_dtls(conn) ? "DTLS" : "TLS", conn->cc_socket);
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	573 } else {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	574 snprintf(buf, len, "%s,soc#%d", IPPROTO_NAME(conn->cc_proto), conn->cc_socket);
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	575 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	576
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	577 return 0;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	578 }
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	579
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	580 /* Retrieve a list of all IP addresses of the local system from the kernel, using getifaddrs */
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	581 int fd_cnx_get_local_eps(struct fd_list * list)
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	582 {
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	583 struct ifaddrs iflist, cur;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	584
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	585 CHECK_SYS(getifaddrs(&iflist));
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	586
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	587 for (cur = iflist; cur != NULL; cur = cur->ifa_next) {
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	588 if (cur->ifa_flags & IFF_LOOPBACK)
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	589 continue;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	590
927 8bb4d749ed37 Fix for ticket #43: PPP interface have no address Sebastien Decugis <sdecugis@freediameter.net> parents: 896 diff changeset	591 if (cur->ifa_addr == NULL) /* may happen with ppp interfaces */
8bb4d749ed37 Fix for ticket #43: PPP interface have no address Sebastien Decugis <sdecugis@freediameter.net> parents: 896 diff changeset	592 continue;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	593
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	594 if (fd_g_config->cnf_flags.no_ip4 && (cur->ifa_addr->sa_family == AF_INET))
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	595 continue;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	596
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	597 if (fd_g_config->cnf_flags.no_ip6 && (cur->ifa_addr->sa_family == AF_INET6))
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	598 continue;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	599
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	600 CHECK_FCT(fd_ep_add_merge( list, cur->ifa_addr, sSAlen(cur->ifa_addr), EP_FL_LL ));
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	601 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	602
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	603 freeifaddrs(iflist);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	604
378 41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	605 return 0;
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	606 }
41e3c2a3721c Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner! Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	607
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	608
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	609 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	610 /* Use of a connection object */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	611 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	612
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	613 /* An error occurred on the socket */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	614 void fd_cnx_markerror(struct cnxctx * conn)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	615 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	616 TRACE_ENTRY("%p", conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	617 CHECK_PARAMS_DO( conn, goto fatal );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	618
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	619 TRACE_DEBUG(FULL, "Error flag set for socket %d (%s, %s)", conn->cc_socket, conn->cc_id, conn->cc_remid);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	620
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	621 /* Mark the error */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	622 fd_cnx_addstate(conn, CC_STATUS_ERROR);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	623
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	624 /* Report the error if not reported yet, and not closing */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	625 if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING \| CC_STATUS_SIGNALED )) {
223 85dc47afeac7 Cleanup termination Sebastien Decugis <sdecugis@nict.go.jp> parents: 220 diff changeset	626 TRACE_DEBUG(FULL, "Sending FDEVP_CNX_ERROR event");
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	627 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), FDEVP_CNX_ERROR, 0, NULL), goto fatal);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	628 fd_cnx_addstate(conn, CC_STATUS_SIGNALED);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	629 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	630
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	631 return;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	632 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	633 /* An unrecoverable error occurred, stop the daemon */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	634 ASSERT(0);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	635 CHECK_FCT_DO(fd_core_shutdown(), );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	636 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	637
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	638 /* Set the timeout option on the socket */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	639 void fd_cnx_s_setto(int sock)
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	640 {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	641 struct timeval tv;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	642
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	643 /* Set a timeout on the socket so that in any case we are not stuck waiting for something */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	644 memset(&tv, 0, sizeof(tv));
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	645 tv.tv_usec = 100000L; /* 100ms, to react quickly to head-of-the-line blocking. */
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	646 CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)), );
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	647 CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)), );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	648 }
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	649
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	650
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	651 #ifdef GNUTLS_VERSION_300
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	652 /* The pull_timeout function for gnutls */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	653 static int fd_cnx_s_select (struct cnxctx * conn, unsigned int ms)
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	654 {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	655 fd_set rfds;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	656 struct timeval tv;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	657
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	658 FD_ZERO (&rfds);
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	659 FD_SET (conn->cc_socket, &rfds);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	660
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	661 tv.tv_sec = ms / 1000;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	662 tv.tv_usec = (ms * 1000) % 1000000;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	663
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	664 return select (conn->cc_socket + 1, &rfds, NULL, NULL, &tv);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	665 }
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	666 #endif /* GNUTLS_VERSION_300 */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	667
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	668 /* A recv-like function, taking a cnxctx object instead of socket as entry. We use it to quickly react to timeouts without traversing GNUTLS wrapper each time */
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	669 ssize_t fd_cnx_s_recv(struct cnxctx * conn, void *buffer, size_t length)
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	670 {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	671 ssize_t ret = 0;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	672 int timedout = 0;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	673 again:
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	674 ret = recv(conn->cc_socket, buffer, length, 0);
710 e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	675 /* Handle special case of timeout / interrupts */
e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	676 if ((ret < 0) && ((errno == EAGAIN) \|\| (errno == EINTR))) {
e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	677 pthread_testcancel();
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	678 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	679 goto again; /* don't care, just ignore */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	680 if (!timedout) {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	681 timedout ++; /* allow for one timeout while closing */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	682 goto again;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	683 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	684 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	685
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	686 /* Mark the error */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	687 if (ret <= 0) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	688 CHECK_SYS_DO(ret, /* continue, this is only used to log the error here */);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	689 fd_cnx_markerror(conn);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	690 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	691
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	692 return ret;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	693 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	694
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	695 /* Send */
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	696 static ssize_t fd_cnx_s_sendv(struct cnxctx * conn, const struct iovec * iov, int iovcnt)
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	697 {
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	698 ssize_t ret = 0;
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	699 struct timespec ts, now;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	700 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &ts), return -1 );
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	701 again:
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	702 ret = writev(conn->cc_socket, iov, iovcnt);
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	703 /* Handle special case of timeout */
710 e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	704 if ((ret < 0) && ((errno == EAGAIN) \|\| (errno == EINTR))) {
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	705 ret = -errno;
710 e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	706 pthread_testcancel();
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	707
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	708 /* Check how much time we were blocked for this sending. */
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	709 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), return -1 );
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	710 if ( ((now.tv_sec - ts.tv_sec) * 1000 + ((now.tv_nsec - ts.tv_nsec) / 1000000L)) > MAX_HOTL_BLOCKING_TIME) {
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	711 LOG_D("Unable to send any data for %dms, closing the connection", MAX_HOTL_BLOCKING_TIME);
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	712 } else if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING )) {
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	713 goto again; /* don't care, just ignore */
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	714 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	715
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	716 /* propagate the error */
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	717 errno = -ret;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	718 ret = -1;
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	719 CHECK_SYS_DO(ret, /* continue */);
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	720 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	721
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	722 /* Mark the error */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	723 if (ret <= 0)
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	724 fd_cnx_markerror(conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	725
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	726 return ret;
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	727 }
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	728
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	729 /* Send, for older GNUTLS */
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	730 #ifndef GNUTLS_VERSION_212
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	731 static ssize_t fd_cnx_s_send(struct cnxctx * conn, const void *buffer, size_t length)
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	732 {
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	733 struct iovec iov;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	734 iov.iov_base = (void *)buffer;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	735 iov.iov_len = length;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	736 return fd_cnx_s_sendv(conn, &iov, 1);
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	737 }
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	738 #endif /* GNUTLS_VERSION_212 */
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	739
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	740 #define ALIGNOF(t) ((char )(&((struct { char c; t _h; } )0)->_h) - (char )0) / Could use __alignof__(t) on some systems but this is more portable probably */
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	741 #define PMDL_PADDED(len) ( ((len) + ALIGNOF(struct fd_msg_pmdl) - 1) & ~(ALIGNOF(struct fd_msg_pmdl) - 1) )
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	742
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	743 size_t fd_msg_pmdl_sizewithoverhead(size_t datalen)
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	744 {
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	745 return PMDL_PADDED(datalen) + sizeof(struct fd_msg_pmdl);
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	746 }
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	747
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	748 struct fd_msg_pmdl * fd_msg_pmdl_get_inbuf(uint8_t * buf, size_t datalen)
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	749 {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	750 return (struct fd_msg_pmdl *)(buf + PMDL_PADDED(datalen));
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	751 }
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	752
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	753 static int fd_cnx_init_msg_buffer(uint8_t * buffer, size_t expected_len, struct fd_msg_pmdl ** pmdl)
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	754 {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	755 *pmdl = fd_msg_pmdl_get_inbuf(buffer, expected_len);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	756 fd_list_init(&(*pmdl)->sentinel, NULL);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	757 CHECK_POSIX(pthread_mutex_init(&(*pmdl)->lock, NULL) );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	758 return 0;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	759 }
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	760
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	761 static uint8_t * fd_cnx_alloc_msg_buffer(size_t expected_len, struct fd_msg_pmdl ** pmdl)
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	762 {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	763 uint8_t * ret = NULL;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	764
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	765 CHECK_MALLOC_DO( ret = malloc( fd_msg_pmdl_sizewithoverhead(expected_len) ), return NULL );
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	766 CHECK_FCT_DO( fd_cnx_init_msg_buffer(ret, expected_len, pmdl), {free(ret); return NULL;} );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	767 return ret;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	768 }
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	769
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	770 #ifndef DISABLE_SCTP /* WE use this function only in SCTP code */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	771 static uint8_t * fd_cnx_realloc_msg_buffer(uint8_t * buffer, size_t expected_len, struct fd_msg_pmdl ** pmdl)
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	772 {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	773 uint8_t * ret = NULL;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	774
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	775 CHECK_MALLOC_DO( ret = realloc( buffer, fd_msg_pmdl_sizewithoverhead(expected_len) ), return NULL );
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	776 CHECK_FCT_DO( fd_cnx_init_msg_buffer(ret, expected_len, pmdl), {free(ret); return NULL;} );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	777 return ret;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	778 }
1141 3ae22e5dc56c Fix a few compilation warnings/errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1103 diff changeset	779 #endif /* DISABLE_SCTP */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	780
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	781 static void free_rcvdata(void * arg)
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	782 {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	783 struct fd_cnx_rcvdata * data = arg;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	784 struct fd_msg_pmdl * pmdl = fd_msg_pmdl_get_inbuf(data->buffer, data->length);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	785 (void) pthread_mutex_destroy(&pmdl->lock);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	786 free(data->buffer);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	787 }
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	788
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	789 /* Receiver thread (TCP & noTLS) : incoming message is directly saved into the target queue */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	790 static void * rcvthr_notls_tcp(void * arg)
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	791 {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	792 struct cnxctx * conn = arg;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	793
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	794 TRACE_ENTRY("%p", arg);
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	795 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto out);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	796
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	797 /* Set the thread name */
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	798 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	799 char buf[48];
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	800 snprintf(buf, sizeof(buf), "Receiver (%d) TCP/noTLS)", conn->cc_socket);
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	801 fd_log_threadname ( buf );
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	802 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	803
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	804 ASSERT( conn->cc_proto == IPPROTO_TCP );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	805 ASSERT( ! fd_cnx_teststate(conn, CC_STATUS_TLS ) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	806 ASSERT( fd_cnx_target_queue(conn) );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	807
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	808 /* Receive from a TCP connection: we have to rebuild the message boundaries */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	809 do {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	810 uint8_t header[4];
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	811 struct fd_cnx_rcvdata rcv_data;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	812 struct fd_msg_pmdl *pmdl=NULL;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	813 ssize_t ret = 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	814 size_t received = 0;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	815
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	816 do {
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	817 ret = fd_cnx_s_recv(conn, &header[received], sizeof(header) - received);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	818 if (ret <= 0) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	819 goto out; /* Stop the thread, the event was already sent */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	820 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	821
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	822 received += ret;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	823
1192 48759e3f7611 Reject more quickly invalid messages if possible Sebastien Decugis <sdecugis@freediameter.net> parents: 1190 diff changeset	824 if (header[0] != DIAMETER_VERSION)
48759e3f7611 Reject more quickly invalid messages if possible Sebastien Decugis <sdecugis@freediameter.net> parents: 1190 diff changeset	825 break; /* No need to wait for 4 bytes in this case */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	826 } while (received < sizeof(header));
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	827
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	828 rcv_data.length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	829
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	830 /* Check the received word is a valid begining of a Diameter message */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	831 if ((header[0] != DIAMETER_VERSION) /* defined in <libfdproto.h> */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	832 \|\| (rcv_data.length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	833 /* The message is suspect */
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	834 LOG_E( "Received suspect header [ver: %d, size: %zd] from '%s', assuming disconnection", (int)header[0], rcv_data.length, conn->cc_remid);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	835 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	836 goto out; /* Stop the thread, the recipient of the event will cleanup */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	837 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	838
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	839 /* Ok, now we can really receive the data */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	840 CHECK_MALLOC_DO( rcv_data.buffer = fd_cnx_alloc_msg_buffer( rcv_data.length, &pmdl ), goto fatal );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	841 memcpy(rcv_data.buffer, header, sizeof(header));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	842
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	843 while (received < rcv_data.length) {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	844 pthread_cleanup_push(free_rcvdata, &rcv_data); /* In case we are canceled, clean the partialy built buffer */
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	845 ret = fd_cnx_s_recv(conn, rcv_data.buffer + received, rcv_data.length - received);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	846 pthread_cleanup_pop(0);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	847
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	848 if (ret <= 0) {
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	849 free_rcvdata(&rcv_data);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	850 goto out;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	851 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	852 received += ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	853 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	854
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	855 fd_hook_call(HOOK_DATA_RECEIVED, NULL, NULL, &rcv_data, pmdl);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	856
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	857 /* We have received a complete message, pass it to the daemon */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	858 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), FDEVP_CNX_MSG_RECV, rcv_data.length, rcv_data.buffer),
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	859 {
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	860 free_rcvdata(&rcv_data);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	861 goto fatal;
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	862 } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	863
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	864 } while (conn->cc_loop);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	865
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	866 out:
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	867 TRACE_DEBUG(FULL, "Thread terminated");
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	868 return NULL;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	869
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	870 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	871 /* An unrecoverable error occurred, stop the daemon */
1190 6a1042d8075b Replace FDEV_TERMINATE events with calls to fd_core_shutdown to handle the core state properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1186 diff changeset	872 CHECK_FCT_DO(fd_core_shutdown(), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	873 goto out;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	874 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	875
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	876 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	877 /* Receiver thread (SCTP & noTLS) : incoming message is directly saved into cc_incoming, no need to care for the stream ID */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	878 static void * rcvthr_notls_sctp(void * arg)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	879 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	880 struct cnxctx * conn = arg;
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	881 struct fd_cnx_rcvdata rcv_data;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	882 int event;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	883
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	884 TRACE_ENTRY("%p", arg);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	885 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto fatal);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	886
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	887 /* Set the thread name */
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	888 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	889 char buf[48];
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	890 snprintf(buf, sizeof(buf), "Receiver (%d) SCTP/noTLS)", conn->cc_socket);
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	891 fd_log_threadname ( buf );
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	892 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	893
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	894 ASSERT( conn->cc_proto == IPPROTO_SCTP );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	895 ASSERT( ! fd_cnx_teststate(conn, CC_STATUS_TLS ) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	896 ASSERT( fd_cnx_target_queue(conn) );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	897
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	898 do {
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	899 struct fd_msg_pmdl *pmdl=NULL;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	900 CHECK_FCT_DO( fd_sctp_recvmeta(conn, NULL, &rcv_data.buffer, &rcv_data.length, &event), goto fatal );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	901 if (event == FDEVP_CNX_ERROR) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	902 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	903 goto out;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	904 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	905
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	906 if (event == FDEVP_CNX_SHUTDOWN) {
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	907 /* Just ignore the notification for now, we will get another error later anyway */
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	908 continue;
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	909 }
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	910
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	911 if (event == FDEVP_CNX_MSG_RECV) {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	912 CHECK_MALLOC_DO( rcv_data.buffer = fd_cnx_realloc_msg_buffer(rcv_data.buffer, rcv_data.length, &pmdl), goto fatal );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	913 fd_hook_call(HOOK_DATA_RECEIVED, NULL, NULL, &rcv_data, pmdl);
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	914 }
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	915 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), event, rcv_data.length, rcv_data.buffer), goto fatal );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	916
250 07624e65c7e0 Loop anyway until we get a real message or an error Sebastien Decugis <sdecugis@nict.go.jp> parents: 247 diff changeset	917 } while (conn->cc_loop \|\| (event != FDEVP_CNX_MSG_RECV));
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	918
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	919 out:
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	920 TRACE_DEBUG(FULL, "Thread terminated");
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	921 return NULL;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	922
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	923 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	924 /* An unrecoverable error occurred, stop the daemon */
1190 6a1042d8075b Replace FDEV_TERMINATE events with calls to fd_core_shutdown to handle the core state properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1186 diff changeset	925 CHECK_FCT_DO(fd_core_shutdown(), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	926 goto out;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	927 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	928 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	929
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	930 /* Start receving messages in clear (no TLS) on the connection */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	931 int fd_cnx_start_clear(struct cnxctx * conn, int loop)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	932 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	933 TRACE_ENTRY("%p %i", conn, loop);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	934
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	935 CHECK_PARAMS( conn && fd_cnx_target_queue(conn) && (!fd_cnx_teststate(conn, CC_STATUS_TLS)) && (!conn->cc_loop));
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	936
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	937 /* Release resources in case of a previous call was already made */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	938 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	939
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	940 /* Save the loop request */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	941 conn->cc_loop = loop;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	942
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	943 switch (conn->cc_proto) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	944 case IPPROTO_TCP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	945 /* Start the tcp_notls thread */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	946 CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_notls_tcp, conn ) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	947 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	948 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	949 case IPPROTO_SCTP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	950 /* Start the tcp_notls thread */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	951 CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_notls_sctp, conn ) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	952 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	953 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	954 default:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	955 TRACE_DEBUG(INFO, "Unknown protocol: %d", conn->cc_proto);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	956 ASSERT(0);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	957 return ENOTSUP;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	958 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	959
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	960 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	961 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	962
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	963
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	964
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	965
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	966 /* Returns 0 on error, received data size otherwise (always >= 0). This is not used for DTLS-protected associations. */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	967 static ssize_t fd_tls_recv_handle_error(struct cnxctx * conn, gnutls_session_t session, void * data, size_t sz)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	968 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	969 ssize_t ret;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	970 again:
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	971 CHECK_GNUTLS_DO( ret = gnutls_record_recv(session, data, sz),
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	972 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	973 switch (ret) {
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	974 case GNUTLS_E_REHANDSHAKE:
803 d5a4b5e175c2 Add timeout in gnutls_handshake for version 3.1.x Sebastien Decugis <sdecugis@nict.go.jp> parents: 767 diff changeset	975 if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING)) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	976 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	977 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	978 if (TRACE_BOOL(INFO)) {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	979 fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	980 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	981 goto end;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	982 } );
803 d5a4b5e175c2 Add timeout in gnutls_handshake for version 3.1.x Sebastien Decugis <sdecugis@nict.go.jp> parents: 767 diff changeset	983 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	984
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	985 case GNUTLS_E_AGAIN:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	986 case GNUTLS_E_INTERRUPTED:
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	987 if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING))
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	988 goto again;
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	989 TRACE_DEBUG(FULL, "Connection is closing, so abord gnutls_record_recv now.");
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	990 break;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	991
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	992 case GNUTLS_E_UNEXPECTED_PACKET_LENGTH:
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	993 /* The connection is closed */
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	994 TRACE_DEBUG(FULL, "Got 0 size while reading the socket, probably connection closed...");
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	995 break;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	996
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	997 default:
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	998 if (gnutls_error_is_fatal (ret) == 0) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	999 LOG_N("Ignoring non-fatal GNU TLS error: %s", gnutls_strerror (ret));
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1000 goto again;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1001 }
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1002 LOG_E("Fatal GNUTLS error: %s", gnutls_strerror (ret));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1003 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1004 } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1005
251 52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	1006 if (ret == 0)
52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	1007 CHECK_GNUTLS_DO( gnutls_bye(session, GNUTLS_SHUT_RDWR), );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1008
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1009 end:
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1010 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1011 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1012 return ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1013 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1014
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1015 /* Wrapper around gnutls_record_send to handle some error codes. This is also used for DTLS-protected associations */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1016 static ssize_t fd_tls_send_handle_error(struct cnxctx * conn, gnutls_session_t session, void * data, size_t sz)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1017 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1018 ssize_t ret;
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1019 struct timespec ts, now;
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1020 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &ts), return -1 );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1021 again:
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1022 CHECK_GNUTLS_DO( ret = gnutls_record_send(session, data, sz),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1023 {
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1024 pthread_testcancel();
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1025 switch (ret) {
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1026 case GNUTLS_E_REHANDSHAKE:
803 d5a4b5e175c2 Add timeout in gnutls_handshake for version 3.1.x Sebastien Decugis <sdecugis@nict.go.jp> parents: 767 diff changeset	1027 if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING)) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1028 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1029 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1030 if (TRACE_BOOL(INFO)) {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1031 fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1032 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1033 goto end;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1034 } );
803 d5a4b5e175c2 Add timeout in gnutls_handshake for version 3.1.x Sebastien Decugis <sdecugis@nict.go.jp> parents: 767 diff changeset	1035 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1036
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1037 case GNUTLS_E_AGAIN:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1038 case GNUTLS_E_INTERRUPTED:
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1039 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), return -1 );
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1040 if ( ((now.tv_sec - ts.tv_sec) * 1000 + ((now.tv_nsec - ts.tv_nsec) / 1000000L)) > MAX_HOTL_BLOCKING_TIME) {
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1041 LOG_D("Unable to send any data for %dms, closing the connection", MAX_HOTL_BLOCKING_TIME);
ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1042 } else if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING )) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1043 goto again;
1200 ce2b00dc86c1 React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h Sebastien Decugis <sdecugis@freediameter.net> parents: 1198 diff changeset	1044 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1045 break;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1046
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1047 default:
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1048 if (gnutls_error_is_fatal (ret) == 0) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1049 LOG_N("Ignoring non-fatal GNU TLS error: %s", gnutls_strerror (ret));
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1050 goto again;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1051 }
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1052 LOG_E("Fatal GNUTLS error: %s", gnutls_strerror (ret));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1053 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1054 } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1055 end:
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1056 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1057 fd_cnx_markerror(conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1058
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1059 return ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1060 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1061
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1062
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1063 /* The function that receives TLS data and re-builds a Diameter message -- it exits only on error or cancelation */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1064 /* For the case of DTLS, since we are not using SCTP_UNORDERED, the messages over a single stream are ordered.
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1065 Furthermore, as long as messages are shorter than the MTU [2^14 = 16384 bytes], they are delivered in a single
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1066 record, as far as I understand.
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1067 For larger messages, however, it is possible that pieces of messages coming from different streams can get interleaved.
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1068 As a result, we do not use the following function for DTLS reception, because we use the sequence number to rebuild the
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1069 messages. */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1070 int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1071 {
1322 7800e6f1919f Do not log an error if TLS link was shutdown properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1281 diff changeset	1072 ssize_t ret = 0;
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1073 /* No guarantee that GnuTLS preserves the message boundaries, so we re-build it as in TCP. */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1074 do {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1075 uint8_t header[4];
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1076 struct fd_cnx_rcvdata rcv_data;
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1077 struct fd_msg_pmdl *pmdl=NULL;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1078 size_t received = 0;
1322 7800e6f1919f Do not log an error if TLS link was shutdown properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1281 diff changeset	1079 ret = 0;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1080
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1081 do {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1082 ret = fd_tls_recv_handle_error(conn, session, &header[received], sizeof(header) - received);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1083 if (ret <= 0) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1084 /* The connection is closed */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1085 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1086 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1087 received += ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1088 } while (received < sizeof(header));
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1089
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1090 rcv_data.length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1091
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1092 /* Check the received word is a valid beginning of a Diameter message */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1093 if ((header[0] != DIAMETER_VERSION) /* defined in <libfreeDiameter.h> */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1094 \|\| (rcv_data.length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1095 /* The message is suspect */
1103 d8591b1c56cd Implemented a few hooks Sebastien Decugis <sdecugis@freediameter.net> parents: 1102 diff changeset	1096 LOG_E( "Received suspect header [ver: %d, size: %zd] from '%s', assume disconnection", (int)header[0], rcv_data.length, conn->cc_remid);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1097 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1098 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1099 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1100
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1101 /* Ok, now we can really receive the data */
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1102 CHECK_MALLOC( rcv_data.buffer = fd_cnx_alloc_msg_buffer( rcv_data.length, &pmdl ) );
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1103 memcpy(rcv_data.buffer, header, sizeof(header));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1104
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1105 while (received < rcv_data.length) {
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1106 pthread_cleanup_push(free_rcvdata, &rcv_data); /* In case we are canceled, clean the partialy built buffer */
1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1107 ret = fd_tls_recv_handle_error(conn, session, rcv_data.buffer + received, rcv_data.length - received);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1108 pthread_cleanup_pop(0);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1109
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1110 if (ret <= 0) {
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1111 free_rcvdata(&rcv_data);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1112 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1113 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1114 received += ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1115 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1116
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1117 fd_hook_call(HOOK_DATA_RECEIVED, NULL, NULL, &rcv_data, pmdl);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1118
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1119 /* We have received a complete message, pass it to the daemon */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1120 CHECK_FCT_DO( ret = fd_event_send( fd_cnx_target_queue(conn), FDEVP_CNX_MSG_RECV, rcv_data.length, rcv_data.buffer),
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1121 {
1102 1d7b3ebda27f Implemented the calls to HOOK_DATA_RECEIVED hook Sebastien Decugis <sdecugis@freediameter.net> parents: 1101 diff changeset	1122 free_rcvdata(&rcv_data);
1190 6a1042d8075b Replace FDEV_TERMINATE events with calls to fd_core_shutdown to handle the core state properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1186 diff changeset	1123 CHECK_FCT_DO(fd_core_shutdown(), );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1124 return ret;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1125 } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1126
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1127 } while (1);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1128
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1129 out:
1322 7800e6f1919f Do not log an error if TLS link was shutdown properly Sebastien Decugis <sdecugis@freediameter.net> parents: 1281 diff changeset	1130 return (ret == 0) ? 0 : ENOTCONN;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1131 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1132
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1133 /* Receiver thread (TLS & 1 stream SCTP or TCP) */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1134 static void * rcvthr_tls_single(void * arg)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1135 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1136 struct cnxctx * conn = arg;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1137
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1138 TRACE_ENTRY("%p", arg);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1139 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), return NULL );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1140
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1141 /* Set the thread name */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1142 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1143 char buf[48];
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1144 snprintf(buf, sizeof(buf), "Receiver (%d) TLS/single stream", conn->cc_socket);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1145 fd_log_threadname ( buf );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1146 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1147
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1148 ASSERT( fd_cnx_teststate(conn, CC_STATUS_TLS) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1149 ASSERT( fd_cnx_target_queue(conn) );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1150
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1151 /* The next function only returns when there is an error on the socket */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1152 CHECK_FCT_DO(fd_tls_rcvthr_core(conn, conn->cc_tls_para.session), /* continue */);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1153
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1154 TRACE_DEBUG(FULL, "Thread terminated");
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1155 return NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1156 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1157
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1158 /* Prepare a gnutls session object for handshake */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1159 int fd_tls_prepare(gnutls_session_t * session, int mode, int dtls, char * priority, void * alt_creds)
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1160 {
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1161 if (dtls) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1162 LOG_E("DTLS sessions not yet supported");
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1163 return ENOTSUP;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1164 }
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1165
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1166 /* Create the session context */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1167 CHECK_GNUTLS_DO( gnutls_init (session, mode), return ENOMEM );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1168
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1169 /* Set the algorithm suite */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1170 if (priority) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1171 const char * errorpos;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1172 CHECK_GNUTLS_DO( gnutls_priority_set_direct( *session, priority, &errorpos ),
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1173 { TRACE_DEBUG(INFO, "Error in priority string '%s' at position: '%s'", priority, errorpos); return EINVAL; } );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1174 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1175 CHECK_GNUTLS_DO( gnutls_priority_set( *session, fd_g_config->cnf_sec_data.prio_cache ), return EINVAL );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1176 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1177
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1178 /* Set the credentials of this side of the connection */
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1179 CHECK_GNUTLS_DO( gnutls_credentials_set (*session, GNUTLS_CRD_CERTIFICATE, alt_creds ?: fd_g_config->cnf_sec_data.credentials), return EINVAL );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1180
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1181 /* Request the remote credentials as well */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1182 if (mode == GNUTLS_SERVER) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1183 gnutls_certificate_server_set_request (*session, GNUTLS_CERT_REQUIRE);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1184 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1185
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1186 return 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1187 }
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1188
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1189 #ifndef GNUTLS_VERSION_300
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1190
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1191 /* Verify remote credentials after successful handshake (return 0 if OK, EINVAL otherwise) */
59 067ab3fc6093 Cleanups in debug messages Sebastien Decugis <sdecugis@nict.go.jp> parents: 57 diff changeset	1192 int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1193 {
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1194 int i, ret = 0;
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1195 unsigned int gtret;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1196 const gnutls_datum_t *cert_list;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1197 unsigned int cert_list_size;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1198 gnutls_x509_crt_t cert;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1199 time_t now;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1200
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1201 TRACE_ENTRY("%p %d", conn, verbose);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1202 CHECK_PARAMS(conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1203
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1204 /* Trace the session information -- http://www.gnu.org/software/gnutls/manual/gnutls.html#Obtaining-session-information */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1205 #ifdef DEBUG
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1206 if (verbose) {
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1207 const char *tmp;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1208 gnutls_kx_algorithm_t kx;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1209 gnutls_credentials_type_t cred;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1210
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1211 LOG_D("TLS Session information for connection '%s':", conn->cc_id);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1212
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1213 /* print the key exchange's algorithm name */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1214 GNUTLS_TRACE( kx = gnutls_kx_get (session) );
5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1215 GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1216 LOG_D("\t - Key Exchange: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1217
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1218 /* Check the authentication type used and switch
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1219 * to the appropriate. */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1220 GNUTLS_TRACE( cred = gnutls_auth_get_type (session) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1221 switch (cred)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1222 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1223 case GNUTLS_CRD_IA:
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1224 LOG_D("\t - TLS/IA session");
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1225 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1226
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1227 case GNUTLS_CRD_PSK:
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1228 /* This returns NULL in server side. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1229 if (gnutls_psk_client_get_hint (session) != NULL)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1230 LOG_D("\t - PSK authentication. PSK hint '%s'",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1231 gnutls_psk_client_get_hint (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1232 /* This returns NULL in client side. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1233 if (gnutls_psk_server_get_username (session) != NULL)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1234 LOG_D("\t - PSK authentication. Connected as '%s'",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1235 gnutls_psk_server_get_username (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1236 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1237
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1238 case GNUTLS_CRD_ANON: /* anonymous authentication */
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1239 LOG_D("\t - Anonymous DH using prime of %d bits",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1240 gnutls_dh_get_prime_bits (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1241 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1242
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1243 case GNUTLS_CRD_CERTIFICATE: /* certificate authentication */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1244 /* Check if we have been using ephemeral Diffie-Hellman. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1245 if (kx == GNUTLS_KX_DHE_RSA \|\| kx == GNUTLS_KX_DHE_DSS) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1246 LOG_D("\t - Ephemeral DH using prime of %d bits",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1247 gnutls_dh_get_prime_bits (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1248 }
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1249 break;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1250 #ifdef ENABLE_SRP
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1251 case GNUTLS_CRD_SRP:
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1252 LOG_D("\t - SRP session with username %s",
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1253 gnutls_srp_server_get_username (session));
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1254 break;
591 88a494357a9d Protect against gnutls_srp_server_get_username which is not provided on some platforms, including Fedora 13 Sebastien Decugis <sdecugis@nict.go.jp> parents: 543 diff changeset	1255 #endif /* ENABLE_SRP */
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1256
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1257 default:
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1258 fd_log_debug("\t - Different type of credentials for the session (%d).", cred);
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1259 break;
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1260
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1261 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1262
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1263 /* print the protocol's name (ie TLS 1.0) */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1264 tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1265 LOG_D("\t - Protocol: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1266
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1267 /* print the certificate type of the peer. ie X.509 */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1268 tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1269 LOG_D("\t - Certificate Type: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1270
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1271 /* print the compression algorithm (if any) */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1272 tmp = gnutls_compression_get_name (gnutls_compression_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1273 LOG_D("\t - Compression: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1274
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1275 /* print the name of the cipher used. ie 3DES. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1276 tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1277 LOG_D("\t - Cipher: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1278
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1279 /* Print the MAC algorithms name. ie SHA1 */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1280 tmp = gnutls_mac_get_name (gnutls_mac_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1281 LOG_D("\t - MAC: %s", tmp);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1282 }
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1283 #endif /* DEBUG */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1284
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1285 /* First, use built-in verification */
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1286 CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &gtret), return EINVAL );
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1287 if (gtret) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1288 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1289 if (gtret & GNUTLS_CERT_INVALID)
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1290 LOG_E(" - The certificate is not trusted (unknown CA? expired?)");
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1291 if (gtret & GNUTLS_CERT_REVOKED)
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1292 LOG_E(" - The certificate has been revoked.");
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1293 if (gtret & GNUTLS_CERT_SIGNER_NOT_FOUND)
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1294 LOG_E(" - The certificate hasn't got a known issuer.");
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1295 if (gtret & GNUTLS_CERT_SIGNER_NOT_CA)
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1296 LOG_E(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.");
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1297 if (gtret & GNUTLS_CERT_INSECURE_ALGORITHM)
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1298 LOG_E(" - The certificate signature uses a weak algorithm.");
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1299 return EINVAL;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1300 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1301
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1302 /* Code from http://www.gnu.org/software/gnutls/manual/gnutls.html#Verifying-peer_0027s-certificate */
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1303 if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1304 LOG_E("TLS: Remote peer did not present a certificate, other mechanisms are not supported yet. socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1305 return EINVAL;
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1306 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1307
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1308 GNUTLS_TRACE( cert_list = gnutls_certificate_get_peers (session, &cert_list_size) );
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1309 if (cert_list == NULL)
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1310 return EINVAL;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1311
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1312 now = time(NULL);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1313
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1314 #ifdef DEBUG
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1315 char serial[40];
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1316 char dn[128];
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1317 size_t size;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1318 unsigned int algo, bits;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1319 time_t expiration_time, activation_time;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1320
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1321 LOG_D("TLS Certificate information for connection '%s' (%d certs provided):", conn->cc_id, cert_list_size);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1322 for (i = 0; i < cert_list_size; i++)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1323 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1324
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1325 CHECK_GNUTLS_DO( gnutls_x509_crt_init (&cert), return EINVAL);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1326 CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1327
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1328 LOG_A(" Certificate %d info:", i);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1329
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1330 GNUTLS_TRACE( expiration_time = gnutls_x509_crt_get_expiration_time (cert) );
5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1331 GNUTLS_TRACE( activation_time = gnutls_x509_crt_get_activation_time (cert) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1332
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1333 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - Certificate is valid since: %.24s", ctime (&activation_time));
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1334 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - Certificate expires: %.24s", ctime (&expiration_time));
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1335
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1336 /* Print the serial number of the certificate. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1337 size = sizeof (serial);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1338 gnutls_x509_crt_get_serial (cert, serial, &size);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1339
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1340 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1341 int j;
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1342 char buf[1024];
2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1343 snprintf(buf, sizeof(buf), "\t - Certificate serial number: ");
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1344 for (j = 0; j < size; j++) {
999 0f71fc6c069f Fix compilation warning Sebastien Decugis <sdecugis@freediameter.net> parents: 982 diff changeset	1345 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%02hhx", serial[j]);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1346 }
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1347 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "%s", buf);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1348 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1349
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1350 /* Extract some of the public key algorithm's parameters */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1351 GNUTLS_TRACE( algo = gnutls_x509_crt_get_pk_algorithm (cert, &bits) );
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1352 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - Certificate public key: %s",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1353 gnutls_pk_algorithm_get_name (algo));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1354
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1355 /* Print the version of the X.509 certificate. */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1356 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - Certificate version: #%d",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1357 gnutls_x509_crt_get_version (cert));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1358
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1359 size = sizeof (dn);
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1360 GNUTLS_TRACE( gnutls_x509_crt_get_dn (cert, dn, &size) );
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1361 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - DN: %s", dn);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1362
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1363 size = sizeof (dn);
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1364 GNUTLS_TRACE( gnutls_x509_crt_get_issuer_dn (cert, dn, &size) );
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1365 LOG( i ? FD_LOG_ANNOYING : FD_LOG_DEBUG, "\t - Issuer's DN: %s", dn);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1366
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1367 GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1368 }
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1369 #endif /* DEBUG */
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1370
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1371 /* Check validity of all the certificates */
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1372 for (i = 0; i < cert_list_size; i++)
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1373 {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1374 time_t deadline;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1375
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1376 CHECK_GNUTLS_DO( gnutls_x509_crt_init (&cert), return EINVAL);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1377 CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1378
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1379 GNUTLS_TRACE( deadline = gnutls_x509_crt_get_expiration_time(cert) );
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1380 if ((deadline != (time_t)-1) && (deadline < now)) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1381 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1382 LOG_E(" - The certificate %d in the chain is expired", i);
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1383 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1384 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1385
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1386 GNUTLS_TRACE( deadline = gnutls_x509_crt_get_activation_time(cert) );
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1387 if ((deadline != (time_t)-1) && (deadline > now)) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1388 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1389 LOG_E(" - The certificate %d in the chain is not yet activated", i);
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1390 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1391 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1392
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1393 if ((i == 0) && (conn->cc_tls_para.cn)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1394 if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1395 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1396 LOG_E(" - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1397 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1398 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1399 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1400
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1401 GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1402 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1403
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1404 return ret;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1405 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1406
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1407 #else /* GNUTLS_VERSION_300 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1408
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1409 /* Verify remote credentials DURING handshake (return gnutls status) */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1410 int fd_tls_verify_credentials_2(gnutls_session_t session)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1411 {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1412 /* inspired from gnutls 3.x guidelines */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1413 unsigned int status;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1414 const gnutls_datum_t *cert_list = NULL;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1415 unsigned int cert_list_size;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1416 gnutls_x509_crt_t cert;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1417 struct cnxctx * conn;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1418 int hostname_verified = 0;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1419
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1420 TRACE_ENTRY("%p", session);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1421
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1422 /* get the associated connection */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1423 conn = gnutls_session_get_ptr (session);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1424
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1425 /* Trace the session information -- http://www.gnu.org/software/gnutls/manual/gnutls.html#Obtaining-session-information */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1426 #ifdef DEBUG
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1427 const char *tmp;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1428 gnutls_credentials_type_t cred;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1429 gnutls_kx_algorithm_t kx;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1430 int dhe, ecdh;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1431
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1432 dhe = ecdh = 0;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1433
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1434 LOG_A("TLS Session information for connection '%s':", conn->cc_id);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1435
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1436 /* print the key exchange's algorithm name
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1437 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1438 GNUTLS_TRACE( kx = gnutls_kx_get (session) );
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1439 GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1440 LOG_D("\t- Key Exchange: %s", tmp);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1441
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1442 /* Check the authentication type used and switch
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1443 * to the appropriate.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1444 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1445 GNUTLS_TRACE( cred = gnutls_auth_get_type (session) );
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1446 switch (cred)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1447 {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1448 case GNUTLS_CRD_IA:
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1449 LOG_D("\t - TLS/IA session");
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1450 break;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1451
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1452
982 018357d4c9bb Use gnutls_srp_* functions only ifdef ENABLE_SRP Sebastien Decugis <sdecugis@freediameter.net> parents: 974 diff changeset	1453 #ifdef ENABLE_SRP
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1454 case GNUTLS_CRD_SRP:
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1455 LOG_D("\t - SRP session with username %s",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1456 gnutls_srp_server_get_username (session));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1457 break;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1458 #endif
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1459
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1460 case GNUTLS_CRD_PSK:
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1461 /* This returns NULL in server side.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1462 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1463 if (gnutls_psk_client_get_hint (session) != NULL)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1464 LOG_D("\t - PSK authentication. PSK hint '%s'",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1465 gnutls_psk_client_get_hint (session));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1466 /* This returns NULL in client side.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1467 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1468 if (gnutls_psk_server_get_username (session) != NULL)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1469 LOG_D("\t - PSK authentication. Connected as '%s'",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1470 gnutls_psk_server_get_username (session));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1471
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1472 if (kx == GNUTLS_KX_ECDHE_PSK)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1473 ecdh = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1474 else if (kx == GNUTLS_KX_DHE_PSK)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1475 dhe = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1476 break;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1477
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1478 case GNUTLS_CRD_ANON: /* anonymous authentication */
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1479 LOG_D("\t - Anonymous DH using prime of %d bits",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1480 gnutls_dh_get_prime_bits (session));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1481 if (kx == GNUTLS_KX_ANON_ECDH)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1482 ecdh = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1483 else if (kx == GNUTLS_KX_ANON_DH)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1484 dhe = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1485 break;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1486
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1487 case GNUTLS_CRD_CERTIFICATE: /* certificate authentication */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1488
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1489 /* Check if we have been using ephemeral Diffie-Hellman.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1490 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1491 if (kx == GNUTLS_KX_DHE_RSA \|\| kx == GNUTLS_KX_DHE_DSS)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1492 dhe = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1493 else if (kx == GNUTLS_KX_ECDHE_RSA \|\| kx == GNUTLS_KX_ECDHE_ECDSA)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1494 ecdh = 1;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1495
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1496 /* Now print some info on the remote certificate */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1497 if (gnutls_certificate_type_get (session) == GNUTLS_CRT_X509) {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1498 gnutls_datum_t cinfo;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1499
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1500 cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1501
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1502 LOG_D("\t Peer provided %d certificates.", cert_list_size);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1503
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1504 if (cert_list_size > 0)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1505 {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1506 int ret;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1507
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1508 /* we only print information about the first certificate.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1509 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1510 gnutls_x509_crt_init (&cert);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1511
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1512 gnutls_x509_crt_import (cert, &cert_list[0], GNUTLS_X509_FMT_DER);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1513
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1514 LOG_A("\t Certificate info:");
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1515
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1516 /* This is the preferred way of printing short information about
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1517 a certificate. */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1518
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1519 ret = gnutls_x509_crt_print (cert, GNUTLS_CRT_PRINT_ONELINE, &cinfo);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1520 if (ret == 0)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1521 {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1522 LOG_D("\t\t%s", cinfo.data);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1523 gnutls_free (cinfo.data);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1524 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1525
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1526 if (conn->cc_tls_para.cn) {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1527 if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1528 LOG_E("\tTLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1529 LOG_E("\t - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1530 gnutls_x509_crt_deinit (cert);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1531 return GNUTLS_E_CERTIFICATE_ERROR;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1532 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1533
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1534 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1535
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1536 hostname_verified = 1;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1537
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1538 gnutls_x509_crt_deinit (cert);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1539
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1540 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1541 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1542 break;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1543
1145 ea3a653a809e Fix warning on OpenSUSE Sebastien Decugis <sdecugis@freediameter.net> parents: 1141 diff changeset	1544 default:
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1545 LOG_E("\t - unknown session type (%d)", cred);
1145 ea3a653a809e Fix warning on OpenSUSE Sebastien Decugis <sdecugis@freediameter.net> parents: 1141 diff changeset	1546
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1547 } /* switch */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1548
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1549 if (ecdh != 0)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1550 LOG_D("\t - Ephemeral ECDH using curve %s",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1551 gnutls_ecc_curve_get_name (gnutls_ecc_curve_get (session)));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1552 else if (dhe != 0)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1553 LOG_D("\t - Ephemeral DH using prime of %d bits",
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1554 gnutls_dh_get_prime_bits (session));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1555
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1556 /* print the protocol's name (ie TLS 1.0)
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1557 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1558 tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1559 LOG_D("\t - Protocol: %s", tmp);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1560
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1561 /* print the certificate type of the peer.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1562 * ie X.509
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1563 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1564 tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1565 LOG_D("\t - Certificate Type: %s", tmp);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1566
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1567 /* print the name of the cipher used.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1568 * ie 3DES.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1569 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1570 tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1571 LOG_D("\t - Cipher: %s", tmp);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1572
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1573 /* Print the MAC algorithms name.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1574 * ie SHA1
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1575 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1576 tmp = gnutls_mac_get_name (gnutls_mac_get (session));
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1577 LOG_D("\t - MAC: %s", tmp);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1578
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1579 #endif /* DEBUG */
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1580
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1581 /* This verification function uses the trusted CAs in the credentials
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1582 * structure. So you must have installed one or more CA certificates.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1583 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1584 CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &status), return GNUTLS_E_CERTIFICATE_ERROR );
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1585 if (status & GNUTLS_CERT_INVALID) {
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1586 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1587 if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1588 LOG_E(" - The certificate hasn't got a known issuer.");
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1589
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1590 if (status & GNUTLS_CERT_REVOKED)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1591 LOG_E(" - The certificate has been revoked.");
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1592
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1593 if (status & GNUTLS_CERT_EXPIRED)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1594 LOG_E(" - The certificate has expired.");
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1595
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1596 if (status & GNUTLS_CERT_NOT_ACTIVATED)
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1597 LOG_E(" - The certificate is not yet activated.");
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1598 }
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1599 if (status & GNUTLS_CERT_INVALID)
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1600 {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1601 return GNUTLS_E_CERTIFICATE_ERROR;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1602 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1603
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1604 /* Up to here the process is the same for X.509 certificates and
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1605 * OpenPGP keys. From now on X.509 certificates are assumed. This can
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1606 * be easily extended to work with openpgp keys as well.
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1607 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1608 if ((!hostname_verified) && (conn->cc_tls_para.cn)) {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1609 if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1610 LOG_E("TLS: Remote credentials are not x509, rejected on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1611 return GNUTLS_E_CERTIFICATE_ERROR;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1612 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1613
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1614 CHECK_GNUTLS_DO( gnutls_x509_crt_init (&cert), return GNUTLS_E_CERTIFICATE_ERROR );
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1615
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1616 cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1617 CHECK_PARAMS_DO( cert_list, return GNUTLS_E_CERTIFICATE_ERROR );
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1618
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1619 CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[0], GNUTLS_X509_FMT_DER), return GNUTLS_E_CERTIFICATE_ERROR );
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1620
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1621 if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
1256 bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1622 LOG_E("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
bd6b40c9f731 Fix messages display level on TLS errors Sebastien Decugis <sdecugis@freediameter.net> parents: 1211 diff changeset	1623 LOG_E(" - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1624 gnutls_x509_crt_deinit (cert);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1625 return GNUTLS_E_CERTIFICATE_ERROR;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1626 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1627
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1628 gnutls_x509_crt_deinit (cert);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1629 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1630
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1631 /* notify gnutls to continue handshake normally */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1632 return 0;
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1633 }
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1634
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1635 #endif /* GNUTLS_VERSION_300 */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1636
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1637 static int fd_cnx_may_dtls(struct cnxctx * conn) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1638 #ifndef DISABLE_SCTP
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1639 if ((conn->cc_proto == IPPROTO_SCTP) && (conn->cc_tls_para.algo == ALGO_HANDSHAKE_DEFAULT))
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1640 return 1;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1641 #endif /* DISABLE_SCTP */
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1642 return 0;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1643 }
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1644
1211 98478a8aabb1 Fix compilation warning Sebastien Decugis <sdecugis@freediameter.net> parents: 1200 diff changeset	1645 #ifndef DISABLE_SCTP
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1646 static int fd_cnx_uses_dtls(struct cnxctx * conn) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1647 return fd_cnx_may_dtls(conn) && (fd_cnx_teststate(conn, CC_STATUS_TLS));
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1648 }
1211 98478a8aabb1 Fix compilation warning Sebastien Decugis <sdecugis@freediameter.net> parents: 1200 diff changeset	1649 #endif /* DISABLE_SCTP */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1650
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1651 /* TLS handshake a connection; no need to have called start_clear before. Reception is active if handhsake is successful */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1652 int fd_cnx_handshake(struct cnxctx * conn, int mode, int algo, char * priority, void * alt_creds)
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1653 {
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1654 int dtls = 0;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1655
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1656 TRACE_ENTRY( "%p %d %d %p %p", conn, mode, algo, priority, alt_creds);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1657 CHECK_PARAMS( conn && (!fd_cnx_teststate(conn, CC_STATUS_TLS)) && ( (mode == GNUTLS_CLIENT) \|\| (mode == GNUTLS_SERVER) ) && (!conn->cc_loop) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1658
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1659 /* Save the mode */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1660 conn->cc_tls_para.mode = mode;
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1661 conn->cc_tls_para.algo = algo;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1662
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1663 /* Cancel receiving thread if any -- it should already be terminated anyway, we just release the resources */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1664 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1665
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1666 /* Once TLS handshake is done, we don't stop after the first message */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1667 conn->cc_loop = 1;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1668
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1669 dtls = fd_cnx_may_dtls(conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1670
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1671 /* Prepare the master session credentials and priority */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1672 CHECK_FCT( fd_tls_prepare(&conn->cc_tls_para.session, mode, dtls, priority, alt_creds) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1673
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1674 /* Special case: multi-stream TLS is not natively managed in GNU TLS, we use a wrapper library */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1675 if ((!dtls) && (conn->cc_sctp_para.pairs > 1)) {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1676 #ifdef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1677 ASSERT(0);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1678 CHECK_FCT( ENOTSUP );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1679 #else /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1680 /* Initialize the wrapper, start the demux thread */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1681 CHECK_FCT( fd_sctp3436_init(conn) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1682 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1683 } else {
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	1684 /* Set the transport pointer passed to push & pull callbacks */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1685 GNUTLS_TRACE( gnutls_transport_set_ptr( conn->cc_tls_para.session, (gnutls_transport_ptr_t) conn ) );
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	1686
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	1687 /* Set the push and pull callbacks */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1688 if (!dtls) {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1689 #ifdef GNUTLS_VERSION_300
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1690 GNUTLS_TRACE( gnutls_transport_set_pull_timeout_function( conn->cc_tls_para.session, (void *)fd_cnx_s_select ) );
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1691 #endif /* GNUTLS_VERSION_300 */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1692 GNUTLS_TRACE( gnutls_transport_set_pull_function(conn->cc_tls_para.session, (void *)fd_cnx_s_recv) );
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1693 #ifndef GNUTLS_VERSION_212
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1694 GNUTLS_TRACE( gnutls_transport_set_push_function(conn->cc_tls_para.session, (void *)fd_cnx_s_send) );
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1695 #else /* GNUTLS_VERSION_212 */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1696 GNUTLS_TRACE( gnutls_transport_set_vec_push_function(conn->cc_tls_para.session, (void *)fd_cnx_s_sendv) );
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1697 #endif /* GNUTLS_VERSION_212 */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1698 } else {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1699 TODO("DTLS push/pull functions");
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1700 return ENOTSUP;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1701 }
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1702 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1703
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1704 /* additional initialization for gnutls 3.x */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1705 #ifdef GNUTLS_VERSION_300
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1706 /* the verify function has already been set in the global initialization in config.c */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1707
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1708 /* fd_tls_verify_credentials_2 uses the connection */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1709 gnutls_session_set_ptr (conn->cc_tls_para.session, (void *) conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1710
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1711 if ((conn->cc_tls_para.cn != NULL) && (mode == GNUTLS_CLIENT)) {
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1712 /* this might allow virtual hosting on the remote peer */
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1713 CHECK_GNUTLS_DO( gnutls_server_name_set (conn->cc_tls_para.session, GNUTLS_NAME_DNS, conn->cc_tls_para.cn, strlen(conn->cc_tls_para.cn)), /* ignore failure */);
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1714 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1715
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1716 #endif /* GNUTLS_VERSION_300 */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1717
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1718 #ifdef GNUTLS_VERSION_310
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1719 GNUTLS_TRACE( gnutls_handshake_set_timeout( conn->cc_tls_para.session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));
09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1720 #endif /* GNUTLS_VERSION_310 */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1721
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1722 /* Mark the connection as protected from here, so that the gnutls credentials will be freed */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1723 fd_cnx_addstate(conn, CC_STATUS_TLS);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1724
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1725 /* Handshake master session */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1726 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1727 int ret;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1728
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1729 CHECK_GNUTLS_DO( ret = gnutls_handshake(conn->cc_tls_para.session),
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1730 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1731 if (TRACE_BOOL(INFO)) {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 961 diff changeset	1732 fd_log_debug("TLS Handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1733 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1734 fd_cnx_markerror(conn);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1735 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1736 } );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1737
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1738 #ifndef GNUTLS_VERSION_300
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1739 /* Now verify the remote credentials are valid -- only simple tests here */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1740 CHECK_FCT_DO( fd_tls_verify_credentials(conn->cc_tls_para.session, conn, 1),
89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1741 {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1742 CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_RDWR), );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1743 fd_cnx_markerror(conn);
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1744 return EINVAL;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1745 });
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1746 #endif /* GNUTLS_VERSION_300 */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1747 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1748
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1749 /* Multi-stream TLS: handshake other streams as well */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1750 if ((!dtls) && (conn->cc_sctp_para.pairs > 1)) {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1751 #ifndef DISABLE_SCTP
543 40141acabee7 Fix behavior of TLS/SCTP when only one peer does not accept the remote certificate Sebastien Decugis <sdecugis@nict.go.jp> parents: 542 diff changeset	1752 /* Start reading the messages from the master session. That way, if the remote peer closed, we are not stuck inside handshake */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1753 CHECK_FCT(fd_sctp3436_startthreads(conn, 0));
807 09f8f0c4f4a4 Several changes to support GnuTLS 3.x in a more efficient way Sebastien Decugis <sdecugis@freediameter.net> parents: 803 diff changeset	1754
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1755 /* Resume all additional sessions from the master one. */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1756 CHECK_FCT(fd_sctp3436_handshake_others(conn, priority, alt_creds));
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1757
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1758 /* Start decrypting the messages from all threads and queuing them in target queue */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1759 CHECK_FCT(fd_sctp3436_startthreads(conn, 1));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1760 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1761 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1762 /* Start decrypting the data */
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1763 if (!dtls) {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1764 CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_tls_single, conn ) );
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1765 } else {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1766 TODO("Signal the dtls_push function that multiple streams can be used from this point.");
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1767 TODO("Create DTLS rcvthr (must reassembly based on seq numbers & stream id ?)");
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1768 return ENOTSUP;
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1769 }
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1770 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1771
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1772 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1773 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1774
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1775 /* Retrieve TLS credentials of the remote peer, after handshake */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1776 int fd_cnx_getcred(struct cnxctx * conn, const gnutls_datum_t *cert_list, unsigned int cert_list_size)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1777 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1778 TRACE_ENTRY("%p %p %p", conn, cert_list, cert_list_size);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1779 CHECK_PARAMS( conn && fd_cnx_teststate(conn, CC_STATUS_TLS) && cert_list && cert_list_size );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1780
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1781 /* This function only works for X.509 certificates. */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1782 CHECK_PARAMS( gnutls_certificate_type_get (conn->cc_tls_para.session) == GNUTLS_CRT_X509 );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1783
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1784 GNUTLS_TRACE( *cert_list = gnutls_certificate_get_peers (conn->cc_tls_para.session, cert_list_size) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1785 if (*cert_list == NULL) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1786 TRACE_DEBUG(INFO, "No certificate was provided by remote peer / an error occurred.");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1787 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1788 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1789
54 889c55527a1d Fixed additional newline character Sebastien Decugis <sdecugis@nict.go.jp> parents: 53 diff changeset	1790 TRACE_DEBUG( FULL, "Saved certificate chain (%d certificates) in peer structure.", *cert_list_size);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1791
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1792 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1793 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1794
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1795 /* Receive next message. if timeout is not NULL, wait only until timeout. This function only pulls from a queue, mgr thread is filling that queue aynchrounously. */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1796 /* if the altfifo has been set on this conn object, this function must not be called */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1797 int fd_cnx_receive(struct cnxctx * conn, struct timespec * timeout, unsigned char *buf, size_t len)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1798 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1799 int ev;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1800 size_t ev_sz;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1801 void * ev_data;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1802
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1803 TRACE_ENTRY("%p %p %p %p", conn, timeout, buf, len);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1804 CHECK_PARAMS(conn && (conn->cc_socket > 0) && buf && len);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1805 CHECK_PARAMS(conn->cc_rcvthr != (pthread_t)NULL);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1806 CHECK_PARAMS(conn->cc_alt == NULL);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1807
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1808 /* Now, pull the first event */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1809 get_next:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1810 if (timeout) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1811 CHECK_FCT( fd_event_timedget(conn->cc_incoming, timeout, FDEVP_PSM_TIMEOUT, &ev, &ev_sz, &ev_data) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1812 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1813 CHECK_FCT( fd_event_get(conn->cc_incoming, &ev, &ev_sz, &ev_data) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1814 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1815
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1816 switch (ev) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1817 case FDEVP_CNX_MSG_RECV:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1818 /* We got one */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1819 *len = ev_sz;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1820 *buf = ev_data;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1821 return 0;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1822
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1823 case FDEVP_PSM_TIMEOUT:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1824 TRACE_DEBUG(FULL, "Timeout event received");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1825 return ETIMEDOUT;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1826
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1827 case FDEVP_CNX_EP_CHANGE:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1828 /* We ignore this event */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1829 goto get_next;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1830
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1831 case FDEVP_CNX_ERROR:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1832 TRACE_DEBUG(FULL, "Received ERROR event on the connection");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1833 return ENOTCONN;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1834 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1835
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1836 TRACE_DEBUG(INFO, "Received unexpected event %d (%s)", ev, fd_pev_str(ev));
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1837 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1838 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1839
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1840 /* Where the events are sent */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1841 struct fifo * fd_cnx_target_queue(struct cnxctx * conn)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1842 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1843 struct fifo *q;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1844 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1845 q = conn->cc_alt ?: conn->cc_incoming;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1846 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1847 return q;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1848 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1849
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1850 /* Set an alternate FIFO list to send FDEVP_CNX_* events to */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1851 int fd_cnx_recv_setaltfifo(struct cnxctx * conn, struct fifo * alt_fifo)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1852 {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1853 int ret;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1854 TRACE_ENTRY( "%p %p", conn, alt_fifo );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1855 CHECK_PARAMS( conn && alt_fifo && conn->cc_incoming );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1856
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1857 /* The magic function does it all */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1858 CHECK_POSIX_DO( pthread_mutex_lock(&state_lock), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1859 CHECK_FCT_DO( ret = fd_fifo_move( conn->cc_incoming, alt_fifo, &conn->cc_alt ), );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1860 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1861
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1862 return ret;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1863 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1864
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1865 /* Send function when no multi-stream is involved, or sending on stream #0 (send() always use stream 0)*/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1866 static int send_simple(struct cnxctx * conn, unsigned char * buf, size_t len)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1867 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1868 ssize_t ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1869 size_t sent = 0;
27 b3a1773e9f46 again, correct was actually %zd Sebastien Decugis <sdecugis@nict.go.jp> parents: 26 diff changeset	1870 TRACE_ENTRY("%p %p %zd", conn, buf, len);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1871 do {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1872 if (fd_cnx_teststate(conn, CC_STATUS_TLS)) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1873 CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_tls_para.session, buf + sent, len - sent), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1874 } else {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1875 struct iovec iov;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1876 iov.iov_base = buf + sent;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1877 iov.iov_len = len - sent;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1878 CHECK_SYS_DO( ret = fd_cnx_s_sendv(conn, &iov, 1), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1879 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1880 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1881 return ENOTCONN;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1882
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1883 sent += ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1884 } while ( sent < len );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1885 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1886 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1887
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1888 /* Send a message -- this is synchronous -- and we assume it's never called by several threads at the same time (on the same conn), so we don't protect. */
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1889 int fd_cnx_send(struct cnxctx * conn, unsigned char * buf, size_t len)
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1890 {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1891 TRACE_ENTRY("%p %p %zd", conn, buf, len);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1892
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1893 CHECK_PARAMS(conn && (conn->cc_socket > 0) && (! fd_cnx_teststate(conn, CC_STATUS_ERROR)) && buf && len);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1894
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1895 TRACE_DEBUG(FULL, "Sending %zdb %sdata on connection %s", len, fd_cnx_teststate(conn, CC_STATUS_TLS) ? "TLS-protected ":"", conn->cc_id);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1896
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1897 switch (conn->cc_proto) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1898 case IPPROTO_TCP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1899 CHECK_FCT( send_simple(conn, buf, len) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1900 break;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1901
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1902 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1903 case IPPROTO_SCTP: {
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1904 int dtls = fd_cnx_uses_dtls(conn);
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1905 if (!dtls) {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1906 int stream = 0;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1907 if (conn->cc_sctp_para.unordered) {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1908 int limit;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1909 if (fd_cnx_teststate(conn, CC_STATUS_TLS))
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1910 limit = conn->cc_sctp_para.pairs;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1911 else
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1912 limit = conn->cc_sctp_para.str_out;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1913
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1914 if (limit > 1) {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1915 conn->cc_sctp_para.next += 1;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1916 conn->cc_sctp_para.next %= limit;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1917 stream = conn->cc_sctp_para.next;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1918 }
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1919 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1920
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1921 if (stream == 0) {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1922 /* We can use default function, it sends over stream #0 */
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1923 CHECK_FCT( send_simple(conn, buf, len) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1924 } else {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1925 if (!fd_cnx_teststate(conn, CC_STATUS_TLS)) {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1926 struct iovec iov;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1927 iov.iov_base = buf;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1928 iov.iov_len = len;
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1929
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1930 CHECK_SYS_DO( fd_sctp_sendstrv(conn, stream, &iov, 1), { fd_cnx_markerror(conn); return ENOTCONN; } );
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1931 } else {
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1932 /* push the data to the appropriate session */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1933 ssize_t ret;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1934 size_t sent = 0;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1935 ASSERT(conn->cc_sctp3436_data.array != NULL);
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1936 do {
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1937 CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctp3436_data.array[stream].session, buf + sent, len - sent), );
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1938 if (ret <= 0)
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1939 return ENOTCONN;
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1940
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1941 sent += ret;
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1942 } while ( sent < len );
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1943 }
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1944 }
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1945 } else {
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1946 /* DTLS */
1186 56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1947 /* Multistream is handled at lower layer in the push/pull function */
56c36d1007b4 Further preparation of the DTLS integration. Some cleanups in the GNUTLS handling. Sebastien Decugis <sdecugis@freediameter.net> parents: 1181 diff changeset	1948 CHECK_FCT( send_simple(conn, buf, len) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1949 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1950 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1951 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1952 #endif /* DISABLE_SCTP */
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1953
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1954 default:
1099 6ce5c99a40af Fix some typos. Thomas Klausner <tk@giga.or.at> parents: 1084 diff changeset	1955 TRACE_DEBUG(INFO, "Unknown protocol: %d", conn->cc_proto);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1956 ASSERT(0);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1957 return ENOTSUP; /* or EINVAL... */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1958 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1959
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1960 return 0;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1961 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1962
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1963
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1964 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1965 /* Destruction of connection */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1966 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1967
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1968 /* Destroy a conn structure, and shutdown the socket */
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1969 void fd_cnx_destroy(struct cnxctx * conn)
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1970 {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1971 TRACE_ENTRY("%p", conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1972
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1973 CHECK_PARAMS_DO(conn, return);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1974
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1975 fd_cnx_addstate(conn, CC_STATUS_CLOSING);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	1976
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1977 /* Initiate shutdown of the TLS session(s): call gnutls_bye(WR), then read until error */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1978 if (fd_cnx_teststate(conn, CC_STATUS_TLS)) {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1979 #ifndef DISABLE_SCTP
1181 22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1980 int dtls = fd_cnx_uses_dtls(conn);
22de21feec64 Preparing for DTLS support Sebastien Decugis <sdecugis@freediameter.net> parents: 1180 diff changeset	1981 if ((!dtls) && (conn->cc_sctp_para.pairs > 1)) {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1982 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR )) {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1983 /* Bye on master session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1984 CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1985 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1986
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1987 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1988 /* and other stream pairs */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1989 fd_sctp3436_bye(conn);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1990 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1991
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1992 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1993 /* Now wait for all decipher threads to terminate */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1994 fd_sctp3436_waitthreadsterm(conn);
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1995 } else {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1996 /* Abord the threads, the connection is dead already */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	1997 fd_sctp3436_stopthreads(conn);
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1998 }
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1999
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2000 /* Deinit gnutls resources */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	2001 fd_sctp3436_gnutls_deinit_others(conn);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2002 if (conn->cc_tls_para.session) {
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	2003 GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2004 conn->cc_tls_para.session = NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2005 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2006
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2007 /* Destroy the wrapper (also stops the demux thread) */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	2008 fd_sctp3436_destroy(conn);
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2009
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2010 } else {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2011 #endif /* DISABLE_SCTP */
1180 773498f59520 Preparing for future DTLS/SCTP support Sebastien Decugis <sdecugis@freediameter.net> parents: 1145 diff changeset	2012 /* We are TLS, but not using the sctp3436 wrapper layer */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	2013 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2014 /* Master session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2015 CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2016 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2017
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	2018 if (! fd_cnx_teststate(conn, CC_STATUS_ERROR ) ) {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2019 /* In this case, just wait for thread rcvthr_tls_single to terminate */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2020 if (conn->cc_rcvthr != (pthread_t)NULL) {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2021 CHECK_POSIX_DO( pthread_join(conn->cc_rcvthr, NULL), /* continue */ );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2022 conn->cc_rcvthr = (pthread_t)NULL;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2023 }
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2024 } else {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2025 /* Cancel the receiver thread in case it did not already terminate */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2026 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */ );
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2027 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2028
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2029 /* Free the resources of the TLS session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2030 if (conn->cc_tls_para.session) {
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	2031 GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2032 conn->cc_tls_para.session = NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	2033 }
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2034 #ifndef DISABLE_SCTP
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2035 }
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2036 #endif /* DISABLE_SCTP */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2037 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2038
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	2039 /* Terminate the thread in case it is not done yet -- is there any such case left ?*/
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	2040 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */ );
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2041
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2042 /* Shut the connection down */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2043 if (conn->cc_socket > 0) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2044 shutdown(conn->cc_socket, SHUT_RDWR);
38 68c1890f7049 Fixed a small bug in SCTP close Sebastien Decugis <sdecugis@nict.go.jp> parents: 31 diff changeset	2045 close(conn->cc_socket);
68c1890f7049 Fixed a small bug in SCTP close Sebastien Decugis <sdecugis@nict.go.jp> parents: 31 diff changeset	2046 conn->cc_socket = -1;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2047 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2048
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2049 /* Empty and destroy FIFO list */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2050 if (conn->cc_incoming) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2051 fd_event_destroy( &conn->cc_incoming, free );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	2052 }
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2053
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2054 /* Free the object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2055 free(conn);
1419 89cbb08d3189 Remove trailing whitespace. Thomas Klausner <tk@giga.or.at> parents: 1356 diff changeset	2056
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	2057 /* Done! */
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	2058 return;
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	2059 }

Mercurial > hg > freeDiameter

annotate libfdcore/cnxctx.c @ 1540:407e0a889c7e