Changeset 201 for pjproject/trunk/pjsip/src/pjsip-simple/xpidf.c

Timestamp:

Feb 19, 2006 3:37:19 PM (18 years ago)

Author:

bennylp

Message:

SIMPLE test with FWD, and added more info in UI

File:

• pjproject/trunk/pjsip/src/pjsip-simple/xpidf.c (modified) (6 diffs)

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

@@ -30 +30 @@
 static pj_str_t ATOM = { "atom", 4 };
 static pj_str_t ATOMID = { "atomid", 6 };
+static pj_str_t ID = { "id", 2 };
 static pj_str_t ADDRESS = { "address", 7 };
 static pj_str_t SUBSCRIBE_PARAM = { ";method=SUBSCRIBE", 17 };
@@ -127 +128 @@
     if (pj_stricmp(&pres->name, &PRESENCE) != 0)
         return NULL;
-    if (pj_xml_find_attr(pres, &URI, NULL) == NULL)
-        return NULL;
 
     /* Validate <presentity> */
@@ -134 +133 @@
     if (node == NULL)
         return NULL;
+    if (pj_xml_find_attr(node, &URI, NULL) == NULL)
+        return NULL;
 
     /* Validate <atom> */
@@ -139 +140 @@
     if (node == NULL)
         return NULL;
-    if (pj_xml_find_attr(node, &ATOMID, NULL) == NULL)
-        return NULL;
+    if (pj_xml_find_attr(node, &ATOMID, NULL) == NULL && 
+        pj_xml_find_attr(node, &ID, NULL) == NULL)
+    {
+        return NULL;
+    }
 
     /* Address */
@@ -247 +251 @@
         return PJ_FALSE;
     }
-    status = pj_xml_find_node(atom, &STATUS);
+    status = pj_xml_find_node(addr, &STATUS);
     if (!status) {
         pj_assert(0);
@@ -258 +262 @@
     }
 
-    return pj_stricmp(&attr->value, &OPEN) ? PJ_TRUE : PJ_FALSE;
+    return pj_stricmp(&attr->value, &OPEN)==0 ? PJ_TRUE : PJ_FALSE;
 }