Changeset 448

Timestamp:

May 16, 2006 1:20:00 PM (18 years ago)

Author:

bennylp

Message:

Rearrange transaction statefull stuffs in SIP so that it will not be linked when transaction is disabled

Location:

pjproject/trunk

Files:

• pjsip-apps/build/Samples-vc.mak (modified) (1 diff)
• pjsip-apps/build/Samples.mak (modified) (1 diff)
• pjsip-apps/build/samples.dsp (modified) (1 diff)
• pjsip-apps/src/samples/sipstateless.c (added)
• pjsip-apps/src/samples/streamutil.c (modified) (1 diff)
• pjsip/src/pjsip/sip_endpoint.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transaction.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_util.c (modified) (1 diff)
• pjsip/src/pjsip/sip_util_statefull.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/build/Samples-vc.mak

@@ -36 +36 @@
 
 
-SAMPLES = $(BINDIR)\simpleua.exe $(BINDIR)\playfile.exe $(BINDIR)\playsine.exe\
-          $(BINDIR)\confsample.exe $(BINDIR)\sndinfo.exe \
-          $(BINDIR)\level.exe $(BINDIR)\recfile.exe  \
-          $(BINDIR)\resampleplay.exe $(BINDIR)\siprtp.exe \
+SAMPLES = $(BINDIR)\confsample.exe \
+          $(BINDIR)\level.exe \
+          $(BINDIR)\playfile.exe \
+          $(BINDIR)\playsine.exe\
+          $(BINDIR)\recfile.exe  \
+          $(BINDIR)\resampleplay.exe \
+          $(BINDIR)\simpleua.exe \
+          $(BINDIR)\siprtp.exe \
+          $(BINDIR)\sipstateless.exe \
+          $(BINDIR)\sndinfo.exe \
           $(BINDIR)\streamutil.exe
 

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -39 +39 @@
 BINDIR := ../bin/samples
 
-SAMPLES := simpleua playfile playsine confsample sndinfo level recfile resampleplay \
-           siprtp streamutil
+SAMPLES := confsample \
+           level \
+           playfile \
+           playsine \
+           recfile \
+           resampleplay \
+           simpleua \
+           siprtp \
+           sipstateless \
+           sndinfo \
+           streamutil
 
 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(TARGET)$(HOST_EXE))

pjproject/trunk/pjsip-apps/build/samples.dsp

@@ -123 +123 @@
 # Begin Source File
 
+SOURCE=..\src\samples\sipstateless.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\samples\sndinfo.c
 # End Source File

pjproject/trunk/pjsip-apps/src/samples/streamutil.c

@@ -75 +75 @@
     pj_status_t status;
 
+#if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0
     status = pjmedia_codec_g711_init(med_endpt);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-
+#endif
+
+#if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC!=0
     status = pjmedia_codec_gsm_init(med_endpt);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-
+#endif
+
+#if defined(PJMEDIA_HAS_SPEEX_CODEC) && PJMEDIA_HAS_SPEEX_CODEC!=0
     status = pjmedia_codec_speex_init(med_endpt, 0, -1, -1);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-
+#endif
+
+#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
     status = pjmedia_codec_l16_init(med_endpt, 0);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+#endif
 
     return PJ_SUCCESS;

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -104 +104 @@
 pj_status_t pjsip_tel_uri_subsys_init(void);
 
-/* Defined in sip_util_statefull.c */
-extern pjsip_module mod_stateful_util;
-
 
 /* Specifies whether error subsystem has been registered to pjlib. */
@@ -487 +484 @@
     pj_list_init(&endpt->cap_hdr);
 
-    /* Register mod_stateful_util module (sip_util_statefull.c) */
-    status = pjsip_endpt_register_module(endpt, &mod_stateful_util);
-    if (status != PJ_SUCCESS)
-        goto on_error;
 
     /* Done. */

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

@@ -38 +38 @@
 #define TSX_TRACE_(expr)
 #endif
+
+
+/* Defined in sip_util_statefull.c */
+extern pjsip_module mod_stateful_util;
 
 
@@ -466 +470 @@
     }
 
+    /* Register mod_stateful_util module (sip_util_statefull.c) */
+    status = pjsip_endpt_register_module(endpt, &mod_stateful_util);
+    if (status != PJ_SUCCESS) {
+        return status;
+    }
+
     return PJ_SUCCESS;
 }

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1258 +1258 @@
 
 /*
- * Send response statefully.
- */
-PJ_DEF(pj_status_t) pjsip_endpt_respond(  pjsip_endpoint *endpt,
-                                          pjsip_module *tsx_user,
-                                          pjsip_rx_data *rdata,
-                                          int st_code,
-                                          const pj_str_t *st_text,
-                                          const pjsip_hdr *hdr_list,
-                                          const pjsip_msg_body *body,
-                                          pjsip_transaction **p_tsx )
-{
-    pj_status_t status;
-    pjsip_tx_data *tdata;
-    pjsip_transaction *tsx;
-
-    /* Validate arguments. */
-    PJ_ASSERT_RETURN(endpt && rdata, PJ_EINVAL);
-
-    if (p_tsx) *p_tsx = NULL;
-
-    /* Create response message */
-    status = pjsip_endpt_create_response( endpt, rdata, st_code, st_text, 
-                                          &tdata);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    /* Add the message headers, if any */
-    if (hdr_list) {
-        const pjsip_hdr *hdr = hdr_list->next;
-        while (hdr != hdr_list) {
-            pjsip_msg_add_hdr( tdata->msg, pjsip_hdr_clone(tdata->pool, hdr) );
-            hdr = hdr->next;
-        }
-    }
-
-    /* Add the message body, if any. */
-    if (body) {
-        tdata->msg->body = pjsip_msg_body_clone( tdata->pool, body );
-        if (tdata->msg->body == NULL) {
-            pjsip_tx_data_dec_ref(tdata);
-            return status;
-        }
-    }
-
-    /* Create UAS transaction. */
-    status = pjsip_tsx_create_uas(tsx_user, rdata, &tsx);
-    if (status != PJ_SUCCESS) {
-        pjsip_tx_data_dec_ref(tdata);
-        return status;
-    }
-
-    /* Feed the request to the transaction. */
-    pjsip_tsx_recv_msg(tsx, rdata);
-
-    /* Send the message. */
-    status = pjsip_tsx_send_msg(tsx, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsip_tx_data_dec_ref(tdata);
-    } else if (p_tsx) {
-        *p_tsx = tsx;
-    }
-
-    return status;
-}
-
-
-/*
  * Get the event string from the event ID.
  */

pjproject/trunk/pjsip/src/pjsip/sip_util_statefull.c

@@ -90 +90 @@
     PJ_ASSERT_RETURN(endpt && tdata && (timeout==-1 || timeout>0), PJ_EINVAL);
 
+    /* Check that transaction layer module is registered to endpoint */
+    PJ_ASSERT_RETURN(mod_stateful_util.id != -1, PJ_EINVALIDOP);
+
+
     status = pjsip_tsx_create_uac(&mod_stateful_util, tdata, &tsx);
     if (status != PJ_SUCCESS) {
@@ -106 +110 @@
 }
 
+
+/*
+ * Send response statefully.
+ */
+PJ_DEF(pj_status_t) pjsip_endpt_respond(  pjsip_endpoint *endpt,
+                                          pjsip_module *tsx_user,
+                                          pjsip_rx_data *rdata,
+                                          int st_code,
+                                          const pj_str_t *st_text,
+                                          const pjsip_hdr *hdr_list,
+                                          const pjsip_msg_body *body,
+                                          pjsip_transaction **p_tsx )
+{
+    pj_status_t status;
+    pjsip_tx_data *tdata;
+    pjsip_transaction *tsx;
+
+    /* Validate arguments. */
+    PJ_ASSERT_RETURN(endpt && rdata, PJ_EINVAL);
+
+    if (p_tsx) *p_tsx = NULL;
+
+    /* Create response message */
+    status = pjsip_endpt_create_response( endpt, rdata, st_code, st_text, 
+                                          &tdata);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Add the message headers, if any */
+    if (hdr_list) {
+        const pjsip_hdr *hdr = hdr_list->next;
+        while (hdr != hdr_list) {
+            pjsip_msg_add_hdr( tdata->msg, pjsip_hdr_clone(tdata->pool, hdr) );
+            hdr = hdr->next;
+        }
+    }
+
+    /* Add the message body, if any. */
+    if (body) {
+        tdata->msg->body = pjsip_msg_body_clone( tdata->pool, body );
+        if (tdata->msg->body == NULL) {
+            pjsip_tx_data_dec_ref(tdata);
+            return status;
+        }
+    }
+
+    /* Create UAS transaction. */
+    status = pjsip_tsx_create_uas(tsx_user, rdata, &tsx);
+    if (status != PJ_SUCCESS) {
+        pjsip_tx_data_dec_ref(tdata);
+        return status;
+    }
+
+    /* Feed the request to the transaction. */
+    pjsip_tsx_recv_msg(tsx, rdata);
+
+    /* Send the message. */
+    status = pjsip_tsx_send_msg(tsx, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsip_tx_data_dec_ref(tdata);
+    } else if (p_tsx) {
+        *p_tsx = tsx;
+    }
+
+    return status;
+}
+
+