sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

[kamailio/kamailio] mohqueue: use t_newtran() if transaction does not exist (#2373)

by Emmanuel Schmidbauer

#### 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 - [ ] Tested changes locally - [x] Related to issue #2370 #### Description make sure transaction exists with `t_newtran()` and use `t_release_transaction()` instead of `t_release()` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2373 -- Commit Summary -- * mohqueue: use t_newtran() if transaction does not exist -- File Changes -- M src/modules/mohqueue/mohq_funcs.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2373.patch https://github.com/kamailio/kamailio/pull/2373.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/2373

4 years

git:master:12b3cfe6: Merge pull request #2373 from kamailio/mohqueue-issue-2370

by GitHub

Module: kamailio Branch: master Commit: 12b3cfe6fb6c48de28a9aee0420328c6ae863663 URL: https://github.com/kamailio/kamailio/commit/12b3cfe6fb6c48de28a9aee0420328c… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-24T14:59:45-04:00 Merge pull request #2373 from kamailio/mohqueue-issue-2370 mohqueue: use t_newtran() if transaction does not exist --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/12b3cfe6fb6c48de28a9aee0420328c… Patch: https://github.com/kamailio/kamailio/commit/12b3cfe6fb6c48de28a9aee0420328c… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 384be185d3..54ee87486c 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -185,6 +185,7 @@ void ack_msg (sip_msg_t *pmsg, call_lst *pcall) char *pfncname = "ack_msg: "; struct cell *ptrans; tm_api_t *ptm = pmod_data->ptm; +tm_cell_t *t = 0; if (pcall->call_state != CLSTA_INVITED) { /********** @@ -215,7 +216,22 @@ if (ptm->t_lookup_ident (&ptrans, pcall->call_hash, pcall->call_label) < 0) } else { - if (ptm->t_release (pcall->call_pmsg) < 0) + t = ptm->t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if (ptm->t_newtran(pmsg)<0) + { + LM_ERR("cannot create the transaction\n"); + return; + } + t = ptm->t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return; + } + } + if (ptm->t_release_transaction(t) < 0) { LM_ERR ("%sRelease transaction failed for call (%s)!\n", pfncname, pcall->call_from); @@ -2945,4 +2961,4 @@ if (pmod_data->ptm->t_relay (pmsg, 0, 0) < 0) return -1; } return 1; -} \ No newline at end of file +}

4 years

git:master:6b708e93: mohqueue: use t_newtran() if transaction does not exist

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: 6b708e937d161101adc91a4de5a527bf190b55c0 URL: https://github.com/kamailio/kamailio/commit/6b708e937d161101adc91a4de5a527b… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2020-06-24T14:32:15-04:00 mohqueue: use t_newtran() if transaction does not exist --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/6b708e937d161101adc91a4de5a527b… Patch: https://github.com/kamailio/kamailio/commit/6b708e937d161101adc91a4de5a527b… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 384be185d3..54ee87486c 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -185,6 +185,7 @@ void ack_msg (sip_msg_t *pmsg, call_lst *pcall) char *pfncname = "ack_msg: "; struct cell *ptrans; tm_api_t *ptm = pmod_data->ptm; +tm_cell_t *t = 0; if (pcall->call_state != CLSTA_INVITED) { /********** @@ -215,7 +216,22 @@ if (ptm->t_lookup_ident (&ptrans, pcall->call_hash, pcall->call_label) < 0) } else { - if (ptm->t_release (pcall->call_pmsg) < 0) + t = ptm->t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if (ptm->t_newtran(pmsg)<0) + { + LM_ERR("cannot create the transaction\n"); + return; + } + t = ptm->t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return; + } + } + if (ptm->t_release_transaction(t) < 0) { LM_ERR ("%sRelease transaction failed for call (%s)!\n", pfncname, pcall->call_from); @@ -2945,4 +2961,4 @@ if (pmod_data->ptm->t_relay (pmsg, 0, 0) < 0) return -1; } return 1; -} \ No newline at end of file +}

4 years

git:master:224f1643: pkg: obs/kamailio.spec - simplified pkgconfig requirements

by Sergey Safarov

Module: kamailio Branch: master Commit: 224f16431c2a7777c87d7926b361574e25f27ef6 URL: https://github.com/kamailio/kamailio/commit/224f16431c2a7777c87d7926b361574… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-24T17:49:24+03:00 pkg: obs/kamailio.spec - simplified pkgconfig requirements for more detail pleae look GH #2368 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/224f16431c2a7777c87d7926b361574… Patch: https://github.com/kamailio/kamailio/commit/224f16431c2a7777c87d7926b361574… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7ca4184cde..37c67d294e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -271,20 +271,12 @@ Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver -BuildRequires: bison, flex, which, make, gcc, gcc-c++ +BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig %if 0%{?rhel} != 6 Requires: systemd BuildRequires: systemd-devel %endif -%if 0%{?rhel} || 0%{?centos_ver} -%if 0%{?rhel} > 6 || 0%{?centos_ver} > 6 -BuildRequires: pkgconfig -%endif -%else -BuildRequires: pkgconfig -%endif - %if 0%{?suse_version} == 1315 || 0%{?suse_version} == 1330 Requires: filesystem BuildRequires: shadow

4 years

[kamailio/kamailio] Add some missing build requirements (#2368)

by Oded Arbel

I'm building in Docker containers, and with the minimal CentOS/Fedora/whatever image you get from official repos, builds will fail without installing these.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2368 -- Commit Summary -- * Add some missing build requirements -- File Changes -- M pkg/kamailio/obs/kamailio.spec (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2368.patch https://github.com/kamailio/kamailio/pull/2368.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/2368

4 years

git:master:3331fa6e: dlgs: return sip attributes in rpc list command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3331fa6e30b90489be8aec718c4e97232f610ba6 URL: https://github.com/kamailio/kamailio/commit/3331fa6e30b90489be8aec718c4e972… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-24T13:06:54+02:00 dlgs: return sip attributes in rpc list command - adjust route types permissions for cfg functions --- Modified: src/modules/dlgs/dlgs_mod.c Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/3331fa6e30b90489be8aec718c4e972… Patch: https://github.com/kamailio/kamailio/commit/3331fa6e30b90489be8aec718c4e972… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index c2f1a8146c..df6b746167 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -64,9 +64,9 @@ static int dlgs_sip_reply_out(sr_event_param_t *evp); /* clang-format off */ static cmd_export_t cmds[]={ {"dlgs_init", (cmd_function)w_dlgs_init, 3, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + fixup_free_spve_all, REQUEST_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, {"dlgs_update", (cmd_function)w_dlgs_update, 0, 0, - 0, ONSEND_ROUTE}, + 0, REQUEST_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, {"dlgs_tags_add", (cmd_function)w_dlgs_tags_add, 1, fixup_spve_null, fixup_spve_null, ANY_ROUTE}, {"dlgs_tags_rm", (cmd_function)w_dlgs_tags_rm, 1, fixup_spve_null, diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index d837483ef4..08b0ab4bad 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -688,12 +688,15 @@ static void dlgs_rpc_list(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "dSSSSuuu", + if(rpc->struct_add(th, "dSSSSSSSuuu", "count", ++n, "src", &it->src, "dst", &it->dst, "data", &it->data, "ruid", &it->ruid, + "callid", &it->callid, + "ftag", &it->ftag, + "ttag", &it->ttag, "ts_init", (unsigned int)it->ts_init, "ts_answer", (unsigned int)it->ts_answer, "state", it->state)<0) { @@ -728,4 +731,4 @@ int dlgs_rpc_init(void) return -1; } return 0; -} \ No newline at end of file +}

4 years

git:master:1eb27d8c: tm: execute SREV_SIP_REPLY_OUT event on relayed reply

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1eb27d8c5df0c8cbc8bdcb4a110f1fcee9c0e34e URL: https://github.com/kamailio/kamailio/commit/1eb27d8c5df0c8cbc8bdcb4a110f1fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-24T13:05:22+02:00 tm: execute SREV_SIP_REPLY_OUT event on relayed reply - cosmetisation of some debug messages --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb27d8c5df0c8cbc8bdcb4a110f1fc… Patch: https://github.com/kamailio/kamailio/commit/1eb27d8c5df0c8cbc8bdcb4a110f1fc… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index fee04e671f..328c6743d4 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -630,7 +630,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, } } - LM_DBG("reply sent out. buf=%p: %.20s..., shmem=%p: %.20s\n", + LM_DBG("reply sent out - buf=%p: %.20s... shmem=%p: %.20s\n", buf, buf, rb->buffer, rb->buffer ); } if (code>=200) { @@ -2359,7 +2359,7 @@ int reply_received( struct sip_msg *p_msg ) msg_status=p_msg->REPLY_STATUS; uac=&t->uac[branch]; - LM_DBG("org. status uas=%d, uac[%d]=%d local=%d is_invite=%d)\n", + LM_DBG("original status uas=%d, uac[%d]=%d local=%d is_invite=%d)\n", t->uas.status, branch, uac->last_received, is_local(t), is_invite(t)); last_uac_status=uac->last_received; @@ -2476,7 +2476,7 @@ int reply_received( struct sip_msg *p_msg ) p_msg->fwd_send_flags.blst_imask|= uac->request.dst.send_flags.blst_imask & BLST_503; /* processing of on_reply block */ - if (onreply_route) { + if (onreply_route || sr_event_enabled(SREV_SIP_REPLY_OUT)) { set_route_type(TM_ONREPLY_ROUTE); /* transfer transaction flag to message context */ if (t->uas.request) { @@ -2527,6 +2527,21 @@ int reply_received( struct sip_msg *p_msg ) run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx); } + + if((!(ctx.run_flags&DROP_R_F)) && sr_event_enabled(SREV_SIP_REPLY_OUT)) { + sr_event_param_t evp; + memset(&evp, 0, sizeof(sr_event_param_t)); + evp.obuf.s = p_msg->buf; + evp.obuf.len = p_msg->len; + evp.rcv = (t->uas.request)?&t->uas.request->rcv:0; + evp.dst = &t->uas.response.dst; + evp.req = t->uas.request; + evp.rpl = p_msg; + evp.rplcode = msg_status; + evp.mode = 2; + sr_event_exec(SREV_SIP_REPLY_OUT, &evp); + } + /* restore brach last_received as before executing onreply_route */ uac->last_received = last_uac_status; /* transfer current message context back to t */

4 years

git:master:238c5d70: core: events - fix the field name for SREV_SIP_REPLY_OUT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 238c5d70a472cf7903bac09c04581c37323afd55 URL: https://github.com/kamailio/kamailio/commit/238c5d70a472cf7903bac09c04581c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-24T13:04:11+02:00 core: events - fix the field name for SREV_SIP_REPLY_OUT --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/238c5d70a472cf7903bac09c04581c3… Patch: https://github.com/kamailio/kamailio/commit/238c5d70a472cf7903bac09c04581c3… --- diff --git a/src/core/events.c b/src/core/events.c index ebe47ee4b1..91df673996 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -327,7 +327,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) return ret; } else return 1; case SREV_SIP_REPLY_OUT: - if(unlikely(_sr_events_list.net_data_in[0]!=0)) + if(unlikely(_sr_events_list.sip_reply_out[0]!=0)) { ret = 0; for(i=0; i<SREV_CB_LIST_SIZE

4 years

Question about textops

by Mojtaba

Hello, Some confusing things while developing in Kamailio: In is_method_f function in textops module, the code checks the HDR_CSEQ_F in msg also, and if the method name appears in CSEQ_F, The result is returned TRUE. These question will arise why in this function, the CSEQ field in message will check? if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { LM_ERR("cannot parse cseq header\n"); return -1; /* should it be 0 ?!?! */ } if(m->s==0) return (get_cseq(msg)->method_id&m->len)?1:-1; else return (get_cseq(msg)->method_id==METHOD_OTHER && get_cseq(msg)->method.len==m->len && (strncasecmp(get_cseq(msg)->method.s, m->s, m->len)==0))?1:-1; I think it would be nice to add new function like: is_cseq_method_f in module to avoid some problem understanding. -- --Mojtaba Esfandiari.S

4 years

git:master:fbc55950: avpops: free fname1 in case of error getting fname2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fbc55950c8ac0c34c5b6693c1578de7cd11b484c URL: https://github.com/kamailio/kamailio/commit/fbc55950c8ac0c34c5b6693c1578de7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-24T09:12:58+02:00 avpops: free fname1 in case of error getting fname2 --- Modified: src/modules/avpops/avpops.c --- Diff: https://github.com/kamailio/kamailio/commit/fbc55950c8ac0c34c5b6693c1578de7… Patch: https://github.com/kamailio/kamailio/commit/fbc55950c8ac0c34c5b6693c1578de7… --- diff --git a/src/modules/avpops/avpops.c b/src/modules/avpops/avpops.c index 06f5f1f8fa..f2c0b93ce6 100644 --- a/src/modules/avpops/avpops.c +++ b/src/modules/avpops/avpops.c @@ -1216,6 +1216,7 @@ static int ki_copy_avps(struct sip_msg* msg, str *name1, str *name2) if((fname2 = avpops_parse_pvar(name2->s)) == NULL) { LM_ERR("unable to get pseudo-variable in param 2\n"); + pkg_free(fname1); return E_OUT_OF_MEM; } /* attr name is mandatory */ @@ -1283,4 +1284,4 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_rtpengine_exports); return 0; -} \ No newline at end of file +}

4 years

← Newer
1
...
13
14
15
16
17
18
19
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020