From 79b44345f2acd9190de3d1c36af39641f6d0b9b6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 Nov 2014 16:13:54 +0100 Subject: [PATCH] update linphone submodule and move out use_ipv6 from factory config file --- Resources/linphonerc | 1 + Resources/linphonerc-factory | 1 - Resources/linphonerc-factory~ipad | 3 ++- Resources/linphonerc~ipad | 1 + submodules/linphone | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/linphonerc b/Resources/linphonerc index be46954f2..c8122e63d 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -4,6 +4,7 @@ keepalive_period=30000 default_proxy=0 sip_port=-1 sip_tcp_port=-1 +use_ipv6=0 [rtp] audio_rtp_port=7076 diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index f9e2ab486..1ab74d64c 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -8,7 +8,6 @@ edge_bw=10 guess_hostname=1 inc_timeout=45 use_info=0 -use_ipv6=0 register_only_when_network_is_up=1 auto_net_state_mon=0 keepalive_period=30000 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index b34cdc13d..20371b043 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -8,7 +8,6 @@ edge_bw=10 guess_hostname=1 inc_timeout=45 use_info=0 -use_ipv6=0 register_only_when_network_is_up=1 auto_net_state_mon=0 keepalive_period=30000 @@ -51,3 +50,5 @@ stun=stun.linphone.org [video] display_filter_auto_rotate=0 + + diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 2f010650c..69042e73a 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -4,6 +4,7 @@ keepalive_period=30000 default_proxy=0 sip_port=-1 sip_tcp_port=-1 +use_ipv6=0 [rtp] audio_rtp_port=7076 diff --git a/submodules/linphone b/submodules/linphone index a7bbf819a..b70e389ef 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a7bbf819a7da31a767c74a29ba9f68f9b3345ccb +Subproject commit b70e389ef54ded24f7bf1e955fe5824ca79bee08