- sr-dev - kamailio.org

git:master:abbe5187: pua_json: exported KSR.pua_json.publish() to kemi
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: abbe518724d645b6f977ca526011285bc03c581c URL: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:29:33+02:00 pua_json: exported KSR.pua_json.publish() to kemi - corresponding to config pua_json_publish() - use fixup_spve_null() and fixup_free_spve_null() for pua_json_publish() config export --- Modified: src/modules/pua_json/pua_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Patch: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… --- diff --git a/src/modules/pua_json/pua_json_mod.c b/src/modules/pua_json/pua_json_mod.c index 2c7e7f5513..2b51e5020e 100644 --- a/src/modules/pua_json/pua_json_mod.c +++ b/src/modules/pua_json/pua_json_mod.c @@ -27,31 +27,41 @@ #include "../json/api.h" #include "../presence/bind_presence.h" +#include "../../core/mod_fix.h" +#include "../../core/kemi.h" + #include "pua_json_mod.h" MODULE_VERSION +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2); + +/* clang-format off */ static param_export_t params[] = { - {"pua_include_entity", INT_PARAM, &pua_include_entity}, - {0, 0, 0}}; + {"pua_include_entity", PARAM_INT, &pua_include_entity}, + {0, 0, 0} +}; static cmd_export_t cmds[] = { - {"pua_json_publish", (cmd_function)pua_json_publish, 1, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pua_json_publish", (cmd_function)w_pua_json_publish, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "pua_json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -66,3 +76,50 @@ static int mod_init(void) return 0; } + +/** + * + */ +static int ki_pua_json_publish(sip_msg_t* msg, str* pjson) +{ + return pua_json_publish(msg, pjson->s); +} + +/** + * + */ +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2) +{ + str pjson = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1pjson, &pjson)<0) { + LM_ERR("failed to get p1 value\n"); + return -1; + } + + return pua_json_publish(msg, pjson.s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_json_exports[] = { + { str_init("pua_json"), str_init("publish"), + SR_KEMIP_INT, ki_pua_json_publish, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_json_exports); + return 0; +}

1 0

git:master:f34f9456: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: f34f9456c68d25bcdd49d670d95f16649e14e8d5 URL: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-16T12:16:28+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Patch: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 453179d5a1..411d7428cf 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -102,6 +102,7 @@ Gabriel Vasile 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -160,6 +161,7 @@ Gabriel Vasile 1.45. contact_param_decode usage 1.46. contact_param_decode_ruri usage 1.47. contact_param_rm usage + 1.48. hdr_date_check usage Chapter 1. Admin Guide @@ -223,6 +225,7 @@ Chapter 1. Admin Guide 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -444,6 +447,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 4.1. ring_insert_callid() @@ -1112,6 +1116,25 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { } ... +4.39. hdr_date_check(tdiff) + + Returns true if sip message has Date header and its value is lower than + 'NOW() - tdiff'. + + Meaning of the parameters is as follows: + * tdiff - time difference in seconds, it can be a variable or static + integer value. + + This function can be used from ANY_ROUTE. + + Example 1.48. hdr_date_check usage +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:6a2a1dfb: siputils: docs for hdr_date_check()
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 6a2a1dfb8a6718f7ecb7cc2f28cf471bdcf0fec3 URL: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:09:36+02:00 siputils: docs for hdr_date_check() --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Patch: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 8e7140385d..b1dffa1c3e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1354,6 +1354,37 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { contact_param_rm("myparam"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.hdr_date_check"> + <title> + <function moreinfo="none">hdr_date_check(tdiff)</function> + </title> + <para> + Returns true if sip message has Date header and its value is lower + than 'NOW() - tdiff'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>tdiff</emphasis> - time difference in seconds, + it can be a variable or static integer value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hdr_date_check</function> usage</title> + <programlisting format="linespecific"> +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:466e5f46: siputils: added hdr_date_check(tdiff)
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 466e5f469f5b6b9f5d1b30139c2b854e62f4f50b URL: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:03:38+02:00 siputils: added hdr_date_check(tdiff) - returns true if sip message has Date header and its value is lower than NOW() - tdiff --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Patch: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 57ae9fb262..3dc7188fa8 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -66,6 +66,7 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_option_tags.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_date.h" #include "ring.h" #include "options.h" @@ -113,6 +114,8 @@ static int w_contact_param_decode(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_decode_ruri(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_rm(sip_msg_t *msg, char *pnparam, char *p2); +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void** param, int param_no); static int fixup_free_set_uri(void** param, int param_no); @@ -205,6 +208,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"contact_param_rm", (cmd_function)w_contact_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -548,6 +553,66 @@ static int ki_is_uri(sip_msg_t* msg, str* suri) return 1; } +/* + * Check date header value with time difference + */ +static int ki_hdr_date_check(sip_msg_t* msg, int tdiff) +{ + time_t tnow, tmsg; + + if ((!msg->date) && (parse_headers(msg, HDR_DATE_F, 0) == -1)) { + LM_ERR("failed parsing Date header\n"); + return -1; + } + if (!msg->date) { + LM_ERR("Date header field is not found\n"); + return -1; + } + if ((!(msg->date)->parsed) && (parse_date_header(msg) < 0)) { + LM_ERR("failed parsing DATE body\n"); + return -1; + } + +#ifdef HAVE_TIMEGM + tmsg=timegm(&get_date(msg)->date); +#else + tmsg=_timegm(&get_date(msg)->date); +#endif + if (tmsg < 0) { + LM_ERR("timegm error\n"); + return -2; + } + + if ((tnow=time(0)) < 0) { + LM_ERR("time error %s\n", strerror(errno)); + return -3; + } + + if (tnow > tmsg + tdiff) { + LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); + return -4; + } else { + LM_ERR("Date header value OK\n"); + } + + return 1; + +} + +/** + * + */ +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) +{ + int tdiff = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)ptdiff, &tdiff)<0) { + LM_ERR("failed to get time diff parameter\n"); + return -1; + } + return ki_hdr_date_check(msg, tdiff); +} + /** * */ @@ -668,6 +733,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("hdr_date_check"), + SR_KEMIP_INT, ki_hdr_date_check, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

Kamailio v5.5.1 Released
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Hello, Kamailio SIP Server v5.5.1 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.1. For more details about version 5.5.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-5-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 3

[kamailio/kamailio] Typo in htable.seti example (#2782)
by arkadiam 16 Jun '21

16 Jun '21

https://github.com/kamailio/kamailio/blob/30467037a7d97def6fbb40cad14e6f101… It should be `htable.seti` to set as an integer -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2782

3 2

git:master:f22a09da: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: f22a09dacf85e6489005a634eb6d907c4b8ef782 URL: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T19:16:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Patch: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... 6.5. htable.dump htable

1 0

git:master:ee9c2bc2: htable: fix documentation
by Ovidiu Sas 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: ee9c2bc2046103f0f7888c078b1f88d0befd6f7d URL: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-06-15T13:03:07-04:00 htable: fix documentation - reported by arkadiam on Github --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… Patch: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 3a7f101bca..5ef04b2ee6 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1363,7 +1363,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... </programlisting> </section>

1 0

git:5.5:307af87b: topos: documentation fixed for contact_host xavu parameter
by Henning Westerholt 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 307af87b17fdadce2d38794b85933f6b202d1313 URL: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-15T13:36:20Z topos: documentation fixed for contact_host xavu parameter (cherry picked from commit 40073c9975ee256cebbfe60f27d1b07c977395d0) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… Patch: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b13902929f..4218dae3fe 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -453,7 +453,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") </programlisting> </example> </section> - <section id="topos.p.xavu_filed_contact_host"> + <section id="topos.p.xavu_field_contact_host"> <title><varname>xavu_field_contact_host</varname> (str)</title> <para> Control from where to take the host part of the Contact header added @@ -476,7 +476,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:master:30467037: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 30467037a7d97def6fbb40cad14e6f101178cb05 URL: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T12:01:24+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… Patch: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 783b57ba57..49b786ac13 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -441,7 +441,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:master:40073c99: topos: documentation fixed for contact_host xavu parameter
by Henning Westerholt 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 40073c9975ee256cebbfe60f27d1b07c977395d0 URL: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-15T09:59:00Z topos: documentation fixed for contact_host xavu parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… Patch: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b13902929f..4218dae3fe 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -453,7 +453,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") </programlisting> </example> </section> - <section id="topos.p.xavu_filed_contact_host"> + <section id="topos.p.xavu_field_contact_host"> <title><varname>xavu_field_contact_host</varname> (str)</title> <para> Control from where to take the host part of the Contact header added @@ -476,7 +476,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:5.5:8aa8df7e: Makefile.defs: version set to 5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 8aa8df7e2c662a349150c4f4c9ea49d088f56254 URL: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:24:46+02:00 Makefile.defs: version set to 5.5.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… Patch: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 6b24118a9c..18afd9cf4c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:7abebb9f: ChangeLog: content updated for v5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 7abebb9fcbbad8d35a273e8a95d752397919455d URL: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:27:16+02:00 ChangeLog: content updated for v5.5.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523… Patch: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523…

1 0

git:5.5:16f45aa4: pkg/kamailio/deb: version set 5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 16f45aa4a790be921abef7569e809b20ba295226 URL: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:19:59+02:00 pkg/kamailio/deb: version set 5.5.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2… Patch: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2…

1 0

git:5.5:98ce167b: pkg: version set to 5.5.1 for rpm and alpine specs
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 98ce167bcf88ad6bb16b8d52a5998546bfc47428 URL: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:45:10+02:00 pkg: version set to 5.5.1 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… Patch: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e5f39653d1..ee259927bf 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.0 +pkgver=5.5.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3928c1c596..e095ac9b5e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.0 +%define ver 5.5.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:e9cdbdfa: textops: fixed condition on header parsing error for find_hdr_line_start()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: e9cdbdfa302940606295c3b79a671cf2f0d38fc5 URL: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:39:09+02:00 textops: fixed condition on header parsing error for find_hdr_line_start() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… Patch: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 75a00f16a8..b2ad856cfc 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1612,8 +1612,8 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, start = *buf; len = *buf_len; parse_hname2_str(&sname, &h1); - if(h1.type!=HDR_ERROR_T) { - LM_ERR("not a header name: %.*s\n", hname_len, hname); + if(h1.type==HDR_ERROR_T) { + LM_ERR("failed to parse header name: '%.*s'\n", hname_len, hname); return 0; }

1 0

[kamailio/kamailio] nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted (#2737)
by Dmitry Wagin 15 Jun '21

15 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in doc/ subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2459 #### Description There's a small regression after #2497. If SDP didn't have an "a=rtcp" header (RFC1889 behavior), Kamailio had thrown an Error `can't extract 'a=rtcp' IP from the SDP` on every INVITE. After the PR Kamailio does not flood into log. Please take into account IPv6 address parser after the commit. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2737 -- Commit Summary -- * nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted -- File Changes -- M src/modules/nathelper/nathelper.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2737.patch https://github.com/kamailio/kamailio/pull/2737.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2737

6 10

git:5.5:8bc4b122: nathelper: don't fail if 'a=rtcp' has no IP
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 8bc4b12270e932febcc77fab65546f534001cc30 URL: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:00+02:00 nathelper: don't fail if 'a=rtcp' has no IP Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 (cherry picked from commit 71441c08970c307e2ce17b2dd292630ea615079c) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… Patch: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index baae1dbb6b..9512834d0e 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1655,7 +1655,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { + if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

git:5.5:ccd29983: nathelper: check length on new condition inside replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: ccd29983f538d13de3f5d07584d45020ca75f174 URL: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:09+02:00 nathelper: check length on new condition inside replace_sdp_ip() (cherry picked from commit 521485c8f25f55cb3045ab2b33232c7026d8527d) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… Patch: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9512834d0e..1392a0af2a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1655,7 +1655,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { + if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

git:5.5:e9484db6: rtpproxy: removed unused replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: e9484db689378fce6f52d8e796b22553c2a29eae URL: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:19+02:00 rtpproxy: removed unused replace_sdp_ip() (cherry picked from commit b92f1ab7c711f7b61abadb706f9a4cfbb2cf0dd4) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… Patch: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 23c8357e4b..733ea3cec8 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -939,54 +939,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static inline int -replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) -{ - str body1, oldip, newip; - str body = *org_body; - unsigned hasreplaced = 0; - int pf, pf1 = 0; - str body2; - char *bodylimit = body.s + body.len; - - /* Iterate all lines and replace ips in them. */ - if (!ip) { - newip.s = ip_addr2a(&msg->rcv.src_ip); - newip.len = strlen(newip.s); - } else { - newip = *ip; - } - body1 = body; - for(;;) { - if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) - break; - if (pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n",line); - return -1; - } - if (!pf1) - pf1 = pf; - else if (pf != pf1) { - LM_ERR("mismatching address families in '%s' SDP\n",line); - return -1; - } - body2.s = oldip.s + oldip.len; - body2.len = bodylimit - body2.s; - if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf,1) == -1) { - LM_ERR("can't alter '%s' IP\n",line); - return -1; - } - hasreplaced = 1; - body1 = body2; - } - if (!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n",line); - return -1; - } - - return 0; -} - static int rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) {

1 0

git:master:b92f1ab7: rtpproxy: removed unused replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: b92f1ab7c711f7b61abadb706f9a4cfbb2cf0dd4 URL: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:58:31+02:00 rtpproxy: removed unused replace_sdp_ip() --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… Patch: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 23c8357e4b..733ea3cec8 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -939,54 +939,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static inline int -replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) -{ - str body1, oldip, newip; - str body = *org_body; - unsigned hasreplaced = 0; - int pf, pf1 = 0; - str body2; - char *bodylimit = body.s + body.len; - - /* Iterate all lines and replace ips in them. */ - if (!ip) { - newip.s = ip_addr2a(&msg->rcv.src_ip); - newip.len = strlen(newip.s); - } else { - newip = *ip; - } - body1 = body; - for(;;) { - if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) - break; - if (pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n",line); - return -1; - } - if (!pf1) - pf1 = pf; - else if (pf != pf1) { - LM_ERR("mismatching address families in '%s' SDP\n",line); - return -1; - } - body2.s = oldip.s + oldip.len; - body2.len = bodylimit - body2.s; - if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf,1) == -1) { - LM_ERR("can't alter '%s' IP\n",line); - return -1; - } - hasreplaced = 1; - body1 = body2; - } - if (!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n",line); - return -1; - } - - return 0; -} - static int rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) {

1 0

git:master:521485c8: nathelper: check length on new condition inside replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 521485c8f25f55cb3045ab2b33232c7026d8527d URL: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:54:32+02:00 nathelper: check length on new condition inside replace_sdp_ip() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… Patch: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5fb83cea46..df9a5bce2c 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1696,7 +1696,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { + if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

[kamailio/kamailio] nathelper: 'a=rtcp' without IP generates an ERROR (#2768)
by Victor Seva 15 Jun '21

15 Jun '21

### Description As described at [RFC3605](https://datatracker.ietf.org/doc/html/rfc3605#section-2.1) ``` rtcp-attribute = "a=rtcp:" port [nettype space addrtype space connection-address] CRLF ``` So IP info is optional. ### Troubleshooting #### Log Messages ``` Jun 7 09:55:57 sp2 lb[46796]: ERROR: DEFAULT_ROUTE nathelper [nathelper.c:1796]: nh_extract_mediaip(): no `IP[4|6]' in `a=rtcp' field Jun 7 09:55:57 sp2 lb[46796]: ERROR: DEFAULT_ROUTE nathelper [nathelper.c:1617]: replace_sdp_ip(): can't extract 'a=rtcp' IP from the SDP ``` #### SIP Traffic ``` INVITE sip:jsung2@192.168.88.194;line=8c86b7427b1107f SIP/2.0 Via: SIP/2.0/UDP 192.168.88.194;branch=z9hG4bK4f82.52fb005dac4fe078dd5593a1bebfa33b.0 From: <sip:4316607564835@xxxx>;tag=40FED3EF-60BDED10000D2F23-71F92700 To: <sip:jsung2@xxxx> CSeq: 939 INVITE Call-ID: CDqyvKE3ryYIRkecp_7cXA.. Max-Forwards: 69 Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, MESSAGE, OPTIONS, SUBSCRIBE P-Asserted-Identity: <sip:4316607564835@sip.lab.com> Diversion: <sip:4316607564835@xxxx>;privacy=off;counter=1 Supported: timer Session-Expires: 1800 Min-SE: 90 Content-Type: application/sdp Content-Length: 316 Contact: <sip:btpsh-60baedf4-645b-3@192.168.88.194> v=0 o=Z 1623059728682 1 IN IP4 192.168.88.194 s=Z c=IN IP4 192.168.88.194 t=0 0 m=audio 20252 RTP/AVP 8 0 9 98 101 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:9 G722/8000 a=rtpmap:98 telephone-event/48000 a=fmtp:98 0-16 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=sendrecv a=rtcp:20253 ``` ### Possible Solutions fix for nathelper will follow ### Additional Information ``` version: kamailio 5.5.0 (x86_64/linux) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2768

2 1

[kamailio/kamailio] nathelper: don't fail if 'a=rtcp' has no IP (#2769)
by Victor Seva 15 Jun '21

15 Jun '21

Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2768 (replace XXXX with an open issue number) #### Description  don't fail if there's no IP info if line is 'a=rtcp' You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2769 -- Commit Summary -- * nathelper: don't fail if 'a=rtcp' has no IP -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2769.patch https://github.com/kamailio/kamailio/pull/2769.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2769

3 7

git:master:71441c08: nathelper: don't fail if 'a=rtcp' has no IP
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 71441c08970c307e2ce17b2dd292630ea615079c URL: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:51:07+02:00 nathelper: don't fail if 'a=rtcp' has no IP Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… Patch: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index c3036d35bd..5fb83cea46 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1696,7 +1696,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { + if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev