sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: - version set to 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 88e2a6d4ed6fae4d5c0b9ab268e41307aea4e8a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88e2a6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:27:53 2010 +0200 - version set to 3.0.2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 97824b5..95dad34 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -154,7 +154,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory debugger switcher

14 years, 8 months

git:kamailio_3.0: centos spec: version set to 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e5560029f04058642bebb09a1a1b7df699c5f80b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e556002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:29:24 2010 +0200 centos spec: version set to 3.0.2 --- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 4f4f5bc..021cf7e 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.0.1 +%define ver 3.0.2 %define rel 0 %define _sharedir %{_prefix}/share

14 years, 8 months

git:kamailio_3.0: debian: updated changelog for 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a2dbcec4278631ec78944098e7b407cebd682e92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2dbcec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:28:16 2010 +0200 debian: updated changelog for 3.0.2 --- pkg/kamailio/debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian/changelog b/pkg/kamailio/debian/changelog index c85aec4..4c6ebbd 100644 --- a/pkg/kamailio/debian/changelog +++ b/pkg/kamailio/debian/changelog @@ -1,3 +1,9 @@ +kamailio (3.0.2) unstable; urgency=low + + * update to 3.0.2 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 27 May 2010 10:27:36 +0100 + kamailio (3.0.1) unstable; urgency=low * update to 3.0.1 from upstream

14 years, 8 months

git:kamailio_3.0: dialplan: safety check for fetch rows before data init

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: c2256b44ba8ec4d8190aa9551bc737bd1ab62699 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2256b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 21 15:04:55 2010 +0200 dialplan: safety check for fetch rows before data init (cherry picked from commit 5040ff5cc54f673af80190916de9c1ac5d4c1af9) --- modules/dialplan/dialplan.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index ab3947d..1d4fd3a 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -170,14 +170,14 @@ static int mod_init(void) return -1; } + if(dp_fetch_rows<=0) + dp_fetch_rows = 1000; + if(init_data() != 0) { LM_ERR("could not initialize data\n"); return -1; } - if(dp_fetch_rows<=0) - dp_fetch_rows = 1000; - return 0; }

14 years, 8 months

git:kamailio_3.0: topoh: free nbuf

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 959eb339a44ada14b2b1a7aa551b0f36a2afd523 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=959eb33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 7 22:56:46 2010 +0200 topoh: free nbuf - fixed leak due to no free of new buffer - reported by Libor Chocholaty (cherry picked from commit 198e468b7d83bb62d0761dd45e5c6820bc75a61a) --- modules/topoh/topoh_mod.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 1d95c27..8146cbe 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -169,7 +169,7 @@ int th_msg_received(void *data) { sip_msg_t msg; str *obuf; - char *nbuf; + char *nbuf = NULL; int direction; int dialog; @@ -241,6 +241,8 @@ int th_msg_received(void *data) obuf->s[obuf->len] = '\0'; done: + if(nbuf!=NULL) + pkg_free(nbuf); free_sip_msg(&msg); return 0; }

14 years, 8 months

git:kamailio_3.0: perl: update the index of params in action struct

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 08d6d008af2408892a101eb932a2b93f4c9dfc47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08d6d00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 12:24:29 2010 +0200 perl: update the index of params in action struct - params start from 3rd position of val array (cherry picked from commit f624074a1680befed9328548864407c396ec196f) --- modules_k/perl/openserxs.xs | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 4ee86b6..044f818 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -285,20 +285,20 @@ int moduleFunc(struct sip_msg *m, char *func, } if (argc>=2) { - *retval = exp_func_struct->v1.fixup(&(act->val[2].u.data), 2); + *retval = exp_func_struct->v1.fixup(&(act->val[3].u.data), 2); if (*retval < 0) { LM_ERR("Error in fixup (2)\n"); return -1; } - act->val[2].type = MODFIXUP_ST; + act->val[3].type = MODFIXUP_ST; } if (argc>=1) { - *retval = exp_func_struct->v1.fixup(&(act->val[1].u.data), 1); + *retval = exp_func_struct->v1.fixup(&(act->val[2].u.data), 1); if (*retval < 0) { LM_ERR("Error in fixup (1)\n"); return -1; } - act->val[1].type = MODFIXUP_ST; + act->val[2].type = MODFIXUP_ST; } if (argc==0) { *retval = exp_func_struct->v1.fixup(0, 0); @@ -312,14 +312,14 @@ int moduleFunc(struct sip_msg *m, char *func, init_run_actions_ctx(&ra_ctx); *retval = do_action(&ra_ctx, act, m); - if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { - /* pkg_free(act->elem[2].u.data); */ + if ((act->val[3].type == MODFIXUP_ST) && (act->val[3].u.data)) { + /* pkg_free(act->elem[3].u.data); */ LM_WARN("moduleFunction: A fixup function was called. " "This currently creates a memory leak.\n"); } - if ((act->val[1].type == MODFIXUP_ST) && (act->val[1].u.data)) { - /* pkg_free(act->elem[1].u.data); */ + if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { + /* pkg_free(act->elem[2].u.data); */ LM_WARN("moduleFunction: A fixup function was called. " "This currently creates a memory leak.\n"); }

14 years, 8 months

git:kamailio_3.0: registrar(k): reset dst uri in lookup

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6dc77aa8801808211b42184c15712e6adf9b443d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dc77aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 13 11:41:06 2010 +0200 registrar(k): reset dst uri in lookup - upon lookup, dst uri is reset if no new dst uri is set from received or path, otherwise the coordinates of selected contact are not effective - reported by Andreas Granig (cherry picked from commit 53bb79cef5eb70e98472903ef84b5585cc798e65) --- modules_k/registrar/lookup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 67accc7..944d410 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -105,6 +105,9 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) goto done; } + /* reset next hop address */ + reset_dst_uri(_m); + /* If a Path is present, use first path-uri in favour of * received-uri because in that case the last hop towards the uac * has to handle NAT. - agranig */

14 years, 8 months

git:master: textops: change_reply_status() added

by Miklos Tirpak

Module: sip-router Branch: master Commit: 02ec00fbade29687566a158f20cb310a56346de6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02ec00f… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 26 17:16:47 2010 +0200 textops: change_reply_status() added change_reply_status(code, reason) can be used to change the status code and the reason phrase of a SIP reply from onreply_route. --- modules_s/textops/doc/functions.xml | 30 ++++++++++++++ modules_s/textops/textops.c | 74 +++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 0 deletions(-) diff --git a/modules_s/textops/doc/functions.xml b/modules_s/textops/doc/functions.xml index 3a180a8..b0b528c 100644 --- a/modules_s/textops/doc/functions.xml +++ b/modules_s/textops/doc/functions.xml @@ -642,6 +642,36 @@ if (@hf_value_exists.supported.path == "1") { </example> </section> + <section id="change_reply_status"> + <title> + <function>change_reply_status(code, reason)</function> + </title> + <para> + Change the status code and reason phrase of a SIP reply in onreply_route. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>code</emphasis> - Status code. + </para> + </listitem> + <listitem> + <para><emphasis>reason</emphasis> - Reason phrase. + </para> + </listitem> + </itemizedlist> + <example> + <title><function>change_reply_status</function> usage</title> + <programlisting> +... +if (@status == "603") { + change_reply_status(404, "Not Found") +} +... + </programlisting> + </example> + </section> + <section id="@hf_value"> <title> <function>@hf_value selects</function> diff --git a/modules_s/textops/textops.c b/modules_s/textops/textops.c index 73cd301..e217bc8 100644 --- a/modules_s/textops/textops.c +++ b/modules_s/textops/textops.c @@ -114,6 +114,7 @@ static int append_to_reply_f(struct sip_msg* msg, char* key, char* str); static int append_hf(struct sip_msg* msg, char* str1, char* str2); static int append_urihf(struct sip_msg* msg, char* str1, char* str2); static int append_time_f(struct sip_msg* msg, char* , char *); +static int change_reply_status_f(struct sip_msg* msg, char* , char *); static int incexc_hf_value_f(struct sip_msg* msg, char* , char *); static int include_hf_value_fixup(void**, int); @@ -129,6 +130,7 @@ static int remove_hf_value2_fixup(void** param, int param_no); static int assign_hf_value2_fixup(void** param, int param_no); static int fixup_xlstr(void** param, int param_no); static int fixup_regex_xlstr(void** param, int param_no); +static int change_reply_status_fixup(void** param, int param_no); static int fixup_substre(void**, int); @@ -188,6 +190,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"hf_value_exists", incexc_hf_value_f, 2, hf_value_exists_fixup, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, + ONREPLY_ROUTE}, {0,0,0,0,0} }; @@ -1735,6 +1739,76 @@ static int assign_hf_value2_fixup(void** param, int param_no) { return 0; } +static int change_reply_status_fixup(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_var_int_12(param, param_no); + } else if (param_no == 2) + return fixup_var_str_12(param, param_no); + else + return 0; +} + +static int change_reply_status_f(struct sip_msg* msg, char* _code, char* _reason) +{ + int code; + str reason; + struct lump *l; + char *ch; + + if (get_int_fparam(&code, msg, (fparam_t*)_code) + || get_str_fparam(&reason, msg, (fparam_t*)_reason) + || (reason.len == 0) + ) { + LOG(L_ERR, "ERROR: textops: cannot get parameter\n"); + return -1; + } + + if ((code < 100) || (code > 699)) { + LOG(L_ERR, "ERROR: textops: wrong status code: %d\n", + code); + return -1; + } + + if (((code < 300) || (msg->REPLY_STATUS < 300)) + && (code/100 != msg->REPLY_STATUS/100) + ) { + LOG(L_ERR, "ERROR: textops: the class of provisional or " + "positive final replies cannot be changed\n"); + return -1; + } + + /* rewrite the status code directly in the message buffer */ + msg->first_line.u.reply.statuscode = code; + msg->first_line.u.reply.status.s[2] = code % 10 + '0'; code /= 10; + msg->first_line.u.reply.status.s[1] = code % 10 + '0'; code /= 10; + msg->first_line.u.reply.status.s[0] = code + '0'; + + l = del_lump(msg, + msg->first_line.u.reply.reason.s - msg->buf, + msg->first_line.u.reply.reason.len, + 0); + if (!l) { + LOG(L_ERR, "ERROR: textops(): Failed to add del lump\n"); + return -1; + } + /* clone the reason phrase, the lumps need to be pkg allocated */ + ch = (char *)pkg_malloc(reason.len); + if (!ch) { + LOG(L_ERR, "ERROR: textops: Not enough memory\n"); + return -1; + } + memcpy(ch, reason.s, reason.len); + if (insert_new_lump_after(l, ch, reason.len, 0)==0){ + LOG(L_ERR, "ERROR: textops: failed to add new lump: %.*s\n", + reason.len, ch); + pkg_free(ch); + return -1; + } + + return 1; +} + static int sel_hf_value(str* res, select_t* s, struct sip_msg* msg) { /* dummy */ return 0; }

14 years, 8 months

git:master: modules/ carrierroute Improved usefulness of error messages in case of a incorrect AVP value

by Marius Zbihlei

Module: sip-router Branch: master Commit: f68e9fe0ef0b84e78532e144de2b1ea5c418bbd5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f68e9fe… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 9 12:09:33 2010 +0300 modules/carrierroute Improved usefulness of error messages in case of a incorrect AVP value (cherry picked from commit 6c51d903f5a314f4116df81121d1faa5ea8c95d3) --- modules/carrierroute/cr_func.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 207562d..a6da6e2 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -103,12 +103,11 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t id = map_name2id(map, size, &avp_val.s); if (id < 0) { if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) - LM_ERR("could not find id '%.*s' from AVP\n", - gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, + LM_ERR("cannot map carrier with id %.*s from AVP '%.*s'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) - LM_ERR("could not find id regex\n"); - else LM_ERR("could not find id '%d'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.n); + LM_ERR("cannot map carrier with id %.*s from AVP regex\n", avp_val.s.len, avp_val.s.s); + else LM_ERR("cannot map carrier with id %.*s from AVP '%d'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.n); return -1; } return id;

14 years, 8 months

git:master: modules/carrierroute In case of incorrect avp value ( unknown carrier id), print the name of the avp accordinly to its type

by Marius Zbihlei

Module: sip-router Branch: master Commit: c90ecffaea4e9b47e33de521fbce5f86a896b67a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c90ecff… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Apr 8 16:54:53 2010 +0300 modules/carrierroute In case of incorrect avp value (unknown carrier id), print the name of the avp accordinly to its type (cherry picked from commit 5604e51eb8fd6502495a37c26f9c549bcd63ca8a) --- modules/carrierroute/cr_func.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 382df16..207562d 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -89,8 +89,12 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t avp = search_first_avp(gp->v.pve->spec.pvp.pvn.u.isname.type, gp->v.pve->spec.pvp.pvn.u.isname.name, &avp_val, 0); if (!avp) { - LM_ERR("cannot find AVP '%.*s'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, + if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) + LM_ERR("cannot find AVP '%.*s'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); + else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) + LM_ERR("cannot find AVP regex\n"); + else LM_ERR("cannot find AVP '%d'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.n); return -1; } if ((avp->flags&AVP_VAL_STR)==0) { @@ -98,9 +102,13 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t } else { id = map_name2id(map, size, &avp_val.s); if (id < 0) { - LM_ERR("could not find id '%.*s' from AVP\n", + if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) + LM_ERR("could not find id '%.*s' from AVP\n", gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); + else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) + LM_ERR("could not find id regex\n"); + else LM_ERR("could not find id '%d'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.n); return -1; } return id;

14 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev