Changeset 3412 for pjproject

Timestamp:

Feb 11, 2011 7:39:14 AM (14 years ago)

Author:

ming

Message:

Re #1161: Support for adding custom presence subscription headers.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-simple/evsub.h (modified) (1 diff)
• include/pjsip-simple/presence.h (modified) (1 diff)
• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsip-simple/evsub.c (modified) (4 diffs)
• src/pjsip-simple/presence.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-simple/evsub.h

@@ -381 +381 @@
 
 /**
+ * Add a list of headers to the subscription instance. The list of headers
+ * will be added to outgoing presence subscription requests.
+ *
+ * @param sub           Subscription instance.
+ * @param hdr_list      List of headers to be added.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_evsub_add_header( pjsip_evsub *sub,
+                                             const pjsip_hdr *hdr_list );
+
+
+/**
  * Accept the incoming subscription request by sending 2xx response to
  * incoming SUBSCRIBE request.

pjproject/trunk/pjsip/include/pjsip-simple/presence.h

@@ -181 +181 @@
                                           pjsip_tx_data **p_tdata);
 
+
+/**
+ * Add a list of headers to the subscription instance. The list of headers
+ * will be added to outgoing presence subscription requests.
+ *
+ * @param sub           Subscription instance.
+ * @param hdr_list      List of headers to be added.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_pres_add_header( pjsip_evsub *sub,
+                                            const pjsip_hdr *hdr_list );
 
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2139 +2139 @@
     pjsip_hdr       reg_hdr_list;
 
+    /** 
+     * The optional custom SIP headers to be put in the presence
+     * subscription request.
+     */
+    pjsip_hdr       sub_hdr_list;
+
     /**
      * Subscribe to message waiting indication events (RFC 3842).

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -228 +228 @@
     pjsip_expires_hdr    *expires;      /**< Expires header                 */
     pjsip_accept_hdr     *accept;       /**< Local Accept header.           */
+    pjsip_hdr             sub_hdr_list; /**< User-defined header.           */
 
     pj_time_val           refresh_time; /**< Time to refresh.               */
@@ -724 +725 @@
     sub->accept = (pjsip_accept_hdr*) 
                   pjsip_hdr_clone(sub->pool, pkg->pkg_accept);
+    pj_list_init(&sub->sub_hdr_list);
 
     sub->timer.user_data = sub;
@@ -1028 +1030 @@
                                                mod_evsub.allow_events_hdr));
 
-   
+
+    /* Add custom headers */
+    {
+        const pjsip_hdr *hdr = sub->sub_hdr_list.next;
+        while (hdr != &sub->sub_hdr_list) {
+            pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
+                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
+            hdr = hdr->next;
+        }
+    }
+
+
     *p_tdata = tdata;
 
@@ -1036 +1049 @@
     pjsip_dlg_dec_lock(sub->dlg);
     return status;
+}
+
+
+/*
+ * Add custom headers.
+ */
+PJ_DEF(pj_status_t) pjsip_evsub_add_header( pjsip_evsub *sub,
+                                            const pjsip_hdr *hdr_list )
+{
+    const pjsip_hdr *hdr;
+
+    PJ_ASSERT_RETURN(sub && hdr_list, PJ_EINVAL);
+
+    hdr = hdr_list->next;
+    while (hdr != hdr_list) {
+        pj_list_push_back(&sub->sub_hdr_list, (pjsip_hdr*)
+                          pjsip_hdr_clone(sub->pool, hdr));
+        hdr = hdr->next;
+    }
+
+    return PJ_SUCCESS;
 }
 

pjproject/trunk/pjsip/src/pjsip-simple/presence.c

@@ -357 +357 @@
 
 /*
+ * Add custom headers.
+ */
+PJ_DEF(pj_status_t) pjsip_pres_add_header( pjsip_evsub *sub,
+                                           const pjsip_hdr *hdr_list )
+{
+    return pjsip_evsub_add_header( sub, hdr_list );
+}
+
+
+/*
  * Accept incoming subscription.
  */

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

@@ -191 +191 @@
 #endif
     pj_list_init(&cfg->reg_hdr_list);
+    pj_list_init(&cfg->sub_hdr_list);
     cfg->call_hold_type = PJSUA_CALL_HOLD_TYPE_DEFAULT;
 }

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

@@ -891 +891 @@
         uapres->remote[status] = '\0';
 
+    pjsip_evsub_add_header(sub, &acc->cfg.sub_hdr_list);
     pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id, uapres);