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

Timestamp:

Aug 16, 2007 10:11:44 AM (17 years ago)

Author:

bennylp

Message:

Ticket #354: continuing work to port the Symbian libraries to .DSO format

File:

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

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

@@ -114 +114 @@
 };
 
-/* Config */
-extern pj_bool_t pjsip_include_allow_hdr_in_dlg;
-
 /*
  * Module load()
@@ -224 +221 @@
               pjsip_rx_data_get_info(rdata)));
 
-    status = pjsip_dlg_create_request(inv->dlg, &pjsip_ack_method, 
+    status = pjsip_dlg_create_request(inv->dlg, pjsip_get_ack_method(), 
                                       rdata->msg_info.cseq->cseq, &tdata);
     if (status != PJ_SUCCESS) {
@@ -1109 +1106 @@
 
     /* Create the INVITE request. */
-    status = pjsip_dlg_create_request(inv->dlg, &pjsip_invite_method, -1,
+    status = pjsip_dlg_create_request(inv->dlg, pjsip_get_invite_method(), -1,
                                       &tdata);
     if (status != PJ_SUCCESS)
@@ -1156 +1153 @@
 
     /* Add Allow header. */
-    if (pjsip_include_allow_hdr_in_dlg) {
+    if (inv->dlg->add_allow) {
         hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_ALLOW, NULL);
         if (hdr) {
@@ -1598 +1595 @@
     case PJSIP_INV_STATE_CONFIRMED:
         /* For established dialog, send BYE */
-        status = pjsip_dlg_create_request(inv->dlg, &pjsip_bye_method, -1, 
-                                          &tdata);
+        status = pjsip_dlg_create_request(inv->dlg, pjsip_get_bye_method(), 
+                                          -1, &tdata);
         break;
 
@@ -1793 +1790 @@
 
     pjsip_tsx_create_key(rdata->tp_info.pool, &key, PJSIP_ROLE_UAS,
-                         &pjsip_invite_method, rdata);
+                         pjsip_get_invite_method(), rdata);
     invite_tsx = pjsip_tsx_layer_find_tsx(&key, PJ_TRUE);