Changeset 2273

Timestamp:

Sep 11, 2008 10:25:51 AM (16 years ago)

Author:

bennylp

Message:

Ticket #623: Assertion when receiving SUBSCRIBE with non presence event (thanks Lucas Rosa Galêgo for the report)

Location:

pjproject/trunk

Files:

• pjsip-apps/src/test-pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py (added)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -719 +719 @@
     status = pjsip_pres_create_uas( dlg, &pres_cb, rdata, &sub);
     if (status != PJ_SUCCESS) {
-        pjsip_dlg_terminate(dlg);
+        int code = PJSIP_ERRNO_TO_SIP_STATUS(status);
+        pjsip_tx_data *tdata;
+
         pjsua_perror(THIS_FILE, "Unable to create server subscription", 
                      status);
+
+        if (code==599 || code > 699 || code < 300) {
+            code = 400;
+        }
+
+        status = pjsip_dlg_create_response(dlg, rdata, code, NULL, &tdata);
+        if (status == PJ_SUCCESS) {
+            status = pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata),
+                                             tdata);
+        }
+
         PJSUA_UNLOCK();
         return PJ_TRUE;