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

Timestamp:

Feb 7, 2006 6:48:01 PM (18 years ago)

Author:

bennylp

Message:

Tested initial implementation: basic UAC, client registration, authentication, etc

File:

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

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

@@ -107 +107 @@
 static pj_bool_t mod_inv_on_rx_request(pjsip_rx_data *rdata)
 {
+    pjsip_dialog *dlg;
+
     /* Ignore requests outside dialog */
-    if (pjsip_rdata_get_dlg(rdata) == NULL)
+    dlg = pjsip_rdata_get_dlg(rdata);
+    if (dlg == NULL)
         return PJ_FALSE;
 
-    /* Ignore all. */
+    /* Answer BYE with 200/OK. */
+    if (rdata->msg_info.msg->line.req.method.id == PJSIP_BYE_METHOD) {
+        pj_status_t status;
+        pjsip_tx_data *tdata;
+
+        status = pjsip_dlg_create_response(dlg, rdata, 200, NULL, &tdata);
+        if (status == PJ_SUCCESS)
+            status = pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata),
+                                             tdata);
+
+        return status==PJ_SUCCESS ? PJ_TRUE : PJ_FALSE;
+    }
+
     return PJ_FALSE;
 }
@@ -915 +930 @@
 
     case PJSIP_INV_STATE_DISCONNECTED:
-    case PJSIP_INV_STATE_TERMINATED:
         /* No need to do anything. */
         PJ_TODO(RETURN_A_PROPER_STATUS_CODE_HERE);
@@ -1067 +1081 @@
     pjsip_transaction *tsx = e->body.tsx_state.tsx;
     pjsip_dialog *dlg = pjsip_tsx_get_dlg(tsx);
+    pj_status_t status;
 
     PJ_ASSERT_ON_FAIL(tsx && dlg, return);
     
-    if (tsx->method.id == PJSIP_INVITE_METHOD) {
+    if (tsx == s->invite_tsx) {
 
         switch (tsx->state) {
@@ -1093 +1108 @@
                 inv_set_state(s, PJSIP_INV_STATE_CONNECTING, e);
 
+            } else if (tsx->status_code==401 || tsx->status_code==407) {
+
+                /* Handle authentication failure:
+                 * Resend the request with Authorization header.
+                 */
+                pjsip_tx_data *tdata;
+
+                status = pjsip_auth_clt_reinit_req(&s->dlg->auth_sess, 
+                                                   e->body.tsx_state.src.rdata,
+                                                   tsx->last_tx,
+                                                   &tdata);
+
+                if (status != PJ_SUCCESS) {
+
+                    /* Does not have proper credentials. 
+                     * End the session.
+                     */
+                    inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
+
+                } else {
+
+                    /* Restart session. */
+                    s->state = PJSIP_INV_STATE_NULL;
+                    s->invite_tsx = NULL;
+
+                    /* Send the request. */
+                    status = pjsip_inv_send_msg(s, tdata, NULL );
+                }
+
             } else {
+
                 inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
+
             }
             break;
@@ -1116 +1162 @@
             } else  {
                 inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
-                inv_set_state(s, PJSIP_INV_STATE_TERMINATED, e);
             }
             break;
@@ -1136 +1181 @@
     PJ_ASSERT_ON_FAIL(tsx && dlg, return);
 
-    if (tsx->method.id == PJSIP_INVITE_METHOD) {
+    if (tsx == s->invite_tsx) {
         switch (tsx->state) {
         case PJSIP_TSX_STATE_PROCEEDING:
@@ -1151 +1196 @@
             /* This happens on transport error */
             inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
-            inv_set_state(s, PJSIP_INV_STATE_TERMINATED, e);
             break;
         default:
@@ -1168 +1212 @@
     PJ_ASSERT_ON_FAIL(tsx && dlg, return);
 
-    if (tsx->method.id == PJSIP_INVITE_METHOD) {
+    if (tsx == s->invite_tsx) {
 
         switch (tsx->state) {
@@ -1207 +1251 @@
             } else  {
                 inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
-                inv_set_state(s, PJSIP_INV_STATE_TERMINATED, e);
             }
             break;
@@ -1244 +1287 @@
         }
 
+    } else if (tsx->method.id == PJSIP_INVITE_METHOD) {
+
+        /* Ignore previously failed INVITE transaction event
+         * (e.g. when rejected with 401/407)
+         */
+
     } else {
         pj_assert(!"Unexpected transaction type");
@@ -1256 +1305 @@
     PJ_ASSERT_ON_FAIL(tsx && dlg, return);
 
-    if (tsx->method.id == PJSIP_INVITE_METHOD) {
+    if (tsx == s->invite_tsx) {
 
         switch (tsx->state) {
@@ -1270 +1319 @@
             if (tsx->status_code/100 != 2) {
                 inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
-                inv_set_state(s, PJSIP_INV_STATE_TERMINATED, e);
             }
             break;
@@ -1297 +1345 @@
         inv_set_state(s, PJSIP_INV_STATE_DISCONNECTED, e);
 
-    } else if (tsx->method.id == PJSIP_INVITE_METHOD) {
+    } else if (tsx == s->invite_tsx) {
         
         switch (tsx->state) {
@@ -1308 +1356 @@
         }
 
+    } else if (tsx->method.id == PJSIP_INVITE_METHOD) {
+
+        /* Re-INVITE */
 
     } else {