sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:cd379886: tm: proper resoring of backup lumps in case of cloning failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd379886fa7a8ff01b9618491199f8e5b3ce897f URL: https://github.com/kamailio/kamailio/commit/cd379886fa7a8ff01b9618491199f8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-01T13:54:21+02:00 tm: proper resoring of backup lumps in case of cloning failure --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/cd379886fa7a8ff01b9618491199f8e… Patch: https://github.com/kamailio/kamailio/commit/cd379886fa7a8ff01b9618491199f8e… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 2ea1802389..ad1ec2dc15 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -199,14 +199,14 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->add_rm = dup_lump_list(i_req->add_rm); if (unlikely(i_req->add_rm==0)){ ret=E_OUT_OF_MEM; - goto error04; + goto error06; } } if (unlikely(i_req->body_lumps)){ i_req->body_lumps = dup_lump_list(i_req->body_lumps); if (unlikely(i_req->body_lumps==0)){ ret=E_OUT_OF_MEM; - goto error04; + goto error05; } } /* backup uri & path: we need to change them so that build_req...() @@ -593,12 +593,16 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* Delete the duplicated lump lists, this will also delete * all lumps created here, such as lumps created in per-branch * routing sections, Via, and Content-Length headers created in - * build_req_buf_from_sip_req + * build_req_buf_from_sip_req(). */ error04: - free_duped_lump_list(i_req->add_rm); free_duped_lump_list(i_req->body_lumps); - /* Restore the lists from backups */ + +error05: + free_duped_lump_list(i_req->add_rm); + +error06: + /* Restore the lists from backups. */ i_req->add_rm = add_rm_backup; i_req->body_lumps = body_lumps_backup;

5 years, 4 months

git:master:c7ceb08b: tm: removed unused error label in prepare_new_uac()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c7ceb08b31fdb3f6560d02fff6b6ee71602c19ec URL: https://github.com/kamailio/kamailio/commit/c7ceb08b31fdb3f6560d02fff6b6ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-02T13:43:36+02:00 tm: removed unused error label in prepare_new_uac() --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/c7ceb08b31fdb3f6560d02fff6b6ee7… Patch: https://github.com/kamailio/kamailio/commit/c7ceb08b31fdb3f6560d02fff6b6ee7… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index ad1ec2dc15..af6a40de1e 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -199,14 +199,14 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->add_rm = dup_lump_list(i_req->add_rm); if (unlikely(i_req->add_rm==0)){ ret=E_OUT_OF_MEM; - goto error06; + goto error05; } } if (unlikely(i_req->body_lumps)){ i_req->body_lumps = dup_lump_list(i_req->body_lumps); if (unlikely(i_req->body_lumps==0)){ ret=E_OUT_OF_MEM; - goto error05; + goto error04; } } /* backup uri & path: we need to change them so that build_req...() @@ -595,13 +595,12 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, * routing sections, Via, and Content-Length headers created in * build_req_buf_from_sip_req(). */ -error04: free_duped_lump_list(i_req->body_lumps); -error05: +error04: free_duped_lump_list(i_req->add_rm); -error06: +error05: /* Restore the lists from backups. */ i_req->add_rm = add_rm_backup; i_req->body_lumps = body_lumps_backup;

5 years, 4 months

git:master:166ef92d: core: kemi - functions to get headers by name and index

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 166ef92d03d5b42fb172d6940ade808269ca1c4b URL: https://github.com/kamailio/kamailio/commit/166ef92d03d5b42fb172d6940ade808… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-02T13:10:10+02:00 core: kemi - functions to get headers by name and index --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/166ef92d03d5b42fb172d6940ade808… Patch: https://github.com/kamailio/kamailio/commit/166ef92d03d5b42fb172d6940ade808…

5 years, 4 months

git:master:521a631a: kemix: fix for get protoid function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 521a631af088c58cef39fd2c795af8ba64eae28b URL: https://github.com/kamailio/kamailio/commit/521a631af088c58cef39fd2c795af8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-01T11:01:22+02:00 kemix: fix for get protoid function --- Modified: pkg/docker Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/521a631af088c58cef39fd2c795af8b… Patch: https://github.com/kamailio/kamailio/commit/521a631af088c58cef39fd2c795af8b… --- diff --git a/pkg/docker b/pkg/docker index ebc2c9c949..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit ebc2c9c949ecbe328c0024842b64af55897c3630 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 608d2fd502..a3702e0043 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -478,8 +478,9 @@ static int ki_kx_get_protoid(sip_msg_t *msg) if(msg==NULL) { return -1; } + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); - _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; return (int)msg->rcv.proto; }

5 years, 4 months

git:5.1:75f2199a: core: skip to-tag when computing via branch for invite, ack and cancel

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 75f2199aa63647e84d0ae966638d51a360455242 URL: https://github.com/kamailio/kamailio/commit/75f2199aa63647e84d0ae966638d51a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-02T12:06:04+02:00 core: skip to-tag when computing via branch for invite, ack and cancel - proper functionality for stateless proxy in case of negative ACK (in this case the INVITE has no To-tag, but ACK has it and resulted in different via branch, making downstream proxy to not match transaction) - backport of git master commit b4e11cb25d848651406e --- Modified: src/core/char_msg_val.h --- Diff: https://github.com/kamailio/kamailio/commit/75f2199aa63647e84d0ae966638d51a… Patch: https://github.com/kamailio/kamailio/commit/75f2199aa63647e84d0ae966638d51a… --- diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h index 4d6887d713..021b1b67a1 100644 --- a/src/core/char_msg_val.h +++ b/src/core/char_msg_val.h @@ -46,6 +46,7 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) { str src[8]; + str sempty = str_init(""); if (unlikely(!check_transaction_quadruple(msg))) { LM_ERR("can't calculate char_value due to a parsing error\n"); @@ -77,7 +78,12 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) } /* use only the from & to tags */ src[0]=get_from(msg)->tag_value; - src[1]=get_to(msg)->tag_value; + if(msg->first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL)) { + src[1]=sempty; + } else { + src[1]=get_to(msg)->tag_value; + } #endif /* BRANCH_INCLUDE_FROMTO_BODY */ src[2]= msg->callid->body; src[3]= msg->first_line.u.request.uri;

5 years, 4 months

git:master:2306dd47: build: Call make via $(MAKE)

by Victor Seva

Module: kamailio Branch: master Commit: 2306dd47b308f99e5c22c2d6f4d2bc1200ed8453 URL: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-08-01T13:29:35+02:00 build: Call make via $(MAKE) When we need to call make from within a Makefile, we should do so by using the MAKE variable, which has special meaning for make itself. This makes sure, it will get marked as recursive command, and will make it possible to use the make jobserver. Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093 --- Modified: doc/tutorials/rpc_list/Makefile Modified: src/modules/db_berkeley/Makefile Modified: src/modules/db_oracle/Makefile Modified: src/modules/db_sqlite/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… Patch: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… --- diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index c9ff69051c..e105064365 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/doc/tutorials/rpc_list/Makefile @@ -148,7 +148,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT \ -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell make -s -C ../../../src printcdefs)))) +c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell $(MAKE) -s -C ../../../src printcdefs)))) c_defs+= -DMOD_NAME='\"rpcgen\"' c_defs+= -I$(COREPATH)/modules/app_sqlang/squirrel/include @@ -176,7 +176,7 @@ get_listed_grp=$(word 2, $(subst :, ,$(1))) # get module interface define get_modiface=$(word 3, $(subst :, ,$(1))) -find_modiface=$(if $(findstring modules,$(1)),$(shell make -s -C $(dir $(1)) printmiface),-DNONE) +find_modiface=$(if $(findstring modules,$(1)),$(shell $(MAKE) -s -C $(dir $(1)) printmiface),-DNONE) # get base file name from file:grp: get_bname(file:grp) # => basename(file) without extension (e.g. get_bname(foo/bar.c:x) => bar) diff --git a/src/modules/db_berkeley/Makefile b/src/modules/db_berkeley/Makefile index 23013003f2..a33bc58e3e 100644 --- a/src/modules/db_berkeley/Makefile +++ b/src/modules/db_berkeley/Makefile @@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-berkeley-scripts: $(bin_prefix)/$(bin_dir) - BERKELEYDBON=yes make -C ../../../utils/kamctl/ install-modules + BERKELEYDBON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-berkeley-scripts diff --git a/src/modules/db_oracle/Makefile b/src/modules/db_oracle/Makefile index d30c7515ba..77a52af0f2 100644 --- a/src/modules/db_oracle/Makefile +++ b/src/modules/db_oracle/Makefile @@ -17,7 +17,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-oracle-scripts: $(bin_prefix)/$(bin_dir) - ORACLEON=yes make -C ../../../utils/kamctl/ install-modules + ORACLEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-oracle-scripts diff --git a/src/modules/db_sqlite/Makefile b/src/modules/db_sqlite/Makefile index c5f164cc37..92e4de58c1 100644 --- a/src/modules/db_sqlite/Makefile +++ b/src/modules/db_sqlite/Makefile @@ -20,7 +20,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-sqlite-scripts: $(bin_prefix)/$(bin_dir) - SQLITEON=yes make -C ../../../utils/kamctl/ install-modules + SQLITEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-sqlite-scripts

5 years, 4 months

git:master:28b939cc: kemix: functions to get status code for reply

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 28b939cc72cdaf6625caa4f7c2d72b15cf57949d URL: https://github.com/kamailio/kamailio/commit/28b939cc72cdaf6625caa4f7c2d72b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-01T11:15:26+02:00 kemix: functions to get status code for reply --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/28b939cc72cdaf6625caa4f7c2d72b1… Patch: https://github.com/kamailio/kamailio/commit/28b939cc72cdaf6625caa4f7c2d72b1… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index a31588eb70..9265d36890 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -584,6 +584,39 @@ static sr_kemi_xval_t* ki_kx_get_method(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static int ki_kx_get_status(sip_msg_t *msg) +{ + if(msg==NULL) { + return -1; + } + if(msg->first_line.type != SIP_REPLY) { + return -1; + } + return (int)msg->first_line.u.reply.statuscode; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gets_status(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + if(msg->first_line.type != SIP_REPLY) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->first_line.u.reply.status; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -734,6 +767,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_status"), + SR_KEMIP_INT, ki_kx_get_status, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gets_status"), + SR_KEMIP_XVAL, ki_kx_gets_status, + { SR_KEMIP_NONE, 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 } } };

5 years, 4 months

git:master:412b6ddc: kemix: exported KSR.kx.get_method() - return sip method string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 412b6ddc26d9648363dc7a9288aec72c352322d3 URL: https://github.com/kamailio/kamailio/commit/412b6ddc26d9648363dc7a9288aec72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-01T11:08:38+02:00 kemix: exported KSR.kx.get_method() - return sip method string --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/412b6ddc26d9648363dc7a9288aec72… Patch: https://github.com/kamailio/kamailio/commit/412b6ddc26d9648363dc7a9288aec72… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index a3702e0043..a31588eb70 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -556,6 +556,34 @@ static sr_kemi_xval_t* ki_kx_gete_au(sip_msg_t *msg) return ki_kx_get_auth_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_method(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + if(msg->first_line.type == SIP_REQUEST) { + _sr_kemi_kx_xval.v.s = msg->first_line.u.request.method; + return &_sr_kemi_kx_xval; + } + + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || + (msg->cseq==NULL))) { + LM_ERR("no CSEQ header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s = get_cseq(msg)->method; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -701,6 +729,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_method"), + SR_KEMIP_XVAL, ki_kx_get_method, + { SR_KEMIP_NONE, 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 } } };

5 years, 4 months

git:5.2:82635674: core: skip to-tag when computing via branch for invite, ack and cancel

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 82635674517b6c96678289ca4e807ae73020eefc URL: https://github.com/kamailio/kamailio/commit/82635674517b6c96678289ca4e807ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-01T09:39:36+02:00 core: skip to-tag when computing via branch for invite, ack and cancel - proper functionality for stateless proxy in case of negative ACK (in this case the INVITE has no To-tag, but ACK has it and resulted in different via branch, making downstream proxy to not match transaction) (cherry picked from commit b4e11cb25d848651406e0ad355d54f10db971761) --- Modified: src/core/char_msg_val.h --- Diff: https://github.com/kamailio/kamailio/commit/82635674517b6c96678289ca4e807ae… Patch: https://github.com/kamailio/kamailio/commit/82635674517b6c96678289ca4e807ae… --- diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h index 79461cd836..436f58b401 100644 --- a/src/core/char_msg_val.h +++ b/src/core/char_msg_val.h @@ -38,6 +38,7 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) { str src[8]; + str sempty = str_init(""); if (unlikely(!check_transaction_quadruple(msg))) { LM_ERR("can't calculate char_value due to a parsing error\n"); @@ -55,7 +56,12 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) } /* use only the from & to tags */ src[0]=get_from(msg)->tag_value; - src[1]=get_to(msg)->tag_value; + if(msg->first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL)) { + src[1]=sempty; + } else { + src[1]=get_to(msg)->tag_value; + } src[2]= msg->callid->body; src[3]= msg->first_line.u.request.uri; src[4]= get_cseq( msg )->number;

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019