Changeset 1291

Timestamp:

May 23, 2007 7:12:23 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #288: ICE role error on re-INVITE and ICE auth error when sending 487 (Role Conflict) response

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/ice_session.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -445 +445 @@
     realm->slen = nonce->slen = 0;
 
-    if (PJ_STUN_IS_SUCCESS_RESPONSE(msg->hdr.type) ||
-        PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))
-    {
+    if (PJ_STUN_IS_RESPONSE(msg->hdr.type)) {
         /* Outgoing responses need to have the same credential as
          * incoming requests.
@@ -1916 +1914 @@
     }
 
+    /* Handle the case when request comes before answer is received.
+     * We need to put credential in the response, and since we haven't
+     * got the response, copy the username from the request.
+     */
+    if (ice->rcand_cnt == 0) {
+        pj_stun_string_attr *uname_attr;
+
+        uname_attr = (pj_stun_string_attr*)
+                     pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_USERNAME, 0);
+        pj_assert(uname_attr != NULL);
+        pj_strdup(ice->pool, &ice->rx_uname, &uname_attr->value);
+    }
+
     /* 7.2.1.1.  Detecting and Repairing Role Conflicts
      */
@@ -1961 +1972 @@
     }
 
-    /* Handle the case when request comes before answer is received.
-     * We need to put credential in the response, and since we haven't
-     * got the response, copy the username from the request.
-     */
-    if (ice->rcand_cnt == 0) {
-        pj_stun_string_attr *uname_attr;
-
-        uname_attr = (pj_stun_string_attr*)
-                     pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_USERNAME, 0);
-        pj_assert(uname_attr != NULL);
-        pj_strdup(ice->pool, &ice->rx_uname, &uname_attr->value);
-    }
-
     /* 
      * First send response to this request 

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

@@ -2268 +2268 @@
 
         /* Init media channel */
-        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC);
+        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error initializing media channel", status);