witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Fix bad cast of SalAddress into a LinphoneAddress in linphone_proxy_config_get_service_route().

Browse source
This commit is contained in:
Ghislain MARY 2018-08-02 10:53:06 +02:00 • committed by Jehan Monnier
parent 35d613fae9
commit 32b0ff04a8
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/private_structs.h
View file

@ -89,6 +89,7 @@ struct _LinphoneProxyConfig
char *reg_identity;
LinphoneAddress* identity_address;
LinphoneAddress *contact_address;
LinphoneAddress *service_route;
LinphoneAddress *contact_address_without_params;
bctbx_list_t *reg_routes;
char *quality_reporting_collector;

17
coreapi/proxy.c
View file

@ -265,6 +265,7 @@ void _linphone_proxy_config_destroy(LinphoneProxyConfig *cfg){
linphone_error_info_unref(cfg->ei);
}
if (cfg->service_route) linphone_address_unref(cfg->service_route);
if (cfg->contact_address) linphone_address_unref(cfg->contact_address);
if (cfg->contact_address_without_params)
linphone_address_unref(cfg->contact_address_without_params);
@ -1416,8 +1417,22 @@ const LinphoneErrorInfo *linphone_proxy_config_get_error_info(const LinphoneProx
}
const LinphoneAddress* linphone_proxy_config_get_service_route(const LinphoneProxyConfig* cfg) {
return cfg->op?(const LinphoneAddress*) cfg->op->getServiceRoute():NULL;
if (!cfg->op)
return NULL;
const SalAddress *salAddr = cfg->op->getServiceRoute();
if (!salAddr)
return NULL;
if (cfg->service_route)
L_GET_PRIVATE_FROM_C_OBJECT(cfg->service_route)->setInternalAddress(const_cast<SalAddress *>(salAddr));
else {
char *buf = sal_address_as_string(salAddr);
const_cast<LinphoneProxyConfig *>(cfg)->service_route = linphone_address_new(buf);
ms_free(buf);
}
return cfg->service_route;
}
const char* linphone_proxy_config_get_transport(const LinphoneProxyConfig *cfg) {
const char* addr=NULL;
const char* ret="udp"; /*default value*/