sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1317 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2007-05-29 11:51:45 +00:00
parent 92807829bc
commit d17a5e9b7b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pjsip/src/pjsip/sip_endpoint.c
View File

@ -830,7 +830,7 @@ static void endpt_on_rx_msg( pjsip_endpoint *endpt,
pj_bool_t mismatch = PJ_FALSE;
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);
}
local_addr = &rdata->tp_info.transport->local_name.host;

3
pjsip/src/pjsip/sip_transport_loop.c
View File

@ -373,7 +373,8 @@ PJ_DEF(pj_status_t) pjsip_loop_start( pjsip_endpoint *endpt,
loop->base.flag = PJSIP_TRANSPORT_DATAGRAM;
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;
loop->base.tpmgr = pjsip_endpt_get_tpmgr(endpt);

8
pjsip/src/pjsip/sip_util.c
View File

@ -1076,7 +1076,7 @@ PJ_DEF(pj_status_t) pjsip_get_response_addr( pj_pool_t *pool,
pj_memcpy(&res_addr->addr, &rdata->pkt_info.src_addr,
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,
&rdata->msg_info.via->recvd_param);
@ -1095,7 +1095,7 @@ PJ_DEF(pj_status_t) pjsip_get_response_addr( pj_pool_t *pool,
* that parameter is not present.
*/
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,
&rdata->msg_info.via->maddr_param);
@ -1114,7 +1114,7 @@ PJ_DEF(pj_status_t) pjsip_get_response_addr( pj_pool_t *pool,
pj_memcpy(&res_addr->addr, &rdata->pkt_info.src_addr,
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,
&rdata->msg_info.via->recvd_param);
@ -1126,7 +1126,7 @@ PJ_DEF(pj_status_t) pjsip_get_response_addr( pj_pool_t *pool,
} 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,
&rdata->msg_info.via->recvd_param);

4
pjsip/src/pjsua-lib/pjsua_core.c
View File

@ -1410,7 +1410,7 @@ PJ_DEF(pj_status_t) pjsua_transport_register( pjsip_transport *tp,
}
/* 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;
@ -1480,7 +1480,7 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
}
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);
info->flag = tp->flag;