freeDiameter: libfdcore/cnxctx.c annotate

annotate libfdcore/cnxctx.c @ 711:f7c665948e0c

Use size returned by accept

author	Sebastien Decugis <sdecugis@nict.go.jp>
date	Thu, 10 Feb 2011 17:19:52 +0900
parents	e60376cb15e8
children	e21d79595045

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) *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	3 * Author: Sebastien Decugis <sdecugis@nict.go.jp> *
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	4 * *
662 2e94ef0515d7 Updated copyright information Sebastien Decugis <sdecugis@nict.go.jp> parents: 658 diff changeset	5 * Copyright (c) 2011, 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 */
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	41
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	42 /* 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	43 #ifndef DIAMETER_MSG_SIZE_MAX
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	44 #define DIAMETER_MSG_SIZE_MAX 65535 /* in bytes */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	45 #endif /* DIAMETER_MSG_SIZE_MAX */
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	46
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	47
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	48 /* 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	49 * 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	50 * 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	51 */
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 /* Lifetime of a cnxctx object:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	54 * 1) Creation
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	55 * a) a server socket:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	56 * - 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	57 * - start listening incoming connections: fd_cnx_serv_listen
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	58 * - accept new clients with fd_cnx_serv_accept.
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	59 * b) a client socket:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	60 * - 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	61 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	62 * 2) Initialization
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	63 * - if TLS is started first, call fd_cnx_handshake
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	64 * - 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	65 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	66 * 3) Usage
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	67 * - 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	68 * - 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	69 * - 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	70 * - 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	71 * - 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	72 *
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	73 * 4) End
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	74 * - fd_cnx_destroy
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	75 */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	76
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	77 /*******************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	78 /* Creation of a connection object */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	79 /*******************************************/
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	80
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	81 /* Initialize a context structure */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	82 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	83 {
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	84 struct cnxctx * conn = NULL;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	85
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	86 TRACE_ENTRY("%d", full);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	87
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	88 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	89 memset(conn, 0, sizeof(struct cnxctx));
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	90
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	91 if (full) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	92 CHECK_FCT_DO( fd_fifo_new ( &conn->cc_incoming ), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	93 }
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 return conn;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	96 }
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 /* 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	99 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	100 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	101 struct cnxctx * cnx = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	102 sSS dummy;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	103 sSA * sa = (sSA *) &dummy;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	104
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	105 TRACE_ENTRY("%hu %d %p", port, family, ep);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	106
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	107 CHECK_PARAMS_DO( port, return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	108 CHECK_PARAMS_DO( ep \|\| family, return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	109 CHECK_PARAMS_DO( (! family) \|\| (family == AF_INET) \|\| (family == AF_INET6), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	110 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	111
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	112 /* The connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	113 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	114
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	115 /* Prepare the socket address information */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	116 if (ep) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	117 memcpy(sa, &ep->ss, sizeof(sSS));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	118 } else {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	119 memset(&dummy, 0, sizeof(dummy));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	120 sa->sa_family = family;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	121 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	122 if (sa->sa_family == AF_INET) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	123 ((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	124 cnx->cc_family = AF_INET;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	125 } else {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	126 ((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	127 cnx->cc_family = AF_INET6;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	128 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	129
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	130 /* Create the socket */
246 6418a188c1b5 getnameinfo is also more sensitive on freeBSD Sebastien Decugis <sdecugis@nict.go.jp> parents: 245 diff changeset	131 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	132
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	133 /* Generate the name for the connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	134 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	135 char addrbuf[INET6_ADDRSTRLEN];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	136 int rc;
247 f89b5a12d2af Forgot a couple of getnameinfo Sebastien Decugis <sdecugis@nict.go.jp> parents: 246 diff changeset	137 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	138 if (rc)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	139 snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	140 snprintf(cnx->cc_id, sizeof(cnx->cc_id), "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	141 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	142
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	143 cnx->cc_proto = IPPROTO_TCP;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	144
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	145 return cnx;
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 error:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	148 fd_cnx_destroy(cnx);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	149 return NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	150 }
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	151
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	152 /* 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	153 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	154 {
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	155 #ifdef DISABLE_SCTP
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	156 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	157 ASSERT(0);
709 19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	158 CHECK_FCT_DO( ENOTSUP, );
19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	159 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	160 #else /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	161 struct cnxctx * cnx = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	162
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	163 TRACE_ENTRY("%hu %p", port, ep_list);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	164
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	165 CHECK_PARAMS_DO( port, return 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 /* The connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	168 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	169
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	170 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	171 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	172 } else {
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	173 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	174 }
5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	175
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	176 /* Create the socket */
220 5f2ce627db3c Try to fix the old bug on sctp_getpaddrs Sebastien Decugis <sdecugis@nict.go.jp> parents: 214 diff changeset	177 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	178
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	179 /* Generate the name for the connection object */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	180 snprintf(cnx->cc_id, sizeof(cnx->cc_id), "SCTP srv :%hu (%d)", port, cnx->cc_socket);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	181
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	182 cnx->cc_proto = IPPROTO_SCTP;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	183
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	184 return cnx;
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 error:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	187 fd_cnx_destroy(cnx);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	188 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	189 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	190 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	191
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	192 /* Allow clients to connect on the server socket */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	193 int fd_cnx_serv_listen(struct cnxctx * conn)
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 CHECK_PARAMS( conn );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	196
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	197 switch (conn->cc_proto) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	198 case IPPROTO_TCP:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	199 CHECK_FCT(fd_tcp_listen(conn->cc_socket));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	200 break;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	201
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	202 #ifndef DISABLE_SCTP
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	203 case IPPROTO_SCTP:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	204 CHECK_FCT(fd_sctp_listen(conn->cc_socket));
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	205 break;
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	206 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	207
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	208 default:
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	209 CHECK_PARAMS(0);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	210 }
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 return 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	213 }
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 /* 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	216 struct cnxctx * fd_cnx_serv_accept(struct cnxctx * serv)
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 struct cnxctx * cli = NULL;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	219 sSS ss;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	220 socklen_t ss_len = sizeof(ss);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	221 int cli_sock = 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	222
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	223 TRACE_ENTRY("%p", serv);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	224 CHECK_PARAMS_DO(serv, return NULL);
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	225
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	226 /* 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	227 CHECK_SYS_DO( cli_sock = accept(serv->cc_socket, (sSA *)&ss, &ss_len), return NULL );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	228
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	229 if (TRACE_BOOL(INFO)) {
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	230 fd_log_debug("%s : accepted new client [", fd_cnx_getid(serv));
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	231 sSA_DUMP_NODE( &ss, NI_NUMERICHOST );
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	232 fd_log_debug("].\n");
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	233 }
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	234
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	235 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	236 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	237 cli->cc_family = serv->cc_family;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	238 cli->cc_proto = serv->cc_proto;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	239
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	240 /* 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	241 fd_cnx_s_setto(cli->cc_socket);
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	242
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	243 /* Generate the name for the connection object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	244 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	245 char addrbuf[INET6_ADDRSTRLEN];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	246 char portbuf[10];
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	247 int rc;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	248
711 f7c665948e0c Use size returned by accept Sebastien Decugis <sdecugis@nict.go.jp> parents: 710 diff changeset	249 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	250 if (rc) {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	251 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	252 portbuf[0] = '\0';
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	253 }
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	254
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	255 /* Numeric values for debug... */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	256 snprintf(cli->cc_id, sizeof(cli->cc_id), "%s from [%s]:%s (%d<-%d)",
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	257 IPPROTO_NAME(cli->cc_proto), addrbuf, portbuf, serv->cc_socket, cli->cc_socket);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	258
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	259
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	260 /* ...Name for log messages */
711 f7c665948e0c Use size returned by accept Sebastien Decugis <sdecugis@nict.go.jp> parents: 710 diff changeset	261 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	262 if (rc)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	263 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	264 }
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;
396 918fbb92eb8b Attempt to fix #6 Sebastien Decugis <sdecugis@nict.go.jp> parents: 378 diff changeset	275
918fbb92eb8b Attempt to fix #6 Sebastien Decugis <sdecugis@nict.go.jp> parents: 378 diff changeset	276 TRACE_DEBUG(FULL,"%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;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	288
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	289 TRACE_ENTRY("%p %d", sa, addrlen);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	290 CHECK_PARAMS_DO( sa && addrlen, return NULL );
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	291
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	292 /* 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	293 {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	294 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	295 if (ret != 0) {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	296 int lvl;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	297 switch (ret) {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	298 case ECONNREFUSED:
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	299
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	300 /* "Normal" errors */
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	301 lvl = FULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	302 break;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	303 default:
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	304 lvl = INFO;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	305 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	306 /* Some errors are expected, we log at different level */
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	307 TRACE_DEBUG( lvl, "fd_tcp_client returned an error: %s", strerror(ret));
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	308 return NULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	309 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	310 }
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	311
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	312 if (TRACE_BOOL(INFO)) {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	313 fd_log_debug("Connection established to server '");
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	314 sSA_DUMP_NODE_SERV( sa, NI_NUMERICSERV);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	315 fd_log_debug("' (TCP:%d).\n", sock);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	316 }
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 /* 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	319 CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	320
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	321 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	322 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	323 cnx->cc_proto = IPPROTO_TCP;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	324
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	325 /* 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	326 fd_cnx_s_setto(cnx->cc_socket);
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	327
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	328 /* Generate the names for the object */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	329 {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	330 char addrbuf[INET6_ADDRSTRLEN];
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	331 char portbuf[10];
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	332 int rc;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	333
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	334 /* Numeric values for debug... */
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	335 rc = getnameinfo(sa, addrlen, addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST \| NI_NUMERICSERV);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	336 if (rc) {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	337 snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	338 portbuf[0] = '\0';
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	339 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	340
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	341 snprintf(cnx->cc_id, sizeof(cnx->cc_id), "TCP to [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	342
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	343 /* ...Name for log messages */
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	344 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	345 if (rc)
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	346 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	347 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	348
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	349 return cnx;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	350 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	351
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	352 /* Same for SCTP, accepts a list of remote addresses to connect to (see sctp_connectx for how they are used) */
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	353 struct cnxctx * fd_cnx_cli_connect_sctp(int no_ip6, uint16_t port, struct fd_list * list)
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	354 {
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	355 #ifdef DISABLE_SCTP
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	356 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	357 ASSERT(0);
709 19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	358 CHECK_FCT_DO( ENOTSUP, );
19a9470de77a Fix a few compilations errors and warnings Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	359 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	360 #else /* DISABLE_SCTP */
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	361 int sock = 0;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	362 struct cnxctx * cnx = NULL;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	363 sSS primary;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	364
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	365 TRACE_ENTRY("%p", list);
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	366 CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	367
227 80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	368 {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	369 int ret = fd_sctp_client( &sock, no_ip6, port, list );
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	370 if (ret != 0) {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	371 int lvl;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	372 switch (ret) {
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	373 case ECONNREFUSED:
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	374
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	375 /* "Normal" errors */
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	376 lvl = FULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	377 break;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	378 default:
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	379 lvl = INFO;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	380 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	381 /* Some errors are expected, we log at different level */
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	382 TRACE_DEBUG( lvl, "fd_sctp_client returned an error: %s", strerror(ret));
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	383 return NULL;
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	384 }
80a7e65167c4 Cleanup verbosity and fix unintialized variable Sebastien Decugis <sdecugis@nict.go.jp> parents: 223 diff changeset	385 }
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	386
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	387 /* 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	388 CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	389
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	390 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	391 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	392 cnx->cc_proto = IPPROTO_SCTP;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	393
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	394 /* 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	395 fd_cnx_s_setto(cnx->cc_socket);
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	396
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	397 /* 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	398 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	399 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	400 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	401 else
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	402 cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_in;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	403
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	404 if (TRACE_BOOL(INFO)) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	405 fd_log_debug("Connection established to server '");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	406 sSA_DUMP_NODE_SERV( &primary, NI_NUMERICSERV);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	407 fd_log_debug("' (SCTP:%d, %d/%d streams).\n", sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	408 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	409
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	410 /* Generate the names for the object */
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	411 {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	412 char addrbuf[INET6_ADDRSTRLEN];
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	413 char portbuf[10];
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	414 int rc;
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	415
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	416 /* Numeric values for debug... */
247 f89b5a12d2af Forgot a couple of getnameinfo Sebastien Decugis <sdecugis@nict.go.jp> parents: 246 diff changeset	417 rc = getnameinfo((sSA *)&primary, sSAlen(&primary), 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	418 if (rc) {
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	419 snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	420 portbuf[0] = '\0';
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	421 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	422
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	423 snprintf(cnx->cc_id, sizeof(cnx->cc_id), "SCTP to [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	424
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	425 /* ...Name for log messages */
247 f89b5a12d2af Forgot a couple of getnameinfo Sebastien Decugis <sdecugis@nict.go.jp> parents: 246 diff changeset	426 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	427 if (rc)
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	428 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	429 }
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	430
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	431 return cnx;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	432
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	433 error:
bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	434 fd_cnx_destroy(cnx);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	435 return NULL;
24 bd83ce9328ed Cleanups and completed sctp code (not finished) Sebastien Decugis <sdecugis@nict.go.jp> parents: 23 diff changeset	436 #endif /* DISABLE_SCTP */
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	437 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	438
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	439 /* Return a string describing the connection, for debug */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	440 char * fd_cnx_getid(struct cnxctx * conn)
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	441 {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	442 CHECK_PARAMS_DO( conn, return "" );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	443 return conn->cc_id;
20 277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	444 }
277ec00d793e Backup before typhoon... Progress on server side Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	445
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	446 /* 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	447 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	448 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	449 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	450 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	451 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	452
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	453 /* 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	454 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	455 {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	456 CHECK_PARAMS_DO( conn, return );
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	457 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	458 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	459
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	460 /* 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	461 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	462 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	463 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	464 uint32_t st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	465 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	466 st = conn->cc_state;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	467 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	468 return st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	469 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	470 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	471 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	472 uint32_t st;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	473 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	474 st = conn->cc_state;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	475 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	476 return st & flag;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	477 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	478 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	479 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	480 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	481 conn->cc_state \|= orstate;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	482 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	483 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	484 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	485 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	486 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	487 conn->cc_state = abstate;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	488 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	489 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	490
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	491
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	492 /* 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	493 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	494 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	495 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	496 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	497 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	498
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	499 /* Return true if the connection supports unordered delivery of messages */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	500 int fd_cnx_isMultichan(struct cnxctx * conn)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	501 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	502 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	503 #ifndef DISABLE_SCTP
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	504 if (conn->cc_proto == IPPROTO_SCTP)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	505 return (conn->cc_sctp_para.str_in > 1) \|\| (conn->cc_sctp_para.str_out > 1);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	506 #endif /* DISABLE_SCTP */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	507 return 0;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	508 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	509
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	510
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	511 /* 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	512 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	513 {
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	514 TRACE_ENTRY("%p %p %p", conn, 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	515 CHECK_PARAMS(conn && eps);
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	516
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	517 /* 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	518 CHECK_PARAMS( conn->cc_incoming );
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	519
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	520 /* 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	521 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	522 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	523 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	524 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	525 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	526 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	527 }
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 break;
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 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 #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	531 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	532 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	533 }
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 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	535 #endif /* DISABLE_SCTP */
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	536
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	537 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	538 CHECK_PARAMS(0);
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	539 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	540
23 db6c40b8b307 Added some code in cnxctx.c mainly Sebastien Decugis <sdecugis@nict.go.jp> parents: 22 diff changeset	541 return 0;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	542 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	543
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	544 /* 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	545 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	546 {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	547 CHECK_PARAMS_DO( conn, return "" );
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	548 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	549 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	550
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	551 /* 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	552 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	553 {
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	554 struct ifaddrs iflist, cur;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	555
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	556 CHECK_SYS(getifaddrs(&iflist));
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	557
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	558 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	559 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	560 continue;
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	561
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	562 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	563 continue;
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	564
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	565 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	566 continue;
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	567
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	568 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	569 }
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	570
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	571 freeifaddrs(iflist);
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	572
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	573 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	574 }
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	575
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	576
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	577 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	578 /* Use of a connection object */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	579 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	580
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	581 /* An error occurred on the socket */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	582 void fd_cnx_markerror(struct cnxctx * conn)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	583 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	584 TRACE_ENTRY("%p", conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	585 CHECK_PARAMS_DO( conn, goto fatal );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	586
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	587 TRACE_DEBUG(FULL, "Error flag set for socket %d (%s, %s)", conn->cc_socket, conn->cc_id, conn->cc_remid);
211 929513df9024 Add a debug message Sebastien Decugis <sdecugis@nict.go.jp> parents: 209 diff changeset	588
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	589 /* Mark the error */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	590 fd_cnx_addstate(conn, CC_STATUS_ERROR);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	591
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	592 /* 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	593 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	594 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	595 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	596 fd_cnx_addstate(conn, CC_STATUS_SIGNALED);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	597 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	598 return;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	599 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	600 /* 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	601 ASSERT(0);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	602 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	603 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	604
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	605 /* Set the timeout option on the socket */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	606 void fd_cnx_s_setto(int sock)
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	607 {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	608 struct timeval tv;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	609
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	610 /* 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	611 memset(&tv, 0, sizeof(tv));
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	612 tv.tv_sec = 3; /* allow 3 seconds timeout for TLS session cleanup */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	613 CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)), /* best effort only */ );
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	614 CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)), /* Also timeout for sending, to avoid waiting forever */ );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	615 }
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	616
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	617 /* 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	618 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	619 {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	620 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	621 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	622 again:
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	623 ret = recv(conn->cc_socket, buffer, length, 0);
710 e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	624 /* Handle special case of timeout / interrupts */
e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	625 if ((ret < 0) && ((errno == EAGAIN) \|\| (errno == EINTR))) {
e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	626 pthread_testcancel();
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	627 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	628 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	629 if (!timedout) {
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	630 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	631 goto again;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	632 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	633 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	634
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	635 /* Mark the error */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	636 if (ret <= 0) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	637 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	638 fd_cnx_markerror(conn);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	639 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	640
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	641 return ret;
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	642 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	643
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	644 /* Send */
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	645 static ssize_t fd_cnx_s_send(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	646 {
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	647 ssize_t ret = 0;
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	648 int timedout = 0;
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	649 again:
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	650 ret = send(conn->cc_socket, buffer, length, 0);
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	651 /* Handle special case of timeout */
710 e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	652 if ((ret < 0) && ((errno == EAGAIN) \|\| (errno == EINTR))) {
e60376cb15e8 Minor changes Sebastien Decugis <sdecugis@nict.go.jp> parents: 709 diff changeset	653 pthread_testcancel();
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	654 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	655 goto again; /* don't care, just ignore */
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	656 if (!timedout) {
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	657 timedout ++; /* allow for one timeout while closing */
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	658 goto again;
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	659 }
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	660 CHECK_SYS_DO(ret, /* continue */);
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	661 }
1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	662
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	663 /* Mark the error */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	664 if (ret <= 0)
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	665 fd_cnx_markerror(conn);
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	666
201 1b47afa59358 Also timeout on sends Sebastien Decugis <sdecugis@nict.go.jp> parents: 199 diff changeset	667 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	668 }
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	669
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	670 /* 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	671 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	672 {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	673 struct cnxctx * conn = arg;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	674
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	675 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	676 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto out);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	677
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	678 /* 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	679 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	680 char buf[48];
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	681 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	682 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	683 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	684
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	685 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	686 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	687 ASSERT( fd_cnx_target_queue(conn) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	688
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	689 /* 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	690 do {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	691 uint8_t header[4];
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	692 uint8_t * newmsg;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	693 size_t length;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	694 ssize_t ret = 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	695 size_t received = 0;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	696
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	697 do {
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	698 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	699 if (ret <= 0) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	700 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	701 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	702
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	703 received += ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	704 } while (received < sizeof(header));
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	705
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	706 length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	707
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	708 /* 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	709 if ((header[0] != DIAMETER_VERSION) /* defined in <libfdproto.h> */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	710 \|\| (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	711 /* The message is suspect */
27 b3a1773e9f46 again, correct was actually %zd Sebastien Decugis <sdecugis@nict.go.jp> parents: 26 diff changeset	712 TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	713 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	714 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	715 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	716
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	717 /* Ok, now we can really receive the data */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	718 CHECK_MALLOC_DO( newmsg = malloc( length ), goto fatal );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	719 memcpy(newmsg, header, sizeof(header));
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	720
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	721 while (received < length) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	722 pthread_cleanup_push(free, newmsg); /* In case we are canceled, clean the partialy built buffer */
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	723 ret = fd_cnx_s_recv(conn, newmsg + received, length - received);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	724 pthread_cleanup_pop(0);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	725
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	726 if (ret <= 0) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	727 free(newmsg);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	728 goto out;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	729 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	730 received += ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	731 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	732
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	733 /* We have received a complete message, pass it to the daemon */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	734 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), FDEVP_CNX_MSG_RECV, length, newmsg), /* continue or destroy everything? */);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	735
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	736 } while (conn->cc_loop);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	737
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	738 out:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	739 TRACE_DEBUG(FULL, "Thread terminated");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	740 return NULL;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	741
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	742 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	743 /* An unrecoverable error occurred, stop the daemon */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	744 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	745 goto out;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	746 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	747
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	748 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	749 /* 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	750 static void * rcvthr_notls_sctp(void * arg)
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	751 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	752 struct cnxctx * conn = arg;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	753 uint8_t * buf;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	754 size_t bufsz;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	755 int event;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	756
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	757 TRACE_ENTRY("%p", arg);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	758 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto fatal);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	759
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	760 /* 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	761 {
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	762 char buf[48];
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	763 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	764 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	765 }
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	766
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	767 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	768 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	769 ASSERT( fd_cnx_target_queue(conn) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	770
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	771 do {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	772 CHECK_FCT_DO( fd_sctp_recvmeta(conn, NULL, &buf, &bufsz, &event), goto fatal );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	773 if (event == FDEVP_CNX_ERROR) {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	774 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	775 goto out;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	776 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	777
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	778 if (event == FDEVP_CNX_SHUTDOWN) {
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	779 /* 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	780 continue;
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	781 }
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	782
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	783 CHECK_FCT_DO( fd_event_send( fd_cnx_target_queue(conn), event, bufsz, buf), goto fatal );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	784
250 07624e65c7e0 Loop anyway until we get a real message or an error Sebastien Decugis <sdecugis@nict.go.jp> parents: 247 diff changeset	785 } while (conn->cc_loop \|\| (event != FDEVP_CNX_MSG_RECV));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	786
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	787 out:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	788 TRACE_DEBUG(FULL, "Thread terminated");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	789 return NULL;
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	790
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	791 fatal:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	792 /* An unrecoverable error occurred, stop the daemon */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	793 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	794 goto out;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	795 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	796 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	797
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	798 /* 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	799 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	800 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	801 TRACE_ENTRY("%p %i", conn, loop);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	802
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	803 CHECK_PARAMS( conn && fd_cnx_target_queue(conn) && (!fd_cnx_teststate(conn, CC_STATUS_TLS)) && (!conn->cc_loop));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	804
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	805 /* 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	806 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	807
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	808 /* Save the loop request */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	809 conn->cc_loop = loop;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	810
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	811 switch (conn->cc_proto) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	812 case IPPROTO_TCP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	813 /* Start the tcp_notls thread */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	814 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	815 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	816 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	817 case IPPROTO_SCTP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	818 /* Start the tcp_notls thread */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	819 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	820 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	821 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	822 default:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	823 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	824 ASSERT(0);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	825 return ENOTSUP;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	826 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	827
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	828 return 0;
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
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	831
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	832
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	833
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	834 /* Returns 0 on error, received data size otherwise (always >= 0) */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	835 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	836 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	837 ssize_t ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	838 again:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	839 CHECK_GNUTLS_DO( ret = gnutls_record_recv(session, data, sz),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	840 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	841 switch (ret) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	842 case GNUTLS_E_REHANDSHAKE:
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	843 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	844 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	845 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	846 if (TRACE_BOOL(INFO)) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	847 fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	848 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	849 goto end;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	850 } );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	851
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	852 case GNUTLS_E_AGAIN:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	853 case GNUTLS_E_INTERRUPTED:
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	854 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	855 goto again;
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	856 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	857 break;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	858
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	859 case GNUTLS_E_UNEXPECTED_PACKET_LENGTH:
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	860 /* The connection is closed */
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	861 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	862 break;
dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	863
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	864 default:
228 dcb58243e91f More cleanups Sebastien Decugis <sdecugis@nict.go.jp> parents: 227 diff changeset	865 TRACE_DEBUG(INFO, "This GNU TLS error is not handled, assume unrecoverable error");
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	866 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	867 } );
251 52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	868
52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	869 if (ret == 0)
52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	870 CHECK_GNUTLS_DO( gnutls_bye(session, GNUTLS_SHUT_RDWR), );
52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	871
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	872 end:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	873 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	874 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	875 return ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	876 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	877
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	878 /* Wrapper around gnutls_record_send to handle some error codes */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	879 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	880 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	881 ssize_t ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	882 again:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	883 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	884 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	885 switch (ret) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	886 case GNUTLS_E_REHANDSHAKE:
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	887 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	888 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	889 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	890 if (TRACE_BOOL(INFO)) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	891 fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	892 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	893 goto end;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	894 } );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	895
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	896 case GNUTLS_E_AGAIN:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	897 case GNUTLS_E_INTERRUPTED:
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	898 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	899 goto again;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	900 TRACE_DEBUG(INFO, "Connection is closing, so abord gnutls_record_send now.");
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	901 break;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	902
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	903 default:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	904 TRACE_DEBUG(INFO, "This TLS error is not handled, assume unrecoverable error");
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	905 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	906 } );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	907 end:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	908 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	909 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	910
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	911 return ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	912 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	913
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	914
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	915 /* The function that receives TLS data and re-builds a Diameter message -- it exits only on error or cancelation */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	916 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	917 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	918 /* No guarantee that GnuTLS preserves the message boundaries, so we re-build it as in TCP */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	919 do {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	920 uint8_t header[4];
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	921 uint8_t * newmsg;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	922 size_t length;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	923 ssize_t ret = 0;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	924 size_t received = 0;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	925
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	926 do {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	927 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	928 if (ret <= 0) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	929 /* The connection is closed */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	930 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	931 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	932 received += ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	933 } while (received < sizeof(header));
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	934
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	935 length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	936
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	937 /* 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	938 if ((header[0] != DIAMETER_VERSION) /* defined in <libfreeDiameter.h> */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	939 \|\| (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	940 /* The message is suspect */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	941 TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	942 fd_cnx_markerror(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	943 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	944 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	945
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	946 /* Ok, now we can really receive the data */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	947 CHECK_MALLOC( newmsg = malloc( length ) );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	948 memcpy(newmsg, header, sizeof(header));
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	949
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	950 while (received < length) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	951 pthread_cleanup_push(free, newmsg); /* In case we are canceled, clean the partialy built buffer */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	952 ret = fd_tls_recv_handle_error(conn, session, newmsg + received, length - received);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	953 pthread_cleanup_pop(0);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	954
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	955 if (ret <= 0) {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	956 free(newmsg);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	957 goto out;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	958 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	959 received += ret;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	960 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	961
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	962 /* We have received a complete message, pass it to the daemon */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	963 CHECK_FCT_DO( ret = fd_event_send( fd_cnx_target_queue(conn), FDEVP_CNX_MSG_RECV, length, newmsg),
209 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 free(newmsg);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	966 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	967 return ret;
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
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	970 } while (1);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	971
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	972 out:
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	973 return ENOTCONN;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	974 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	975
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	976 /* Receiver thread (TLS & 1 stream SCTP or TCP) */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	977 static void * rcvthr_tls_single(void * arg)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	978 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	979 struct cnxctx * conn = arg;
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 TRACE_ENTRY("%p", arg);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	982 CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), return NULL );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	983
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	984 /* Set the thread name */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	985 {
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	986 char buf[48];
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	987 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	988 fd_log_threadname ( buf );
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	989 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	990
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	991 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	992 ASSERT( fd_cnx_target_queue(conn) );
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	993
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	994 /* The next function only returns when there is an error on the socket */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	995 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	996
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	997 TRACE_DEBUG(FULL, "Thread terminated");
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	998 return NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	999 }
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1000
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1001 /* Prepare a gnutls session object for handshake */
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1002 int fd_tls_prepare(gnutls_session_t * session, int mode, char * priority, void * alt_creds)
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1003 {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1004 /* Create the session context */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1005 CHECK_GNUTLS_DO( gnutls_init (session, mode), return ENOMEM );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1006
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1007 /* Set the algorithm suite */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1008 if (priority) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1009 const char * errorpos;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1010 CHECK_GNUTLS_DO( gnutls_priority_set_direct( *session, priority, &errorpos ),
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1011 { TRACE_DEBUG(INFO, "Error in priority string '%s' at position: '%s'\n", priority, errorpos); return EINVAL; } );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1012 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1013 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	1014 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1015
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1016 /* 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	1017 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	1018
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1019 /* Request the remote credentials as well */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1020 if (mode == GNUTLS_SERVER) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1021 gnutls_certificate_server_set_request (*session, GNUTLS_CERT_REQUIRE);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1022 }
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1023
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1024 return 0;
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1025 }
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1026
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1027 /* 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	1028 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	1029 {
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	1030 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	1031 unsigned int gtret;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1032 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	1033 unsigned int cert_list_size;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1034 gnutls_x509_crt_t cert;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1035 time_t now;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1036
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1037 TRACE_ENTRY("%p %d", conn, verbose);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1038 CHECK_PARAMS(conn);
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1039
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1040 /* Trace the session information -- http://www.gnu.org/software/gnutls/manual/gnutls.html#Obtaining-session-information */
59 067ab3fc6093 Cleanups in debug messages Sebastien Decugis <sdecugis@nict.go.jp> parents: 57 diff changeset	1041 if (verbose && TRACE_BOOL(FULL)) {
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1042 const char *tmp;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1043 gnutls_kx_algorithm_t kx;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1044 gnutls_credentials_type_t cred;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1045
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1046 fd_log_debug("TLS Session information for connection '%s':\n", conn->cc_id);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1047
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1048 /* 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	1049 GNUTLS_TRACE( kx = gnutls_kx_get (session) );
5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1050 GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1051 fd_log_debug("\t - Key Exchange: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1052
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1053 /* Check the authentication type used and switch
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1054 * to the appropriate. */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1055 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	1056 switch (cred)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1057 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1058 case GNUTLS_CRD_IA:
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1059 fd_log_debug("\t - TLS/IA session\n");
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1060 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1061
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1062 case GNUTLS_CRD_PSK:
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1063 /* This returns NULL in server side. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1064 if (gnutls_psk_client_get_hint (session) != NULL)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1065 fd_log_debug("\t - PSK authentication. PSK hint '%s'\n",
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1066 gnutls_psk_client_get_hint (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1067 /* This returns NULL in client side. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1068 if (gnutls_psk_server_get_username (session) != NULL)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1069 fd_log_debug("\t - PSK authentication. Connected as '%s'\n",
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1070 gnutls_psk_server_get_username (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1071 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1072
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1073 case GNUTLS_CRD_ANON: /* anonymous authentication */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1074 fd_log_debug("\t - Anonymous DH using prime of %d bits\n",
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1075 gnutls_dh_get_prime_bits (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1076 break;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1077
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1078 case GNUTLS_CRD_CERTIFICATE: /* certificate authentication */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1079 /* 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	1080 if (kx == GNUTLS_KX_DHE_RSA \|\| kx == GNUTLS_KX_DHE_DSS) {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1081 fd_log_debug("\t - Ephemeral DH using prime of %d bits\n",
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1082 gnutls_dh_get_prime_bits (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1083 }
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1084 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	1085 #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	1086 case GNUTLS_CRD_SRP:
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1087 fd_log_debug("\t - SRP session with username %s\n",
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1088 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	1089 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	1090 #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	1091
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1092 default:
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1093 fd_log_debug("\t - Different type of credentials for the session (%d).\n", cred);
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1094 break;
26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1095
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1096 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1097
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1098 /* 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	1099 tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1100 fd_log_debug("\t - Protocol: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1101
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1102 /* 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	1103 tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1104 fd_log_debug("\t - Certificate Type: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1105
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1106 /* print the compression algorithm (if any) */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1107 tmp = gnutls_compression_get_name (gnutls_compression_get (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1108 fd_log_debug("\t - Compression: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1109
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1110 /* 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	1111 tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1112 fd_log_debug("\t - Cipher: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1113
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1114 /* Print the MAC algorithms name. ie SHA1 */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1115 tmp = gnutls_mac_get_name (gnutls_mac_get (session));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1116 fd_log_debug("\t - MAC: %s\n", tmp);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1117 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1118
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1119 /* 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	1120 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	1121 if (gtret) {
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1122 if (TRACE_BOOL(INFO)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1123 fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1124 if (gtret & GNUTLS_CERT_INVALID)
251 52c1547dab42 Call gnutls_bye on closing connection Sebastien Decugis <sdecugis@nict.go.jp> parents: 250 diff changeset	1125 fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1126 if (gtret & GNUTLS_CERT_REVOKED)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1127 fd_log_debug(" - The certificate has been revoked.\n");
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1128 if (gtret & GNUTLS_CERT_SIGNER_NOT_FOUND)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1129 fd_log_debug(" - The certificate hasn't got a known issuer.\n");
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1130 if (gtret & GNUTLS_CERT_SIGNER_NOT_CA)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1131 fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
403 26aafbbc1640 Cleanup all compilation warnings in base code for 32 bit arch Sebastien Decugis <sdecugis@nict.go.jp> parents: 402 diff changeset	1132 if (gtret & GNUTLS_CERT_INSECURE_ALGORITHM)
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1133 fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1134 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1135 return EINVAL;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1136 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1137
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1138 /* Code from http://www.gnu.org/software/gnutls/manual/gnutls.html#Verifying-peer_0027s-certificate */
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1139 if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509)
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1140 return EINVAL;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1141
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1142 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	1143 if (cert_list == NULL)
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1144 return EINVAL;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1145
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1146 now = time(NULL);
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1147
59 067ab3fc6093 Cleanups in debug messages Sebastien Decugis <sdecugis@nict.go.jp> parents: 57 diff changeset	1148 if (verbose && TRACE_BOOL(FULL)) {
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1149 char serial[40];
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1150 char dn[128];
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1151 size_t size;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1152 unsigned int algo, bits;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1153 time_t expiration_time, activation_time;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1154
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1155 fd_log_debug("TLS Certificate information for connection '%s' (%d certs provided):\n", conn->cc_id, cert_list_size);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1156 for (i = 0; i < cert_list_size; i++)
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1157 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1158
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1159 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	1160 CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1161
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1162 fd_log_debug(" Certificate %d info:\n", i);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1163
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1164 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	1165 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	1166
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1167 fd_log_debug("\t - Certificate is valid since: %s", ctime (&activation_time));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1168 fd_log_debug("\t - Certificate expires: %s", ctime (&expiration_time));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1169
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1170 /* Print the serial number of the certificate. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1171 size = sizeof (serial);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1172 gnutls_x509_crt_get_serial (cert, serial, &size);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1173
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1174 fd_log_debug("\t - Certificate serial number: ");
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1175 {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1176 int j;
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1177 for (j = 0; j < size; j++) {
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1178 fd_log_debug("%02.2hhx", serial[j]);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1179 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1180 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1181 fd_log_debug("\n");
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1182
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1183 /* 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	1184 GNUTLS_TRACE( algo = gnutls_x509_crt_get_pk_algorithm (cert, &bits) );
57 54a55133044f Fix newline Sebastien Decugis <sdecugis@nict.go.jp> parents: 54 diff changeset	1185 fd_log_debug("\t - Certificate public key: %s\n",
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1186 gnutls_pk_algorithm_get_name (algo));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1187
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1188 /* Print the version of the X.509 certificate. */
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1189 fd_log_debug("\t - Certificate version: #%d\n",
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1190 gnutls_x509_crt_get_version (cert));
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1191
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1192 size = sizeof (dn);
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1193 GNUTLS_TRACE( gnutls_x509_crt_get_dn (cert, dn, &size) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1194 fd_log_debug("\t - DN: %s\n", dn);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1195
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1196 size = sizeof (dn);
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1197 GNUTLS_TRACE( gnutls_x509_crt_get_issuer_dn (cert, dn, &size) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1198 fd_log_debug("\t - Issuer's DN: %s\n", dn);
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1199
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1200 GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
53 cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1201 }
cd5620362909 Add debug information for TLS Sebastien Decugis <sdecugis@nict.go.jp> parents: 43 diff changeset	1202 }
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1203
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1204 /* 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	1205 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	1206 {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1207 time_t deadline;
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1208
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1209 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	1210 CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1211
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1212 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	1213 if ((deadline != (time_t)-1) && (deadline < now)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1214 if (TRACE_BOOL(INFO)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1215 fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1216 fd_log_debug(" - The certificate %d in the chain is expired\n", i);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1217 }
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	1218 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1219 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1220
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1221 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	1222 if ((deadline != (time_t)-1) && (deadline > now)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1223 if (TRACE_BOOL(INFO)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1224 fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1225 fd_log_debug(" - The certificate %d in the chain is not yet activated\n", i);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1226 }
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	1227 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1228 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1229
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1230 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	1231 if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1232 if (TRACE_BOOL(INFO)) {
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1233 fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1234 fd_log_debug(" - The certificate hostname does not match '%s'\n", conn->cc_tls_para.cn);
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1235 }
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	1236 ret = EINVAL;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1237 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1238 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1239
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1240 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	1241 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1242
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	1243 return ret;
31 26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1244 }
26685c67d387 Completed the test and fixed a couple issues Sebastien Decugis <sdecugis@nict.go.jp> parents: 30 diff changeset	1245
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1246 /* TLS handshake a connection; no need to have called start_clear before. Reception is active if handhsake is successful */
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1247 int fd_cnx_handshake(struct cnxctx * conn, int mode, char * priority, void * alt_creds)
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1248 {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1249 TRACE_ENTRY( "%p %d %p %p", conn, mode, priority, alt_creds);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1250 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	1251
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1252 /* Save the mode */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1253 conn->cc_tls_para.mode = mode;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1254
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1255 /* 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	1256 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1257
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1258 /* 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	1259 conn->cc_loop = 1;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1260
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1261 /* Prepare the master session credentials and priority */
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1262 CHECK_FCT( fd_tls_prepare(&conn->cc_tls_para.session, mode, priority, alt_creds) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1263
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1264 /* Special case: multi-stream TLS is not natively managed in GNU TLS, we use a wrapper library */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1265 if (conn->cc_sctp_para.pairs > 1) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1266 #ifdef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1267 ASSERT(0);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1268 CHECK_FCT( ENOTSUP );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1269 #else /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1270 /* Initialize the wrapper, start the demux thread */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1271 CHECK_FCT( fd_sctps_init(conn) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1272 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1273 } else {
194 d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	1274 /* 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	1275 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	1276
d1af490d6e85 Change in sockets options to avoid waiting forever on closing connections Sebastien Decugis <sdecugis@nict.go.jp> parents: 188 diff changeset	1277 /* Set the push and pull callbacks */
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1278 GNUTLS_TRACE( gnutls_transport_set_pull_function(conn->cc_tls_para.session, (void *)fd_cnx_s_recv) );
5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1279 GNUTLS_TRACE( gnutls_transport_set_push_function(conn->cc_tls_para.session, (void *)fd_cnx_s_send) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1280 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1281
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1282 /* 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	1283 fd_cnx_addstate(conn, CC_STATUS_TLS);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1284
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1285 /* Handshake master session */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1286 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1287 int ret;
542 0b6cee362f5d Enforce validation of local certificate upon daemon start. Sebastien Decugis <sdecugis@nict.go.jp> parents: 455 diff changeset	1288
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	1289 /* When gnutls 2.10.1 is around, we should use gnutls_certificate_set_verify_function and fd_tls_verify_credentials, so that handshake fails directly. */
542 0b6cee362f5d Enforce validation of local certificate upon daemon start. Sebastien Decugis <sdecugis@nict.go.jp> parents: 455 diff changeset	1290
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1291 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	1292 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1293 if (TRACE_BOOL(INFO)) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1294 fd_log_debug("TLS Handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1295 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1296 fd_cnx_markerror(conn);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1297 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1298 } );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1299
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1300 /* Now verify the remote credentials are valid -- only simple tests here */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1301 CHECK_FCT_DO( fd_tls_verify_credentials(conn->cc_tls_para.session, conn, 1),
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1302 {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1303 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	1304 fd_cnx_markerror(conn);
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1305 return EINVAL;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1306 });
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1307 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1308
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1309 /* Multi-stream TLS: handshake other streams as well */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1310 if (conn->cc_sctp_para.pairs > 1) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1311 #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	1312 /* Start reading the messages from the master session. That way, if the remote peer closed, we are not stuck inside handshake */
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	1313 CHECK_FCT(fd_sctps_startthreads(conn, 0));
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	1314
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1315 /* Resume all additional sessions from the master one. */
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1316 CHECK_FCT(fd_sctps_handshake_others(conn, priority, alt_creds));
5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1317
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1318 /* Start decrypting the messages from all threads and queuing them in target queue */
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	1319 CHECK_FCT(fd_sctps_startthreads(conn, 1));
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1320 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1321 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1322 /* Start decrypting the data */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1323 CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_tls_single, conn ) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1324 }
29 5ba91682f0bc Added a test for cnxctx (tbc) and fixed some bugs Sebastien Decugis <sdecugis@nict.go.jp> parents: 27 diff changeset	1325
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1326 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1327 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1328
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1329 /* Retrieve TLS credentials of the remote peer, after handshake */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1330 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	1331 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1332 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	1333 CHECK_PARAMS( conn && fd_cnx_teststate(conn, CC_STATUS_TLS) && cert_list && cert_list_size );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1334
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1335 /* This function only works for X.509 certificates. */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1336 CHECK_PARAMS( gnutls_certificate_type_get (conn->cc_tls_para.session) == GNUTLS_CRT_X509 );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1337
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1338 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	1339 if (*cert_list == NULL) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1340 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	1341 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1342 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1343
54 889c55527a1d Fixed additional newline character Sebastien Decugis <sdecugis@nict.go.jp> parents: 53 diff changeset	1344 TRACE_DEBUG( FULL, "Saved certificate chain (%d certificates) in peer structure.", *cert_list_size);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1345
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1346 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1347 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1348
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1349 /* 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	1350 /* 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	1351 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	1352 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1353 int ev;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1354 size_t ev_sz;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1355 void * ev_data;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1356
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1357 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	1358 CHECK_PARAMS(conn && (conn->cc_socket > 0) && buf && len);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1359 CHECK_PARAMS(conn->cc_rcvthr != (pthread_t)NULL);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1360 CHECK_PARAMS(conn->cc_alt == NULL);
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1361
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1362 /* Now, pull the first event */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1363 get_next:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1364 if (timeout) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1365 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	1366 } else {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1367 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	1368 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1369
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1370 switch (ev) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1371 case FDEVP_CNX_MSG_RECV:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1372 /* We got one */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1373 *len = ev_sz;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1374 *buf = ev_data;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1375 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1376
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1377 case FDEVP_PSM_TIMEOUT:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1378 TRACE_DEBUG(FULL, "Timeout event received");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1379 return ETIMEDOUT;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1380
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1381 case FDEVP_CNX_EP_CHANGE:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1382 /* We ignore this event */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1383 goto get_next;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1384
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1385 case FDEVP_CNX_ERROR:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1386 TRACE_DEBUG(FULL, "Received ERROR event on the connection");
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1387 return ENOTCONN;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1388 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1389
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1390 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	1391 return EINVAL;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1392 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1393
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1394 /* Where the events are sent */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1395 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	1396 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1397 struct fifo *q;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1398 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	1399 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	1400 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	1401 return q;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1402 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1403
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1404 /* 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	1405 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	1406 {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1407 int ret;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1408 TRACE_ENTRY( "%p %p", conn, alt_fifo );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1409 CHECK_PARAMS( conn && alt_fifo && conn->cc_incoming );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1410
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1411 /* 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	1412 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	1413 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	1414 CHECK_POSIX_DO( pthread_mutex_unlock(&state_lock), { ASSERT(0); } );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1415
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1416 return ret;
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1417 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1418
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1419 /* 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	1420 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	1421 {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1422 ssize_t ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1423 size_t sent = 0;
27 b3a1773e9f46 again, correct was actually %zd Sebastien Decugis <sdecugis@nict.go.jp> parents: 26 diff changeset	1424 TRACE_ENTRY("%p %p %zd", conn, buf, len);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1425 do {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1426 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	1427 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	1428 } else {
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1429 /* Maybe better to replace this call with sendmsg for atomic sending? */
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1430 CHECK_SYS_DO( ret = fd_cnx_s_send(conn, buf + sent, len - sent), );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1431 }
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1432 if (ret <= 0)
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1433 return ENOTCONN;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1434
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1435 sent += ret;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1436 } while ( sent < len );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1437 return 0;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1438 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1439
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1440 /* 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. */
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1441 int fd_cnx_send(struct cnxctx * conn, unsigned char * buf, size_t len, uint32_t flags)
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1442 {
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1443 TRACE_ENTRY("%p %p %zd %x", conn, buf, len, flags);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1444
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1445 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	1446
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1447 TRACE_DEBUG(FULL, "Sending %zdb %sdata on connection %s", len, fd_cnx_teststate(conn, CC_STATUS_TLS) ? "TLS-protected ":"", conn->cc_id);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1448
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1449 switch (conn->cc_proto) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1450 case IPPROTO_TCP:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1451 CHECK_FCT( send_simple(conn, buf, len) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1452 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1453
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1454 #ifndef DISABLE_SCTP
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1455 case IPPROTO_SCTP: {
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1456 if (flags & FD_CNX_ORDERED) {
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1457 /* We send over stream #0 */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1458 CHECK_FCT( send_simple(conn, buf, len) );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1459 } else {
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1460 /* Default case : no flag specified */
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1461
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1462 int another_str = 0; /* do we send over stream #0 ? */
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1463
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1464 if ((conn->cc_sctp_para.str_out > 1) && ((!fd_cnx_teststate(conn, CC_STATUS_TLS)) \|\| (conn->cc_sctp_para.pairs > 1))) {
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1465 /* Update the id of the stream we will send this message over */
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1466 conn->cc_sctp_para.next += 1;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1467 conn->cc_sctp_para.next %= (fd_cnx_teststate(conn, CC_STATUS_TLS) ? conn->cc_sctp_para.pairs : conn->cc_sctp_para.str_out);
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1468 another_str = (conn->cc_sctp_para.next ? 1 : 0);
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1469 }
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1470
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1471 if ( ! another_str ) {
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1472 CHECK_FCT( send_simple(conn, buf, len) );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1473 } else {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1474 if (!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	1475 CHECK_FCT_DO( fd_sctp_sendstr(conn, conn->cc_sctp_para.next, buf, len), { 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	1476 } else {
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1477 /* push the record to the appropriate session */
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1478 ssize_t ret;
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1479 size_t sent = 0;
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1480 ASSERT(conn->cc_sctps_data.array != NULL);
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1481 do {
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1482 CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctps_data.array[conn->cc_sctp_para.next].session, buf + sent, len - sent), );
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1483 if (ret <= 0)
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1484 return ENOTCONN;
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1485
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1486 sent += ret;
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1487 } while ( sent < len );
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 228 diff changeset	1488 }
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1489 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1490 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1491 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1492 break;
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1493 #endif /* DISABLE_SCTP */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1494
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1495 default:
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1496 TRACE_DEBUG(INFO, "Unknwon protocol: %d", conn->cc_proto);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1497 ASSERT(0);
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1498 return ENOTSUP; /* or EINVAL... */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1499 }
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1500
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1501 return 0;
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1502 }
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1503
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1504
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1505 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1506 /* Destruction of connection */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1507 /**************************************/
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1508
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1509 /* 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	1510 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	1511 {
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1512 TRACE_ENTRY("%p", conn);
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1513
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1514 CHECK_PARAMS_DO(conn, return);
43 2db15632a63d Added a large part of connection establishment logic, to test Sebastien Decugis <sdecugis@nict.go.jp> parents: 38 diff changeset	1515
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1516 fd_cnx_addstate(conn, CC_STATUS_CLOSING);
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1517
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1518 /* 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	1519 if (fd_cnx_teststate(conn, CC_STATUS_TLS)) {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1520 #ifndef DISABLE_SCTP
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1521 if (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	1522 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	1523 /* Bye on master session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1524 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	1525 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1526
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1527 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	1528 /* and other stream pairs */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1529 fd_sctps_bye(conn);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1530 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1531
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1532 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	1533 /* Now wait for all decipher threads to terminate */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1534 fd_sctps_waitthreadsterm(conn);
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1535 } else {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1536 /* Abord the threads, the connection is dead already */
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1537 fd_sctps_stopthreads(conn);
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1538 }
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1539
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1540 /* Deinit gnutls resources */
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1541 fd_sctps_gnutls_deinit_others(conn);
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1542 if (conn->cc_tls_para.session) {
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1543 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	1544 conn->cc_tls_para.session = NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1545 }
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1546
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1547 /* Destroy the wrapper (also stops the demux thread) */
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1548 fd_sctps_destroy(conn);
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1549
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1550 } else {
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1551 #endif /* DISABLE_SCTP */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1552 /* We are TLS, but not using the sctps wrapper layer */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1553 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	1554 /* Master session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1555 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	1556 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1557
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	1558 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	1559 /* 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	1560 if (conn->cc_rcvthr != (pthread_t)NULL) {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1561 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	1562 conn->cc_rcvthr = (pthread_t)NULL;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1563 }
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1564 } else {
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1565 /* 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	1566 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	1567 }
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1568
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1569 /* Free the resources of the TLS session */
209 b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1570 if (conn->cc_tls_para.session) {
214 5a1b93f59f8f Added trace facility for GNUTLS calls Sebastien Decugis <sdecugis@nict.go.jp> parents: 211 diff changeset	1571 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	1572 conn->cc_tls_para.session = NULL;
b9f48f2f2a22 Some cleanups in the code Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	1573 }
155 30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1574 #ifndef DISABLE_SCTP
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1575 }
30a7252cbb55 Cleanup connection cleanup sequence Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	1576 #endif /* DISABLE_SCTP */
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1577 }
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1578
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 201 diff changeset	1579 /* 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	1580 CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */ );
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1581
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1582 /* Shut the connection down */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1583 if (conn->cc_socket > 0) {
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1584 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	1585 close(conn->cc_socket);
68c1890f7049 Fixed a small bug in SCTP close Sebastien Decugis <sdecugis@nict.go.jp> parents: 31 diff changeset	1586 conn->cc_socket = -1;
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1587 }
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1588
25 67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1589 /* Empty and destroy FIFO list */
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1590 if (conn->cc_incoming) {
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1591 fd_event_destroy( &conn->cc_incoming, free );
67ca08d5bc48 Completed connection context files Sebastien Decugis <sdecugis@nict.go.jp> parents: 24 diff changeset	1592 }
22 0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1593
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1594 /* Free the object */
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1595 free(conn);
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1596
0b3b46da2c12 Progress on server code Sebastien Decugis <sdecugis@nict.go.jp> parents: 21 diff changeset	1597 /* Done! */
21 bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1598 return;
bef197f6826f Backup before week-end, cnxctx and server in progress Sebastien Decugis <sdecugis@nict.go.jp> parents: 20 diff changeset	1599 }

Mercurial > hg > freeDiameter

annotate libfdcore/cnxctx.c @ 711:f7c665948e0c