Changeset 605

Timestamp:

Jul 16, 2006 10:40:37 AM (18 years ago)

Author:

bennylp

Message:

Fixed crash in SIP TCP transport deinitialization, and set pjsip-perf to handle INVITE request to non-standard URL call-statefully

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/pjsip-perf.c (modified) (6 diffs)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (1 diff)

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

@@ -363 +363 @@
     sip_uri = (pjsip_sip_uri*) uri;
 
-    /* Check for matching user part */
-    if (pj_strcmp(&sip_uri->user, &call_user)!=0)
+    /* Only want to handle INVITE requests. */
+    if (rdata->msg_info.msg->line.req.method.id != PJSIP_INVITE_METHOD) {
         return PJ_FALSE;
-
-    /* Only want to handle INVITE requests (for now). */
-    if (rdata->msg_info.msg->line.req.method.id != PJSIP_INVITE_METHOD) {
+    }
+
+
+    /* Check for matching user part. Incoming requests will be handled 
+     * call-statefully if:
+     *  - user part is "2", or
+     *  - user part is not "0" nor "1" and method is INVITE.
+     */
+    if (pj_strcmp(&sip_uri->user, &call_user) == 0 ||
+        sip_uri->user.slen != 1 ||
+        (*sip_uri->user.ptr != '0' && *sip_uri->user.ptr != '1'))
+    {
+        /* Match */
+
+    } else {
         return PJ_FALSE;
     }
@@ -460 +472 @@
 }
 
+
+
+/**************************************************************************
+ * Default handler when incoming request is not handled by any other
+ * modules.
+ */
+static pj_bool_t mod_responder_on_rx_request(pjsip_rx_data *rdata);
+
+/* Module to handle incoming requests statelessly.
+ */
+static pjsip_module mod_responder =
+{
+    NULL, NULL,                     /* prev, next.              */
+    { "mod-responder", 13 },        /* Name.                    */
+    -1,                             /* Id                       */
+    PJSIP_MOD_PRIORITY_APPLICATION+1, /* Priority               */
+    NULL,                           /* load()                   */
+    NULL,                           /* start()                  */
+    NULL,                           /* stop()                   */
+    NULL,                           /* unload()                 */
+    &mod_responder_on_rx_request,   /* on_rx_request()          */
+    NULL,                           /* on_rx_response()         */
+    NULL,                           /* on_tx_request.           */
+    NULL,                           /* on_tx_response()         */
+    NULL,                           /* on_tsx_state()           */
+};
+
+
+static pj_bool_t mod_responder_on_rx_request(pjsip_rx_data *rdata)
+{
+    const pj_str_t reason = pj_str("Not expecting request at this URI");
+
+    /*
+     * Respond any requests with 500.
+     */
+    pjsip_endpt_respond_stateless(app.sip_endpt, rdata, 500, &reason,
+                                  NULL, NULL);
+    return PJ_TRUE;
+}
 
 
@@ -721 +772 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
+    /* Register default responder module */
+    status = pjsip_endpt_register_module( app.sip_endpt, &mod_responder);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
     /* Register stateless server module */
@@ -1489 +1543 @@
     static char report[1024];
 
-    puts("PJSIP Performance Measurement Tool\n"
-        "(c)2006 pjsip.org\n");
+    printf("PJSIP Performance Measurement Tool v%s\n"
+           "(c)2006 pjsip.org\n\n",
+           PJ_VERSION);
 
     if (create_app() != 0)
@@ -1506 +1561 @@
     pj_log_set_level(app.log_level);
 
-    if (app.log_level > 3) {
+    if (app.log_level > 4) {
         pjsip_endpt_register_module(app.sip_endpt, &msg_logger);
     }
@@ -1658 +1713 @@
                app.local_port,
                (app.use_tcp ? ";transport=tcp" : ""));
+        printf("INVITE with non-matching user part will be handled call-statefully\n");
 
         for (i=0; i<app.thread_count; ++i) {

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -366 +366 @@
     for (i=0; i<PJ_ARRAY_SIZE(listener->accept_op); ++i) {
         if (listener->accept_op[i] && listener->accept_op[i]->pool) {
-            pj_pool_release(listener->accept_op[i]->pool);
+            pj_pool_t *pool = listener->accept_op[i]->pool;
             listener->accept_op[i]->pool = NULL;
+            pj_pool_release(pool);
         }
     }