Fix uPnP issues. Correct registration and update with uPnP

[linphone] / coreapi / proxy.c

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 559547727bb348bf365cd60fae4997d946d41895..75930adb14a52b2e5422fefb19975240e3381680 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -1100,10 +1100,11 @@ void linphone_proxy_config_update(LinphoneProxyConfig *cfg){
                switch(linphone_core_get_firewall_policy(lc)) {
                        case LinphonePolicyUseUpnp:
 #ifdef BUILD_UPNP
-                       if(lc->upnp != NULL && !linphone_upnp_context_is_ready_for_register(lc->upnp)) {
+                       if(!lc->sip_conf.register_only_when_upnp_is_ok || 
+                          (lc->upnp != NULL && !linphone_upnp_context_is_ready_for_register(lc->upnp))) {
                                break;
                        }
-#endif         
+#endif //BUILD_UPNP
                        default:
                        if ((!lc->sip_conf.register_only_when_network_is_up || lc->network_reachable)) {
                                linphone_proxy_config_register(cfg);