sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:ce5362dc: rtpengine: add stop_recording function

by Claudiu Boriga

Module: kamailio Branch: master Commit: ce5362dc460ed9ecc477bd8103904a009ebb3f6c URL: https://github.com/kamailio/kamailio/commit/ce5362dc460ed9ecc477bd8103904a0… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-09-27T10:07:29+03:00 rtpengine: add stop_recording function --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/ce5362dc460ed9ecc477bd8103904a0… Patch: https://github.com/kamailio/kamailio/commit/ce5362dc460ed9ecc477bd8103904a0…

6 years, 7 months

[kamailio/kamailio] Add stop_recording function, and make start/stop_recording functions accept flags (#1253)

by Paul Claudiu Boriga

#### 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  ce5362d adds stop_recording function that is similar to start_recording. This is useful when wanting to stop recording in the middle of the call since it has it's own message and is not attached to the offer/answer/delete message (like the "record-call off" flag in rtpengine_manage function). 45b4d35 enables the use of flags with both start_recording and stop_recording functions. This allows overwriting fields like call-id to start/stop recording for different ongoing calls (for example from a rtimer route). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1253 -- Commit Summary -- * rtpengine: add stop_recording function * rtpengine: make start_recording and stop_recording accept flags -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (37) M src/modules/rtpengine/rtpengine.c (55) M src/modules/rtpengine/rtpengine.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1253.patch https://github.com/kamailio/kamailio/pull/1253.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/1253

6 years, 7 months

git:master:f90e7851: sqlops: keep string values zero-terminated inside db result structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f90e785114c7dd738ca7ce7e70d72dd92cbd7136 URL: https://github.com/kamailio/kamailio/commit/f90e785114c7dd738ca7ce7e70d72dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-29T13:11:50+02:00 sqlops: keep string values zero-terminated inside db result structure --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/f90e785114c7dd738ca7ce7e70d72dd… Patch: https://github.com/kamailio/kamailio/commit/f90e785114c7dd738ca7ce7e70d72dd… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index ddf579cb96..16492300bc 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -394,14 +394,15 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) res->vals[i][j].value.s.len = 0; continue; } - res->vals[i][j].value.s.s - = (char*)pkg_malloc(sv.len*sizeof(char)); + res->vals[i][j].value.s.s + = (char*)pkg_malloc((sv.len+1)*sizeof(char)); if(res->vals[i][j].value.s.s==NULL) { LM_ERR("no more memory\n"); goto error; } memcpy(res->vals[i][j].value.s.s, sv.s, sv.len); + res->vals[i][j].value.s.s[sv.len] = '\0'; res->vals[i][j].value.s.len = sv.len; } }

6 years, 7 months

[kamailio/kamailio] v5.0.3: "kamctl domain show" not showing all domains (#1251)

by 00Asgaroth00

### Description Using the DBTEXT database engine I add a couple domains to the table, issue a reload and the attempt to list the domains loaded. The output of the listing only shows the 1st entry in the domain table, however, testing with a sip client, I can confirm that all domains are actually loaded, it appears that the listing of the domains is what is at fault here. domain data: ``` # cat domain id(int,auto) domain(string) did(string,null) last_modified(int) 1:testing.one.two:1:1506437399 2:testing.one.three:2:1506437399 3:testing.two.one:3:1506437399 4:testing.two.two:3:1506437399 ``` domain showdb ``` # kamctl domain showdb [1, 'testing.one.two', '1', 1506437399] [2, 'testing.one.three', '2', 1506437399] [3, 'testing.two.one', '3', 1506437399] [4, 'testing.two.two', '3', 1506437399] ``` domain show ``` # kamctl domain show { "jsonrpc": "2.0", "result": { "domain": "testing.one.two", "did": "1" }, "id": 32341 } ``` If I add some domain attribues the output is different again, data is the same above with the addition of some domain attrs. domain_attrs: ``` # cat domain_attrs id(int,auto) did(string) name(string) type(int) value(string) last_modified(int) 1:1:test_name:2:test_value:1506535015 ``` domain show: ``` # kamctl domain show { "jsonrpc": "2.0", "result": { "did": "1", "attr": "test_name" }, "id": 32468 } ``` I'm using the following version of kamailio, compiled from the kamailio v5.0.3 src code. kamailio version: ``` # kamailio -V version: kamailio 5.0.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 17:43:41 Sep 15 2017 with gcc 4.8.5 ``` Running onCentOS 7: ``` # uname -a Linux klb01.home.ie 3.10.0-693.2.2.el7.x86_64 #1 SMP Tue Sep 12 22:26:13 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` Any thoughts? -- 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/1251

6 years, 7 months

git:master:d3b7f0d3: kamctl: added db subcommand to mange records in version table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3b7f0d390dd430d40a1d47112f076f4b21e3afe URL: https://github.com/kamailio/kamailio/commit/d3b7f0d390dd430d40a1d47112f076f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-29T09:58:04+02:00 kamctl: added db subcommand to mange records in version table --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.sqlbase --- Diff: https://github.com/kamailio/kamailio/commit/d3b7f0d390dd430d40a1d47112f076f… Patch: https://github.com/kamailio/kamailio/commit/d3b7f0d390dd430d40a1d47112f076f… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 3aaecbd15a..569ddd8f3b 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1050,6 +1050,32 @@ db_ops() { fi $DBCMDCONNECT ;; + version) + shift + if [ $# -ne 3 ] ; then + merr "missing parameters" + exit 1 + fi + case $1 in + add) + QUERY="INSERT INTO version (table_name, table_version) VALUES ('$2', $3);" + $DBCMD "$QUERY" + ;; + set) + QUERY="DELETE FROM version WHERE table_name='$2';" + $DBCMD "$QUERY" + QUERY="INSERT INTO version (table_name, table_version) VALUES ('$2', $3);" + $DBCMD "$QUERY" + ;; + update) + QUERY="UPDATE version SET table_version=$3 WHERE table_name='$2';" + $DBCMD "$QUERY" + ;; + *) + usage_db_ops + exit 1 + esac + ;; *) usage_db_ops exit 1 diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index 2aef9801af..f821d2a799 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -67,6 +67,9 @@ cat <<EOF db nmatch <table> <key> <value>...... display record from table that has ........................... column key equal to value as non-string db connect .......................... connect to db server via cli + db version add <table> <value> ...... add new value in version table + db version set <table> <value> ...... set value in version table + db version update <table> <value> ... update value in version table EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_db_ops" @@ -79,7 +82,7 @@ usage_speeddial() { cat <<EOF speeddial show <speeddial-id> ....... show speeddial details speeddial list <sip-id> ............. list speeddial for uri - speeddial add <sip-id> <sd-id> <new-uri> [<desc>] ... + speeddial add <sip-id> <sd-id> <new-uri> [<desc>] ... ........................... add a speedial (*) speeddial rm <sip-id> <sd-id> ....... remove a speeddial (*) speeddial help ...................... help message

6 years, 7 months

git:5.0:a6269861: domain: proper output format for rpc dump command

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: a62698612bccaaa2defd640feb3552f6d916b279 URL: https://github.com/kamailio/kamailio/commit/a62698612bccaaa2defd640feb3552f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-29T09:31:44+02:00 domain: proper output format for rpc dump command - arrays have to be used to list domains and attributes (cherry picked from commit 6d4367e4ab1e7e2d38b94b942f2383e3878a1e7a) --- Modified: src/modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a62698612bccaaa2defd640feb3552f… Patch: https://github.com/kamailio/kamailio/commit/a62698612bccaaa2defd640feb3552f… --- diff --git a/src/modules/domain/domain_mod.c b/src/modules/domain/domain_mod.c index 179d847a45..3c16fe00c3 100644 --- a/src/modules/domain/domain_mod.c +++ b/src/modules/domain/domain_mod.c @@ -290,30 +290,46 @@ static void domain_rpc_dump(rpc_t *rpc, void *ctx) struct domain_list *np; struct attr_list *ap; struct domain_list **ht; + void *rt; + void *at; void *st; if(hash_table == 0 || *hash_table == 0) { rpc->fault(ctx, 404, "Server Domain Cache Empty"); return; } + if(rpc->add(ctx, "{", &rt) < 0) { + rpc->fault(ctx, 500, "Failed to create root struct"); + return; + } + if(rpc->struct_add(rt, "[", "domains", &at) < 0) { + rpc->fault(ctx, 500, "Failed to create domains struct"); + return; + } + ht = *hash_table; for(i = 0; i < DOM_HASH_SIZE; i++) { np = ht[i]; while(np) { - if(rpc->add(ctx, "{", &st) < 0) + if(rpc->array_add(at, "{", &st) < 0) return; rpc->struct_add(st, "SS", "domain", &np->domain, "did", &np->did); np = np->next; } } + if(rpc->struct_add(rt, "[", "attributes", &at) < 0) { + rpc->fault(ctx, 500, "Failed to create attributes struct"); + return; + } np = ht[DOM_HASH_SIZE]; while(np) { - if(rpc->add(ctx, "{", &st) < 0) + if(rpc->array_add(at, "{", &st) < 0) return; rpc->struct_add(st, "S", "did", &np->did); + rpc->struct_add(st, "[", "attrs", &st); ap = np->attrs; while(ap) { - rpc->struct_add(st, "S", "attr", &ap->name); + rpc->array_add(st, "S", &ap->name); ap = ap->next; } np = np->next; @@ -325,7 +341,9 @@ static void domain_rpc_dump(rpc_t *rpc, void *ctx) rpc_export_t domain_rpc_list[] = { {"domain.reload", domain_rpc_reload, domain_rpc_reload_doc, 0}, - {"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, {0, 0, 0, 0}}; + {"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, + {0, 0, 0, 0} +}; static int domain_init_rpc(void) { @@ -334,4 +352,4 @@ static int domain_init_rpc(void) return -1; } return 0; -} \ No newline at end of file +}

6 years, 7 months

git:master:6d4367e4: domain: proper output format for rpc dump command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6d4367e4ab1e7e2d38b94b942f2383e3878a1e7a URL: https://github.com/kamailio/kamailio/commit/6d4367e4ab1e7e2d38b94b942f2383e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-29T09:28:08+02:00 domain: proper output format for rpc dump command - arrays have to be used to list domains and attributes --- Modified: src/modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d4367e4ab1e7e2d38b94b942f2383e… Patch: https://github.com/kamailio/kamailio/commit/6d4367e4ab1e7e2d38b94b942f2383e… --- diff --git a/src/modules/domain/domain_mod.c b/src/modules/domain/domain_mod.c index 81564168bc..cc6fabb74e 100644 --- a/src/modules/domain/domain_mod.c +++ b/src/modules/domain/domain_mod.c @@ -291,30 +291,46 @@ static void domain_rpc_dump(rpc_t *rpc, void *ctx) struct domain_list *np; struct attr_list *ap; struct domain_list **ht; + void *rt; + void *at; void *st; if(hash_table == 0 || *hash_table == 0) { rpc->fault(ctx, 404, "Server Domain Cache Empty"); return; } + if(rpc->add(ctx, "{", &rt) < 0) { + rpc->fault(ctx, 500, "Failed to create root struct"); + return; + } + if(rpc->struct_add(rt, "[", "domains", &at) < 0) { + rpc->fault(ctx, 500, "Failed to create domains struct"); + return; + } + ht = *hash_table; for(i = 0; i < DOM_HASH_SIZE; i++) { np = ht[i]; while(np) { - if(rpc->add(ctx, "{", &st) < 0) + if(rpc->array_add(at, "{", &st) < 0) return; rpc->struct_add(st, "SS", "domain", &np->domain, "did", &np->did); np = np->next; } } + if(rpc->struct_add(rt, "[", "attributes", &at) < 0) { + rpc->fault(ctx, 500, "Failed to create attributes struct"); + return; + } np = ht[DOM_HASH_SIZE]; while(np) { - if(rpc->add(ctx, "{", &st) < 0) + if(rpc->array_add(at, "{", &st) < 0) return; rpc->struct_add(st, "S", "did", &np->did); + rpc->struct_add(st, "[", "attrs", &st); ap = np->attrs; while(ap) { - rpc->struct_add(st, "S", "attr", &ap->name); + rpc->array_add(st, "S", &ap->name); ap = ap->next; } np = np->next; @@ -326,7 +342,8 @@ static void domain_rpc_dump(rpc_t *rpc, void *ctx) rpc_export_t domain_rpc_list[] = { {"domain.reload", domain_rpc_reload, domain_rpc_reload_doc, 0}, - {"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, {0, 0, 0, 0} + {"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, + {0, 0, 0, 0} }; static int domain_init_rpc(void) @@ -380,4 +397,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_domain_exports); return 0; -} \ No newline at end of file +}

6 years, 7 months

[kamailio/kamailio] need to refresh database script (#1254)

by sergey-safarov

During loading kamailio i got error ``` 0(55) ERROR: <core> [db.c:450]: db_check_table_version(): invalid version 8 for table location found, expected 9 (check table structure and table "version") 0(55) ERROR: usrloc [dlist.c:659]: register_udomain(): error during table version check. 0(55) ERROR: registrar [registrar.c:651]: domain_fixup(): failed to register domain ``` Module now use version 9 of table `location` but script contains version 8. Please update database scripts -- 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/1254

6 years, 7 months

git:master:0a3c3d1c: kamctl: regenerated the db creation scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a3c3d1c7066d9a6fd7460b5f60a013717815ce1 URL: https://github.com/kamailio/kamailio/commit/0a3c3d1c7066d9a6fd7460b5f60a013… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-29T09:09:19+02:00 kamctl: regenerated the db creation scripts - reported by #1254 --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/location.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/0a3c3d1c7066d9a6fd7460b5f60a013… Patch: https://github.com/kamailio/kamailio/commit/0a3c3d1c7066d9a6fd7460b5f60a013…

6 years, 7 months

use key dynamic for xavp

by Luis Azedo

Hi List, shouldn't this be possible ? $xavp(ulattrs=>first) = 33; $var(ccv) = "whatever"; $xavp(ulattrs[0]=>$var(ccv)) = "some value"; when using in the particular case of usrloc attrs, i see the value of the attr created as "first" (correct) and "$var(ccv)" which i believe is incorrect, it should be "whatever". thoughts ?

6 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017