sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: test: fix path in one test after sl move

by Henning Westerholt

Module: sip-router Branch: master Commit: 97ad00f3fbe9bccd64788aab082b7db0275f6c48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97ad00f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 12 17:11:40 2010 +0200 test: fix path in one test after sl move --- test/unit/11.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/11.cfg b/test/unit/11.cfg index 243a9a2..c9d525e 100644 --- a/test/unit/11.cfg +++ b/test/unit/11.cfg @@ -6,8 +6,8 @@ children=1 disable_tcp=yes # ------------------ module loading ---------------------------------- -loadpath "../../modules_k/" -loadmodule "../../modules/tm/tm.so" +loadpath "../../modules/:../../modules_k/" +loadmodule "tm" loadmodule "sl" loadmodule "rr" loadmodule "maxfwd"

14 years, 5 months

[tracker] Comment added: presence, add_event(), missing handler on subscribe

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#82 - presence, add_event(), missing handler on subscribe User who did this - nikita kozlov (klnikita) ---------- Hello, I'm adding a sample code to describe the issue. <code> int my_pres_new_events(void) { pres_ev_t event; LM_INFO("adding my new event\n"); memset(&event, 0, sizeof(pres_ev_t)); event.name.s = "test-event"; event.name.len = 10; event.content_type.s = "application/test-event"; event.content_type.len = 22; event.default_expires= 3600; event.type = SUBS_TYPE; /* * BUG : my event callback addr is not duplicated in the presence event list. (see the patch in the ticket) * So my callback isn't called on new subscribes. */ event.evs_subs_handl = addressbook_subscribe_hdlr; if (pres_add_event(&event) < 0) { LM_ERR("failed to add my new event\n"); return -1; } return 0; } </code> I will be happy to have any feedback on this issue, especially if this callback is deprecated. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=82#comment112 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

[tracker] Task closed: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#83 - ds_reload fails (MySQL backend) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Already fixed in latest version. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

[tracker] User took ownership: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#83 - ds_reload fails (MySQL backend) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

[tracker] Task closed: htable / sercmd mi sht_dump fails with error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#84 - htable / sercmd mi sht_dump fails with error User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Internal buffer size can be controlled already via ctl module parameter. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=84 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

[tracker] Comment added: htable / sercmd mi sht_dump fails with error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#84 - htable / sercmd mi sht_dump fails with error User who did this - Daniel-Constantin Mierla (miconda) ---------- There is a parameter that can be used to increase the internal buffer size: http://kamailio.org/docs/modules/stable/modules/ctl.html#binrpc_max_body_si… ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=84#comment111 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

git:master: pv: more To hdr attributes allowed in assignment

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 203bbc38cb7bca36878b561ea6e6f58d17f07c71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=203bbc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 15:47:12 2010 +0200 pv: more To hdr attributes allowed in assignment - values of username, domain and display name of To header can be set via PV assignmet ($tU, $td, $tn) - use carefully, don't do many assignments to these variables for same message - it can results in strange output due to lumps system used behind. However, you can do msg_apply_changes() after one assignment --- modules_k/pv/pv.c | 12 ++-- modules_k/pv/pv_core.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++-- modules_k/pv/pv_core.h | 9 ++++ 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 2878c77..dece906 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -328,13 +328,13 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_srcport, 0, 0, 0, 0, 0}, {{"td", (sizeof("td")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, 0, + PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, {{"to.domain", (sizeof("to.domain")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, 0, + PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, {{"tn", (sizeof("tn")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, 0, + PVT_OTHER, pv_get_to_attr, pv_set_to_display, 0, 0, pv_init_iname, 5}, {{"tt", (sizeof("tt")-1)}, /* */ PVT_OTHER, pv_get_to_attr, 0, @@ -343,13 +343,13 @@ static pv_export_t mod_pvs[] = { PVT_TO, pv_get_to_attr, pv_set_to_uri, 0, 0, pv_init_iname, 1}, {{"to", (sizeof("to")-1)}, /* */ - PVT_TO, pv_get_to_attr, 0, + PVT_TO, pv_get_to_attr, pv_set_to_uri, 0, 0, pv_init_iname, 1}, {{"tU", (sizeof("tU")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, 0, + PVT_OTHER, pv_get_to_attr, pv_set_to_username, 0, 0, pv_init_iname, 2}, {{"to.user", (sizeof("to.user")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, 0, + PVT_OTHER, pv_get_to_attr, pv_set_to_username, 0, 0, pv_init_iname, 2}, {{"true", (sizeof("true")-1)}, /* */ PVT_OTHER, pv_get_true, 0, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 2b1eede..d434d70 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -2057,15 +2057,108 @@ int pv_set_xto_attr(struct sip_msg* msg, pv_param_t *param, goto error; } buf.len = val->rs.len; - memcpy(buf.s, val->rs.s, val->rs.len); + memcpy(buf.s, val->rs.s, val->rs.len); loffset = tb->uri.s - msg->buf; llen = tb->uri.len; break; case 1: /* username */ + if(val == NULL || (val->flags&PV_VAL_NULL)) + { + if(tb->parsed_uri.user.len==0) + return 0; /* nothing to delete */ + /* delete username */ + loffset = tb->parsed_uri.user.s - msg->buf; + llen = tb->parsed_uri.user.len; + /* delete '@' after */ + if(tb->parsed_uri.user.s[tb->parsed_uri.user.len]=='@') + llen++; + break; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("attempt to assign non-str value to To header" + " display name\n"); + return -1; + } + buf.s = pkg_malloc(val->rs.len+1); + if (buf.s==0) + { + LM_ERR("no more pkg mem\n"); + goto error; + } + buf.len = val->rs.len; + memcpy(buf.s, val->rs.s, val->rs.len); + if(tb->parsed_uri.user.len==0) + { + l = anchor_lump(msg, tb->parsed_uri.host.s - msg->buf, 0, 0); + buf.s[buf.len] = '@'; + buf.len++; + } else { + /* delete username */ + loffset = tb->parsed_uri.user.s - msg->buf; + llen = tb->parsed_uri.user.len; + } break; case 2: /* domain */ + if(val == NULL || (val->flags&PV_VAL_NULL)) + { + LM_WARN("To header URI domain cannot be deleted\n"); + return 0; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("attempt to assign non-str value to To header" + " URI domain\n"); + return -1; + } + buf.s = pkg_malloc(val->rs.len); + if (buf.s==0) + { + LM_ERR("no more pkg mem\n"); + goto error; + } + buf.len = val->rs.len; + memcpy(buf.s, val->rs.s, val->rs.len); + loffset = tb->parsed_uri.host.s - msg->buf; + llen = tb->parsed_uri.host.len; break; case 3: /* display */ + if(val == NULL || (val->flags&PV_VAL_NULL)) + { + if(tb->display.len==0) + return 0; /* nothing to delete */ + /* delete display */ + loffset = tb->display.s - msg->buf; + llen = tb->display.len; + /* delete whitespace after */ + if(tb->display.s[tb->display.len]==' ') + llen++; + break; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("attempt to assign non-str value to To header" + " display name\n"); + return -1; + } + buf.s = pkg_malloc(val->rs.len+1); + if (buf.s==0) + { + LM_ERR("no more pkg mem\n"); + goto error; + } + buf.len = val->rs.len; + memcpy(buf.s, val->rs.s, val->rs.len); + if(tb->display.len==0) + { + l = anchor_lump(msg, tb->body.s - msg->buf, 0, 0); + buf.s[buf.len] = ' '; + buf.len++; + } else { + /* delete display */ + loffset = tb->display.s - msg->buf; + llen = tb->display.len; + } break; } @@ -2079,7 +2172,7 @@ int pv_set_xto_attr(struct sip_msg* msg, pv_param_t *param, } } /* set new value when given */ - if(buf.len>0) + if(l!=NULL && buf.len>0) { if (insert_new_lump_after(l, buf.s, buf.len, 0)==0) { @@ -2101,8 +2194,7 @@ int pv_set_to_attr(struct sip_msg* msg, pv_param_t *param, if(msg==NULL) return -1; - if(msg->to==NULL && parse_headers(msg, HDR_TO_F, 0)==-1) - { + if(msg->to==NULL && parse_headers(msg, HDR_TO_F, 0)==-1) { LM_ERR("cannot parse To header\n"); return -1; } @@ -2110,6 +2202,10 @@ int pv_set_to_attr(struct sip_msg* msg, pv_param_t *param, LM_DBG("no To header\n"); return -1; } + if(parse_to_uri(msg)==NULL) { + LM_ERR("cannot parse To header\n"); + return -1; + } return pv_set_xto_attr(msg, param, op, val, get_to(msg), type); } @@ -2119,6 +2215,24 @@ int pv_set_to_uri(struct sip_msg* msg, pv_param_t *param, return pv_set_to_attr(msg, param, op, val, 0); } +int pv_set_to_username(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_to_attr(msg, param, op, val, 1); +} + +int pv_set_to_domain(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_to_attr(msg, param, op, val, 2); +} + +int pv_set_to_display(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_to_attr(msg, param, op, val, 3); +} + /********* end PV set functions *********/ int pv_parse_scriptvar_name(pv_spec_p sp, str *in) diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 0c5ce4c..418632a 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -235,6 +235,15 @@ int pv_set_bflags(struct sip_msg* msg, pv_param_t *param, int pv_set_to_uri(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_set_to_username(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + +int pv_set_to_domain(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + +int pv_set_to_display(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + /********* end PV set functions *********/ int pv_parse_scriptvar_name(pv_spec_p sp, str *in);

14 years, 5 months

git:master: pv: allow From header attributes to be updated with assignment

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f9afe8b64410f66b39513e6bfcedf3ffc71c16a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9afe8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 16:00:35 2010 +0200 pv: allow From header attributes to be updated with assignment - same as for To header attributes - writable PVs: $fu, $fU, $fd and $fn --- modules_k/pv/pv.c | 14 +++++++------- modules_k/pv/pv_core.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_core.h | 12 ++++++++++++ 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index dece906..2a79578 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -178,13 +178,13 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_errinfo_attr, 0, 0, 0, pv_init_iname, 4}, {{"fd", (sizeof("fd")-1)}, /* */ - PVT_OTHER, pv_get_from_attr, 0, + PVT_OTHER, pv_get_from_attr, pv_set_from_domain, 0, 0, pv_init_iname, 3}, {{"from.domain", (sizeof("from.domain")-1)}, /* */ - PVT_OTHER, pv_get_from_attr, 0, + PVT_OTHER, pv_get_from_attr, pv_set_from_domain, 0, 0, pv_init_iname, 3}, {{"fn", (sizeof("fn")-1)}, /* */ - PVT_OTHER, pv_get_from_attr, 0, + PVT_OTHER, pv_get_from_attr, pv_set_from_display, 0, 0, pv_init_iname, 5}, {{"fs", (sizeof("fs")-1)}, /* */ PVT_OTHER, pv_get_force_sock, pv_set_force_sock, @@ -193,16 +193,16 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_from_attr, 0, 0, 0, pv_init_iname, 4}, {{"fu", (sizeof("fu")-1)}, /* */ - PVT_FROM, pv_get_from_attr, 0, + PVT_FROM, pv_get_from_attr, pv_set_from_uri, 0, 0, pv_init_iname, 1}, {{"from", (sizeof("from")-1)}, /* */ - PVT_FROM, pv_get_from_attr, 0, + PVT_FROM, pv_get_from_attr, pv_set_from_uri, 0, 0, pv_init_iname, 1}, {{"fU", (sizeof("fU")-1)}, /* */ - PVT_OTHER, pv_get_from_attr, 0, + PVT_OTHER, pv_get_from_attr, pv_set_from_username, 0, 0, pv_init_iname, 2}, {{"from.user", (sizeof("from.user")-1)}, /* */ - PVT_OTHER, pv_get_from_attr, 0, + PVT_OTHER, pv_get_from_attr, pv_set_from_username, 0, 0, pv_init_iname, 2}, {{"mb", (sizeof("mb")-1)}, /* */ PVT_OTHER, pv_get_msg_buf, 0, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index d434d70..b69df2a 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -2203,7 +2203,7 @@ int pv_set_to_attr(struct sip_msg* msg, pv_param_t *param, return -1; } if(parse_to_uri(msg)==NULL) { - LM_ERR("cannot parse To header\n"); + LM_ERR("cannot parse To header URI\n"); return -1; } return pv_set_xto_attr(msg, param, op, val, get_to(msg), type); @@ -2233,6 +2233,49 @@ int pv_set_to_display(struct sip_msg* msg, pv_param_t *param, return pv_set_to_attr(msg, param, op, val, 3); } +int pv_set_from_attr(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val, int type) +{ + if(msg==NULL) + return -1; + + if(parse_from_header(msg)<0) + { + LM_ERR("failed to parse From header\n"); + return -1; + } + if(parse_from_uri(msg)==NULL) + { + LM_ERR("cannot parse From header URI\n"); + return -1; + } + return pv_set_xto_attr(msg, param, op, val, get_from(msg), type); +} + +int pv_set_from_uri(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_from_attr(msg, param, op, val, 0); +} + +int pv_set_from_username(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_from_attr(msg, param, op, val, 1); +} + +int pv_set_from_domain(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_from_attr(msg, param, op, val, 2); +} + +int pv_set_from_display(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_from_attr(msg, param, op, val, 3); +} + /********* end PV set functions *********/ int pv_parse_scriptvar_name(pv_spec_p sp, str *in) diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 418632a..a3c8a60 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -244,6 +244,18 @@ int pv_set_to_domain(struct sip_msg* msg, pv_param_t *param, int pv_set_to_display(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_set_from_uri(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + +int pv_set_from_username(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + +int pv_set_from_domain(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + +int pv_set_from_display(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + /********* end PV set functions *********/ int pv_parse_scriptvar_name(pv_spec_p sp, str *in);

14 years, 5 months

git:master: pv: $tu can be used in assignments

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aa2f0a04895a9b402faaef3925267e1992a7bc34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa2f0a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 14:38:36 2010 +0200 pv: $tu can be used in assignments - update sip URI in To header $tu = "sip:test@sip-router.org"; - note that this should be avoided unless strictly necessary (can break compatibility with some old devices that match on To uri instead of To tag --- modules/matrix/doc/matrix.html | 874 ---------------------------------------- modules/matrix/doc/matrix.txt | 313 -------------- modules_k/pv/pv.c | 2 +- modules_k/pv/pv_core.c | 100 +++++ modules_k/pv/pv_core.h | 4 + 5 files changed, 105 insertions(+), 1188 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=aa2…

14 years, 5 months

[tracker] Task opened: htable / sercmd mi sht_dump fails with error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Kim Jakobsson (kjakobsson) Attached to Project - sip-router Summary - htable / sercmd mi sht_dump fails with error Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - - version 3.0.x from git - module htable with mysql backend I have approx 100 rows in htable, persisted in mysql database. Kamailio starts up fine and loads htable contents from database. Issuing 'sercmd mi sht_dump foo' fails with error: > error: 500 - Internal server error processing 's': buffer too small (overflow) (-2) In the syslog: > ERROR: ctl [binrpc_run.c:413]: ERROR: binrpc: rpc_send: rpc method mi tried to reply more then once More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=84 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev