Changeset 1000 for pjproject/trunk

Timestamp:

Feb 24, 2007 3:33:54 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #136: Invalid presence entity ID when URI is specified in name-addr format

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (2 diffs)

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

@@ -623 +623 @@
     /* Create PUBLISH request */
     if (active) {
+        char *bpos;
+        pj_str_t entity;
+
         status = pjsip_publishc_publish(acc->publish_sess, PJ_TRUE, &tdata);
         if (status != PJ_SUCCESS) {
@@ -634 +637 @@
         pres_status.info[0].basic_open = acc->online_status;
 
+        /* Be careful not to send PIDF with presence entity ID containing
+         * "<" character.
+         */
+        if ((bpos=pj_strchr(&acc_cfg->id, '<')) != NULL) {
+            char *epos = pj_strchr(&acc_cfg->id, '>');
+            if (epos - bpos < 2) {
+                pj_assert(!"Unexpected invalid URI");
+                status = PJSIP_EINVALIDURI;
+                goto on_error;
+            }
+            entity.ptr = bpos+1;
+            entity.slen = epos - bpos - 1;
+        } else {
+            entity = acc_cfg->id;
+        }
+
         /* Create and add PIDF message body */
         status = pjsip_pres_create_pidf(tdata->pool, &pres_status,
-                                        &acc_cfg->id, &tdata->msg->body);
+                                        &entity, &tdata->msg->body);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error creating PIDF for PUBLISH request",