sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
342 discussions

git:master:e6252246: modules/rtpengine: return the new SDP in an AVP
by Camille Oudot 09 Feb '15

09 Feb '15

Module: kamailio Branch: master Commit: e6252246ea8056e06115d82a57372c8f241164a2 URL: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-09T13:51:27+01:00 modules/rtpengine: return the new SDP in an AVP if the new module param `write_sdp_pv` is set to a valid $avp() or $var() specifier, the SDP returned by rtpengine in the offer/answer operations is returned in the specified pv instead of the message body --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… Patch: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 4a1ea6f..7a01b0d 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -260,6 +260,26 @@ modparam("rtpengine", "force_send_interface", "10.3.7.123") </programlisting> </example> </section> + <section id="rtpengine.p.write_sdp_avp"> + <title><varname>write_sdp_avp</varname> (string)</title> + <para> + If this parameter is set to a valid AVP specifier, the + SDP returned by rtpengine in the offer/answer operations + is returned in the specified SDP instead of the + message body. + </para> + <para> + There is no default value. + </para> + <example> + <title>Set <varname>write_sdp_avp</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +... +</programlisting> + </example> + </section> <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 5ff6f36..ff9223d 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -211,8 +211,13 @@ static int *rtpp_socks = 0; static int setid_avp_type; static int_str setid_avp; +static str write_sdp_pvar_str = {NULL, 0}; +static pv_spec_t* write_sdp_pvar = NULL; + + char* force_send_ip_str=""; + typedef struct rtpp_set_link { struct rtpp_set *rset; pv_spec_t *rpv; @@ -282,6 +287,7 @@ static param_export_t params[] = { {"setid_avp", PARAM_STRING, &setid_avp_param }, {"force_send_interface", PARAM_STRING, &force_send_ip_str }, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param }, + {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str }, {0, 0, 0} }; @@ -853,6 +859,16 @@ mod_init(void) setid_avp_type = avp_flags; } + if (write_sdp_pvar_str.len > 0) { + write_sdp_pvar = pv_cache_get(&write_sdp_pvar_str); + if (write_sdp_pvar == NULL + || (write_sdp_pvar->type != PVT_AVP && write_sdp_pvar->type != PVT_SCRIPTVAR) ) { + LM_ERR("write_sdp_pv: not a valid AVP or VAR definition <%.*s>\n", + write_sdp_pvar_str.len, write_sdp_pvar_str.s); + return -1; + } + } + if (rtpp_strings) pkg_free(rtpp_strings); @@ -1962,6 +1978,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) bencode_item_t *dict; str body, newbody; struct lump *anchor; + pv_value_t pv_val; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -1978,14 +1995,28 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) if (more) body_intermediate = newbody; else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); - if (!anchor) { - LM_ERR("del_lump failed\n"); - goto error_free; - } - if (!insert_new_lump_after(anchor, newbody.s, newbody.len, 0)) { - LM_ERR("insert_new_lump_after failed\n"); - goto error_free; + if (write_sdp_pvar!= NULL) { + pv_val.rs = newbody; + pv_val.flags = PV_VAL_STR; + + if (write_sdp_pvar->setf(msg,&write_sdp_pvar->pvp, (int)EQ_T, &pv_val) < 0) + { + LM_ERR("error setting pvar <%.*s>\n", write_sdp_pvar_str.len, write_sdp_pvar_str.s); + goto error_free; + } + + pkg_free(newbody.s); + + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + if (!anchor) { + LM_ERR("del_lump failed\n"); + goto error_free; + } + if (!insert_new_lump_after(anchor, newbody.s, newbody.len, 0)) { + LM_ERR("insert_new_lump_after failed\n"); + goto error_free; + } } }

1 0

git:master:91b3d9b9: modules/rtpengine: README update
by Camille Oudot 09 Feb '15

09 Feb '15

Module: kamailio Branch: master Commit: 91b3d9b9483b488b8e18f45372c0e11b320b6d86 URL: https://github.com/kamailio/kamailio/commit/91b3d9b9483b488b8e18f45372c0e11… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-09T13:52:37+01:00 modules/rtpengine: README update --- Modified: modules/rtpengine/README Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91b3d9b9483b488b8e18f45372c0e11… Patch: https://github.com/kamailio/kamailio/commit/91b3d9b9483b488b8e18f45372c0e11…

1 0

[kamailio] Coudot/rtpengine pv sdp (#73)
by Camille Oudot 09 Feb '15

09 Feb '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/73 -- Commit Summary -- * modules/rtpengine: return the new SDP in an AVP * modules/rtpengine: README update -- File Changes -- M modules/rtpengine/README (70) M modules/rtpengine/doc/rtpengine_admin.xml (20) M modules/rtpengine/rtpengine.c (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/73.patch https://github.com/kamailio/kamailio/pull/73.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/73

1 1

[kamailio] Coudot/rtpengine avp sdp (#64)
by Camille Oudot 09 Feb '15

09 Feb '15

As proposed on the mailing list (http://lists.sip-router.org/pipermail/sr-dev/2014-December/026514.html), here is a patch to be able to retrieve the new SDP in an avp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/64 -- Commit Summary -- * modules/rtpengine: return the new SDP in an AVP * rtpengine: README update -- File Changes -- M modules/rtpengine/README (70) M modules/rtpengine/doc/rtpengine_admin.xml (20) M modules/rtpengine/rtpengine.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/64.patch https://github.com/kamailio/kamailio/pull/64.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/64

2 4

totag field to sip_trace table
by Juha Heinanen 08 Feb '15

08 Feb '15

how about adding totag field to sip_trace table? it would make finding of initial requests faster and help in separating legs of forks. -- juha

1 0

git:master:d60f014e: sl remove SVN ID and history
by Olle E. Johansson 08 Feb '15

08 Feb '15

Module: kamailio Branch: master Commit: d60f014e7aa1865cda4441b1560b4fb0d8aaae3c URL: https://github.com/kamailio/kamailio/commit/d60f014e7aa1865cda4441b1560b4fb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-08T22:17:29+01:00 sl remove SVN ID and history --- Modified: modules/sl/sl.c Modified: modules/sl/sl.h Modified: modules/sl/sl_funcs.c Modified: modules/sl/sl_funcs.h Modified: modules/sl/sl_stats.c Modified: modules/sl/sl_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/d60f014e7aa1865cda4441b1560b4fb… Patch: https://github.com/kamailio/kamailio/commit/d60f014e7aa1865cda4441b1560b4fb…

1 0

git:master:15ab2ed2: pkg/kamailio/deb: enable reproducible builds
by Victor Seva 07 Feb '15

07 Feb '15

Module: kamailio Branch: master Commit: 15ab2ed22070b3483cc2de7652fb54a38ae8faf6 URL: https://github.com/kamailio/kamailio/commit/15ab2ed22070b3483cc2de7652fb54a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-07T18:33:36+01:00 pkg/kamailio/deb: enable reproducible builds --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/15ab2ed22070b3483cc2de7652fb54a… Patch: https://github.com/kamailio/kamailio/commit/15ab2ed22070b3483cc2de7652fb54a… --- diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 10a4ae2..9d9441a 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -114,6 +114,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index d258b31..3d8b529 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -114,6 +114,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 4e1436a..f66c34a 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -113,6 +113,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 1a26bde..8b5f08b 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -111,6 +111,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index d258b31..3d8b529 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -114,6 +114,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index dadfa5b..e16072b 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -113,6 +113,9 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) +# https://wiki.debian.org/ReproducibleBuilds/ +CC_EXTRA_OPTS += -DVERSION_NODATE + configure: configure-stamp configure-stamp: dh_testdir

1 0

git:master:a5b3c636: pkg/kamailio/deb: easier way to set CC_EXTRA_OPTS and LD_EXTRA_OPTS
by Victor Seva 07 Feb '15

07 Feb '15

Module: kamailio Branch: master Commit: a5b3c63684cabc7293b1667416448094fb15cbb2 URL: https://github.com/kamailio/kamailio/commit/a5b3c63684cabc7293b166741644809… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-07T18:32:16+01:00 pkg/kamailio/deb: easier way to set CC_EXTRA_OPTS and LD_EXTRA_OPTS --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/a5b3c63684cabc7293b166741644809… Patch: https://github.com/kamailio/kamailio/commit/a5b3c63684cabc7293b166741644809…

1 0

git:master:6fcfc18c: qos Remove SVN ID, remove history
by Olle E. Johansson 07 Feb '15

07 Feb '15

Module: kamailio Branch: master Commit: 6fcfc18c7de2ba5530905c2dc03941312e29b47c URL: https://github.com/kamailio/kamailio/commit/6fcfc18c7de2ba5530905c2dc039413… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-07T14:35:44+01:00 qos Remove SVN ID, remove history --- Modified: modules/qos/qos.c Modified: modules/qos/qos_cb.c Modified: modules/qos/qos_cb.h Modified: modules/qos/qos_ctx_helpers.c Modified: modules/qos/qos_ctx_helpers.h Modified: modules/qos/qos_handlers.c Modified: modules/qos/qos_handlers.h Modified: modules/qos/qos_load.h Modified: modules/qos/qos_mi.c Modified: modules/qos/qos_mi.h --- Diff: https://github.com/kamailio/kamailio/commit/6fcfc18c7de2ba5530905c2dc039413… Patch: https://github.com/kamailio/kamailio/commit/6fcfc18c7de2ba5530905c2dc039413…

1 0

git:master:de2596d5: dialog Document dependency on the PV module
by Olle E. Johansson 07 Feb '15

07 Feb '15

Module: kamailio Branch: master Commit: de2596d518bae15e379342ee53bbc1632d0f90a1 URL: https://github.com/kamailio/kamailio/commit/de2596d518bae15e379342ee53bbc16… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-07T14:26:02+01:00 dialog Document dependency on the PV module --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de2596d518bae15e379342ee53bbc16… Patch: https://github.com/kamailio/kamailio/commit/de2596d518bae15e379342ee53bbc16… --- diff --git a/modules/dialog/README b/modules/dialog/README index 65f9cb3..c812043 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -449,6 +449,7 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * TM - Transaction module * RR - Record-Route module + * PV - Pseudovariables module 4.2. External Libraries or Applications diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 49c3122..b3fdf34 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -121,6 +121,11 @@ <emphasis>RR</emphasis> - Record-Route module </para> </listitem> + <listitem> + <para> + <emphasis>PV</emphasis> - Pseudovariables module + </para> + </listitem> </itemizedlist> </para> </section>

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015