Changeset 843

Timestamp:

Dec 2, 2006 7:25:29 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #36: pjsip_regc_unregister() SHOULD NOT unregister all contacts but rather only contact that was previously sent in the registration. In addition, added function pjsip_regc_unregister_all() to unregister all contacts

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_regc.h (modified) (2 diffs)
• src/pjsip-ua/sip_reg.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h

@@ -231 +231 @@
 
 /**
- * Create REGISTER request to unregister all contacts from server records.
+ * Create REGISTER request to unregister the contacts that were previously
+ * registered by this client registration.
  *
  * @param regc      The client registration structure.
@@ -240 +241 @@
 PJ_DECL(pj_status_t) pjsip_regc_unregister(pjsip_regc *regc,
                                            pjsip_tx_data **p_tdata);
+
+/**
+ * Create REGISTER request to unregister all contacts from server records.
+ * Note that this will unregister all registered contact for the AOR
+ * including contacts registered by other user agents. To only unregister
+ * contact registered by this client registration instance, use
+ * #pjsip_regc_unregister() instead.
+ *
+ * @param regc      The client registration structure.
+ * @param p_tdata   Pointer to receive the REGISTER request.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_regc_unregister_all(pjsip_regc *regc,
+                                               pjsip_tx_data **p_tdata);
 
 /**

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

@@ -444 +444 @@
 
     msg = tdata->msg;
+    pjsip_msg_add_hdr(msg, pjsip_hdr_shallow_clone(tdata->pool, 
+                                                   regc->contact_hdr));
+    pjsip_msg_add_hdr( msg, (pjsip_hdr*)regc->unreg_expires_hdr);
+
+    *p_tdata = tdata;
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjsip_regc_unregister_all(pjsip_regc *regc,
+                                              pjsip_tx_data **p_tdata)
+{
+    pjsip_tx_data *tdata;
+    pjsip_msg *msg;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(regc && p_tdata, PJ_EINVAL);
+
+    if (regc->timer.id != 0) {
+        pjsip_endpt_cancel_timer(regc->endpt, &regc->timer);
+        regc->timer.id = 0;
+    }
+
+    status = create_request(regc, &tdata);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    msg = tdata->msg;
     pjsip_msg_add_hdr( msg, (pjsip_hdr*)regc->unreg_contact_hdr);
     pjsip_msg_add_hdr( msg, (pjsip_hdr*)regc->unreg_expires_hdr);