mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 21:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.savannah.nongnu.org/linphone

Browse source
This commit is contained in:
Jehan Monnier 2010-07-18 18:14:48 +02:00
commit 7b8757169b
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
coreapi/proxy.c
View file

@ -90,22 +90,20 @@ bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj){
* - hostnames : sip:sip.example.net
**/
int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr){
LinphoneAddress *addr;
char *try=NULL;
LinphoneAddress *addr=NULL;
char *modified=NULL;
if (obj->reg_proxy!=NULL) ms_free(obj->reg_proxy);
obj->reg_proxy=NULL;
if (server_addr!=NULL && strlen(server_addr)>0){
addr=linphone_address_new(server_addr);
if (!addr){
/*try to prepend 'sip:' */
if (strstr(server_addr,"sip:")==NULL){
try=ms_strdup_printf("sip:%s",server_addr);
addr=linphone_address_new(try);
ms_free(try);
}
if (strstr(server_addr,"sip:")==NULL){
modified=ms_strdup_printf("sip:%s",server_addr);
addr=linphone_address_new(modified);
ms_free(modified);
}
if (addr==NULL)
addr=linphone_address_new(server_addr);
if (addr){
obj->reg_proxy=linphone_address_as_string_uri_only(addr);
linphone_address_destroy(addr);

2
mediastreamer2

@ -1 +1 @@
Subproject commit 429baf423f2db8673ffa98f7f7d6cbac0c23bde9
Subproject commit df9cac524bbe77240127630fa5d253b19c8fdae7

2
oRTP

@ -1 +1 @@
Subproject commit d4868b64141773b38ba6e8afe3a371fa57525b2b
Subproject commit a8076d9487ee91d89df221256e0d3371e0fa3f50