sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:e7dc20f4: modules/tsilo: return from ts_store if transaction is not defined

by grumvalski

Module: kamailio Branch: master Commit: e7dc20f48c674b0eca5419c93e05a430a5b20e71 URL: https://github.com/kamailio/kamailio/commit/e7dc20f48c674b0eca5419c93e05a43… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2015-03-29T17:48:20+02:00 modules/tsilo: return from ts_store if transaction is not defined --- Modified: modules/tsilo/ts_hash.c Modified: modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/e7dc20f48c674b0eca5419c93e05a43… Patch: https://github.com/kamailio/kamailio/commit/e7dc20f48c674b0eca5419c93e05a43… --- diff --git a/modules/tsilo/ts_hash.c b/modules/tsilo/ts_hash.c index 6225db6..cf529ee 100644 --- a/modules/tsilo/ts_hash.c +++ b/modules/tsilo/ts_hash.c @@ -297,7 +297,7 @@ void remove_ts_urecord(ts_urecord_t* _r) int insert_ts_transaction(struct cell* t, struct sip_msg* msg, struct ts_urecord* _r) { ts_transaction_t *ptr, *prev; - ts_transaction_t* ts; + ts_transaction_t* ts; unsigned int tindex; unsigned int tlabel; diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c index 76ab9f6..48d1441 100644 --- a/modules/tsilo/ts_store.c +++ b/modules/tsilo/ts_store.c @@ -46,6 +46,11 @@ int ts_store(struct sip_msg* msg) { t = _tmb.t_gett(); ruri = msg->first_line.u.request.uri; + if (!t || t==T_UNDEFINED) { + LM_ERR("no transaction defined for %.*s\n", ruri.len, ruri.s); + return -1; + } + LM_DBG("storing transaction %u:%u for r-uri: %.*s\n", t->hash_index, t->label, ruri.len, ruri.s); lock_entry_by_ruri(&ruri);

9 years, 1 month

Re: [sr-dev] [ser-dev] re.h - subst_str ussage

by Cockhootec Yahrabee

Hi, I am trying to use Kamailio specific function 'subst_str' for replacing some media attributes in SDP in my module. Finally I have resolved how to create 'subst_expr' structure so I can pass it to 'subst_str' function. I am doing something like this: struct subst_expr *seMedia; char *pattern; asprintf(&pattern, "/m=audio ([0-9]{0,5})/m=audio %s/", _host_port.s); str *subst; subst = (str *) pkg_malloc(sizeof(str)); subst->s = pattern; subst->len = strlen(pattern); seMedia = subst_parser(subst); int count = 0; str *tmpBody; char const *oldBody = (char const *) msg->body; tmpBody = subst_str(oldBody, msg, seMedia, &count); if (count > 0) { // do other stuff I am trying to replace all "m=audio {port number}" attributes with port 5060. I think that the regular expression is correct. But unfortunately in Kamailio log I am getting something like this: 0(25049) DEBUG: <core> [re.c:329]: subst_parser(): subst_parser: ok, se is 0xb72941d8 0(25049) DEBUG: <core> [re.c:454]: subst_run(): subst_run: running. r=1 0(25049) DEBUG: <core> [re.c:523]: subst_str(): subst_str: no match It seems like regex was not matched but after this I am printing out whole message and I can see that in SDP 'm=audio' is present. I also noticed another thing when I am printing out 'seMedia->replacement.s' in log I am getting my replacement "m=audio 5060" but also at the end of the string I can see some weird character: [image: Inline image 1] If someone came across this issue in the past and resolved it, it would be great if he/she can share his/her knowledge with me because seriously this issue is driving me crazy. On Thu, Mar 12, 2015 at 9:17 PM, Cockhootec Yahrabee <cockootec(a)gmail.com> wrote: > Thanks a lot. I am sorry I didn't code with pointers quite a long time so > I need to refresh my knowledge a bit :) > But unfortunately it was not the main problem. > > In Kamailio log I am getting something like this: > > 0(17809) ERROR: <core> [re.c:181]: parse_repl(): subst_parser: bad > specifier in replace part /$1 5060/gm > > I think, that problem is on this line > https://gist.github.com/ivanbarlog/1b552b57e89bf4670872#file-test-c-L5 > where I am trying to use $1 as a placeholder for first matched group. > > I also tried it without it - just replace `m=audio` (not m=*) but it also > didn't worked. > > I am also not sure if I am correctly re-transmitting updated SIP message. > I looked at other modules which perform the same action and I tried to > inspire with their code but unfortunately it's not working. > > Could you please review this code sample > https://gist.github.com/ivanbarlog/4040ae5b735386a88ea0 ? > > Or maybe if you can point me to some resource where I can read more about > it. Also it would be great if there was some tutorial for developing > modules. > > Thanks for help > > > On Wed, Mar 11, 2015 at 7:20 PM, Daniel-Constantin Mierla < > miconda(a)gmail.com> wrote: > >> Hello, >> >> at least one problem is the next line in your code: >> >> subst->len = sizeof(pattern); >> >> should be: >> >> subst->len = strlen(pattern); >> >> Because patter is declared as 'char*', sizeof returns 4 or 8 (if 32b or >> 64b architecture). >> >> Try with that change and see how far it goes. >> >> Cheers, >> Daniel >> >> >> On 11/03/15 00:43, Cockhootec Yahrabee wrote: >> >> Hi guys, >> I am trying to 'search&replace' some patterns in message body but >> unfortunately with no result (but bunch of errors). >> >> First of all I am trying to perform regex substitution as one that can >> be seen at https://regex101.com/r/vF1kZ7/1 >> >> Since I have regular expression I am trying to convert it so it will >> work with `sub_str` function from re.h >> >> Here is my attempt: >> https://gist.github.com/ivanbarlog/1b552b57e89bf4670872#file-test-c-L12 >> >> I had quite lot of errors but last error I am getting is that >> `subst_parser` cannot find separator >> https://github.com/kamailio/kamailio/blob/master/re.c#L240 >> >> Since the `struct subst_expr` is not parsed right the next error is >> segfault in `subst_str` function. >> >> >> >> If someone can explain me how exactly I should use `subst_str` function >> with my regex I'll be really grateful. Little example code would be also >> great. >> >> Thanks in advance >> >> >> _______________________________________________ >> sr-dev mailing listsr-dev@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >> >> >> -- >> Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda >> Kamailio World Conference, May 27-29, 2015 >> Berlin, Germany - http://www.kamailioworld.com >> >> >

9 years, 1 month

git:master:8a7c70a5: tm: clone path vector back to pkg for faked message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a7c70a5b831542cde77e7945e97d51901b95310 URL: https://github.com/kamailio/kamailio/commit/8a7c70a5b831542cde77e7945e97d51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-28T15:00:48+01:00 tm: clone path vector back to pkg for faked message - it is cloned and can be changed, resulting in attempt to free a shm pointer via pkg operation - reported by Jose Seabra --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/8a7c70a5b831542cde77e7945e97d51… Patch: https://github.com/kamailio/kamailio/commit/8a7c70a5b831542cde77e7945e97d51… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5dfbfd0..d14ed1c 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -819,7 +819,31 @@ void faked_env(struct cell *t, struct sip_msg *msg, int is_async_env) { } } +/** + * helper function to clone back to pkg fields that can change in fake_req + */ +int fake_req_clone_str_helper(str *src, str *dst, char *txt) +{ + /* src string can change -- make a private copy */ + if (src->s!=0 && src->len!=0) { + dst->s=pkg_malloc(src->len+1); + if (!dst->s) { + LM_ERR("no pkg mem to clone %s back to faked msg\n", txt); + return -1; + } + dst->len=src->len; + memcpy(dst->s, src->s, dst->len); + dst->s[dst->len]=0; + }else{ + /* in case src->len==0, but src->s!=0 (extra safety) */ + dst->s = 0; + } + return 0; +} +/** + * fake a semi-private sip message using transaction's shared memory message + */ int fake_req(struct sip_msg *faked_req, struct sip_msg *shmem_msg, int extra_flags, struct ua_client *uac) { @@ -839,47 +863,40 @@ int fake_req(struct sip_msg *faked_req, faked_req->msg_flags|=extra_flags; /* set the extra tm flags */ - /* dst_uri can change ALSO!!! -- make a private copy */ - if (shmem_msg->dst_uri.s!=0 && shmem_msg->dst_uri.len!=0) { - faked_req->dst_uri.s=pkg_malloc(shmem_msg->dst_uri.len+1); - if (!faked_req->dst_uri.s) { - LOG(L_ERR, "ERROR: fake_req: no uri/pkg mem\n"); - goto error01; - } - faked_req->dst_uri.len=shmem_msg->dst_uri.len; - memcpy( faked_req->dst_uri.s, shmem_msg->dst_uri.s, - faked_req->dst_uri.len); - faked_req->dst_uri.s[faked_req->dst_uri.len]=0; - }else{ - /* in case len==0, but shmem_msg->dst_uri.s!=0 (extra safety) */ - faked_req->dst_uri.s = 0; + /* path_vec was cloned in shm and can change -- make a private copy */ + if(fake_req_clone_str_helper(&shmem_msg->path_vec, &faked_req->path_vec, + "path_vec")<0) { + goto error00; } - /* new_uri can change -- make a private copy */ - if (shmem_msg->new_uri.s!=0 && shmem_msg->new_uri.len!=0) { - faked_req->new_uri.s=pkg_malloc(shmem_msg->new_uri.len+1); - if (!faked_req->new_uri.s) { - LOG(L_ERR, "ERROR: fake_req: no uri/pkg mem\n"); - goto error00; - } - faked_req->new_uri.len=shmem_msg->new_uri.len; - memcpy( faked_req->new_uri.s, shmem_msg->new_uri.s, - faked_req->new_uri.len); - faked_req->new_uri.s[faked_req->new_uri.len]=0; - }else{ - /* in case len==0, but shmem_msg->new_uri.s!=0 (extra safety)*/ - faked_req->new_uri.s = 0; + /* dst_uri was cloned in shm and can change -- make a private copy */ + if(fake_req_clone_str_helper(&shmem_msg->dst_uri, &faked_req->dst_uri, + "dst_uri")<0) { + goto error01; + } + /* new_uri was cloned in shm and can change -- make a private copy */ + if(fake_req_clone_str_helper(&shmem_msg->new_uri, &faked_req->new_uri, + "new_uri")<0) { + goto error02; } + if(uac) setbflagsval(0, uac->branch_flags); else setbflagsval(0, 0); return 1; -error00: + +error02: if (faked_req->dst_uri.s) { pkg_free(faked_req->dst_uri.s); faked_req->dst_uri.s = 0; faked_req->dst_uri.len = 0; } error01: + if (faked_req->path_vec.s) { + pkg_free(faked_req->path_vec.s); + faked_req->path_vec.s = 0; + faked_req->path_vec.len = 0; + } +error00: return 0; }

9 years, 1 month

git:master:3957db5f: tm: reply_lock per transaction made re-entrant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3957db5fb51e23535a89b15c8f05463e5702424d URL: https://github.com/kamailio/kamailio/commit/3957db5fb51e23535a89b15c8f05463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-28T14:31:59+01:00 tm: reply_lock per transaction made re-entrant - on a report by Jason Penton - re-ordered some includes to get rid of cross dependencies in defines --- Modified: modules/tm/defs.h Modified: modules/tm/h_table.h Modified: modules/tm/t_append_branches.c Modified: modules/tm/t_funcs.c Modified: modules/tm/t_fwd.c Modified: modules/tm/t_msgbuilder.h Modified: modules/tm/t_reply.c Modified: modules/tm/t_reply.h Modified: modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/3957db5fb51e23535a89b15c8f05463… Patch: https://github.com/kamailio/kamailio/commit/3957db5fb51e23535a89b15c8f05463…

9 years, 1 month

Errored: kamailio/kamailio#497 (master - 44fdfff)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #497 Status: Errored Duration: 4 minutes and 56 seconds Commit: 44fdfff (master) Author: Daniel-Constantin Mierla Message: usrloc: proper init column names - reported and patch by Anthony Messina, GH#117 View the changeset: https://github.com/kamailio/kamailio/compare/64dc2bbba40c...44fdfff6b407 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/56193097 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 1 month

[kamailio] DB issue with multiple reg_id insertion when upgrading to 64dc2bbba40ccc2afc1d34c78a6d066892549fb3 (#117)

by Anthony Messina

Query: insert into location (username,contact,expires,q,callid,cseq,flags,cflags,user_agent,received,socket,methods,last_modified,ruid,instance,reg_id,reg_id,reg_id,reg_id,domain ) --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/117

9 years, 1 month

git:master:44fdfff6: usrloc: proper init column names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44fdfff6b407bc3d541cd43f249700a69f1e0eb8 URL: https://github.com/kamailio/kamailio/commit/44fdfff6b407bc3d541cd43f249700a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-28T08:57:15+01:00 usrloc: proper init column names - reported and patch by Anthony Messina, GH#117 --- Modified: modules/usrloc/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/44fdfff6b407bc3d541cd43f249700a… Patch: https://github.com/kamailio/kamailio/commit/44fdfff6b407bc3d541cd43f249700a… --- diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 99c8346..c5e95f8 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -140,9 +140,9 @@ str methods_col = str_init(METHODS_COL); /*!< Name of column containing the str instance_col = str_init(INSTANCE_COL); /*!< Name of column containing the SIP instance value */ str reg_id_col = str_init(REG_ID_COL); /*!< Name of column containing the reg-id value */ str last_mod_col = str_init(LAST_MOD_COL); /*!< Name of column containing the last modified date */ -str srv_id_col = str_init(REG_ID_COL); /*!< Name of column containing the server id value */ -str con_id_col = str_init(REG_ID_COL); /*!< Name of column containing the connection id value */ -str keepalive_col = str_init(REG_ID_COL); /*!< Name of column containing the keepalive value */ +str srv_id_col = str_init(SRV_ID_COL); /*!< Name of column containing the server id value */ +str con_id_col = str_init(CON_ID_COL); /*!< Name of column containing the connection id value */ +str keepalive_col = str_init(KEEPALIVE_COL); /*!< Name of column containing the keepalive value */ str ulattrs_user_col = str_init(ULATTRS_USER_COL); /*!< Name of column containing username */ str ulattrs_domain_col = str_init(ULATTRS_DOMAIN_COL); /*!< Name of column containing domain */

9 years, 1 month

git:master:64dc2bbb: usrloc: doc updated for the parameters of the new db table columns

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64dc2bbba40ccc2afc1d34c78a6d066892549fb3 URL: https://github.com/kamailio/kamailio/commit/64dc2bbba40ccc2afc1d34c78a6d066… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-27T15:57:53+01:00 usrloc: doc updated for the parameters of the new db table columns --- Modified: modules/usrloc/README Modified: modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64dc2bbba40ccc2afc1d34c78a6d066… Patch: https://github.com/kamailio/kamailio/commit/64dc2bbba40ccc2afc1d34c78a6d066…

9 years, 1 month

git:master:c3d74313: kamctl: database creation scripts updated for new location table schema

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3d74313a4ec98096878ba231859b5bf11fd0e54 URL: https://github.com/kamailio/kamailio/commit/c3d74313a4ec98096878ba231859b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-27T15:47:22+01:00 kamctl: database creation scripts updated for new location table schema --- Modified: utils/kamctl/db_berkeley/kamailio/location Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/dbtext/kamailio/location Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/usrloc-mod Modified: utils/kamctl/xhttp_pi/usrloc-table --- Diff: https://github.com/kamailio/kamailio/commit/c3d74313a4ec98096878ba231859b5b… Patch: https://github.com/kamailio/kamailio/commit/c3d74313a4ec98096878ba231859b5b…

9 years, 1 month

git:master:5c817f89: registrar: set server_id field for location record

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c817f8997cea3345f053129aa8945968b8b17bd URL: https://github.com/kamailio/kamailio/commit/5c817f8997cea3345f053129aa89459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-27T15:46:58+01:00 registrar: set server_id field for location record --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/5c817f8997cea3345f053129aa89459… Patch: https://github.com/kamailio/kamailio/commit/5c817f8997cea3345f053129aa89459… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 1391647..ae311e8 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -217,7 +217,8 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) /*! \brief * Fills the common part (for all contacts) of the info structure */ -static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsigned int _e, unsigned int _f, int _use_regid) +static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, + unsigned int _e, unsigned int _f, int _use_regid) { static ucontact_info_t ci; static str no_ua = str_init("n/a"); @@ -305,6 +306,8 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } + ci.server_id = server_id; + allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */ m = _m; /* remember the message */

9 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015