From 68eaa3c4f5a1b47a71e054314fd225a010543217 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 15 Apr 2011 22:55:42 +0200 Subject: [PATCH] fix options ping regression, update ms2 --- coreapi/linphonecall.c | 8 ++++---- mediastreamer2 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index eb4f79111..8c480fbb9 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -190,7 +190,7 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *from, LinphoneAddress *to, SalOp *op){ LinphoneCall *call=ms_new0(LinphoneCall,1); - char *to_str; + char *from_str; call->dir=LinphoneCallIncoming; sal_op_set_user_pointer(op,call); @@ -201,11 +201,11 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro /*the following sends an option request back to the caller so that we get a chance to discover our nat'd address before answering.*/ call->ping_op=sal_op_new(lc->sal); - to_str=linphone_address_as_string(to); + from_str=linphone_address_as_string(from); sal_op_set_route(call->ping_op,sal_op_get_network_origin(call->op)); sal_op_set_user_pointer(call->ping_op,call); - sal_ping(call->ping_op,to_str,linphone_core_find_best_identity(lc,from,NULL)); - ms_free(to_str); + sal_ping(call->ping_op,linphone_core_find_best_identity(lc,from,NULL),from_str); + ms_free(from_str); } linphone_address_clean(from); diff --git a/mediastreamer2 b/mediastreamer2 index c0ae6c3f9..c9f3208df 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c0ae6c3f9f78ae9e9e4c7030e7054dc5c0267e2c +Subproject commit c9f3208dfa0657a5d97870b80d1e2e5d9b080acc