Changeset 3330

Timestamp:

Oct 1, 2010 2:03:42 AM (14 years ago)

Author:

bennylp

Message:

Closed #1142 (Account based configuration to specify if "c=0.0.0.0" method should be used when putting call on hold):

• use PJSUA_CALL_HOLD_TYPE_DEFAULT to specify default global call hold type
• use pjsua_acc_config.call_hold_type to specify call hold type for the account
• call hold type can also be set on per call basis by changing the call_hold_type in the call structure (requires inclusion of <pjsua-lib/pjsua_internal.h>

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (2 diffs)
• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (7 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2042 +2042 @@
 
 /**
+ * This enumeration specifies how we should offer call hold request to
+ * remote peer. The default value is set by compile time constant
+ * PJSUA_CALL_HOLD_TYPE_DEFAULT, and application may control the setting
+ * on per-account basis by manipulating \a call_hold_type field in
+ * #pjsua_acc_config.
+ */
+typedef enum pjsua_call_hold_type
+{
+    /**
+     * This will follow RFC 3264 recommendation to use a=sendonly,
+     * a=recvonly, and a=inactive attribute as means to signal call
+     * hold status. This is the correct value to use.
+     */
+    PJSUA_CALL_HOLD_TYPE_RFC3264,
+
+    /**
+     * This will use the old and deprecated method as specified in RFC 2543,
+     * and will offer c=0.0.0.0 in the SDP instead. Using this has many
+     * drawbacks such as inability to keep the media transport alive while
+     * the call is being put on hold, and should only be used if remote
+     * does not understand RFC 3264 style call hold offer.
+     */
+    PJSUA_CALL_HOLD_TYPE_RFC2543
+
+} pjsua_call_hold_type;
+
+
+/**
+ * Specify the default call hold type to be used in #pjsua_acc_config.
+ *
+ * Default is PJSUA_CALL_HOLD_TYPE_RFC3264, and there's no reason to change
+ * this except if you're communicating with an old/non-standard peer.
+ */
+#ifndef PJSUA_CALL_HOLD_TYPE_DEFAULT
+#   define PJSUA_CALL_HOLD_TYPE_DEFAULT         PJSUA_CALL_HOLD_TYPE_RFC3264
+#endif
+
+
+/**
  * This structure describes account configuration to be specified when
  * adding a new account with #pjsua_acc_add(). Application MUST initialize
@@ -2370 +2409 @@
     pj_bool_t        use_stream_ka;
 #endif
+
+    /**
+     * Specify how to offer call hold to remote peer. Please see the
+     * documentation on #pjsua_call_hold_type for more info.
+     *
+     * Default: PJSUA_CALL_HOLD_TYPE_DEFAULT
+     */
+    pjsua_call_hold_type call_hold_type;
 
 } pjsua_acc_config;

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -62 +62 @@
     pjsua_acc_id         acc_id;    /**< Account index being used.          */
     int                  secure_level;/**< Signaling security level.        */
+    pjsua_call_hold_type call_hold_type; /**< How to do call hold.          */
     pj_bool_t            local_hold;/**< Flag for call-hold by local.       */
     pjsua_call_media_status media_st;/**< Media state.                      */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -83 +83 @@
 /* Create SDP for call hold. */
 static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
-                                           pjmedia_sdp_session **p_answer);
+                                           pjmedia_sdp_session **p_sdp);
 
 /*
@@ -405 +405 @@
     /* Associate session with account */
     call->acc_id = acc_id;
+    call->call_hold_type = acc->cfg.call_hold_type;
 
     /* Create temporary pool */
@@ -759 +760 @@
      */
     acc_id = call->acc_id = pjsua_acc_find_for_incoming(rdata);
+    call->call_hold_type = pjsua_var.acc[acc_id].cfg.call_hold_type;
 
     /* Get call's secure level */
@@ -3574 +3576 @@
 
 
-/* Create SDP for call hold. */
-static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
-                                           pjmedia_sdp_session **p_answer)
-{
-    pj_status_t status;
-    pj_pool_t *pool;
-    pjmedia_sdp_session *sdp;
-
-    /* Use call's provisional pool */
-    pool = call->inv->pool_prov;
-
-    /* Create new offer */
-    status = pjsua_media_channel_create_sdp(call->index, pool, NULL, &sdp, 
-                                            NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
-        return status;
-    }
-
+/* Modify SDP for call hold. */
+static pj_status_t modify_sdp_of_call_hold(pjsua_call *call,
+                                           pj_pool_t *pool,
+                                           pjmedia_sdp_session *sdp)
+{
     /* Call-hold is done by set the media direction to 'sendonly' 
      * (PJMEDIA_DIR_ENCODING), except when current media direction is 
@@ -3601 +3589 @@
        if (call->media_dir != PJMEDIA_DIR_ENCODING) {
      */
-    if (1) {
+    /* https://trac.pjsip.org/repos/ticket/1142:
+     *  configuration to use c=0.0.0.0 for call hold.
+     */
+    if (call->call_hold_type == PJSUA_CALL_HOLD_TYPE_RFC2543) {
+        pjmedia_sdp_conn *conn;
+        pjmedia_sdp_attr *attr;
+
+        /* Get SDP media connection line */
+        conn = sdp->media[0]->conn;
+        if (!conn)
+            conn = sdp->conn;
+
+        /* Modify address */
+        conn->addr = pj_str("0.0.0.0");
+
+        /* Remove existing directions attributes */
+        pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendrecv");
+        pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendonly");
+        pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly");
+        pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive");
+
+        /* Add inactive attribute */
+        attr = pjmedia_sdp_attr_create(pool, "inactive", NULL);
+        pjmedia_sdp_media_add_attr(sdp->media[0], attr);
+
+
+    } else {
         pjmedia_sdp_attr *attr;
 
@@ -3621 +3635 @@
     }
 
-    *p_answer = sdp;
-
-    return status;
+    return PJ_SUCCESS;
+}
+
+/* Create SDP for call hold. */
+static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
+                                           pjmedia_sdp_session **p_sdp)
+{
+    pj_status_t status;
+    pj_pool_t *pool;
+    pjmedia_sdp_session *sdp;
+
+    /* Use call's provisional pool */
+    pool = call->inv->pool_prov;
+
+    /* Create new offer */
+    status = pjsua_media_channel_create_sdp(call->index, pool, NULL, &sdp,
+                                            NULL);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
+        return status;
+    }
+
+    status = modify_sdp_of_call_hold(call, pool, sdp);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    *p_sdp = sdp;
+
+    return PJ_SUCCESS;
 }
 
@@ -3668 +3708 @@
     /* Check if call is on-hold */
     if (call->local_hold) {
-        pjmedia_sdp_attr *attr;
-
-        /* Remove existing directions attributes */
-        pjmedia_sdp_media_remove_all_attr(answer->media[0], "sendrecv");
-        pjmedia_sdp_media_remove_all_attr(answer->media[0], "sendonly");
-        pjmedia_sdp_media_remove_all_attr(answer->media[0], "recvonly");
-        pjmedia_sdp_media_remove_all_attr(answer->media[0], "inactive");
-
-        /* Keep call on-hold by setting 'sendonly' attribute.
-         * (See RFC 3264 Section 8.4 and RFC 4317 Section 3.1)
-         */
-        attr = pjmedia_sdp_attr_create(call->inv->pool_prov, "sendonly", NULL);
-        pjmedia_sdp_media_add_attr(answer->media[0], attr);
+        modify_sdp_of_call_hold(call, call->inv->pool_prov, answer);
     }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -190 +190 @@
 #endif
     pj_list_init(&cfg->reg_hdr_list);
+    cfg->call_hold_type = PJSUA_CALL_HOLD_TYPE_DEFAULT;
 }