fix missing handling of paused-by-remote when done twice

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 142a7a564aa6d3dec09796818f5bb73fb5e6240a..d7bc861bafbe047429375c0b65cc5068c2ddf6fb 100644 (file)
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -463,7 +463,7 @@ static void call_updating(SalOp *op){
                case LinphoneCallPausedByRemote:
                        if (sal_media_description_has_dir(rmd,SalStreamSendRecv) || sal_media_description_has_dir(rmd,SalStreamRecvOnly)){
                                call_resumed(lc,call);
-                       }
+                       }else call_paused_by_remote(lc,call);
                break;
                case LinphoneCallStreamsRunning:
                case LinphoneCallConnected:

diff --git a/coreapi/linphone_tunnel.h b/coreapi/linphone_tunnel.h
index 539668904f654c95bfe6ff373ebc255ed582e655..ea49ac8b25a565d6cd078a81ab86ea60e481fc57 100644 (file)
--- a/coreapi/linphone_tunnel.h
+++ b/coreapi/linphone_tunnel.h
@@ -52,7 +52,7 @@ extern "C"
  * Add a tunnel server. At least one should be provided to be able to connect.
  * When several addresses are provided, the tunnel client may try each of them until it gets connected.
  * @param  tunnel object
- * @param ip server ip address
+ * @param host server ip address
  * @param port tunnel server tls port, recommended value is 443
  */
 void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port);
@@ -60,7 +60,7 @@ void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int po
  *Add tunnel server with auto detection capabilities
  *
  * @param  tunnel object
- * @param ip tunnel server ip address
+ * @param host tunnel server ip address
  * @param port tunnel server tls port, recommended value is 443
  * @param remote_udp_mirror remote port on the tunnel server side  used to test udp reachability
  * @param delay udp packet round trip delay in ms considered as acceptable. recommended value is 1000 ms.
@@ -79,7 +79,7 @@ void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel);
 /**
  * Sets whether tunneling of SIP and RTP is required.
  * @param  tunnel object
- * @param isEnabled If true enter in tunneled mode, if false exits from tunneled mode.
+ * @param enabled If true enter in tunneled mode, if false exits from tunneled mode.
  * The TunnelManager takes care of refreshing SIP registration when switching on or off the tunneled mode.
  *
 **/
@@ -109,6 +109,10 @@ void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnel*tunnel, const char*
 
 void linphone_tunnel_enable_logs(LinphoneTunnel *tunnel, bool_t enabled);
 
+/**
+ * @}
+**/
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 802afe7256b4e8fc79b074431f25ba49532b7e77..0ca5b7b4a43744141dc80097f7267fcfd7364fec 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2367,7 +2367,7 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
  * Then, when the user responds to dialog prompt, it becomes possible to call linphone_core_accept_call_update() to answer
  * the reINVITE, with eventually video enabled in the LinphoneCallParams argument.
  * 
- * @Returns 0 if successful, -1 if the linphone_core_defer_call_update() was done outside a #LinphoneCallUpdatedByRemote notification, which is illegal.
+ * @return 0 if successful, -1 if the linphone_core_defer_call_update() was done outside a #LinphoneCallUpdatedByRemote notification, which is illegal.
 **/
 int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call){
        if (call->state==LinphoneCallUpdatedByRemote){
@@ -2395,7 +2395,7 @@ int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call){
  * @param lc the linphone core object.
  * @param call the LinphoneCall object
  * @param params a LinphoneCallParams object describing the call parameters to accept.
- * @Returns 0 if sucessful, -1 otherwise (actually when this function call is performed outside ot #LinphoneCallUpdatedByRemote state).
+ * @return 0 if sucessful, -1 otherwise (actually when this function call is performed outside ot #LinphoneCallUpdatedByRemote state).
 **/
 int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
        SalMediaDescription *md;

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index bd10556a054e6925a98e9644819e85b81e2e248d..0eaec1e81e2e4f223b74f22600611244d935693e 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -227,6 +227,9 @@ typedef struct _LinphoneVideoPolicy LinphoneVideoPolicy;
  * The LinphoneCall object represents a call issued or received by the LinphoneCore
 **/
 struct _LinphoneCall;
+/**
+ * The LinphoneCall object represents a call issued or received by the LinphoneCore
+**/
 typedef struct _LinphoneCall LinphoneCall;
     
 /** Callback prototype */

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index cf767580708c861e409033de7ffb7bbd213c067e..1676e0918c6278737e65490bd0810090466822cc 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -477,7 +477,7 @@ const char *linphone_proxy_config_get_route(const LinphoneProxyConfig *obj){
 /**
  * Returns the SIP identity that belongs to this proxy configuration.
  *
- * The SIP identity is a SIP address (Display Name <sip:username@domain> )
+ * The SIP identity is a SIP address (Display Name <sip:username@@domain> )
 **/
 const char *linphone_proxy_config_get_identity(const LinphoneProxyConfig *obj){
        return obj->reg_identity;