Changeset 160 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Feb 8, 2006 10:44:25 PM (18 years ago)

Author:

bennylp

Message:

Finished invite session UAS implementation

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -171 +171 @@
 static int         tsx_send_msg( pjsip_transaction *tsx, 
                                  pjsip_tx_data *tdata);
-static void        tsx_on_rx_msg( pjsip_transaction *tsx,
-                                  pjsip_rx_data *rdata );
 
 
@@ -698 +696 @@
     /* Race condition!
      * Transaction may gets deleted before we have chance to lock it
-     * in tsx_on_rx_msg().
+     * in pjsip_tsx_recv_msg().
      */
     PJ_TODO(FIX_RACE_CONDITION_HERE);
 
     /* Pass the message to the transaction. */
-    tsx_on_rx_msg(tsx, rdata );
+    pjsip_tsx_recv_msg(tsx, rdata );
 
     return PJ_TRUE;
@@ -746 +744 @@
     /* Race condition!
      * Transaction may gets deleted before we have chance to lock it
-     * in tsx_on_rx_msg().
+     * in pjsip_tsx_recv_msg().
      */
     PJ_TODO(FIX_RACE_CONDITION_HERE);
 
     /* Pass the message to the transaction. */
-    tsx_on_rx_msg(tsx, rdata );
+    pjsip_tsx_recv_msg(tsx, rdata );
 
     return PJ_TRUE;
@@ -966 +964 @@
         pj_assert(rdata != NULL);
 
-        if (rdata->msg_info.msg->type == PJSIP_REQUEST_MSG &&
-            tsx->tsx_user->on_rx_request)
-        {
-            (*tsx->tsx_user->on_rx_request)(rdata);
-
-        } else if (rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG &&
+        if (rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG &&
                    tsx->tsx_user->on_rx_response)
         {
@@ -1240 +1233 @@
 
 
-    /* Begin with state TRYING.
+    /* Begin with state NULL.
      * Manually set-up the state becase we don't want to call the callback.
      */
-    tsx->state = PJSIP_TSX_STATE_TRYING; 
-    tsx->state_handler = &tsx_on_state_trying;
+    tsx->state = PJSIP_TSX_STATE_NULL; 
+    tsx->state_handler = &tsx_on_state_null;
 
     /* Get response address. */
@@ -1328 +1321 @@
                              state_str[tsx->state]));
 
-    PJSIP_EVENT_INIT_TX_MSG(event, tsx, tdata);
+    PJSIP_EVENT_INIT_TX_MSG(event, tdata);
 
     /* Dispatch to transaction. */
@@ -1350 +1343 @@
  * transaction is received.
  */
-static void tsx_on_rx_msg( pjsip_transaction *tsx, pjsip_rx_data *rdata)
+PJ_DEF(void) pjsip_tsx_recv_msg( pjsip_transaction *tsx, 
+                                 pjsip_rx_data *rdata)
 {
     pjsip_event event;
@@ -1363 +1357 @@
 
     /* Init event. */
-    PJSIP_EVENT_INIT_RX_MSG(event, tsx, rdata);
+    PJSIP_EVENT_INIT_RX_MSG(event, rdata);
 
     /* Dispatch to transaction. */
@@ -1717 +1711 @@
     if (tsx->role == PJSIP_ROLE_UAS) {
 
-        /* UAS doesn't have STATE_NULL.
-         * State has moved from NULL after transaction is initialized.
-         */
-        pj_assert(!"Bug bug bug!!");
-        return PJ_EBUG;
+        /* Set state to Trying. */
+        pj_assert(event->type == PJSIP_EVENT_RX_MSG &&
+                  event->body.rx_msg.rdata->msg_info.msg->type == 
+                    PJSIP_REQUEST_MSG);
+        tsx_set_state( tsx, PJSIP_TSX_STATE_TRYING, PJSIP_EVENT_RX_MSG,
+                       event->body.rx_msg.rdata);
 
     } else {