From 8da97fe4c14276e21c8223a3ecc53e96e830bd38 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Mar 2017 14:20:39 +0100 Subject: [PATCH 1/3] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index cd3e093c3..237786682 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit cd3e093c3282e99496b0eb5387a545e119e868f3 +Subproject commit 2377866823f41056109519fbc362ddd6fc8214e9 From 310f6504a429607b6603b9b6e92898a1d962f78c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 20 Mar 2017 14:46:58 +0100 Subject: [PATCH 2/3] fix tunnel compilation --- coreapi/linphonecore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 9b208ba8a..ca5fa9d64 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -5481,7 +5481,7 @@ void sip_config_uninit(LinphoneCore *lc) /*now that we are unregisted, there is no more channel using tunnel socket we no longer need the tunnel.*/ #ifdef TUNNEL_ENABLED if (lc->tunnel) { - linphone_tunnel_destroy(lc->tunnel); + linphone_tunnel_ref(lc->tunnel); lc->tunnel=NULL; ms_message("Tunnel destroyed."); } From b54310bc3efab56243d005f35c57b9d98d3a191c Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 20 Mar 2017 14:49:28 +0100 Subject: [PATCH 3/3] Changing inappropriate variable name... --- coreapi/friend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coreapi/friend.c b/coreapi/friend.c index cb5da743d..216ba4c00 100644 --- a/coreapi/friend.c +++ b/coreapi/friend.c @@ -659,23 +659,23 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){ const LinphonePresenceModel * linphone_friend_get_presence_model(const LinphoneFriend *lf) { const LinphonePresenceModel *presence = NULL; - LinphoneFriend* fuckconst = (LinphoneFriend*)lf; - const bctbx_list_t* addrs = linphone_friend_get_addresses(fuckconst); + LinphoneFriend* const_lf = (LinphoneFriend*)lf; + const bctbx_list_t* addrs = linphone_friend_get_addresses(const_lf); bctbx_list_t* phones = NULL; bctbx_list_t *it; for (it = (bctbx_list_t *)addrs; it!= NULL; it = it->next) { LinphoneAddress *addr = (LinphoneAddress*)it->data; char *uri = linphone_address_as_string_uri_only(addr); - presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, uri); + presence = linphone_friend_get_presence_model_for_uri_or_tel(const_lf, uri); ms_free(uri); if (presence) break; } if (presence) return presence; - phones = linphone_friend_get_phone_numbers(fuckconst); + phones = linphone_friend_get_phone_numbers(const_lf); for (it = phones; it!= NULL; it = it->next) { - presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, it->data); + presence = linphone_friend_get_presence_model_for_uri_or_tel(const_lf, it->data); if (presence) break; } bctbx_list_free(phones);