From 36d95999b57bb81b375a9b8261def957a1acab36 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 4 Aug 2016 11:17:01 +0200 Subject: [PATCH] Revert "Enable IPv6 by default on all platforms (it was only enabled on iOS)." This reverts commit ead444f3f0ea864e86a49e79c88e334da91e85f9. --- coreapi/linphonecore.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 33eedc3dd..bea0fff1b 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -953,7 +953,10 @@ static void sip_config_read(LinphoneCore *lc) const char *tmpstr; LCSipTransports tr; int i,tmp; - int ipv6_default = TRUE; + int ipv6_default = FALSE; +#if TARGET_OS_IPHONE + ipv6_default=TRUE; +#endif if (lp_config_get_int(lc->config,"sip","use_session_timers",0)==1){ sal_use_session_timers(lc->sal,200); @@ -962,11 +965,13 @@ static void sip_config_read(LinphoneCore *lc) sal_use_no_initial_route(lc->sal,lp_config_get_int(lc->config,"sip","use_no_initial_route",0)); sal_use_rport(lc->sal,lp_config_get_int(lc->config,"sip","use_rport",1)); +#if TARGET_OS_IPHONE if (!lp_config_get_int(lc->config,"sip","ipv6_migration_done",FALSE) && lp_config_has_entry(lc->config,"sip","use_ipv6")) { lp_config_clean_entry(lc->config,"sip","use_ipv6"); lp_config_set_int(lc->config, "sip", "ipv6_migration_done", TRUE); ms_message("IPV6 settings migration done."); } +#endif lc->sip_conf.ipv6_enabled=lp_config_get_int(lc->config,"sip","use_ipv6",ipv6_default);