Ticket #539: ticket539.patch

pjsip/include/pjsua-lib/pjsua_internal.h

@@ -26 +26 @@
 
 PJ_BEGIN_DECL
 
+/**
+ * Structure to be attached to media transport.
+ */
+typedef struct pjsua_med_tp_data
+{
+    pjmedia_transport   *tp;        /**< The media transport                */
+    pjsua_call_id        cid;       /**< Call-ID (may be -1)                */
+    pjsip_dialog        *dlg;       /**< SIP dialog (useful when cid is -1) */
+    pj_status_t          status;    /**< Transport status.                  */
+
+    /** Incoming call data */
+    struct in {
+        pjmedia_sdp_session *rem_sdp;   /**< Cached remote SDP      */
+        pjsip_dialog        *replaced_dlg;/**< call xfer                    */
+        pjsip_rx_data       *rdata;     /**< rdata                  */
+        pj_bool_t            rdata_copy;        /**< was rdata copied?      */
+    } in;
+
+    /** Outgoing call data */
+    struct out {
+        pjsua_msg_data      *msg_data;  /**< Saved outgoing msg_data        */
+    } out;
+
+
+} pjsua_med_tp_data;
+
+
 /** 
  * Structure to be attached to invite dialog. 
  * Given a dialog "dlg", application can retrieve this structure
@@ -51 +78 @@
     int                  conf_slot; /**< Slot # in conference bridge.       */
     pjsip_evsub         *xfer_sub;  /**< Xfer server subscription, if this
                                          call was triggered by xfer.        */
-    pjmedia_transport   *med_tp;    /**< Current media transport.           */
-    pj_status_t          med_tp_st; /**< Media transport status.            */
-    pjmedia_transport   *med_orig;  /**< Original media transport           */
+    
+    pjsua_med_tp_data    med_tp_data;/**< Media transport data              */
+    pjsua_msg_data      *inv_msg_data;/**< Saved make_call() msg_data       */
+
     pj_timer_entry       refresh_tm;/**< Timer to send re-INVITE.           */
     pj_timer_entry       hangup_tm; /**< Timer to hangup call.              */
     pj_stun_nat_type     rem_nat_type; /**< NAT type of remote endpoint.    */
@@ -316 +344 @@
 /*
  * Media channel.
  */
-pj_status_t pjsua_media_channel_init(pjsua_call_id call_id,
-                                     pjsip_role_e role,
-                                     int security_level,
-                                     int *sip_err_code);
+
+/* Create. This may return PJ_EPENDING if transport creation can't 
+ * complete immediately (e.g. STUN, ICE) */
+pj_status_t pjsua_media_channel_create(pjsua_call_id call_id,
+                                       pjsip_role_e role,
+                                       int security_level,
+                                       const pjmedia_sdp_session *rem_sdp,
+                                       int *sip_err_code);
 pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
                                            pj_pool_t *pool,
                                            const pjmedia_sdp_session *rem_sdp,
@@ -330 +362 @@
                                        const pjmedia_sdp_session *remote_sdp);
 pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id);
 
+void        pjsua_on_media_channel_created(pjsua_call_id call_id,
+                                           pj_status_t status);
 
+
 /**
  * Init presence.
  */
@@ -422 +457 @@
  */
 pjsip_accept_hdr* pjsua_im_create_accept(pj_pool_t *pool);
 
+/* Duplicate msg_data */
+void pjsua_msg_data_dup(pj_pool_t *pool, pjsua_msg_data *dst, 
+                        const pjsua_msg_data *src);
+
 /*
  * Add additional headers etc in msg_data specified by application
  * when sending requests.

pjsip/include/pjsip-ua/sip_inv.h

@@ -554 +554 @@
 
 
 /**
+ * Set local offer to be carried by subsequent response (or request).
+ *
+ * @param inv           The invite session.
+ * @param sdp           The SDP offer.
+ *
+ * @return              PJ_SUCCESS if local offer can be accepted by
+ *                      SDP negotiator.
+ */
+PJ_DECL(pj_status_t) pjsip_inv_set_sdp_offer(pjsip_inv_session *inv,
+                                             const pjmedia_sdp_session *sdp );
+
+
+/**
  * Create a SIP message to initiate invite session termination. Depending on 
  * the state of the session, this function may return CANCEL request, 
  * a non-2xx final response, or a BYE request. If the session has not answered

pjsip/src/pjsua-lib/pjsua_core.c

@@ -56 +56 @@
     for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.tpdata); ++i)
         pjsua_var.tpdata[i].index = i;
 
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.calls); ++i) {
+        pjsua_var.calls[i].med_tp_data.cid = PJSUA_INVALID_ID;
+    }
+
     pjsua_var.stun_status = PJ_EUNKNOWN;
     pjsua_var.nat_status = PJ_EPENDING;
 }
@@ -526 +530 @@
 
     /* Add hostname */
     hostname = pj_gethostname();
-    seed = pj_hash_calc(seed, hostname->ptr, (int)hostname->slen);
+    if (hostname)
+        seed = pj_hash_calc(seed, hostname->ptr, (int)hostname->slen);
 
-    /* Add primary IP address */
+    /* Add primary IPv4 address, if any */
     if (pj_gethostip(pj_AF_INET(), &addr)==PJ_SUCCESS)
-        seed = pj_hash_calc(seed, &addr.ipv4.sin_addr, 4);
+        seed = pj_hash_calc(seed, &addr, pj_sockaddr_get_len(&addr));
 
+    /* Add primary IPv6 address, if any */
+#if PJ_HAS_IPV6
+    if (pj_gethostip(pj_AF_INET6(), &addr)==PJ_SUCCESS)
+        seed = pj_hash_calc(seed, &addr, pj_sockaddr_get_len(&addr));
+#endif
+
     /* Get timeofday */
     pj_gettimeofday(&t);
     seed = pj_hash_calc(seed, &t, sizeof(t));
@@ -1819 +1830 @@
 }
 
 
+/* Duplicate msg_data */
+void pjsua_msg_data_dup(pj_pool_t *pool, pjsua_msg_data *dst, 
+                        const pjsua_msg_data *src)
+{
+    const pjsip_hdr *hsrc;
+
+    pjsua_msg_data_init(dst);
+
+    /* Duplicate headers */
+    hsrc = src->hdr_list.next;
+    while (hsrc != &src->hdr_list) {
+        pjsip_hdr *hdst = (pjsip_hdr*) pjsip_hdr_clone(pool, hsrc);
+        pj_list_push_back(&dst->hdr_list, hdst);
+        hsrc = hsrc->next;
+    }
+
+    /* Duplicate mime types and body */
+    pj_strdup(pool, &dst->content_type, &src->content_type);
+    pj_strdup(pool, &dst->msg_body, &src->msg_body);
+}
+
 /*
  * Add additional headers etc in msg_data specified by application
  * when sending requests.

pjsip/src/pjsua-lib/pjsua_call.c

@@ -71 +71 @@
 static pj_status_t create_inactive_sdp(pjsua_call *call,
                                        pjmedia_sdp_session **p_answer);
 
+/* Disconnect call */
+static void call_disconnect(pjsip_inv_session *inv, int code,
+                            const char *reason, const char *warn_text,
+                            pj_status_t warn_status);
+
 /* Update SDP version in the offer */
 static void update_sdp_version(pjsua_call *call,
                                pjmedia_sdp_session *sdp)
@@ -115 +120 @@
     call->res_time.sec = 0;
     call->res_time.msec = 0;
     call->rem_nat_type = PJ_STUN_NAT_TYPE_UNKNOWN;
+
+    pj_bzero(&call->med_tp_data, sizeof(call->med_tp_data));
+    call->med_tp_data.status = PJ_EPENDING;
+    call->med_tp_data.cid = PJSUA_INVALID_ID;
 }
 
 
@@ -329 +338 @@
                                           pjsua_call_id *p_call_id)
 {
     pjsip_dialog *dlg = NULL;
-    pjmedia_sdp_session *offer;
     pjsip_inv_session *inv = NULL;
     pjsua_acc *acc;
     pjsua_call *call;
     int call_id = -1;
     pj_str_t contact;
-    pjsip_tx_data *tdata;
     pj_status_t status;
 
 
@@ -366 +373 @@
     }
 
     call = &pjsua_var.calls[call_id];
+    reset_call(call_id);
 
     /* Verify that destination URI is valid before calling 
      * pjsua_acc_create_uac_contact, or otherwise there  
@@ -426 +434 @@
                                    &acc->cfg.id, &contact,
                                    dest_uri, dest_uri, &dlg);
     if (status != PJ_SUCCESS) {
+        PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Dialog creation failed", status);
-        PJSUA_UNLOCK();
         return status;
     }
 
-    /* Calculate call's secure level */
-    call->secure_level = get_secure_level(acc_id, dest_uri);
 
-    /* Init media channel */
-    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC, 
-                                      call->secure_level, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
-        goto on_error;
-    }
-
-    /* Create SDP offer */
-#if LATE_SDP
-    offer = NULL;
-#else
-    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, 
-                                            &offer, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
-        goto on_error;
-    }
-#endif
-
     /* Create the INVITE session: */
     options |= PJSIP_INV_SUPPORT_100REL;
     if (acc->cfg.require_100rel)
         options |= PJSIP_INV_REQUIRE_100REL;
 
-    status = pjsip_inv_create_uac( dlg, offer, options, &inv);
+    status = pjsip_inv_create_uac( dlg, NULL, options, &inv);
     if (status != PJ_SUCCESS) {
+        pjsip_dlg_terminate(dlg);
+        PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Invite session creation failed", status);
-        goto on_error;
+        return status;
     }
 
-
     /* Create and associate our data in the session. */
     call->acc_id = acc_id;
     call->inv = inv;
@@ -500 +487 @@
     /* Set authentication preference */
     pjsip_auth_clt_set_prefs(&dlg->auth_sess, &acc->cfg.auth_pref);
 
-    /* Create initial INVITE: */
-
-    status = pjsip_inv_invite(inv, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create initial INVITE request", 
-                     status);
-        goto on_error;
+    /* Save msg_data for later, if any */
+    if (msg_data) {
+        call->med_tp_data.out.msg_data = PJ_POOL_ALLOC_T(dlg->pool,
+                                                         pjsua_msg_data);
+        pjsua_msg_data_dup(inv->pool, call->med_tp_data.out.msg_data, 
+                           msg_data);
+    } else {
+        call->med_tp_data.out.msg_data = NULL;
     }
 
 
-    /* Add additional headers etc */
+    /* Calculate call's secure level */
+    call->secure_level = get_secure_level(acc_id, dest_uri);
 
-    pjsua_process_msg_data( tdata, msg_data);
+    /* Create the media channel. Further processing to this call will
+     * be done in pjsua_on_media_channel_created() when media channel 
+     * creation completes.
+     */
+    call->med_tp_data.status = PJ_EPENDING;
+    status = pjsua_media_channel_create(call->index, PJSIP_ROLE_UAC, 
+                                        call->secure_level, NULL, NULL);
+    if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+        if (call->inv != NULL) {
+            pjsip_inv_terminate(call->inv, PJSIP_SC_OK, PJ_FALSE);
+        }
+        reset_call(call_id);
+        PJSUA_UNLOCK();
+        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+        return status;
+    }
 
-    /* Must increment call counter now */
+    /* Increment call counter */
     ++pjsua_var.call_cnt;
 
-    /* Send initial INVITE: */
+    if (p_call_id)
+        *p_call_id = call_id;
 
-    status = pjsip_inv_send_msg(inv, tdata);
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+void pjsua_on_media_channel_created(pjsua_call_id call_id,
+                                    pj_status_t med_status)
+{
+    pjsua_call *call;
+    pjsip_dialog *dlg;
+    pjsip_inv_session *inv;
+    pj_status_t status;
+
+    status = acquire_call("pjsua_on_media_channel_created", call_id, 
+                          &call, &dlg);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send initial INVITE request", 
-                     status);
+        pj_assert(!"Unexpected!");
+        return;
+    }
 
-        /* Upon failure to send first request, both dialog and invite 
-         * session would have been cleared.
+    call->med_tp_data.status = med_status;
+    inv = call->inv;
+
+    if (inv->role == PJSIP_ROLE_UAC) {
+        /*
+         * Outgoing call
          */
-        inv = NULL;
-        dlg = NULL;
-        goto on_error;
-    }
+        pjmedia_sdp_session *offer;
+        pjsip_tx_data *tdata;
 
-    /* Done. */
+        /* Handle failure to start media channel */
+        if (med_status != PJ_SUCCESS) {
+            pjsip_inv_terminate(call->inv, PJSIP_SC_OK, PJ_FALSE);
+            reset_call(call->index);
+            goto on_return;
+        }
 
-    if (p_call_id)
-        *p_call_id = call_id;
+        /* Create SDP offer */
+#if LATE_SDP
+        offer = NULL;
+#else
+        status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, 
+                                                &offer, NULL);
+        if (status != PJ_SUCCESS) {
+            pjsip_inv_terminate(call->inv, PJSIP_SC_OK, PJ_FALSE);
+            reset_call(call->index);
+            pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
+            goto on_return;
+        }
 
-    PJSUA_UNLOCK();
+        status = pjsip_inv_set_sdp_offer(inv, offer);
+#endif
 
-    return PJ_SUCCESS;
+        /* Create initial INVITE: */
+        status = pjsip_inv_invite(inv, &tdata);
+        if (status != PJ_SUCCESS) {
+            pjsip_inv_terminate(call->inv, PJSIP_SC_OK, PJ_FALSE);
+            reset_call(call->index);
+            pjsua_perror(THIS_FILE, "Unable to create initial INVITE request",
+                         status);
+            goto on_return;
+        }
 
+        /* Add additional headers etc */
+        pjsua_process_msg_data(tdata, call->med_tp_data.out.msg_data);
 
-on_error:
-    if (inv != NULL) {
-        pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE);
-    } else if (dlg) {
-        pjsip_dlg_terminate(dlg);
-    }
+        /* Send initial INVITE: */
+        status = pjsip_inv_send_msg(inv, tdata);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to send initial INVITE request",
+                         status);
 
-    if (call_id != -1) {
-        reset_call(call_id);
-        pjsua_media_channel_deinit(call_id);
+            /* Upon failure to send first request, both dialog and invite 
+             * session would have been cleared.
+             */
+            inv = NULL;
+            dlg = NULL;
+            goto on_return;
+        }
+
+    } else {
+        /*
+         * Incoming call
+         */
+        pjmedia_sdp_session *answer;
+        int sip_err_code;
+
+        /* Handle failure to start media channel */
+        if (med_status != PJ_SUCCESS) {
+            call_disconnect(inv, 500, "Media Error", NULL, 
+                            med_status);
+            goto on_return;
+        }
+
+        /* Get media channel's SDP */
+        status = pjsua_media_channel_create_sdp(call_id, inv->pool, 
+                                                call->med_tp_data.in.rem_sdp, 
+                                                &answer, &sip_err_code);
+        if (status != PJ_SUCCESS) {
+            call_disconnect(inv, sip_err_code, NULL, 
+                            "SDP creation/negotiation failed", status);
+            goto on_return;
+        }
+
+        /* Set SDP to the invite session */
+        if (inv->neg) {
+            status = pjsip_inv_set_sdp_answer(inv, answer);
+        } else {
+            status = pjsip_inv_set_sdp_offer(inv, answer);
+        }
+
+        if (status != PJ_SUCCESS) {
+            call_disconnect(inv, sip_err_code, NULL, "Unable to set SDP",
+                            status);
+            goto on_return;
+        }
+
+        /* Check if this request should replace existing call */
+        if (call->med_tp_data.in.replaced_dlg) {
+            pjsip_dialog *replaced_dlg = call->med_tp_data.in.replaced_dlg;
+            pjsip_inv_session *replaced_inv;
+            struct pjsua_call *replaced_call;
+            pjsip_tx_data *tdata;
+
+            /* Get the invite session in the dialog */
+            replaced_inv = pjsip_dlg_get_inv_session(replaced_dlg);
+
+            /* Get the replaced call instance */
+            replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
+
+            /* Notify application */
+            if (pjsua_var.ua_cfg.cb.on_call_replaced)
+                pjsua_var.ua_cfg.cb.on_call_replaced(replaced_call->index,
+                                                     call_id);
+
+            PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with 200/OK",
+                                 call_id));
+
+            /* Answer the new call with 200 response */
+            status = pjsip_inv_answer(inv, 200, NULL, NULL, &tdata);
+            if (status == PJ_SUCCESS)
+                status = pjsip_inv_send_msg(inv, tdata);
+
+            if (status != PJ_SUCCESS)
+                pjsua_perror(THIS_FILE, "Error answering session", status);
+
+            /* Note that inv may be invalid if 200/OK has caused error in
+             * starting the media.
+             */
+
+            PJ_LOG(4,(THIS_FILE, "Disconnecting replaced call %d",
+                                 replaced_call->index));
+
+            /* Disconnect replaced invite session */
+            status = pjsip_inv_end_session(replaced_inv, PJSIP_SC_GONE, NULL,
+                                           &tdata);
+            if (status == PJ_SUCCESS && tdata)
+                status = pjsip_inv_send_msg(replaced_inv, tdata);
+
+            if (status != PJ_SUCCESS)
+                pjsua_perror(THIS_FILE, "Error terminating session", status);
+
+
+        } else {
+
+            /* Notify application if on_incoming_call() is overriden, 
+             * otherwise hangup the call with 480
+             */
+            if (pjsua_var.ua_cfg.cb.on_incoming_call) {
+                pjsua_var.ua_cfg.cb.on_incoming_call(call->acc_id, call_id, 
+                                                     rdata);
+            } else {
+                pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE, 
+                                  NULL, NULL);
+            }
+        }
+
     }
 
-    PJSUA_UNLOCK();
-    return status;
+on_return:
+    pjsip_dlg_dec_lock(dlg);
+    return;
 }
 
 
@@ -595 +746 @@
     pjsua_call *call;
     int call_id = -1;
     int sip_err_code;
-    pjmedia_sdp_session *offer, *answer;
+    pjmedia_sdp_session *offer, *test_answer = NULL;
     pj_status_t status;
 
     /* Don't want to handle anything but INVITE */
@@ -658 +809 @@
         return PJ_TRUE;
     }
 
+    call->med_tp_data.in.replaced_dlg = replaced_dlg;
+
     /* If this INVITE request contains Replaces header, notify application
      * about the request so that application can do subsequent checking
      * if it wants to.
@@ -697 +850 @@
      */
     acc_id = call->acc_id = pjsua_acc_find_for_incoming(rdata);
 
-    /* Get call's secure level */
-    if (PJSIP_URI_SCHEME_IS_SIPS(rdata->msg_info.msg->line.req.uri))
-        call->secure_level = 2;
-    else if (PJSIP_TRANSPORT_IS_SECURE(rdata->tp_info.transport))
-        call->secure_level = 1;
-    else
-        call->secure_level = 0;
-
-    /* Init media channel */
-    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS, 
-                                      call->secure_level, &sip_err_code);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
-                                      sip_err_code, NULL,
-                                      NULL, NULL);
-        PJSUA_UNLOCK();
-        return PJ_TRUE;
-    }
-
     /* Parse SDP from incoming request */
     if (rdata->msg_info.msg->body) {
+        pjmedia_sock_info sock_info;
+
         status = pjmedia_sdp_parse(rdata->tp_info.pool, 
                                    (char*)rdata->msg_info.msg->body->data,
                                    rdata->msg_info.msg->body->len, &offer);
@@ -744 +879 @@
             return PJ_TRUE;
         }
 
+        /* Create a template SDP answer to verify incoming SDP */
+        pj_bzero(&sock_info, sizeof(sock_info));
+        pj_sockaddr_in_init(&sock_info.rtp_addr_name.ipv4, NULL, 4000);
+        pj_sockaddr_in_init(&sock_info.rtcp_addr_name.ipv4, NULL, 4001);
+        status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, 
+                                          rdata->tp_info.pool,
+                                          1, &sock_info, &test_answer);
     } else {
         offer = NULL;
+        test_answer = NULL;
     }
 
-    /* Get media capability from media endpoint: */
-    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, 
-                                            offer, &answer, &sip_err_code);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error creating SDP answer", status);
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
-                                      sip_err_code, NULL,
-                                      NULL, NULL);
-        pjsua_media_channel_deinit(call->index);
-        PJSUA_UNLOCK();
-        return PJ_TRUE;
-    }
-
     /* Verify that we can handle the request. */
     options |= PJSIP_INV_SUPPORT_100REL;
     if (pjsua_var.acc[acc_id].cfg.require_100rel)
         options |= PJSIP_INV_REQUIRE_100REL;
 
-    status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,
-                                       pjsua_var.endpt, &response);
+    status = pjsip_inv_verify_request2(rdata, &options, offer, test_answer,
+                                       NULL, pjsua_var.endpt, &response);
     if (status != PJ_SUCCESS) {
 
         /*
@@ -792 +922 @@
         return PJ_TRUE;
     } 
 
-
     /* Get suitable Contact header */
     if (pjsua_var.acc[acc_id].contact.slen) {
         contact = pjsua_var.acc[acc_id].contact;
@@ -833 +962 @@
                              &pjsua_var.acc[acc_id].cfg.auth_pref);
 
     /* Create invite session: */
-    status = pjsip_inv_create_uas( dlg, rdata, answer, options, &inv);
+    status = pjsip_inv_create_uas( dlg, rdata, NULL, options, &inv);
     if (status != PJ_SUCCESS) {
         pjsip_hdr hdr_list;
         pjsip_warning_hdr *w;
@@ -857 +986 @@
     /* Update NAT type of remote endpoint, only when there is SDP in
      * incoming INVITE! 
      */
-    if (pjsua_var.ua_cfg.nat_type_in_sdp &&
-        pjmedia_sdp_neg_get_state(inv->neg) > PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) 
-    {
-        const pjmedia_sdp_session *remote_sdp;
-
-        if (pjmedia_sdp_neg_get_neg_remote(inv->neg, &remote_sdp)==PJ_SUCCESS)
-            update_remote_nat_type(call, remote_sdp);
+    if (pjsua_var.ua_cfg.nat_type_in_sdp && offer != NULL) {
+        update_remote_nat_type(call, offer);
     }
 
     /* Create and attach pjsua_var data to the dialog: */
@@ -903 +1027 @@
         }
     }
 
-    ++pjsua_var.call_cnt;
+    /* Save state */
+    call->med_tp_data.status = PJ_EPENDING;
+    if (offer) {
+        call->med_tp_data.in.rem_sdp = 
+                pjmedia_sdp_session_clone(inv->pool, offer);
+    }
 
+    /* Get call's secure level */
+    if (PJSIP_URI_SCHEME_IS_SIPS(rdata->msg_info.msg->line.req.uri))
+        call->secure_level = 2;
+    else if (PJSIP_TRANSPORT_IS_SECURE(rdata->tp_info.transport))
+        call->secure_level = 1;
+    else
+        call->secure_level = 0;
 
-    /* Check if this request should replace existing call */
-    if (replaced_dlg) {
-        pjsip_inv_session *replaced_inv;
-        struct pjsua_call *replaced_call;
-        pjsip_tx_data *tdata;
 
-        /* Get the invite session in the dialog */
-        replaced_inv = pjsip_dlg_get_inv_session(replaced_dlg);
-
-        /* Get the replaced call instance */
-        replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
-
-        /* Notify application */
-        if (pjsua_var.ua_cfg.cb.on_call_replaced)
-            pjsua_var.ua_cfg.cb.on_call_replaced(replaced_call->index,
-                                                 call_id);
-
-        PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with 200/OK",
-                             call_id));
-
-        /* Answer the new call with 200 response */
-        status = pjsip_inv_answer(inv, 200, NULL, NULL, &tdata);
-        if (status == PJ_SUCCESS)
-            status = pjsip_inv_send_msg(inv, tdata);
-
-        if (status != PJ_SUCCESS)
-            pjsua_perror(THIS_FILE, "Error answering session", status);
-
-        /* Note that inv may be invalid if 200/OK has caused error in
-         * starting the media.
-         */
-
-        PJ_LOG(4,(THIS_FILE, "Disconnecting replaced call %d",
-                             replaced_call->index));
-
-        /* Disconnect replaced invite session */
-        status = pjsip_inv_end_session(replaced_inv, PJSIP_SC_GONE, NULL,
-                                       &tdata);
-        if (status == PJ_SUCCESS && tdata)
-            status = pjsip_inv_send_msg(replaced_inv, tdata);
-
-        if (status != PJ_SUCCESS)
-            pjsua_perror(THIS_FILE, "Error terminating session", status);
-
-
-    } else {
-
-        /* Notify application if on_incoming_call() is overriden, 
-         * otherwise hangup the call with 480
-         */
-        if (pjsua_var.ua_cfg.cb.on_incoming_call) {
-            pjsua_var.ua_cfg.cb.on_incoming_call(acc_id, call_id, rdata);
-        } else {
-            pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE, 
-                              NULL, NULL);
-        }
+    /* Create the media channel. Further processing to this call will
+     * be done in pjsua_on_media_channel_created() when media channel 
+     * creation completes.
+     */
+    status = pjsua_media_channel_create(call->index, PJSIP_ROLE_UAS, 
+                                        call->secure_level, &sip_err_code);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+                                      sip_err_code, NULL,
+                                      NULL, NULL);
+        PJSUA_UNLOCK();
+        return PJ_TRUE;
     }
 
+    ++pjsua_var.call_cnt;
 
     /* This INVITE request has been handled. */
     PJSUA_UNLOCK();
@@ -2290 +2385 @@
         *p = '\0';
     }
 
+    /* Only print media when media channel/transport is ready */
+    if (call->med_tp_data.tp==NULL || call->med_tp_data.status!=PJ_SUCCESS)
+        return PJ_SUCCESS;
+
     /* Get SRTP status */
     pjmedia_transport_info_init(&tp_info);
     pjmedia_transport_get_info(call->med_tp, &tp_info);
@@ -2482 +2581 @@
 /*
  * Disconnect call upon error.
  */
-static void call_disconnect( pjsip_inv_session *inv, 
-                             int code )
+static void call_disconnect(pjsip_inv_session *inv, int code,
+                            const char *res, const char *warn_text,
+                            pj_status_t warn_status)
 {
     pjsua_call *call;
+    pj_str_t str;
     pjsip_tx_data *tdata;
     pj_status_t status;
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
-    status = pjsip_inv_end_session(inv, code, NULL, &tdata);
+    status = pjsip_inv_end_session(inv, code, res ? pj_cstr(&str, res) : NULL,
+                                   &tdata);
     if (status != PJ_SUCCESS)
         return;
 
+    if (warn_text) {
+        pjsip_warning_hdr *whdr;
+        whdr = pjsip_warning_hdr_create(tdata->pool, 399, 
+                                        pjsip_endpt_name(pjsua_var.endpt),
+                                        pj_cstr(&str, warn_text));
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*) whdr);
+    }
+
+    if (warn_status) {
+        pjsip_warning_hdr *whdr;
+        whdr = pjsip_warning_hdr_create_from_status(
+                    tdata->pool, 
+                    pjsip_endpt_name(pjsua_var.endpt),
+                    warn_status);
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*) whdr);
+    }
+
     /* Add SDP in 488 status */
     if (call && call->med_tp && tdata->msg->type==PJSIP_RESPONSE_MSG && 
         code==PJSIP_SC_NOT_ACCEPTABLE_HERE) 
@@ -2545 +2664 @@
         if (inv->state != PJSIP_INV_STATE_NULL &&
             inv->state != PJSIP_INV_STATE_CONFIRMED) 
         {
-            call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+            call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE, 
+                            NULL, NULL, status);
         }
 
         PJSUA_UNLOCK();
@@ -2585 +2705 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create media session", 
                      status);
-        call_disconnect(inv, PJSIP_SC_NOT_ACCEPTABLE_HERE);
+        call_disconnect(inv, PJSIP_SC_NOT_ACCEPTABLE_HERE, NULL, NULL, 
+                        status);
         pjsua_media_channel_deinit(call->index);
         PJSUA_UNLOCK();
         return;

pjsip/src/pjsip-ua/sip_inv.c

@@ -1726 +1726 @@
     pj_status_t status;
 
     PJ_ASSERT_RETURN(inv && sdp, PJ_EINVAL);
+    PJ_ASSERT_RETURN(inv->neg, PJ_EINVALIDOP);
+    PJ_ASSERT_RETURN(pjmedia_sdp_neg_get_state(inv->neg) ==
+                        PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER, 
+                     PJ_EINVALIDOP);
 
     pjsip_dlg_inc_lock(inv->dlg);
     status = pjmedia_sdp_neg_set_local_answer( inv->pool, inv->neg, sdp);
@@ -1736 +1740 @@
 
 
 /*
+ * Set SDP offer. 
+ */
+PJ_DEF(pj_status_t) pjsip_inv_set_sdp_offer(pjsip_inv_session *inv,
+                                            const pjmedia_sdp_session *sdp)
+{
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(inv && sdp, PJ_EINVAL);
+
+    pjsip_dlg_inc_lock(inv->dlg);
+    if (inv->neg == NULL) {
+        status = pjmedia_sdp_neg_create_w_local_offer(inv->pool, sdp,
+                                                      &inv->neg);
+    } else {
+        PJ_ASSERT_ON_FAIL(pjmedia_sdp_neg_get_state(inv->neg) ==
+                            PJMEDIA_SDP_NEG_STATE_DONE,
+                          {pjsip_dlg_dec_lock(inv->dlg); 
+                           return PJ_EINVALIDOP; });
+
+        status = pjmedia_sdp_neg_modify_local_offer(inv->pool, inv->neg,
+                                                    sdp);
+    }
+    pjsip_dlg_dec_lock(inv->dlg);
+
+    return status;
+}
+
+/*
  * End session.
  */
 PJ_DEF(pj_status_t) pjsip_inv_end_session(  pjsip_inv_session *inv,

pjmedia/include/pjmedia/transport.h

@@ -249 +249 @@
                             pjmedia_transport_info *info);
 
     /**
+     * Manage the application data. Application should use 
+     * #pjmedia_transport_get_app_data() and #pjmedia_transport_set_app_data()
+     * instead.
+     *
+     * This function returns the old application data in the transport.
+     * If \a set argument is non-zero, new application data will be set
+     * from \a app_data argument, otherwise the app_data will not be
+     * changed.
+     */
+    void* (*set_app_data)(pjmedia_transport *tp, pj_bool_t set, 
+                          void *app_data);
+
+    /**
      * This function is called by the stream when the transport is about
      * to be used by the stream for the first time, and it tells the transport
      * about remote RTP address to send the packet and some callbacks to be 
@@ -396 +409 @@
      * stacked with other transport to enable encryption on the underlying
      * transport.
      */
-    PJMEDIA_TRANSPORT_TYPE_SRTP
+    PJMEDIA_TRANSPORT_TYPE_SRTP,
 
+    /** Start of user defined transport type */
+    PJMEDIA_TRANSPORT_TYPE_USER = 16
+
 } pjmedia_transport_type;
 
 
@@ -504 +520 @@
 
 
 /**
+ * Get the application data attached to the transport. The application data
+ * is set when the transport is created and it can be changed by using
+ * #pjmedia_transport_set_app_data().
+ *
+ * @param tp        The media transport.
+ *
+ * @return          The application data.
+ */
+PJ_INLINE(void*) pjmedia_transport_get_app_data(pjmedia_transport *tp)
+{
+    return tp->op->set_app_data(tp, PJ_FALSE, NULL);
+}
+
+
+/**
+ * Set new application data value to the media transport.
+ *
+ * @param tp        The media transport.
+ * @param app_data  New application data.
+ *
+ * @return          The old application data.
+ */
+PJ_INLINE(void*) pjmedia_transport_set_app_data(pjmedia_transport *tp,
+                                                void *app_data)
+{
+    return tp->op->set_app_data(tp, PJ_TRUE, app_data);
+}
+
+
+/**
  * Attach callbacks to be called on receipt of incoming RTP/RTCP packets.
  * This is just a simple wrapper which calls <tt>attach()</tt> member of 
  * the transport.

pjmedia/include/pjmedia/transport_ice.h

@@ -66 +66 @@
  * @param comp_cnt      Number of components to be created.
  * @param cfg           Pointer to configuration settings.
  * @param cb            Optional callbacks.
+ * @param app_data      Optional application data.
  * @param p_tp          Pointer to receive the media transport instance.
  *
  * @return              PJ_SUCCESS on success, or the appropriate error code.
@@ -75 +76 @@
                                         unsigned comp_cnt,
                                         const pj_ice_strans_cfg *cfg,
                                         const pjmedia_ice_cb *cb,
+                                        void *app_data,
                                         pjmedia_transport **p_tp);
 
 PJ_END_DECL

pjmedia/src/pjmedia/transport_udp.c

@@ -51 +51 @@
 
     pj_pool_t          *pool;           /**< Memory pool                    */
     unsigned            options;        /**< Transport options.             */
+    void               *app_data;       /**< Application data.              */
     unsigned            media_options;  /**< Transport media options.       */
     void               *user_data;      /**< Only valid when attached       */
     pj_bool_t           attached;       /**< Has attachment?                */
@@ -102 +103 @@
  */
 static pj_status_t transport_get_info (pjmedia_transport *tp,
                                        pjmedia_transport_info *info);
+static void*       transport_set_app_data(pjmedia_transport *tp, 
+                                          pj_bool_t set, void *app_data);
 static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
@@ -147 +150 @@
 static pjmedia_transport_op transport_udp_op = 
 {
     &transport_get_info,
+    &transport_set_app_data,
     &transport_attach,
     &transport_detach,
     &transport_send_rtp,
@@ -604 +608 @@
 }
 
 
+/* Get/set application data */
+static void* transport_set_app_data(pjmedia_transport *tp, 
+                                    pj_bool_t set, void *app_data)
+{
+    struct transport_udp *udp = (struct transport_udp*)tp;
+    void *old_app_data;
+
+    PJ_ASSERT_RETURN(tp, NULL);
+
+    old_app_data = udp->app_data;
+    if (set)
+        udp->app_data = app_data;
+
+    return old_app_data;
+}
+
 /* Called by application to initialize the transport */
 static pj_status_t transport_attach(   pjmedia_transport *tp,
                                        void *user_data,

pjmedia/src/pjmedia/transport_ice.c

@@ -30 +30 @@
 {
     pjmedia_transport    base;
     pj_pool_t           *pool;
+    void                *app_data;
     int                  af;
     unsigned             comp_cnt;
     pj_ice_strans       *ice_st;
@@ -57 +58 @@
  */
 static pj_status_t transport_get_info (pjmedia_transport *tp,
                                        pjmedia_transport_info *info);
+static void*       transport_set_app_data(pjmedia_transport *tp,
+                                          pj_bool_t set, void *app_data);
 static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
@@ -114 +117 @@
 static pjmedia_transport_op transport_ice_op = 
 {
     &transport_get_info,
+    &transport_set_app_data,
     &transport_attach,
     &transport_detach,
     &transport_send_rtp,
@@ -139 +143 @@
                                        unsigned comp_cnt,
                                        const pj_ice_strans_cfg *cfg,
                                        const pjmedia_ice_cb *cb,
+                                       void *app_data,
                                        pjmedia_transport **p_tp)
 {
     pj_pool_t *pool;
@@ -154 +159 @@
     tp_ice->pool = pool;
     tp_ice->af = cfg->af;
     tp_ice->comp_cnt = comp_cnt;
+    tp_ice->app_data = app_data;
     pj_ansi_strcpy(tp_ice->base.name, pool->obj_name);
     tp_ice->base.op = &transport_ice_op;
     tp_ice->base.type = PJMEDIA_TRANSPORT_TYPE_ICE;
@@ -675 +681 @@
 }
 
 
+static void* transport_set_app_data(pjmedia_transport *tp, 
+                                    pj_bool_t set, void *app_data)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)tp;
+    void *old_app_data;
+
+    PJ_ASSERT_RETURN(tp, NULL);
+
+    old_app_data = tp_ice->app_data;
+    if (set)
+        tp_ice->app_data = app_data;
+
+    return old_app_data;
+}
+
+
 static pj_status_t transport_attach  (pjmedia_transport *tp,
                                       void *stream,
                                       const pj_sockaddr_t *rem_addr,

pjmedia/src/pjmedia/transport_srtp.c

@@ -78 +78 @@
     pjmedia_transport    base;      /**< Base transport interface. */
     pj_pool_t           *pool;
     pj_lock_t           *mutex;
+    void                *app_data;
     char                 tx_buffer[MAX_BUFFER_LEN];
     pjmedia_srtp_setting setting;
     unsigned             media_option;
@@ -126 +127 @@
  */
 static pj_status_t transport_get_info (pjmedia_transport *tp,
                                        pjmedia_transport_info *info);
+static void*       transport_set_app_data(pjmedia_transport *tp, 
+                                          pj_bool_t set, void *app_data);
 static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
@@ -172 +175 @@
 static pjmedia_transport_op transport_srtp_op = 
 {
     &transport_get_info,
+    &transport_set_app_data,
     &transport_attach,
     &transport_detach,
     &transport_send_rtp,
@@ -582 +586 @@
     return pjmedia_transport_get_info(srtp->real_tp, info);
 }
 
+static void* transport_set_app_data(pjmedia_transport *tp, 
+                                    pj_bool_t set, void *app_data)
+{
+    struct transport_srtp *srtp = (struct transport_srtp*)tp;
+    void *old_app_data;
+
+    PJ_ASSERT_RETURN(tp, NULL);
+
+    old_app_data = srtp->app_data;
+    if (set)
+        srtp->app_data = app_data;
+
+    return old_app_data;
+}
+
 static pj_status_t transport_attach(pjmedia_transport *tp,
                                     void *user_data,
                                     const pj_sockaddr_t *rem_addr,