Changeset 424

Timestamp:

Apr 29, 2006 12:38:25 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in event subscription when it is challenged/authenticated

Location:

pjproject/trunk

Files:

• pjlib/src/pj/config.c (modified) (1 diff)
• pjmedia/src/pjmedia/endpoint.c (modified) (4 diffs)
• pjsip/src/pjsip-simple/evsub.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.5";
+const char *PJ_VERSION = "0.5.5.1";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -433 +433 @@
     unsigned i, count;
     pjmedia_codec_info codec_info[32];
+    unsigned prio[32];
 
     PJ_LOG(3,(THIS_FILE, "Dumping PJMEDIA capabilities:"));
@@ -438 +439 @@
     count = PJ_ARRAY_SIZE(codec_info);
     if (pjmedia_codec_mgr_enum_codecs(&endpt->codec_mgr, 
-                                      &count, codec_info, NULL) != PJ_SUCCESS)
+                                      &count, codec_info, prio) != PJ_SUCCESS)
     {
         PJ_LOG(3,(THIS_FILE, " -error: failed to enum codecs"));
@@ -467 +468 @@
 
         PJ_LOG(3,(THIS_FILE, 
-                  "   %s codec #%2d: pt=%d (%.*s @%dKHz/%d, %sbps, ptime=%d ms, vad=%d, cng=%d)", 
+                  "   %s codec #%2d: pt=%d (%.*s @%dKHz/%d, %sbps, %dms%s%s%s%s%s)",
                   type, i, codec_info[i].pt,
                   (int)codec_info[i].encoding_name.slen,
@@ -475 +476 @@
                   good_number(bps, param.avg_bps), 
                   param.ptime,
-                  param.vad,
-                  param.cng));
+                  (param.vad ? " vad" : ""),
+                  (param.cng ? " cng" : ""),
+                  (param.concl ? " plc" : ""),
+                  (param.penh ? " penh" : ""),
+                  (prio[i]==PJMEDIA_CODEC_PRIO_DISABLED?" disabled":"")));
     }
 #endif

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

@@ -1356 +1356 @@
         sub->pending_sub = tsx;
 
-    } else if (tsx == sub->pending_sub &&
-               tsx->state >= PJSIP_TSX_STATE_COMPLETED)
-    {
-        sub->pending_sub = NULL;
     }
 
@@ -1468 +1464 @@
             return;
         }
+
+        /* Clear pending subscription */
+        if (tsx == sub->pending_sub)
+            sub->pending_sub = NULL;
 
         /* Handle authentication. */

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

@@ -684 +684 @@
 
 
-    /* If user specifies the exact codec to be used, then disable all codecs
-     * and only enable those specific codecs.
+    /* Enable those codecs that user put with "--add-codec", and move
+     * the priority to top
      */
-    if (pjsua.codec_cnt != 0) {
-        codec_id = pj_str("");
-        pjmedia_codec_mgr_set_codec_priority( 
-            pjmedia_endpt_get_codec_mgr(pjsua.med_endpt),
-            &codec_id, 
-            PJMEDIA_CODEC_PRIO_DISABLED);
-    }
-
-        
-
     for (i=0; i<pjsua.codec_cnt; ++i) {
         pjmedia_codec_mgr_set_codec_priority( 

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

@@ -324 +324 @@
     }
 
+    pjsip_auth_clt_set_credentials( &dlg->auth_sess, pjsua.cred_count,
+                                    pjsua.cred_info);
+
     status = pjsip_pres_create_uac( dlg, &pres_callback, 
                                     &pjsua.buddies[index].sub);