Changeset 1534

Timestamp:

Oct 31, 2007 10:20:31 AM (16 years ago)

Author:

bennylp

Message:

Ticket #405: Subscribe to buddy presence upon receiving incoming subscription from the buddy

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

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

@@ -3083 +3083 @@
 
 /**
+ * This specifies how long the library should retry resending SUBSCRIBE
+ * if the previous SUBSCRIBE failed.
+ *
+ * Default: 300 seconds
+ */
+#ifndef PJSUA_PRES_TIMER
+#   define PJSUA_PRES_TIMER         300
+#endif
+
+
+/**
  * This structure describes buddy configuration when adding a buddy to
  * the buddy list with #pjsua_buddy_add(). Application MUST initialize

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

@@ -23 +23 @@
 #define THIS_FILE   "pjsua_pres.c"
 
-#ifndef PJSUA_PRES_TIMER
-#   define PJSUA_PRES_TIMER     120
-#endif
+
+static void subscribe_buddy_presence(unsigned index);
+
+
+/*
+ * Find buddy.
+ */
+static pjsua_buddy_id pjsua_find_buddy(const pjsip_uri *uri)
+{
+    const pjsip_sip_uri *sip_uri;
+    unsigned i;
+
+    uri = pjsip_uri_get_uri((pjsip_uri*)uri);
+
+    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
+        return PJSUA_INVALID_ID;
+
+    sip_uri = (const pjsip_sip_uri*) uri;
+
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.buddy); ++i) {
+        const pjsua_buddy *b = &pjsua_var.buddy[i];
+
+        if (!pjsua_buddy_is_valid(i))
+            continue;
+
+        if (pj_stricmp(&sip_uri->user, &b->name)==0 &&
+            pj_stricmp(&sip_uri->host, &b->host)==0 &&
+            (sip_uri->port==(int)b->port || (sip_uri->port==0 && b->port==5060)))
+        {
+            /* Match */
+            return i;
+        }
+    }
+
+    return PJSUA_INVALID_ID;
+}
 
 
@@ -466 +499 @@
     pjsip_expires_hdr *expires_hdr;
     pjsip_evsub_state ev_state;
+    pjsua_buddy_id buddy_id;
     pj_status_t status;
 
@@ -596 +630 @@
     }
 
+
+    /* Subscribe to buddy's presence if we're not subscribed */
+    buddy_id = pjsua_find_buddy(dlg->remote.info->uri);
+    if (buddy_id != PJSUA_INVALID_ID) {
+        pjsua_buddy *b = &pjsua_var.buddy[buddy_id];
+        if (b->monitor && b->sub == NULL) {
+            PJ_LOG(4,(THIS_FILE, "Received SUBSCRIBE from buddy %d, "
+                      "activating outgoing subscription", buddy_id));
+            subscribe_buddy_presence(buddy_id);
+        }
+    }
 
     /* Done: */