sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
245 discussions

git:master:97f5f77f: core: generalize some comment messages
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 97f5f77f2d003a5e32e39aacf8182787a2c83a43 URL: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T13:20:37Z core: generalize some comment messages --- Modified: src/core/sr_module.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… Patch: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 99c1dc1de1..c9c482dfc1 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -138,7 +138,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); ((fixup) ? (fixup)(param, param_no) : 0) /* Macros - used as rank in child_init function */ -#define PROC_MAIN 0 /**< Main ser process */ +#define PROC_MAIN 0 /**< Main process */ #define PROC_TIMER -1 /**< Timer attendant process */ #define PROC_RPC -2 /**< RPC type process */ #define PROC_FIFO PROC_RPC /**< FIFO attendant process */ diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3b46026027..f8ff8dea45 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3717,9 +3717,9 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) -/* handles io from a "generic" ser process (get fd or new_fd from a tcp_send) +/* handles io from a "generic" process (get fd or new_fd from a tcp_send) * - * params: p - pointer in the ser processes array (pt[]), to the entry for + * params: p - pointer in the processes array (pt[]), to the entry for * which an io event was detected * fd_i - fd index in the fd_array (useful for optimizing * io_watch_deletes) @@ -4636,7 +4636,7 @@ static inline void tcp_timer_run(void) /* keep in sync with tcpconn_destroy, the "delete" part should be * the same except for io_watch_del.. - * Note: this function is called only on shutdown by the main ser process via + * Note: this function is called only on shutdown by the main process via * cleanup(). However it's also safe to call it from the tcp_main process. * => with the ser shutdown exception, it cannot execute in parallel * with tcpconn_add() or tcpconn_destroy()*/ @@ -4750,7 +4750,7 @@ void tcp_main_loop() } } #endif - /* add all the unix sockets used for communcation with other ser processes + /* add all the unix sockets used for communcation with other processes * (get fd, new connection a.s.o) */ for (r=1; r<process_no; r++){ if (pt[r].unix_sock>0) /* we can't have 0, we never close it!*/

1 0

git:5.4:6883d5a1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.4 Commit: 6883d5a1d0868d0d0b4461c0440fe7eb6574837f URL: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:51+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… Patch: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 6ac5868ff0..dd1fc06a8b 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -733,7 +733,7 @@ set_reply_body("test", "text/plain"); Example 1.22. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.5:a21c45df: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.5 Commit: a21c45df78a0cef3f4915b1b68a3b82732198733 URL: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:36+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… Patch: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 08dd399246..3ea7696d4b 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -770,7 +770,7 @@ set_reply_body("test", "text/plain"); Example 1.23. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:master:468a031e: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 468a031ee9fa5c576d1abe177102f1fdf373a56c URL: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:20+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… Patch: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 5f6bf33867..9e5ae3e9e2 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -774,7 +774,7 @@ set_reply_body("test", "text/plain"); Example 1.23. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.5:700cc0f3: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.5 Commit: 700cc0f3f419708b58a0eb8b2af3a9491c5f938d URL: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T12:33:12Z textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… Patch: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 82f6d2495f..cbc2fd2970 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -901,7 +901,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.4:d9c34770: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.4 Commit: d9c34770caa305fc6cafa18e255f3c05342305dc URL: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T12:32:40Z textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… Patch: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9f5f949e5a..55e7cf36aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -859,7 +859,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

[kamailio/kamailio] textops: fix broken example for filter_body (PR #2889)
by Sven Uhlig 20 Oct '21

20 Oct '21

#### 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) - [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 - [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: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This only fixes a typo in one of the examples in the documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2889 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2889/commits/04e5e73a32934868d5cd…">textops: fix broken example for filter_body</a> -- File Changes -- M src/modules/textops/doc/textops_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2889.patch https://github.com/kamailio/kamailio/pull/2889.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/2889

2 2

git:master:f8c1caba: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: f8c1cabaeadb8ee145174843ed11bbbb0c3276b0 URL: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T14:32:05+02:00 textops: fix broken example for filter_body --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… Patch: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 974fbf568c..2a166f37a9 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -901,7 +901,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

[kamailio/kamailio] carrierroute: Update cr dump structure (PR #2887)
by Stefan Mititelu 20 Oct '21

20 Oct '21

#### 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) - [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) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Remove the 1024 fixed size buffer. Update the cr dump structure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2887 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2887/commits/136f321c3609b56a4d91…">carrierroute: Update cr dump structure</a> -- File Changes -- M src/modules/carrierroute/cr_rpc.c (2) M src/modules/carrierroute/cr_rpc_helper.c (42) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2887.patch https://github.com/kamailio/kamailio/pull/2887.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/2887

2 2

git:master:6cd97d30: carrierroute: Update cr dump structure
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 6cd97d3023c7a29670ccfb3a2eab5e9d596b04f3 URL: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T10:53:39+02:00 carrierroute: Update cr dump structure --- Modified: src/modules/carrierroute/cr_rpc.c Modified: src/modules/carrierroute/cr_rpc_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… Patch: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… --- diff --git a/src/modules/carrierroute/cr_rpc.c b/src/modules/carrierroute/cr_rpc.c index 8979d25e8b..0ea19f41f7 100644 --- a/src/modules/carrierroute/cr_rpc.c +++ b/src/modules/carrierroute/cr_rpc.c @@ -50,6 +50,7 @@ static void cr_rpc_reload_routes(rpc_t *rpc, void *c) { if (carrierroute_dbh==NULL) { carrierroute_dbh = carrierroute_dbf.init(&carrierroute_db_url); if(carrierroute_dbh==0 ) { + rpc->fault(c, 500, "Internal error -- cannot initialize database connection"); LM_ERR("cannot initialize database connection\n"); return; } @@ -57,6 +58,7 @@ static void cr_rpc_reload_routes(rpc_t *rpc, void *c) { } if ( (reload_route_data())!=0 ) { + rpc->fault(c, 500, "Internal error -- failed to load routing data\n"); LM_ERR("failed to load routing data\n"); return; } diff --git a/src/modules/carrierroute/cr_rpc_helper.c b/src/modules/carrierroute/cr_rpc_helper.c index 87a361b7f5..256b10f160 100644 --- a/src/modules/carrierroute/cr_rpc_helper.c +++ b/src/modules/carrierroute/cr_rpc_helper.c @@ -235,13 +235,13 @@ int dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, struct dtrie_node_t *node, char *prefix) { char s[256]; - char rbuf[1024]; char *p; int i,len; struct route_flags *rf; struct route_rule *rr; struct route_rule_p_list * rl; double prob; + void* hh, *ih; len=strlen(prefix); if (len > 254) { @@ -267,39 +267,45 @@ int dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, } else { prob = rr->prob; } - snprintf(rbuf, 1024, - "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'", - len > 0 ? prefix : "NULL", prob * 100, - rr->host.len, rr->host.s, - (rr->status ? "ON" : "OFF"), rr->strip, - rr->local_prefix.len, rr->local_prefix.s, - rr->local_suffix.len, rr->local_suffix.s, - rr->comment.len, rr->comment.s); - if (rpc->array_add(gh, "s", rbuf)<0) + + if (rpc->array_add(gh, "{", &hh)<0) { rpc->fault(ctx, 500, "Failed to add data to response"); return -1; } + if(rpc->struct_add(hh, "sfSsdSSS", + "prefix", len > 0 ? prefix : "NULL", + "prob", prob * 100, + "host", &rr->host, + "status",(rr->status ? "ON" : "OFF"), + "strip", rr->strip, + "prefix", &rr->local_prefix, + "suffix", &rr->local_suffix, + "comment", &rr->comment)<0) + { + rpc->fault(ctx, 500, "Internal error - routes structure"); + return -1; + } + if(!rr->status && rr->backup && rr->backup->rr){ - snprintf(rbuf, 1024, - " Rule is backed up by: %.*s", - rr->backup->rr->host.len, rr->backup->rr->host.s); - if (rpc->array_add(gh, "s", rbuf)<0) + if (rpc->struct_add(hh, "S", "backup_by", &rr->backup->rr->host)<0) { rpc->fault(ctx, 500, "Failed to add backup by info to response"); return -1; } } if(rr->backed_up){ + if (rpc->struct_add(hh, "[", "backup_for", &ih)<0) + { + rpc->fault(ctx, 500, "Failed to add backup for data to response"); + return -1; + } rl = rr->backed_up; i=0; while(rl){ if(rl->rr){ - snprintf(rbuf, 1024, - " Rule is backup for: %.*s", - rl->rr->host.len, rl->rr->host.s); - if (rpc->array_add(gh, "s", rbuf)<0) + if (rpc->array_add(ih, "S", &rl->rr->host)<0) { rpc->fault(ctx, 500, "Failed to add backup for data to response"); return -1;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
25
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 2021