add sanity check in linphone_core_remove_proxy_config()

fix compilation without tunnel (stubs are needed and must be declared as extern "c"
This commit is contained in:
Simon Morlat 2012-02-15 21:48:34 +01:00
parent 6305ec6175
commit f1933983b8
3 changed files with 7 additions and 2 deletions

View file

@ -25,8 +25,8 @@
#ifdef TUNNEL_ENABLED
#include "TunnelManager.hh"
#include "linphone_tunnel.h"
#endif
#include "linphone_tunnel.h"
#include "linphonecore.h"
#include "private.h"
#include "lpconfig.h"

View file

@ -538,6 +538,11 @@ int linphone_core_add_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cfg){
* on a deleted list. For that reason, a removed proxy does NOT need to be freed.
**/
void linphone_core_remove_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cfg){
/* check this proxy config is in the list before doing more*/
if (ms_list_find(lc->sip_conf.proxies,cfg)==NULL){
ms_error("linphone_core_remove_proxy_config: LinphoneProxyConfig %p is not known by LinphoneCore (programming error?)",cfg);
return;
}
lc->sip_conf.proxies=ms_list_remove(lc->sip_conf.proxies,(void *)cfg);
/* add to the list of destroyed proxies, so that the possible unREGISTER request can succeed authentication */
lc->sip_conf.deleted_proxies=ms_list_append(lc->sip_conf.deleted_proxies,(void *)cfg);

@ -1 +1 @@
Subproject commit 902cd8d36daef0913ac235b283668e5b3dbda515
Subproject commit 405a3d140e76e28ee5c762321a8dbca133a9fe07