Changeset 324 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Mar 17, 2006 5:57:52 PM (18 years ago)

Author:

bennylp

Message:

Changed pjsip_inv_send_msg() function

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -34 +34 @@
 #define THIS_FILE       "sip_invite_session.c"
 
+static const char *inv_state_names[] =
+{
+    "NULL      ",
+    "CALLING   ",
+    "INCOMING  ",
+    "EARLY     ",
+    "CONNECTING",
+    "CONFIRMED ",
+    "DISCONNCTD",
+    "TERMINATED",
+};
+
 /*
  * Static prototypes.
@@ -67 +79 @@
     pjsip_endpoint      *endpt;
     pjsip_inv_callback   cb;
-    pjsip_module        *app_user;
 } mod_inv = 
 {
@@ -317 +328 @@
  */
 PJ_DEF(pj_status_t) pjsip_inv_usage_init( pjsip_endpoint *endpt,
-                                          pjsip_module *app_module,
                                           const pjsip_inv_callback *cb)
 {
@@ -323 +333 @@
 
     /* Check arguments. */
-    PJ_ASSERT_RETURN(endpt && app_module && cb, PJ_EINVAL);
+    PJ_ASSERT_RETURN(endpt && cb, PJ_EINVAL);
 
     /* Some callbacks are mandatory */
@@ -335 +345 @@
 
     mod_inv.endpt = endpt;
-    mod_inv.app_user = app_module;
 
     /* Register the module. */
@@ -361 +370 @@
 }
 
+
+/*
+ * Get INVITE state name.
+ */
+PJ_DEF(const char *) pjsip_inv_state_name(pjsip_inv_state state)
+{
+    PJ_ASSERT_RETURN(state >= PJSIP_INV_STATE_NULL && 
+                     state <= PJSIP_INV_STATE_DISCONNECTED,
+                     "??");
+
+    return inv_state_names[state];
+}
 
 /*
@@ -1549 +1570 @@
  */
 PJ_DEF(pj_status_t) pjsip_inv_send_msg( pjsip_inv_session *inv,
-                                        pjsip_tx_data *tdata,
-                                        void *token )
+                                        pjsip_tx_data *tdata)
 {
     pj_status_t status;
@@ -1572 +1592 @@
 
         tsx->mod_data[mod_inv.mod.id] = tsx_inv_data;
-        tsx->mod_data[mod_inv.app_user->id] = token;
 
     } else {
@@ -1718 +1737 @@
         } else {
             /* Re-send BYE. */
-            status = pjsip_inv_send_msg(inv, tdata, NULL );
+            status = pjsip_inv_send_msg(inv, tdata);
         }
 
@@ -1852 +1871 @@
 
                     /* Send the request. */
-                    status = pjsip_inv_send_msg(inv, tdata, NULL );
+                    status = pjsip_inv_send_msg(inv, tdata);
                 }
 
@@ -2272 +2291 @@
                 return;
 
-            status = pjsip_inv_send_msg(inv, tdata, NULL);
+            status = pjsip_inv_send_msg(inv, tdata);
 
         }
@@ -2311 +2330 @@
 
             /* Send re-INVITE */
-            status = pjsip_inv_send_msg( inv, tdata, NULL);
+            status = pjsip_inv_send_msg( inv, tdata);
 
         } else if (tsx->status_code==PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||