Changeset 1379 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Jun 20, 2007 10:03:46 AM (17 years ago)

Author:

bennylp

Message:

More on ticket #399: a)send full offer on 200/OK response when re-INVITE does not have SDP, b) added on_create_offer() callback, c) handle some error cases

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -51 +51 @@
 
 /*
+ * Called to generate new offer.
+ */
+static void pjsua_call_on_create_offer(pjsip_inv_session *inv,
+                                       pjmedia_sdp_session **offer);
+
+/*
  * This callback is called when transaction state has changed in INVITE
  * session. We use this to trap:
@@ -119 +125 @@
     inv_cb.on_media_update = &pjsua_call_on_media_update;
     inv_cb.on_rx_offer = &pjsua_call_on_rx_offer;
+    inv_cb.on_create_offer = &pjsua_call_on_create_offer;
     inv_cb.on_tsx_state_changed = &pjsua_call_on_tsx_state_changed;
 
@@ -2296 +2303 @@
 
 /*
+ * Called to generate new offer.
+ */
+static void pjsua_call_on_create_offer(pjsip_inv_session *inv,
+                                       pjmedia_sdp_session **offer)
+{
+    pjsua_call *call;
+    pj_status_t status;
+
+    PJSUA_LOCK();
+
+    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+
+    /* See if we've put call on hold. */
+    if (call->media_st == PJSUA_CALL_MEDIA_LOCAL_HOLD) {
+        PJ_LOG(4,(THIS_FILE, 
+                  "Call %d: call is on-hold locally, creating inactive SDP ",
+                  call->index));
+        status = create_inactive_sdp( call, offer );
+    } else {
+
+        PJ_LOG(4,(THIS_FILE, "Call %d: asked to send a new offer",
+                  call->index));
+
+        /* Init media channel */
+        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+            PJSUA_UNLOCK();
+            return;
+        }
+
+        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, offer);
+    }
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
+        PJSUA_UNLOCK();
+        return;
+    }
+
+
+    PJSUA_UNLOCK();
+}
+
+
+/*
  * Callback called by event framework when the xfer subscription state
  * has changed.