diff --git a/modules/siprec/doc/siprec_admin.xml b/modules/siprec/doc/siprec_admin.xml index 2f1f3e459fe..4a2dcfd4f02 100644 --- a/modules/siprec/doc/siprec_admin.xml +++ b/modules/siprec/doc/siprec_admin.xml @@ -447,9 +447,11 @@ modparam("siprec", "skip_failover_codes", "[34][0-9][0-9]") is used to build the value. - media_ip - the IP that + media - the IP that RTPProxy will be streaming media from. If absent - 127.0.0.1 will be used. + 127.0.0.1 will be used. + NOTE: deprecated + media_ip is an alias for this param. headers - extra headers diff --git a/modules/siprec/siprec_body.c b/modules/siprec/siprec_body.c index 752f3818774..4e68c694919 100644 --- a/modules/siprec/siprec_body.c +++ b/modules/siprec/siprec_body.c @@ -543,7 +543,7 @@ static int srs_build_sdp(struct src_sess *sess, struct srec_buffer *buf) str localh = str_init("127.0.0.1"); str crlf_str = str_init(CRLF); - media_ip = (sess->media_ip.s?sess->media_ip:localh); + media_ip = (sess->media.s?sess->media:localh); SIPREC_COPY_STR(header1, buf); SIPREC_COPY_INT(sess->ts, buf); diff --git a/modules/siprec/siprec_sess.c b/modules/siprec/siprec_sess.c index 6306de06d1c..81aa6483906 100644 --- a/modules/siprec/siprec_sess.c +++ b/modules/siprec/siprec_sess.c @@ -50,22 +50,22 @@ static struct src_sess *src_create_session(str *rtp, str *m_ip, str *grp, } if (m_ip) { - ss->media_ip.s = (char *)(ss + 1) + ss->rtpproxy.len; - memcpy(ss->media_ip.s, m_ip->s, m_ip->len); - ss->media_ip.len = m_ip->len; + ss->media.s = (char *)(ss + 1) + ss->rtpproxy.len; + memcpy(ss->media.s, m_ip->s, m_ip->len); + ss->media.len = m_ip->len; } else { - ss->media_ip.s = NULL; - ss->media_ip.len = 0; + ss->media.s = NULL; + ss->media.len = 0; } if (grp) { - ss->group.s = (char *)(ss + 1) + ss->rtpproxy.len + ss->media_ip.len; + ss->group.s = (char *)(ss + 1) + ss->rtpproxy.len + ss->media.len; memcpy(ss->group.s, grp->s, grp->len); ss->group.len = grp->len; } if (hdrs && hdrs->len) { - ss->headers.s = (char *)(ss + 1) + ss->rtpproxy.len + ss->media_ip.len + + ss->headers.s = (char *)(ss + 1) + ss->rtpproxy.len + ss->media.len + ss->group.len; memcpy(ss->headers.s, hdrs->s, hdrs->len); ss->headers.len = hdrs->len; @@ -488,7 +488,7 @@ void srec_dlg_write_callback(struct dlg_cell *dlg, int type, SIPREC_BIN_PUSH(int, ss->version); SIPREC_BIN_PUSH(int, ss->flags); SIPREC_BIN_PUSH(str, &ss->rtpproxy); - SIPREC_BIN_PUSH(str, &ss->media_ip); + SIPREC_BIN_PUSH(str, &ss->media); /* push only the first SRS - this is the one chosen */ SIPREC_BIN_PUSH(str, &SIPREC_SRS(ss)); SIPREC_BIN_PUSH(str, &ss->group); diff --git a/modules/siprec/siprec_sess.h b/modules/siprec/siprec_sess.h index d6059ff49ae..04a42f84daa 100644 --- a/modules/siprec/siprec_sess.h +++ b/modules/siprec/siprec_sess.h @@ -90,7 +90,7 @@ struct src_sess { int streams_no; int streams_inactive; str rtpproxy; - str media_ip; + str media; str headers; /* SRS */ diff --git a/modules/siprec/siprec_var.c b/modules/siprec/siprec_var.c index 7c5b0383494..13bdf782f7c 100644 --- a/modules/siprec/siprec_var.c +++ b/modules/siprec/siprec_var.c @@ -37,6 +37,7 @@ struct { {"group", SIPREC_VAR_GROUP_ID}, {"caller", SIPREC_VAR_CALLER_ID}, {"callee", SIPREC_VAR_CALLEE_ID}, + {"media", SIPREC_VAR_MEDIA_ID}, {"media_ip", SIPREC_VAR_MEDIA_ID}, {"headers", SIPREC_VAR_HEADERS_ID}, {"socket", SIPREC_VAR_SOCKET_ID},