From 0e602ccdd09d4e09556b93dbdd63841865d08388 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Mon, 17 Mar 2008 16:05:35 +0000 Subject: More ticket #479: bug in pjmedia_transport_get_info(), the info should be initialized by caller git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1873 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsua-lib/pjsua_call.c | 3 +++ pjsip/src/pjsua-lib/pjsua_core.c | 4 +++- pjsip/src/pjsua-lib/pjsua_media.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'pjsip/src/pjsua-lib') diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 6329732a..4035011a 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -2260,6 +2260,7 @@ PJ_DEF(pj_status_t) pjsua_call_dump( pjsua_call_id call_id, } /* Get SRTP status */ + pjmedia_transport_info_init(&tp_info); pjmedia_transport_get_info(call->med_tp, &tp_info); if (tp_info.specific_info_cnt > 0) { int i; @@ -2470,6 +2471,7 @@ static void call_disconnect( pjsip_inv_session *inv, pjmedia_sdp_session *local_sdp; pjmedia_transport_info ti; + pjmedia_transport_info_init(&ti); pjmedia_transport_get_info(call->med_tp, &ti); status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 1, &ti.sock_info, &local_sdp); @@ -2581,6 +2583,7 @@ static pj_status_t create_inactive_sdp(pjsua_call *call, pjmedia_sdp_session *sdp; /* Get media socket info */ + pjmedia_transport_info_init(&tp_info); pjmedia_transport_get_info(call->med_tp, &tp_info); /* Create new offer */ diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index ef838ba8..9bbbca7a 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -320,6 +320,7 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata) } /* Get media socket info */ + pjmedia_transport_info_init(&tpinfo); pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo); /* Add SDP body, using call0's RTP address */ @@ -2064,8 +2065,9 @@ PJ_DEF(void) pjsua_dump(pj_bool_t detail) char addr_buf[80]; /* MSVC complains about tpinfo not being initialized */ - pj_bzero(&tpinfo, sizeof(tpinfo)); + //pj_bzero(&tpinfo, sizeof(tpinfo)); + pjmedia_transport_info_init(&tpinfo); pjmedia_transport_get_info(call->med_tp, &tpinfo); PJ_LOG(3,(THIS_FILE, " %s: %s", diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 765fec0f..86f3d4f0 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -839,6 +839,7 @@ pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, } /* Get media socket info */ + pjmedia_transport_info_init(&tpinfo); pjmedia_transport_get_info(call->med_tp, &tpinfo); /* Create SDP */ -- cgit v1.2.3