changeset 817:7541554029bf 1.1.4-rc1

Fix SCTP_I_WANT_MAPPED_V4_ADDR behavior when IPv6 is disabled in config; thank you Michael Tuexen for the issue report \& patch.
author Sebastien Decugis <sdecugis@freediameter.net>
date Mon, 27 Aug 2012 13:43:03 +0200
parents af62a5485fa2
children 4ae6da028be7
files libfdcore/sctp.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libfdcore/sctp.c	Mon Aug 27 13:34:21 2012 +0200
+++ b/libfdcore/sctp.c	Mon Aug 27 13:43:03 2012 +0200
@@ -408,7 +408,7 @@
 	
 	/* Set the v4 mapped addresses option */
 	#ifdef SCTP_I_WANT_MAPPED_V4_ADDR
-	{
+	if (!fd_g_config->cnf_flags.no_ip6) {
 		int v4mapped;
 		
 		if (TRACE_BOOL(SCTP_LEVEL)) {
@@ -437,6 +437,8 @@
 			CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, &v4mapped, &sz)  );
 			fd_log_debug( "New SCTP_I_WANT_MAPPED_V4_ADDR value : %s\n", v4mapped ? "true" : "false");
 		}
+	} else {
+		TRACE_DEBUG(SCTP_LEVEL, "Skipping SCTP_I_WANT_MAPPED_V4_ADDR, since IPv6 disabled.");
 	}
 	#else /* SCTP_I_WANT_MAPPED_V4_ADDR */
 	TRACE_DEBUG(SCTP_LEVEL, "Skipping SCTP_I_WANT_MAPPED_V4_ADDR");
"Welcome to our mercurial repository"