mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 10:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone-private

Browse source
This commit is contained in:
Jehan Monnier 2010-06-15 14:00:26 +02:00
commit 6d5eeb0dd7
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/proxy.c
View file

@ -244,7 +244,13 @@ static char *guess_contact_for_register(LinphoneProxyConfig *obj){
contact=linphone_address_new(obj->reg_identity);
linphone_address_set_domain (contact,localip);
linphone_address_set_port_int(contact,linphone_core_get_sip_port(obj->lc));
ret=linphone_address_as_string_uri_only (contact);
linphone_address_set_display_name(contact,NULL);
LCSipTransports tr;
linphone_core_get_sip_transports(obj->lc,&tr);
if (tr.udp_port <= 0 && tr.tcp_port>0) {
sal_address_add_param(contact,"transport","tcp");
}
ret=linphone_address_as_string(contact);
linphone_address_destroy(contact);
}
linphone_address_destroy (proxy);

2
coreapi/sal.h
View file

@ -60,7 +60,7 @@ void sal_address_clean(SalAddress *addr);
char *sal_address_as_string(const SalAddress *u);
char *sal_address_as_string_uri_only(const SalAddress *u);
void sal_address_destroy(SalAddress *u);
void sal_address_add_param(SalAddress *u,const char* name,const char* value);

3
coreapi/sal_eXosip2.c
View file

@ -1749,6 +1749,9 @@ char *sal_address_as_string_uri_only(const SalAddress *u){
osip_free(tmp);
return ret;
}
void sal_address_add_param(SalAddress *u,const char* name,const char* value) {
osip_uri_uparam_add (((osip_from_t*)u)->url,ms_strdup(name),ms_strdup(value));
}
void sal_address_destroy(SalAddress *u){
osip_from_free((osip_from_t*)u);

2
java/common/org/linphone/core/LinphoneCoreFactory.java
View file

@ -61,5 +61,5 @@ abstract public class LinphoneCoreFactory {
*/
abstract public void setDebugMode(boolean enable);
//abstract public void setLogHandler(LinphoneLogHandler handler);
abstract public void setLogHandler(LinphoneLogHandler handler);
}