Changeset 1317 for pjproject/trunk

Timestamp:

May 29, 2007 11:51:45 AM (18 years ago)

Author:

bennylp

Message:

Fixed Symbian (aka C++ mode) compilation error because of recent change in transport key in ticket #306 (thanks Esbjorn Dominique)

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_endpoint.c (modified) (1 diff)
• pjsip/sip_transport_loop.c (modified) (1 diff)
• pjsip/sip_util.c (modified) (4 diffs)
• pjsua-lib/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -831 +831 @@
         if (port == 0) {
             pjsip_transport_type_e type;
-            type = rdata->tp_info.transport->key.type;
+            type = (pjsip_transport_type_e)rdata->tp_info.transport->key.type;
             port = pjsip_transport_get_default_port_for_type(type);
         }

pjproject/trunk/pjsip/src/pjsip/sip_transport_loop.c

@@ -374 +374 @@
     loop->base.local_name.host = pj_str(ADDR_LOOP_DGRAM);
     loop->base.local_name.port = 
-        pjsip_transport_get_default_port_for_type(loop->base.key.type);
+        pjsip_transport_get_default_port_for_type((pjsip_transport_type_e)
+                                                  loop->base.key.type);
     loop->base.addr_len = sizeof(pj_sockaddr_in);
     loop->base.endpt = endpt;

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1077 +1077 @@
                   rdata->pkt_info.src_addr_len);
         res_addr->addr_len = rdata->pkt_info.src_addr_len;
-        res_addr->dst_host.type = src_transport->key.type;
+        res_addr->dst_host.type=(pjsip_transport_type_e)src_transport->key.type;
         res_addr->dst_host.flag = src_transport->flag;
         pj_strdup( pool, &res_addr->dst_host.addr.host, 
@@ -1096 +1096 @@
          */
         res_addr->transport = NULL;
-        res_addr->dst_host.type = src_transport->key.type;
+        res_addr->dst_host.type=(pjsip_transport_type_e)src_transport->key.type;
         res_addr->dst_host.flag = src_transport->flag;
         pj_strdup( pool, &res_addr->dst_host.addr.host, 
@@ -1115 +1115 @@
                   rdata->pkt_info.src_addr_len);
         res_addr->addr_len = rdata->pkt_info.src_addr_len;
-        res_addr->dst_host.type = src_transport->key.type;
+        res_addr->dst_host.type=(pjsip_transport_type_e)src_transport->key.type;
         res_addr->dst_host.flag = src_transport->flag;
         pj_strdup( pool, &res_addr->dst_host.addr.host, 
@@ -1127 +1127 @@
     } else {
         res_addr->transport = NULL;
-        res_addr->dst_host.type = src_transport->key.type;
+        res_addr->dst_host.type=(pjsip_transport_type_e)src_transport->key.type;
         res_addr->dst_host.flag = src_transport->flag;
         pj_strdup( pool, &res_addr->dst_host.addr.host, 

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

@@ -1411 +1411 @@
 
     /* Save the transport */
-    pjsua_var.tpdata[id].type = tp->key.type;
+    pjsua_var.tpdata[id].type = (pjsip_transport_type_e) tp->key.type;
     pjsua_var.tpdata[id].local_name = tp->local_name;
     pjsua_var.tpdata[id].data.tp = tp;
@@ -1481 +1481 @@
     
         info->id = id;
-        info->type = tp->key.type;
+        info->type = (pjsip_transport_type_e) tp->key.type;
         info->type_name = pj_str(tp->type_name);
         info->info = pj_str(tp->info);