[sr-dev] git:master:ce4e720c: Merge pull request #572 from adubovikov/master

Module: kamailio Branch: master Commit: ce4e720c7eef22b1d60711a31775792397079c93 URL: https://github.com/kamailio/kamailio/commit/ce4e720c7eef22b1d60711a31775792… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-04-18T17:19:27+02:00 Merge pull request #572 from adubovikov/master modules/sipcapture fixed rtpinfo report for SNOM --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ce4e720c7eef22b1d60711a31775792… Patch: https://github.com/kamailio/kamailio/commit/ce4e720c7eef22b1d60711a31775792… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index d0b4e54..b1f9c6a 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1556,7 +1556,6 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * struct timeval tvb; struct timezone tz; char tmp_node[100]; - char rtpinfo[256]; unsigned int len = 0; LM_DBG("CAPTURE DEBUG...\n"); @@ -1812,20 +1811,9 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * } /* RTP-RxStat */ else if((tmphdr[3] = get_hdr_by_name(msg,"RTP-RxStat", 10)) != NULL) { - if(tmphdr[3]->body.len > 250) tmphdr[3]->body.len = 250; - - memcpy(&rtpinfo, tmphdr[3]->body.s, tmphdr[3]->body.len); - len = tmphdr[3]->body.len; - if((tmphdr[3] = get_hdr_by_name(msg,"RTP-TxStat", 10)) != NULL) { - memcpy(&rtpinfo[len], ", ", 2); - if((len + 2 + tmphdr[3]->body.len) > 256) tmphdr[3]->body.len = 256 - (len+2); - memcpy(&rtpinfo[len+2], tmphdr[3]->body.s, tmphdr[3]->body.len); - } - sco.rtp_stat.s = rtpinfo; - sco.rtp_stat.len = strlen(rtpinfo); + sco.rtp_stat = tmphdr[3]->body; } - else { EMPTY_STR(sco.rtp_stat); } @@ -1920,7 +1908,7 @@ static struct mi_root* sip_capture_mi(struct mi_root* cmd_tree, void* param ) *capture_on_flag = 0; return init_mi_tree( 200, MI_SSTR(MI_OK)); } else { - return init_mi_tree( 400, MI_SSTR(MI_BAD_PARM)); + return init_mi_tree( 400, MI_SSTR(MI_BAD_PARM));
} }