Changeset 4122

Timestamp:

May 14, 2012 11:04:46 AM (12 years ago)

Author:

bennylp

Message:

Re #1509: backported r4112-4121

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/conf_switch.c (modified) (1 diff)
• pjmedia/src/pjmedia/wav_player.c (modified) (1 diff)
• pjsip-apps/src/python/setup-vc.py (modified) (1 diff)
• pjsip-apps/src/python/setup.py (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)
• version.mak (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

@@ -547 +547 @@
     if (src_afd->channel_count != dst_afd->channel_count) {
         pj_mutex_unlock(conf->mutex);
-        return PJMEDIA_ENCCLOCKRATE;
+        return PJMEDIA_ENCCHANNEL;
     }
 

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -158 +158 @@
                     pj_memset(fport->eofpos, val, size_left);
                 }
+                size_left = 0;
             }
 

pjproject/trunk/pjsip-apps/src/python/setup-vc.py

@@ -25 +25 @@
 # Find version
 pj_version=""
-f = open('../../../pjlib/src/pj/config.c', 'r')
+pj_version_major=""
+pj_version_minor=""
+pj_version_rev=""
+pj_version_suffix=""
+f = open('../../../version.mak', 'r')
 for line in f:
-    if line.find("PJ_VERSION") != -1:
-        pj_version = line.split("=")[1].strip('";\r\n ')
-        break
+    if line.find("export PJ_VERSION_MAJOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_major= tokens[1].strip()
+    elif line.find("export PJ_VERSION_MINOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_minor= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_REV") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_rev= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_SUFFIX") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_suffix= line.split("=")[1].strip()
+
 f.close()
-if pj_version=="":
-    print 'Unable to get PJ_pj_version'
+if not pj_version_major:
+    print 'Unable to get PJ_VERSION_MAJOR'
     sys.exit(1)
+
+pj_version = pj_version_major + "." + pj_version_minor
+if pj_version_rev:
+        pj_version += "." + pj_version_rev
+if pj_version_suffix:
+        pj_version += "-" + pj_version_suffix
+
 #print 'PJ_VERSION = "'+ pj_version + '"'
+
 
 # Check that extension has been built

pjproject/trunk/pjsip-apps/src/python/setup.py

@@ -26 +26 @@
 # find pjsip version
 pj_version=""
-f = open('../../../pjlib/src/pj/config.c', 'r')
+pj_version_major=""
+pj_version_minor=""
+pj_version_rev=""
+pj_version_suffix=""
+f = open('../../../version.mak', 'r')
 for line in f:
-    if line.find("PJ_VERSION") != -1:
-        pj_version= line.split(" = ")[1].strip('";\r\n')
-        break
+    if line.find("export PJ_VERSION_MAJOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_major= tokens[1].strip()
+    elif line.find("export PJ_VERSION_MINOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_minor= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_REV") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_rev= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_SUFFIX") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_suffix= line.split("=")[1].strip()
+
 f.close()
-if pj_version=="":
-    print 'Unable to get PJ_VERSION'
+if not pj_version_major:
+    print 'Unable to get PJ_VERSION_MAJOR'
     sys.exit(1)
+
+pj_version = pj_version_major + "." + pj_version_minor
+if pj_version_rev:
+        pj_version += "." + pj_version_rev
+if pj_version_suffix:
+        pj_version += "-" + pj_version_suffix
+
 #print 'PJ_VERSION = "'+ pj_version + '"'
 

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

@@ -2195 +2195 @@
     PJSUA_LOCK();
 
-    if (pjsua_var.tpdata[id].type == PJSIP_TRANSPORT_UDP) {
+    if (t->type == PJSIP_TRANSPORT_UDP) {
 
         pjsip_transport *tp = t->data.tp;
@@ -2216 +2216 @@
         status = PJ_SUCCESS;
 
-    } else if (pjsua_var.tpdata[id].type == PJSIP_TRANSPORT_TCP) {
+    } else if (t->type == PJSIP_TRANSPORT_TCP ||
+               t->type == PJSIP_TRANSPORT_TLS)
+    {
 
         pjsip_tpfactory *factory = t->data.factory;
@@ -2227 +2229 @@
         info->id = id;
         info->type = t->type;
-        info->type_name = pj_str("TCP");
-        info->info = pj_str("TCP transport");
+        info->type_name = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP"):
+                                                          pj_str("TLS");
+        info->info = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP transport"):
+                                                     pj_str("TLS transport");
         info->flag = factory->flag;
         info->addr_len = sizeof(factory->local_addr);

pjproject/trunk/version.mak

@@ +1 @@
+# Don't change the "export PJ_VERSION_xxx" style, they are parsed by setup.py
 export PJ_VERSION_MAJOR  := 2
 export PJ_VERSION_MINOR  := 0