diff freeDiameter/p_cnx.c @ 64:bb45a8ffec77

Enforce configuration flags for new outgoing connections
author Sebastien Decugis <sdecugis@nict.go.jp>
date Mon, 30 Nov 2009 15:58:20 +0900
parents dbba83bafd66
children 65b32c93f21e
line wrap: on
line diff
--- a/freeDiameter/p_cnx.c	Mon Nov 30 15:50:55 2009 +0900
+++ b/freeDiameter/p_cnx.c	Mon Nov 30 15:58:20 2009 +0900
@@ -128,7 +128,7 @@
 	last_prio = &peer->p_connparams;
 	
 	/* Create TCP parameters unless specified otherwise */
-	if (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_SCTP) {
+	if ((!fd_g_config->cnf_flags.no_tcp) && (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_SCTP)) {
 		for (li = peer->p_hdr.info.pi_endpoints.next; li != &peer->p_hdr.info.pi_endpoints; li = li->next) {
 			struct fd_endpoint * ep = (struct fd_endpoint *)li;
 			
@@ -165,7 +165,7 @@
 	
 	/* Now, add the SCTP entry, if not disabled */
 #ifndef DISABLE_SCTP
-	if (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_TCP) {
+	if ((!fd_g_config->cnf_flags.no_sctp) && (peer->p_hdr.info.config.pic_flags.pro4 != PI_P4_TCP)) {
 		struct next_conn   * new;
 		
 		CHECK_MALLOC( new = malloc(sizeof(struct next_conn)) );
"Welcome to our mercurial repository"