sr-dev

sr-dev@lists.kamailio.org

20 participants
45174 discussions

git:master:4570b3eb: tls: Fix typo
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: master Commit: 4570b3ebc6da35efc3cc55b1f4418446b9071688 URL: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… Author: Akash Gupta <akash(a)telnyx.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T15:49:50+02:00 tls: Fix typo --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… Patch: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index e356d5bff7c..f3ff2321c78 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -84,7 +84,7 @@ The most important parameters to set the path to the public certificate and private key files. You can either have them in different file or in the same file in PEM format. The parameters for them are <varname>certificate</varname> and <varname>private_key</varname>. - They can be given as modparam or or provided in the profiles of tls.cfg file. + They can be given as modparam or provided in the profiles of tls.cfg file. </para> <para> When installing tls module of kamailio, a sample 'tls.cfg' file is deployed in the same

1 0

[kamailio/kamailio] Fix typos (PR #3161)
by Akash Gupta 24 Jun '22

24 Jun '22

#### 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) - - [x] [ ] 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/3161 -- Commit Summary -- * Fix typos -- File Changes -- M src/modules/textops/doc/textops_admin.xml (4) M src/modules/tls/doc/tls.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3161.patch https://github.com/kamailio/kamailio/pull/3161.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3161 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3161(a)github.com>

2 4

git:master:65a484df: modules: readme files regenerated - nats ... [skip ci]
by Kamailio Dev 24 Jun '22

24 Jun '22

Module: kamailio Branch: master Commit: 65a484dffa3c854bc17068175cee3dc37fd09d18 URL: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-24T12:46:16+02:00 modules: readme files regenerated - nats ... [skip ci] --- Modified: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… Patch: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… --- diff --git a/src/modules/nats/README b/src/modules/nats/README index f7f1ad7239..29cef171b7 100644 --- a/src/modules/nats/README +++ b/src/modules/nats/README @@ -35,6 +35,7 @@ Emmanuel Schmidbauer 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 5. Functions @@ -48,9 +49,10 @@ Emmanuel Schmidbauer 1.1. Set nats_url parameter 1.2. Set num_publish_workers parameter 1.3. Set subject_queue_group parameter - 1.4. nats_publish usage - 1.5. Example usage of $natsData pseudo variable - 1.6. Define the event routes + 1.4. Set event_callback parameter + 1.5. nats_publish usage + 1.6. Example usage of $natsData pseudo variable + 1.7. Define the event routes Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 5. Functions @@ -115,6 +118,7 @@ Chapter 1. Admin Guide 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 4.1. nats_url (str) @@ -161,6 +165,24 @@ modparam("nats", "subject_queue_group", "MyQueue1:2021") modparam("nats", "subject_queue_group", "MyQueue2:2021") ... +4.4. event_callback (str) + + Name of the KEMI function to be executed instead of the event route. + + Default value is not set. + + Example 1.4. Set event_callback parameter +... +modparam("nats", "event_callback", "ksr_nats_event") + +-- event callback function implemented in Lua +function ksr_nats_event(evname) + KSR.info("===== nats module received event: " .. evname .. + ", data:" .. KSR.pv.gete('$natsData') .. "\n"); + return 1; +end +... + 5. Functions 5.1. nats_publish(subject, payload) @@ -169,7 +191,7 @@ modparam("nats", "subject_queue_group", "MyQueue2:2021") Publishes the payload to subject. - Example 1.4. nats_publish usage + Example 1.5. nats_publish usage ... $var(my_info) = "$ci=" + $ci + " $fU=" + $fU; nats_publish("mysubject", "$var(my_info)"); # publish $var(my_info) to "mysubjec @@ -178,7 +200,7 @@ t" 6. Pseudo Variables - Example 1.5. Example usage of $natsData pseudo variable + Example 1.6. Example usage of $natsData pseudo variable ... xlog("L_INFO", "received payload $natsData"); } @@ -191,7 +213,7 @@ t" received payload. The name of the event-route name must match the subject of the message. - Example 1.6. Define the event routes + Example 1.7. Define the event routes ... modparam("nats", "subject_queue_group", "Kamailio-World:2021") modparam("nats", "subject_queue_group", "MyQueue1:2021")

1 0

[kamailio/kamailio] nats: add KEMI publish function and event_callback param (PR #3154)
by Seven Du 24 Jun '22

24 Jun '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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  - add `event_callback` KEMI param like in other modules - expose `KSR.nats.publish` I can fix module doc if it looks good. How to generate docs locally btw? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3154 -- Commit Summary -- * nats: add KEMI publish function and event_callback param -- File Changes -- M src/modules/nats/defs.h (3) M src/modules/nats/nats_mod.c (88) M src/modules/nats/nats_mod.h (3) M src/modules/nats/nats_pub.c (5) M src/modules/nats/nats_pub.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3154.patch https://github.com/kamailio/kamailio/pull/3154.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3154 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3154(a)github.com>

4 11

git:master:25d42b7e: nats: add KEMI publish function and event_callback param (#3154)
by GitHub 24 Jun '22

24 Jun '22

Module: kamailio Branch: master Commit: 25d42b7e69cc6242c66887a2816499d841e3ba89 URL: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d… Author: Seven Du <dujinfang(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-24T12:44:28+02:00 nats: add KEMI publish function and event_callback param (#3154) --- Modified: src/modules/nats/defs.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h Modified: src/modules/nats/nats_pub.c Modified: src/modules/nats/nats_pub.h --- Diff: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d… Patch: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d…

1 0

git:5.6:967b8290: topos_redis: use tag based on direction for early dialog transaction record loading
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: 5.6 Commit: 967b8290d1e5081966425cbf705bd4ba36d5e98e URL: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:40+02:00 topos_redis: use tag based on direction for early dialog transaction record loading - GH #3112 (cherry picked from commit 06679174fc3d9cc6a18bc3edc7f2fb985c50d27b) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… Patch: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 456d54ebee5..a1d6c85d016 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -54,6 +54,11 @@ static str _tps_redis_dprefix = str_init("d:z:"); static char _tps_redis_cbuf[TPS_REDIS_DATA_SIZE]; +static str _tps_redis_empty = str_init(""); + +#define TPS_REDIS_STRZ(_s) ((_s).s)?(_s):(_tps_redis_empty) + + /** * storage keys */ @@ -594,6 +599,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str xtag = str_init(""); str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) @@ -615,6 +621,11 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->direction==TPS_DIR_DOWNSTREAM) { + xtag = TPS_REDIS_STRZ(md->b_tag); + } else { + xtag = TPS_REDIS_STRZ(md->a_tag); + } if(md->a_uuid.len>1) { xuuid.s = md->a_uuid.s + 1; xuuid.len = md->a_uuid.len - 1; @@ -641,7 +652,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat _tps_redis_bprefix.len, _tps_redis_bprefix.s, smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s, + xtag.len, xtag.s, xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len);

1 0

git:5.6:45c3b1b6: topos: don't insert contact header for 4xx replies
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: 5.6 Commit: 45c3b1b6cd97b610ca3bd8753df44e14ec780b22 URL: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:08:52+02:00 topos: don't insert contact header for 4xx replies unless original msg has contact (cherry picked from commit f49f14a87606314e98a253ee29b1624ae814dccf) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… Patch: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c01dde7b3f..a3f123b593 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1167,6 +1167,11 @@ int tps_response_sent(sip_msg_t *msg) && msg->contact==NULL) { contact_keep = 1; } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>=400 + && msg->first_line.u.reply.statuscode<500 + && msg->contact==NULL) { + contact_keep = 1; + } if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); if(direction==TPS_DIR_DOWNSTREAM) {

1 0

git:5.6:82edf7a4: acc: Fix reason code for locally generated replies. (#3137)
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: 5.6 Commit: 82edf7a447a770f1cd2c97a05ad128255898586a URL: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… Author: Frits Wiersma <cfwiersma(a)solcon.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:09+02:00 acc: Fix reason code for locally generated replies. (#3137) * acc: Fix reason code for locally generated replies. - Use heap memory for the reason code instead of the stack memory. - See issue #2981 * acc: Remove code which was commented out. - Code was commented out in the previous pull request. (#3137). - This has now been corrected. (cherry picked from commit e74cb2371ab879874a8981818139024f1c2beb9e) --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… Patch: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e045b8c95ac..169a4222fbf 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -93,25 +93,20 @@ void env_set_totag(struct cell *t, struct sip_msg *reply) tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); } -int env_set_reason(struct sip_msg *reply, str *buff) { - int i; - char *p; +int env_set_reason(struct sip_msg *reply, str *buff, int code) { + if (reply!=FAKED_REPLY || !buff || !buff->s || buff->len < 20) return 0; if (strncmp(buff->s, "SIP/2.0 ", 8) != 0) { LM_ERR("not a SIP reply\n"); return 0; } - p = buff->s + 12; - for (i=12;i<buff->len;i++) { - if (*p == '\r' || *p == '\n') { - acc_env.reason.s = buff->s+12; - acc_env.reason.len = i-12; - LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); - return 1; - } - p++; - } + + /* Set the reason to a pointer in heap memory. It will contain the last seen FAKED_REPLY */ + acc_env.reason.s = error_text(code); + acc_env.reason.len = strlen(acc_env.reason.s); + LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); + return 0; } @@ -139,7 +134,8 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ - if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ + /* In case of an ACK the reply == NULL, but the reason must be set when report_ack is 1 */ + if (acc_env.reason.len == 0 || reply==NULL) { /* already extracted in case of locally generated replies */ acc_env.reason.s = error_text(code); acc_env.reason.len = strlen(acc_env.reason.s); } @@ -719,7 +715,7 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) LM_DBG("acc callback called for t(%p) event type %d, reply code %d\n", t, type, ps->code); if (type&TMCB_RESPONSE_OUT) { - env_set_reason(ps->rpl, &ps->send_buf); + env_set_reason(ps->rpl, &ps->send_buf, ps->code); acc_onreply( t, ps->req, ps->rpl, ps->code); } else if (type&TMCB_E2EACK_IN) { acc_onack( t, t->uas.request, ps->req, ps->code);

1 0

git:5.6:a4fc8afe: kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str'
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: 5.6 Commit: a4fc8afea094b6778b9d264cf9911b69c1a6d22f URL: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:27+02:00 kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str' - GH #2469 (cherry picked from commit 6aa1a84c6e37e0d6d5a725d43636debeaf5fa3b4) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… Patch: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 581496c309d..0efe419026c 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1135,7 +1135,7 @@ def WriteTempTable(self): else: header = '%s)' % header - self.temp_file.write(header.strip() + '\n') + self.temp_file.write((header.strip() + '\n').encode()) # write data for row in self.data: @@ -1143,7 +1143,7 @@ def WriteTempTable(self): for col in columns: row_str = '%s:%s' % (row_str, row[col]) - self.temp_file.write(row_str[1:] + '\n') + self.temp_file.write((row_str[1:] + '\n').encode()) self.temp_file.flush()

1 0

git:5.6:8137b8da: topos: skip adding contact header for BYE, CANCEL, PRACK
by Daniel-Constantin Mierla 24 Jun '22

24 Jun '22

Module: kamailio Branch: 5.6 Commit: 8137b8da1a36e54787957ab3d4ee66ca49a4b5ee URL: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:08:25+02:00 topos: skip adding contact header for BYE, CANCEL, PRACK - GH #3149 (cherry picked from commit 414c7dd608584df18f871b42e05f401e21ba775d) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… Patch: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 83d5f5fddff..c01dde7b3f1 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -46,6 +46,8 @@ #include "tps_msg.h" #include "tps_storage.h" +#define TPS_METHODS_NOCONTACT (METHOD_CANCEL|METHOD_BYE|METHOD_PRACK) + extern int _tps_param_mask_callid; extern int _tps_contact_mode; extern str _tps_cparam_name; @@ -582,6 +584,10 @@ int tps_reinsert_contact(sip_msg_t *msg, tps_data_t *ptsd, str *hbody) { str hname = str_init("Contact"); + if (get_cseq(msg)->method_id & TPS_METHODS_NOCONTACT) { + return 0; + } + if(tps_add_headers(msg, &hname, hbody, 0)<0) { return -1; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev