sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:34a675ba: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 34a675ba4987f202dfb3477114d6b86be5eeb2a1 URL: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-26T11:01:20+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… Patch: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index bd67b08983..74543b05d7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -741,10 +741,13 @@ if (has_body("multipart/mixed")) { 4.23. append_to_reply(txt) - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + Kamailio (e.g., via sl_send_reply(...)). Meaning of the parameters is as follows: - * txt - String which may contains pseudo-variables. + * txt - String which may contains pseudo-variables. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, ERROR_ROUTE. @@ -757,12 +760,14 @@ append_to_reply("Foo: $rm at $Ts\r\n"); 4.24. append_hf(txt[, hdr]) - Appends 'txt' as header after first header field or after last 'hdr' - header field. + Appends 'txt' as header at the end of the all headers, or after last + header named 'hdr' if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be appended. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name after which the 'txt' is appended. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -776,12 +781,14 @@ append_hf("From-username: $fU\r\n", "Call-ID"); 4.25. insert_hf(txt[, hdr]) - Inserts 'txt' as header before the first header field or before first - 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before first + header named 'hdr'if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be inserted. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name before which the 'txt' is inserted. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:master:374f0f05: textops: docs - some enhancements to basic header operations functions
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 374f0f05bdf27ddaf5d8652560738fbfb886c43c URL: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:53:24+01:00 textops: docs - some enhancements to basic header operations functions --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… Patch: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index a8685510a0..44540841d4 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -872,13 +872,15 @@ if (has_body("multipart/mixed")) { <function moreinfo="none">append_to_reply(txt)</function> </title> <para> - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + &kamailio; (e.g., via sl_send_reply(...)). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - String which may contains - pseudo-variables. + pseudo-variables. Note that the value has to be ended with "\r\n" + (end of header characters sequence). </para> </listitem> </itemizedlist> @@ -902,15 +904,16 @@ append_to_reply("Foo: $rm at $Ts\r\n"); <function moreinfo="none">append_hf(txt[, hdr])</function> </title> <para> - Appends 'txt' as header after first header field or after - last 'hdr' header field. + Appends 'txt' as header at the end of the all headers, or after + last header named 'hdr' if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be appended. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem> @@ -939,15 +942,16 @@ append_hf("From-username: $fU\r\n", "Call-ID"); <function moreinfo="none">insert_hf(txt[, hdr])</function> </title> <para> - Inserts 'txt' as header before the first header field or before - first 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before + first header named 'hdr'if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be inserted. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem>

1 0

git:5.3:f641fe53: textops: fix append_hf function
by Stefan Mititelu 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.3 Commit: f641fe53fdbbd54db8ef136ec2425d7624e50173 URL: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-10-26T11:32:01+02:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance (cherry-picked from commit 4adea97a4f8a9b35273d4d28b0518964abb7f0d8) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… Patch: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 0b7fd9e16e..580c850e71 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3229,7 +3229,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3240,6 +3240,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3252,20 +3253,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:master:46c7a8c0: pv_headers: free hash entry in case of error
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 46c7a8c0bf2b4d5c00e22a751f95f13263686445 URL: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T09:17:02+01:00 pv_headers: free hash entry in case of error --- Modified: src/modules/pv_headers/pvh_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… Patch: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… --- diff --git a/src/modules/pv_headers/pvh_hash.c b/src/modules/pv_headers/pvh_hash.c index 89f93f77b8..80297bcaaf 100644 --- a/src/modules/pv_headers/pvh_hash.c +++ b/src/modules/pv_headers/pvh_hash.c @@ -85,6 +85,7 @@ int pvh_str_hash_add_key(struct str_hash_table *ht, str *key) err: pvh_str_free(&e->key); + pkg_free(e); return -1; }

1 0

git:master:3dca5cd2: alias_db: clang format the code
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 3dca5cd2c7f018189b6784a7e87807df1de7589e URL: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T08:15:10+01:00 alias_db: clang format the code --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d… Patch: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d…

1 0

git:master:7ae0caaf: alias_db: removed history from top comments
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 7ae0caaffd3d6e523fd32501401213521a1881e5 URL: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T07:52:49+01:00 alias_db: removed history from top comments - missing copyright header --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135… Patch: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135…

1 0

git:master:dc1bb5b1: alias_db: set ending zero in a single place
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: dc1bb5b1861de279b450ab550888dd748b77463f URL: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T07:42:10+01:00 alias_db: set ending zero in a single place --- Modified: src/modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… Patch: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… --- diff --git a/src/modules/alias_db/alookup.c b/src/modules/alias_db/alookup.c index 28dd916999..faa5f6739e 100644 --- a/src/modules/alias_db/alookup.c +++ b/src/modules/alias_db/alookup.c @@ -163,19 +163,18 @@ static int alias_db_query(struct sip_msg* _msg, str table, (char*)RES_ROWS(db_res)[i].values[1].val.str_val.s, RES_ROWS(db_res)[i].values[1].val.str_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.str_val.len; - useruri_buf[user_s.len] = '\0'; break; case DB1_BLOB: strncpy(user_s.s, (char*)RES_ROWS(db_res)[i].values[1].val.blob_val.s, RES_ROWS(db_res)[i].values[1].val.blob_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.blob_val.len; - useruri_buf[user_s.len] = '\0'; break; default: LM_ERR("unknown type of DB user column\n"); goto err_server; } + useruri_buf[user_s.len] = '\0'; user_s.s = useruri_buf; /* set the URI */ LM_DBG("new URI [%d] is [%.*s]\n", i, user_s.len ,user_s.s );

1 0

[kamailio/kamailio] rtp_media_server: state transition improvement (#2532)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Type Of Change - [x] bug fix (non-breaking change which fixes an issue) - [x] refactoring - [x] Tested changes locally #### Description - Bridge disconnection was over complicated, to simplify things both legs will automatically be disconnected for now. - The "state machine" is only a POC at this point, I made sure it was easy to pinpoint problems. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2532 -- Commit Summary -- * rtp_media_server: state transition improvement -- File Changes -- M src/modules/rtp_media_server/rms_dialog_info.c (21) M src/modules/rtp_media_server/rms_dialog_info.h (4) M src/modules/rtp_media_server/rtp_media_server.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2532.patch https://github.com/kamailio/kamailio/pull/2532.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/2532

1 1

git:master:e419bad7: rtp_media_server: state transition improvement
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: e419bad759dc817ba673563ec4e79681f685dc28 URL: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-25T18:54:33Z rtp_media_server: state transition improvement - fix disconnection while in bridge, to keep thing simple for now the second leg is automaticaly disconnected. --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968… Patch: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968…

1 0

[kamailio/kamailio] rtp_media_server: declare extern dialog_list_mutex and tmb in header file (#2522)
by Anthony Messina 25 Oct '20

25 Oct '20

Similar to #2235 ``` src/modules/rtp_media_server/rtp_media_server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index bf22660b1b..cd3a0109ce 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -ser_lock_t dialog_list_mutex; +extern ser_lock_t dialog_list_mutex; @@ -51,7 +51,7 @@ typedef struct rms char *local_ip; } rms_t; -struct tm_binds tmb; +extern struct tm_binds tmb; #endif ``` -- 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/issues/2522

3 9

← Newer
1
...
17
18
19
20
21
22
23
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020