Mercurial > hg > freeDiameter

annotate libfdcore/p_cnx.c @ 931:155d45d06530 1.1.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated copyright information
author Sebastien Decugis <sdecugis@freediameter.net>
date Sun, 03 Mar 2013 09:15:36 +0100
parents 5053f1abcf5d
children 2091bf698fb1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
1 /*********************************************************************************************************
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
2 * Software License Agreement (BSD License) *
740
4a9f08d6b6ba Updated my mail address
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 706
diff changeset
3 * Author: Sebastien Decugis <sdecugis@freediameter.net> *
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
4 * *
931
155d45d06530 Updated copyright information
Sebastien Decugis <sdecugis@freediameter.net>
parents: 928
diff changeset
5 * Copyright (c) 2013, WIDE Project and NICT *
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
6 * All rights reserved. *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
7 * *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
9 * permitted provided that the following conditions are met: *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
10 * *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
11 * * Redistributions of source code must retain the above *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
12 * copyright notice, this list of conditions and the *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
13 * following disclaimer. *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
14 * *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
15 * * Redistributions in binary form must reproduce the above *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
16 * copyright notice, this list of conditions and the *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
17 * following disclaimer in the documentation and/or other *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
18 * materials provided with the distribution. *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
19 * *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
20 * * Neither the name of the WIDE Project or NICT nor the *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
21 * names of its contributors may be used to endorse or *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
22 * promote products derived from this software without *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
23 * specific prior written permission of WIDE Project and *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
24 * NICT. *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
25 * *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
29 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
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 *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
34 *********************************************************************************************************/
cc3c59fe98fe Lot of cleanups in peer structure management
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: 379
diff changeset
36 #include "fdcore-internal.h"
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
37
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
38
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
39 /* TODO: change the behavior to handle properly forced ordering at beginning & end of OPEN state */
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
40
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
41 /* This file contains code used by a peer state machine to initiate a connection to remote peer */
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
42
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
43 struct next_conn {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
44 struct fd_list chain;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
45 int proto; /* Protocol of the next attempt */
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
46 union {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
47 sSS ss; /* The address, only for TCP */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
48 sSA4 sin;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
49 sSA6 sin6;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
50 };
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
51 uint16_t port; /* The port, for SCTP (included in ss for TCP) */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
52 int dotls; /* Handshake TLS after connection ? */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
53 };
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
54
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
55 static __inline__ void failed_connection_attempt(struct fd_peer * peer)
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
56 {
50
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
57 /* Simply remove the first item in the list if not empty */
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
58 if (! FD_IS_LIST_EMPTY(&peer->p_connparams) ) {
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
59 struct fd_list * li = peer->p_connparams.next;
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
60 fd_list_unlink(li);
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
61 free(li);
dbba83bafd66 Fix small bug
thedoc@morbier.koganei.wide.ad.jp
parents: 49
diff changeset
62 }
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
63 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
64
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
65 static void empty_connection_list(struct fd_peer * peer)
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
66 {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
67 /* Remove all items */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
68 while (!FD_IS_LIST_EMPTY(&peer->p_connparams)) {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
69 failed_connection_attempt(peer);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
70 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
71 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
72
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
73 static int prepare_connection_list(struct fd_peer * peer)
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
74 {
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
75 struct fd_list * li, *last_prio;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
76 struct next_conn * new;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
77
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
78 uint16_t port_no; /* network order */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
79 int dotls_immediate;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
80
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
81 TRACE_ENTRY("%p", peer);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
82
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
83 /* Resolve peer address(es) if needed */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
84 if (FD_IS_LIST_EMPTY(&peer->p_hdr.info.pi_endpoints)) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
85 struct addrinfo hints, *ai, *aip;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
86 int ret;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
87
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
88 memset(&hints, 0, sizeof(hints));
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
89 hints.ai_flags = AI_ADDRCONFIG;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
90 ret = getaddrinfo(peer->p_hdr.info.pi_diamid, NULL, &hints, &ai);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
91 if (ret) {
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
92 TRACE_DEBUG(INFO, "Unable to resolve address for peer '%s' (%s), aborting\n", peer->p_hdr.info.pi_diamid, gai_strerror(ret));
370
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
93 if (ret != EAI_AGAIN)
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
94 fd_psm_terminate( peer, NULL );
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
95 return 0;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
96 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
97
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
98 for (aip = ai; aip != NULL; aip = aip->ai_next) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
99 CHECK_FCT( fd_ep_add_merge( &peer->p_hdr.info.pi_endpoints, aip->ai_addr, aip->ai_addrlen, EP_FL_DISC ) );
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
100 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
101 freeaddrinfo(ai);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
102 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
103
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
104 /* Remove addresses from unwanted family */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
105 if (peer->p_hdr.info.config.pic_flags.pro3) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
106 CHECK_FCT( fd_ep_filter_family(
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
107 &peer->p_hdr.info.pi_endpoints,
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
108 (peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP) ?
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
109 AF_INET
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
110 : AF_INET6));
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
111 }
370
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
112 if (fd_g_config->cnf_flags.no_ip4) {
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
113 CHECK_FCT( fd_ep_filter_family(
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
114 &peer->p_hdr.info.pi_endpoints,
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
115 AF_INET6));
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
116 }
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
117 if (fd_g_config->cnf_flags.no_ip6) {
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
118 CHECK_FCT( fd_ep_filter_family(
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
119 &peer->p_hdr.info.pi_endpoints,
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
120 AF_INET));
06692259d788 Enforce address family from config when connecting to a peer
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 258
diff changeset
121 }
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
122
379
7337305ee51e Workaround to prevent peer connecting to itself (ipv6 local addresses)
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 375
diff changeset
123 /* Remove any local address that would be here, it should not happen but it does sometimes... */
7337305ee51e Workaround to prevent peer connecting to itself (ipv6 local addresses)
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 375
diff changeset
124 CHECK_FCT( fd_ep_filter_list(&peer->p_hdr.info.pi_endpoints, &fd_g_config->cnf_endpoints) );
7337305ee51e Workaround to prevent peer connecting to itself (ipv6 local addresses)
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 375
diff changeset
125
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
126 /* Now check we have at least one address to attempt */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
127 if (FD_IS_LIST_EMPTY(&peer->p_hdr.info.pi_endpoints)) {
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
128 TRACE_DEBUG(INFO, "No address %savailable to connect to peer '%s', aborting\n",
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
129 peer->p_hdr.info.config.pic_flags.pro3 ? "in the configured family " : "", peer->p_hdr.info.pi_diamid);
78
a58f0757c06a Added code for DPR/DPA
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 70
diff changeset
130 fd_psm_terminate( peer, NULL );
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
131 return 0;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
132 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
133
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
134 /* Cleanup any previous list */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
135 empty_connection_list(peer);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
136
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
137 /* Prepare the parameters */
372
2687aa506ef6 Enforce TLS_OLD mechanism from configuration
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 370
diff changeset
138 if ((peer->p_hdr.info.config.pic_flags.sec != PI_SEC_DEFAULT) || (fd_g_config->cnf_flags.tls_alg)) {
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
139 dotls_immediate = 0;
897
d8d0772586ad Use correct default port for outgoing connections even when local port is not the default one
Sebastien Decugis <sdecugis@freediameter.net>
parents: 765
diff changeset
140 port_no = htons(peer->p_hdr.info.config.pic_port ?: DIAMETER_PORT);
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
141 } else {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
142 dotls_immediate = 1;
897
d8d0772586ad Use correct default port for outgoing connections even when local port is not the default one
Sebastien Decugis <sdecugis@freediameter.net>
parents: 765
diff changeset
143 port_no = htons(peer->p_hdr.info.config.pic_port ?: DIAMETER_SECURE_PORT);
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
144 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
145
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
146 last_prio = &peer->p_connparams;
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
147
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
148 /* Create TCP parameters unless specified otherwise */
64
bb45a8ffec77 Enforce configuration flags for new outgoing connections
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 50
diff changeset
149 if ((!fd_g_config->cnf_flags.no_tcp) && (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_SCTP)) {
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
150 for (li = peer->p_hdr.info.pi_endpoints.next; li != &peer->p_hdr.info.pi_endpoints; li = li->next) {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
151 struct fd_endpoint * ep = (struct fd_endpoint *)li;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
152
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
153 CHECK_MALLOC( new = malloc(sizeof(struct next_conn)) );
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
154 memset(new, 0, sizeof(struct next_conn));
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
155 fd_list_init(&new->chain, new);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
156
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
157 new->proto = IPPROTO_TCP;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
158
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
159 memcpy( &new->ss, &ep->ss, sizeof(sSS) );
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
160 switch (new->ss.ss_family) {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
161 case AF_INET:
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
162 new->sin.sin_port = port_no;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
163 break;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
164 case AF_INET6:
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
165 new->sin6.sin6_port = port_no;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
166 break;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
167 default:
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
168 free(new);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
169 continue; /* Move to the next endpoint */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
170 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
171
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
172 new->dotls = dotls_immediate;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
173
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
174 /* Add the new entry to the appropriate position (conf and disc go first) */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
175 if (ep->flags & (EP_FL_CONF | EP_FL_DISC)) {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
176 fd_list_insert_after(last_prio, &new->chain);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
177 last_prio = &new->chain;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
178 } else {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
179 fd_list_insert_before(&peer->p_connparams, &new->chain);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
180 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
181 }
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
182 }
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
183
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
184 /* Now, add the SCTP entry, if not disabled */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
185 #ifndef DISABLE_SCTP
64
bb45a8ffec77 Enforce configuration flags for new outgoing connections
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 50
diff changeset
186 if ((!fd_g_config->cnf_flags.no_sctp) && (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_TCP)) {
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
187 struct next_conn * new;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
188
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
189 CHECK_MALLOC( new = malloc(sizeof(struct next_conn)) );
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
190 memset(new, 0, sizeof(struct next_conn));
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
191 fd_list_init(&new->chain, new);
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
192
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
193 new->proto = IPPROTO_SCTP;
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
194 new->port = ntohs(port_no); /* back to host byte order... */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
195 new->dotls = dotls_immediate;
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
196
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
197 /* Add the new entry to the appropriate position (depending on preferences) */
374
8f4ae09bc7c3 Enforce the TCP preference from config also
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 372
diff changeset
198 if ((fd_g_config->cnf_flags.pr_tcp) || (peer->p_hdr.info.config.pic_flags.alg == PI_ALGPREF_TCP)) {
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
199 fd_list_insert_after(last_prio, &new->chain);
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
200 } else {
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
201 fd_list_insert_after(&peer->p_connparams, &new->chain); /* very first position */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
202 }
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
203 }
39
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
204 #endif /* DISABLE_SCTP */
d7535cf7bab5 Added initiator connection logic
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 38
diff changeset
205
375
40507b3750da No need to return an error there
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 374
diff changeset
206 return 0;
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
207 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
208
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
209
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
210 /* The thread that attempts the connection */
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
211 static void * connect_thr(void * arg)
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
212 {
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
213 struct fd_peer * peer = arg;
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
214 struct cnxctx * cnx = NULL;
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
215 struct next_conn * nc = NULL;
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
216 int rebuilt = 0;
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
217 int fatal_error=0;
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
218
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
219 TRACE_ENTRY("%p", arg);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
220 CHECK_PARAMS_DO( CHECK_PEER(peer), return NULL );
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
221
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
222 /* Set the thread name */
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
223 {
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
224 char buf[48];
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
225 snprintf(buf, sizeof(buf), "ConnTo:%s", peer->p_hdr.info.pi_diamid);
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
226 fd_log_threadname ( buf );
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
227 }
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
228
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
229 do {
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
230 /* Rebuild the list if needed, if it is empty -- but at most once */
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
231 if (FD_IS_LIST_EMPTY(&peer->p_connparams)) {
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
232 if (! rebuilt) {
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
233 CHECK_FCT_DO( fatal_error = prepare_connection_list(peer), goto out );
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
234 rebuilt ++;
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
235 }
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
236 if (FD_IS_LIST_EMPTY(&peer->p_connparams)) {
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
237 /* We encountered an error or we have looped over all the addresses of the peer. */
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
238 TRACE_DEBUG(INFO, "Unable to connect to the peer %s, aborting attempts for now.", peer->p_hdr.info.pi_diamid);
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
239 CHECK_FCT_DO( fatal_error = fd_event_send(peer->p_events, FDEVP_CNX_FAILED, 0, NULL), goto out );
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
240 return NULL;
49
204718b0fa54 Couple of fixes
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 43
diff changeset
241 }
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
242 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
243
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
244 /* Attempt connection to the first entry */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
245 nc = (struct next_conn *)(peer->p_connparams.next);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
246
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
247 switch (nc->proto) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
248 case IPPROTO_TCP:
246
6418a188c1b5 getnameinfo is also more sensitive on freeBSD
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 219
diff changeset
249 cnx = fd_cnx_cli_connect_tcp((sSA *)&nc->ss, sSAlen(&nc->ss));
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
250 break;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
251 #ifndef DISABLE_SCTP
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
252 case IPPROTO_SCTP:
765
edbdb35a603f Fix a few compilation warning, some are still remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 740
diff changeset
253 cnx = fd_cnx_cli_connect_sctp((peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP) ? 1 : fd_g_config->cnf_flags.no_ip6,
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
254 nc->port, &peer->p_hdr.info.pi_endpoints);
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
255 break;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
256 #endif /* DISABLE_SCTP */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
257 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
258
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
259 if (cnx)
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
260 break;
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
261
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
262 /* Pop these parameters and continue */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
263 failed_connection_attempt(peer);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
264
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
265 pthread_testcancel();
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
266
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
267 } while (!cnx); /* and until cancellation or all addresses attempted without success */
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
268
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
269 /* Now, we have an established connection in cnx */
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
270
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
271 pthread_cleanup_push((void *)fd_cnx_destroy, cnx);
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
272
219
e5bcc8c9322e Add hostname verification
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 136
diff changeset
273 /* Set the hostname in the connection, so that handshake verifies the remote identity */
e5bcc8c9322e Add hostname verification
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 136
diff changeset
274 fd_cnx_sethostname(cnx,peer->p_hdr.info.pi_diamid);
e5bcc8c9322e Add hostname verification
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 136
diff changeset
275
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
276 /* Handshake if needed (secure port) */
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
277 if (nc->dotls) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
278 CHECK_FCT_DO( fd_cnx_handshake(cnx, GNUTLS_CLIENT, peer->p_hdr.info.config.pic_priority, NULL),
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
279 {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
280 /* Handshake failed ... */
706
4ffbc9f1e922 Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 691
diff changeset
281 TRACE_DEBUG(INFO, "TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
282 fd_cnx_destroy(cnx);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
283 empty_connection_list(peer);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
284 fd_ep_filter(&peer->p_hdr.info.pi_endpoints, EP_FL_CONF);
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
285 goto out_pop;
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
286 } );
43
2db15632a63d Added a large part of connection establishment logic, to test
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 39
diff changeset
287 } else {
2db15632a63d Added a large part of connection establishment logic, to test
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 39
diff changeset
288 /* Prepare to receive the next message */
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
289 CHECK_FCT_DO( fatal_error = fd_cnx_start_clear(cnx, 0), goto out_pop );
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
290 }
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
291
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
292 /* Upon success, generate FDEVP_CNX_ESTABLISHED */
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
293 CHECK_FCT_DO( fatal_error = fd_event_send(peer->p_events, FDEVP_CNX_ESTABLISHED, 0, cnx), );
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
294 out_pop:
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
295 ;
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
296 pthread_cleanup_pop(0);
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
297
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
298 out:
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
299
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
300 if (fatal_error) {
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
301
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
302 /* Cleanup the connection */
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
303 if (cnx)
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
304 fd_cnx_destroy(cnx);
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
305
691
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
306 /* Generate a termination event */
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
307 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 662
diff changeset
308 }
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
309
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
310 return NULL;
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
311 }
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
312
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
313
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
314 /* Initiate a connection attempt to a remote peer */
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
315 int fd_p_cnx_init(struct fd_peer * peer)
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
316 {
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
317 TRACE_ENTRY("%p", peer);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
318
37
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
319 /* Start the connect thread */
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
320 CHECK_FCT( pthread_create(&peer->p_ini_thr, NULL, connect_thr, peer) );
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
321 return 0;
cc3c59fe98fe Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
diff changeset
322 }
38
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
323
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
324 /* Cancel a connection attempt */
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
325 void fd_p_cnx_abort(struct fd_peer * peer, int cleanup_all)
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
326 {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
327 TRACE_ENTRY("%p %d", peer, cleanup_all);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
328 CHECK_PARAMS_DO( CHECK_PEER(peer), return );
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
329
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
330 if (peer->p_ini_thr != (pthread_t)NULL) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
331 CHECK_FCT_DO( fd_thr_term(&peer->p_ini_thr), /* continue */);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
332 failed_connection_attempt(peer);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
333 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
334
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
335 if (cleanup_all) {
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
336 empty_connection_list(peer);
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
337 }
68c1890f7049 Fixed a small bug in SCTP close
Sebastien Decugis <sdecugis@nict.go.jp>
parents: 37
diff changeset
338 }
"Welcome to our mercurial repository"