- sr-dev - kamailio.org

git:master:ae664527: Merge pull request #1134 from jchavanton/db_sqlite_doc_fix
by GitHub 21 May '17

21 May '17

Module: kamailio Branch: master Commit: ae664527e18f5269bce80fa2669b905913098784 URL: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-21T12:06:12+02:00 Merge pull request #1134 from jchavanton/db_sqlite_doc_fix db_sqlite: fix xml doc --- Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… Patch: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… --- diff --git a/src/modules/db_sqlite/doc/db_sqlite_admin.xml b/src/modules/db_sqlite/doc/db_sqlite_admin.xml index 695e0d4004..9dd8418563 100644 --- a/src/modules/db_sqlite/doc/db_sqlite_admin.xml +++ b/src/modules/db_sqlite/doc/db_sqlite_admin.xml @@ -62,10 +62,10 @@ </section> <section> - <title>Parameters</title> - <section id="db_sqlite.p.db_set_readonly"> + <title>Parameters</title> + <section id="db_sqlite.p.db_set_readonly"> <title><varname>db_set_readonly</varname> (string)</title> - + <para> This will set the db connection to "SQLITE_OPEN_READONLY", useful if another program is writing to the DB. The value is the full path to the sqlite file used for example in any db_url or sqlops/sqlcon @@ -85,7 +85,7 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using ... </programlisting> </example> - </section> + </section> </section> <section>

1 0

git:master:f6dde6f2: db_sqlite: fix xml doc
by Julien Chavanton 21 May '17

21 May '17

Module: kamailio Branch: master Commit: f6dde6f261891dff5b041a0e545e7bd210baf24b URL: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-05-20T13:06:55-07:00 db_sqlite: fix xml doc --- Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… Patch: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… --- diff --git a/src/modules/db_sqlite/doc/db_sqlite_admin.xml b/src/modules/db_sqlite/doc/db_sqlite_admin.xml index 695e0d4004..9dd8418563 100644 --- a/src/modules/db_sqlite/doc/db_sqlite_admin.xml +++ b/src/modules/db_sqlite/doc/db_sqlite_admin.xml @@ -62,10 +62,10 @@ </section> <section> - <title>Parameters</title> - <section id="db_sqlite.p.db_set_readonly"> + <title>Parameters</title> + <section id="db_sqlite.p.db_set_readonly"> <title><varname>db_set_readonly</varname> (string)</title> - + <para> This will set the db connection to "SQLITE_OPEN_READONLY", useful if another program is writing to the DB. The value is the full path to the sqlite file used for example in any db_url or sqlops/sqlcon @@ -85,7 +85,7 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using ... </programlisting> </example> - </section> + </section> </section> <section>

1 0

[kamailio/kamailio] db_sqlite: fix xml doc (#1134)
by Julien Chavanton 21 May '17

21 May '17

I screw up the xml file again, I found out how to test it using `make modules-readme modules=modules/db_sqlite` seems fine now You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1134 -- Commit Summary -- * db_sqlite: fix xml doc -- File Changes -- M src/modules/db_sqlite/doc/db_sqlite_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1134.patch https://github.com/kamailio/kamailio/pull/1134.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/1134

2 1

git:master:5b9682bf: modules: readme files regenerated - db_sqlite ... [skip ci]
by Kamailio Dev 20 May '17

20 May '17

Module: kamailio Branch: master Commit: 5b9682bf7adc2d03e5d0c729b63413c3575921ec URL: https://github.com/kamailio/kamailio/commit/5b9682bf7adc2d03e5d0c729b63413c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-20T09:01:31+02:00 modules: readme files regenerated - db_sqlite ... [skip ci] --- Modified: src/modules/db_sqlite/README --- Diff: https://github.com/kamailio/kamailio/commit/5b9682bf7adc2d03e5d0c729b63413c… Patch: https://github.com/kamailio/kamailio/commit/5b9682bf7adc2d03e5d0c729b63413c… --- diff --git a/src/modules/db_sqlite/README b/src/modules/db_sqlite/README index cb2e3153d0..139597f9cb 100644 --- a/src/modules/db_sqlite/README +++ b/src/modules/db_sqlite/README @@ -1,101 +1,2 @@ -SQlite Module -Timo Teräs -Edited by - -Timo Teräs - - Copyright © 2011 Timo Teräs - __________________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Parameters - 4. Functions - 5. Usage - - List of Examples - - 1.1. loading the module usage - 1.2. db_url module parameter usage - 1.3. DBURL define usage - -Chapter 1. Admin Guide - - Table of Contents - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Parameters - 4. Functions - 5. Usage - -1. Overview - - The module is an implementation of the internal DB API v1 connector for - SQlite 3 file. - -2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - -2.1. Kamailio Modules - - The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. - -2.2. External Libraries or Applications - - The following libraries or applications must be installed before - running Kamailio with this module loaded: - * SQlite 3 library - e.g., libsqlite3-0 - * SQlite 3 devel library - to compile the module e.g. libsqlite3-dev - * SQlite 3 utilities - for kamdbctl e.g. sqlite3 - -3. Parameters - - NONE - -4. Functions - - NONE - -5. Usage - - To use the module, first you have to load it in the Kamailio - configuration file. - - Example 1.1. loading the module usage -... -loadmodule "db_sqlite.so" -... - - Then set the db_url (or similar) parameter of modules that have to use - the SQLite database to driver part 'sqlite://', followed by the path to - database file. For example: - - Example 1.2. db_url module parameter usage -... -modparam("auth_db", "db_url", "sqlite:///etc/kamailio/kamailio.db") -... - - In the default config file, defined token DBURL can be updated like: - - Example 1.3. DBURL define usage -... -#!define DBURL "sqlite:///etc/kamailio/kamailio.db" -...

1 0

git:master:c7e72555: db_sqlite: move declaration of variables at beginning of function
by Daniel-Constantin Mierla 20 May '17

20 May '17

Module: kamailio Branch: master Commit: c7e7255540944f90a379bde2d084785ee05f3a3b URL: https://github.com/kamailio/kamailio/commit/c7e7255540944f90a379bde2d084785… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-20T08:57:53+02:00 db_sqlite: move declaration of variables at beginning of function - removed para tag from xml doc files --- Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c7e7255540944f90a379bde2d084785… Patch: https://github.com/kamailio/kamailio/commit/c7e7255540944f90a379bde2d084785… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index cf33c83086..a2f852c192 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -50,6 +50,8 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i { struct sqlite_connection *con; int rc; + int flags = 0; + db_param_list_t *db_param; con = pkg_malloc(sizeof(*con)); if (!con) { @@ -61,8 +63,7 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i con->hdr.ref = 1; con->hdr.id = (struct db_id*) id; /* set here - freed on error */ - int flags = 0; - db_param_list_t *db_param = db_param_list_search(id->database); + db_param = db_param_list_search(id->database); if (db_param && db_param->readonly) { // The database is opened in read-only mode. If the database does not already exist, an error is returned. flags |= SQLITE_OPEN_READONLY; diff --git a/src/modules/db_sqlite/doc/db_sqlite_admin.xml b/src/modules/db_sqlite/doc/db_sqlite_admin.xml index 534cf87101..695e0d4004 100644 --- a/src/modules/db_sqlite/doc/db_sqlite_admin.xml +++ b/src/modules/db_sqlite/doc/db_sqlite_admin.xml @@ -63,7 +63,6 @@ <section> <title>Parameters</title> - <para> <section id="db_sqlite.p.db_set_readonly"> <title><varname>db_set_readonly</varname> (string)</title> @@ -87,7 +86,6 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using </programlisting> </example> </section> - </para> </section> <section>

1 0

git:master:20122d08: Merge pull request #1133 from jchavanton/sqlite_readonly
by GitHub 20 May '17

20 May '17

Module: kamailio Branch: master Commit: 20122d08fd287dad9cb40b11c0c65cd13c53da17 URL: https://github.com/kamailio/kamailio/commit/20122d08fd287dad9cb40b11c0c65cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-20T08:55:33+02:00 Merge pull request #1133 from jchavanton/sqlite_readonly db_sqlite: new param to open some database in read-only --- Added: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite.xml Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20122d08fd287dad9cb40b11c0c65cd… Patch: https://github.com/kamailio/kamailio/commit/20122d08fd287dad9cb40b11c0c65cd…

1 0

git:master:aefe50a9: db_sqlite: new param to open some database in read-only
by Julien Chavanton 20 May '17

20 May '17

Module: kamailio Branch: master Commit: aefe50a99a33d3fdab08f302689f0abf79e06aeb URL: https://github.com/kamailio/kamailio/commit/aefe50a99a33d3fdab08f302689f0ab… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-05-19T16:31:37-07:00 db_sqlite: new param to open some database in read-only --- Added: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite.xml Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aefe50a99a33d3fdab08f302689f0ab… Patch: https://github.com/kamailio/kamailio/commit/aefe50a99a33d3fdab08f302689f0ab…

1 0

[kamailio/kamailio] db_sqlite: new param to open some database in read-only (#1133)
by Julien Chavanton 20 May '17

20 May '17

Using a `db_param_list` `clist` we can preset `SQLITE_OPEN_READONLY` on specific database file, this can be reused for more sqlite specific settings since we probably do not want extand `km_dbase` for db engine specific settings. This is required when another process is writing to the db Example: ``modparam("db_sqlite","db_set_readonly","/var/mydb.sqlite")`` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1133 -- Commit Summary -- * db_sqlite: new param to open some database in read-only -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (79) M src/modules/db_sqlite/dbase.c (14) M src/modules/db_sqlite/doc/db_sqlite.xml (16) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1133.patch https://github.com/kamailio/kamailio/pull/1133.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/1133

2 2

git:master:c9b5aa98: Merge pull request #1129 from SipSeb/master
by GitHub 20 May '17

20 May '17

Module: kamailio Branch: master Commit: c9b5aa98952adc7b372817eb2e1b1a968756fc83 URL: https://github.com/kamailio/kamailio/commit/c9b5aa98952adc7b372817eb2e1b1a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-20T08:51:53+02:00 Merge pull request #1129 from SipSeb/master rabbitmq: create reply-to queue w/ exclusive param --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/c9b5aa98952adc7b372817eb2e1b1a9… Patch: https://github.com/kamailio/kamailio/commit/c9b5aa98952adc7b372817eb2e1b1a9… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 7f9fc12ce0..806dfc9fd4 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -350,7 +350,7 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char // alloc reply_to queue if (direct_reply_to == 1) { - reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 0, 1, amqp_empty_table); + reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 1, 1, amqp_empty_table); } else { uuid_generate_random(uuid); uuid_unparse(uuid, uuid_buffer); @@ -358,7 +358,7 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char strcpy(reply_to_buffer, "kamailio-"); strcat(reply_to_buffer, uuid_buffer); - reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 0, 1, amqp_empty_table); + reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 1, 1, amqp_empty_table); } if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) {

1 0

git:master:20706e20: rabbitmq: create reply-to queue w/ exclusive param
by Sebastian Damm 20 May '17

20 May '17

Module: kamailio Branch: master Commit: 20706e20a1615c4cd7bd9fad2e8d458fac0ba86f URL: https://github.com/kamailio/kamailio/commit/20706e20a1615c4cd7bd9fad2e8d458… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Sebastian Damm <damm(a)sipgate.de> Date: 2017-05-12T16:13:23+02:00 rabbitmq: create reply-to queue w/ exclusive param RabbitMQ docs say, temporary reply-to queues should be created with an "exclusive" parameter. This allows only the current connection to access the queue, and when the connection ends, the queue will automatically be deleted. --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/20706e20a1615c4cd7bd9fad2e8d458… Patch: https://github.com/kamailio/kamailio/commit/20706e20a1615c4cd7bd9fad2e8d458… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 7f9fc12ce0..806dfc9fd4 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -350,7 +350,7 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char // alloc reply_to queue if (direct_reply_to == 1) { - reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 0, 1, amqp_empty_table); + reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 1, 1, amqp_empty_table); } else { uuid_generate_random(uuid); uuid_unparse(uuid, uuid_buffer); @@ -358,7 +358,7 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char strcpy(reply_to_buffer, "kamailio-"); strcat(reply_to_buffer, uuid_buffer); - reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 0, 1, amqp_empty_table); + reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 1, 1, amqp_empty_table); } if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) {

1 0

[kamailio/kamailio] rabbitmq: create reply-to queue w/ exclusive param (#1129)
by Sebastian Damm 20 May '17

20 May '17

RabbitMQ docs say, temporary reply-to queues should be created with an "exclusive" parameter. This allows only the current connection to access the queue, and when the connection ends, the queue will automatically be deleted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1129 -- Commit Summary -- * rabbitmq: create reply-to queue w/ exclusive param -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1129.patch https://github.com/kamailio/kamailio/pull/1129.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/1129

2 3

git:master:89174046: core: raw socket code updated log macros
by Daniel-Constantin Mierla 20 May '17

20 May '17

Module: kamailio Branch: master Commit: 8917404659f0057355874ae1eeafac0592887c9b URL: https://github.com/kamailio/kamailio/commit/8917404659f0057355874ae1eeafac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-20T08:49:18+02:00 core: raw socket code updated log macros --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/8917404659f0057355874ae1eeafac0… Patch: https://github.com/kamailio/kamailio/commit/8917404659f0057355874ae1eeafac0…

1 0

[kamailio/kamailio] Connection reset by peer (104) (#1132)
by Dipen Patel 19 May '17

19 May '17

### Description sip /usr/local/sbin/kamailio[26302]: ERROR: <core> [tcp_main.c:4258]: tcpconn_main_timeout(): connect 94.57.164.194:32929 failed (timeout) sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:292]: tcp_read_data(): error reading: Connection reset by peer (104) ([94.59.22.81]:38808 -> sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:293]: tcp_read_data(): -> [78.46.112.139]:443) sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:1321]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f489e51a098 r: 0x7f489e51a118 sip /usr/local/sbin/kamailio[26299]: ERROR: <script>: RTP-stats:60 7025 7047 14072 0 sip /usr/local/sbin/kamailio[26297]: ERROR: <core> [tcp_read.c:292]: tcp_read_data(): error reading: Connection reset by peer (104) ([91.73.125.163]:61783 -> sip /usr/local/sbin/kamailio[26297]: ERROR: <core> [tcp_read.c:293]: tcp_read_data(): -> [78.46.112.139]:443) sip /usr/local/sbin/kamailio[26297]: ERROR: <core> [tcp_read.c:1321]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f4895eb85b8 r: 0x7f4895eb8638 --> ### Troubleshooting use tls protocol and real cert (i have bought from globessl ) #### Reproduction use tls protocol and real cert (i have bought from globessl )--> #### Debugging Data #### Log Messages `` May 19 12:12:07 sip /usr/local/sbin/kamailio[26292]: ERROR: <script>: RTP-stats:60 19470 9789 29259 0 May 19 12:12:07 sip /usr/local/sbin/kamailio[26292]: ERROR: <core> [tcp_read.c:292]: tcp_read_data(): error reading: Connection reset by peer (104) ([91.73.18.104]:52067 -> May 19 12:12:07 sip /usr/local/sbin/kamailio[26292]: ERROR: <core> [tcp_read.c:293]: tcp_read_data(): -> [78.46.111.111]:443) May 19 12:12:07 sip /usr/local/sbin/kamailio[26292]: ERROR: <core> [tcp_read.c:1321]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f48a17df070 r: 0x7f48a17df0f0 May 19 12:12:07 sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:292]: tcp_read_data(): error reading: Connection reset by peer (104) ([5.31.166.189]:34047 -> May 19 12:12:07 sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:293]: tcp_read_data(): -> [78.46.111.111]:443) May 19 12:12:07 sip /usr/local/sbin/kamailio[26299]: ERROR: <core> [tcp_read.c:1321]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f4880a255a0 r: 0x7f4880a25620 May 19 12:12:07 sip /usr/local/sbin/kamailio[26302]: ERROR: <core> [tcp_main.c:4258]: tcpconn_main_timeout(): connect 31.218.135.107:23072 failed (timeout) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 4.4.0 ``` * **Operating System**:  ``` Centos 7 Linux sip.dips.com 2.6.32-642.13.1.el6.x86_64 #1 SMP Wed Jan 11 20:56:24 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1132

2 2

git:master:5d628a40: kazoo: remove unused variable
by lazedo 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 5d628a4093fc4f7ecb1ad6bec7172879e331f2dc URL: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-19T16:25:54+01:00 kazoo: remove unused variable --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… Patch: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 3f51cbf574..1211bc4b8c 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -123,7 +123,6 @@ struct json_object * kz_json_get_field_object(str* json, str* field) json_keys keys; json_key key; char* dup; - char* token; char f1[250], f2[250];//, f3[25]; int i, parts;

1 0

git:5.0:1293dc52: Revert "kazoo: add ksr_msg_env_reset after processing events"
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: 1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5 URL: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:10:00+01:00 Revert "kazoo: add ksr_msg_env_reset after processing events" This reverts commit a5e68b5697688f82edbc48e64f32e15f89c8b357. --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… Patch: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index ca3a86a19c..da310893c9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,10 +42,6 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" -#include "../../core/route.h" -#include "../../core/receive.h" -#include "../../core/action.h" -#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2284,14 +2280,11 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); - exec_post_script_cb(fmsg, REQUEST_CB_TYPE); - ksr_msg_env_reset(); - } + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); set_route_type(rtb); return 0; + } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2415,7 +2408,6 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); - ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2427,7 +2419,6 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); - ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

2 2

git:5.0:a5e68b56: kazoo: add ksr_msg_env_reset after processing events
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: a5e68b5697688f82edbc48e64f32e15f89c8b357 URL: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:08:53+01:00 kazoo: add ksr_msg_env_reset after processing events (cherry picked from commit afed885f8591ebb505511dba750d9671081c5d64) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… Patch: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index da310893c9..ca3a86a19c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,6 +42,10 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" +#include "../../core/route.h" +#include "../../core/receive.h" +#include "../../core/action.h" +#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2280,11 +2284,14 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + ksr_msg_env_reset(); + } set_route_type(rtb); return 0; - } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2408,6 +2415,7 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2419,6 +2427,7 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

1 0

git:5.0:d75e3635: kazoo: avoid creating an empty route block structure
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: d75e3635c960ddfb32bb3201feb31c248f8375ea URL: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:08:32+01:00 kazoo: avoid creating an empty route block structure - use route_lookup() instead of route_get(), so the empty route block is not created if the route is not defined in the kamailio.cfg (cherry picked from commit ab346e80647228afdbcaf6884a8573c9221ca38b) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… Patch: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index f7fc8c1ff1..da310893c9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2401,14 +2401,22 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->cb_route); + int n = route_lookup(&main_rt, cmd->cb_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->err_route); + int n = route_lookup(&main_rt, cmd->err_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); }

1 0

git:master:afed885f: kazoo: add ksr_msg_env_reset after processing events
by lazedo 19 May '17

19 May '17

Module: kamailio Branch: master Commit: afed885f8591ebb505511dba750d9671081c5d64 URL: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-19T16:04:45+01:00 kazoo: add ksr_msg_env_reset after processing events --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… Patch: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index da310893c9..ca3a86a19c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,6 +42,10 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" +#include "../../core/route.h" +#include "../../core/receive.h" +#include "../../core/action.h" +#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2280,11 +2284,14 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + ksr_msg_env_reset(); + } set_route_type(rtb); return 0; - } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2408,6 +2415,7 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2419,6 +2427,7 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

1 0

git:master:dc47a6b2: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 May '17

19 May '17

Module: kamailio Branch: master Commit: dc47a6b284260c521c74dcf4a8cc967c108def30 URL: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-19T15:01:24+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… Patch: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 398921da83..4be5d66028 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -330,7 +330,7 @@ Chapter 1. Admin Guide 3.1. list_file (string) - Path to the file with destination sets. + Path to the file with destination sets (destination groups). Default value is “/etc/kamailio/dispatcher.list” or “/usr/local/etc/kamailio/dispatcher.list”. @@ -342,7 +342,7 @@ modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list") 3.2. db_url (string) - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter. Default value is “NULL” (disable DB support). @@ -354,7 +354,7 @@ modparam("dispatcher", "db_url", "mysql://user:passwb@localhost/database") 3.3. table_name (string) - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter as the database name. Default value is “dispatcher”. @@ -366,7 +366,7 @@ modparam("dispatcher", "table_name", "my_dispatcher") 3.4. setid_col (string) - The column's name in the database storing the gateway's group id. + The column's name in the database storing the gateway's set (group) id. Default value is “setid”. @@ -1233,8 +1233,8 @@ kamcmd dispatcher.ping_active 0 6.1. Destination List File Each destination point must be on one line. First token is the set id - (an integer value), followed by destination address (s string value in - SIP URI format). + (an integer value, also referenced by group id), followed by + destination address (string value in full SIP URI format). Optionally, these fields can be followed by: * flags (listed by index - can be bitwise mask of values): 0 (value @@ -1285,21 +1285,21 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) Example 1.43. dispatcher list file ... -# $Id$ -# dispatcher destination sets +# +# dispatcher destination sets (groups) # # line format -# setit(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(st +# setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(st r,opt) # proxies -2 sip:127.0.0.1:5080 -2 sip:127.0.0.1:5082 +2 sip:127.0.0.1:5080;transport=tcp 0 10 class=4;prefix=448;strip=2 +2 sip:127.0.0.1:5082;px=vx 0 5 duid=abc;socket=udp:192.168.0.125:5060;pipe=p10 # gateways -1 sip:127.0.0.1:7070 -1 sip:127.0.0.1:7072 +1 sip:127.0.0.1:7070 0 0 duid=xyz;maxload=20 +1 sip:127.0.0.1:7072 0 5 1 sip:127.0.0.1:7074 ...

1 0

git:master:45989d3c: dispatcher: updated the example of destinations list file
by Daniel-Constantin Mierla 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 45989d3c53242f8f5f29229333617c7bc00fd3ac URL: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-19T14:58:07+02:00 dispatcher: updated the example of destinations list file --- Modified: src/modules/dispatcher/doc/dispatcher.list Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… Patch: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… --- diff --git a/src/modules/dispatcher/doc/dispatcher.list b/src/modules/dispatcher/doc/dispatcher.list index 25e9c6ebf2..03fbb4e491 100644 --- a/src/modules/dispatcher/doc/dispatcher.list +++ b/src/modules/dispatcher/doc/dispatcher.list @@ -1,15 +1,15 @@ -# $Id$ -# dispatcher destination sets +# +# dispatcher destination sets (groups) # # line format -# setit(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(str,opt) +# setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(str,opt) # proxies -2 sip:127.0.0.1:5080 -2 sip:127.0.0.1:5082 +2 sip:127.0.0.1:5080;transport=tcp 0 10 class=4;prefix=448;strip=2 +2 sip:127.0.0.1:5082;px=vx 0 5 duid=abc;socket=udp:192.168.0.125:5060;pipe=p10 # gateways -1 sip:127.0.0.1:7070 -1 sip:127.0.0.1:7072 +1 sip:127.0.0.1:7070 0 0 duid=xyz;maxload=20 +1 sip:127.0.0.1:7072 0 5 1 sip:127.0.0.1:7074 diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index ab40fb5f00..b5315acc2d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -77,7 +77,7 @@ <section id="dispatcher.p.list_file"> <title><varname>list_file</varname> (string)</title> <para> - Path to the file with destination sets. + Path to the file with destination sets (destination groups). </para> <para> <emphasis> @@ -98,7 +98,7 @@ modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list") <section id="dispatcher.p.db_url"> <title><varname>db_url</varname> (string)</title> <para> - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter. </para> <para> @@ -119,7 +119,7 @@ modparam("dispatcher", "db_url", "mysql://user:passwb@localhost/database") <section id="dispatcher.p.table_name"> <title><varname>table_name</varname> (string)</title> <para> - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter as the database name. </para> <para> @@ -140,7 +140,8 @@ modparam("dispatcher", "table_name", "my_dispatcher") <section id="dispatcher.p.setid_col"> <title><varname>setid_col</varname> (string)</title> <para> - The column's name in the database storing the gateway's group id. + The column's name in the database storing the gateway's set (group) + id. </para> <para> <emphasis> @@ -1524,8 +1525,8 @@ onreply_route { <title>Destination List File</title> <para> Each destination point must be on one line. First token is the set - id (an integer value), followed by destination address - (s string value in SIP URI format). + id (an integer value, also referenced by group id), followed by + destination address (string value in full SIP URI format). </para> <para> Optionally, these fields can be followed by:

1 0

git:master:6fb2dad3: tm: updated old style log macros
by Daniel-Constantin Mierla 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 6fb2dad334850b2a616bb2500b4df2797f6ed54f URL: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-19T14:16:40+02:00 tm: updated old style log macros --- Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27… Patch: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27…

1 0

[kamailio/kamailio] registrar: fix xavp_rcd memory consumption (#1111)
by lazedo 19 May '17

19 May '17

xavp_rcd keeps accumulating values leading to shm exaustion You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1111 -- Commit Summary -- * registrar: fix xavp_rcd memory consumption -- File Changes -- M src/modules/registrar/lookup.c (8) M src/modules/registrar/reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1111.patch https://github.com/kamailio/kamailio/pull/1111.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/1111

2 37

git:4.4:9e343f35: registrar: proper linking of xavps in the xavp_rcd
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 4.4 Commit: 9e343f3585a148f9a117195f179723e74bc475e8 URL: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T12:45:17+01:00 registrar: proper linking of xavps in the xavp_rcd - avoid leaking of shm when using save() in async operations - part of PR #1111 (cherry picked from commit bb3840161acd3b2dbe41001ebfb2bd779bfd68d0) Conflicts: modules/registrar/lookup.c modules/registrar/reply.c --- Modified: modules/registrar/lookup.c Modified: modules/registrar/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… Patch: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… --- diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index 50da15d622..62c0bf86a6 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -96,8 +96,9 @@ int lookup_to_dset(struct sip_msg* _m, udomain_t* _d, str* _uri) { * add xavp with details of the record (ruid, ...) */ int xavp_rcd_helper(ucontact_t* ptr) { - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; @@ -105,34 +106,34 @@ int xavp_rcd_helper(ucontact_t* ptr) { if(ptr==NULL) return -1; - if(reg_xavp_rcd.s!=NULL) - { - list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; - memset(&xval, 0, sizeof(sr_xval_t)); - xval.type = SR_XTYPE_STR; - xval.v.s = ptr->ruid; - xavp_add_value(&xname_ruid, &xval, &xavp); - - if(ptr->received.len > 0) - { - memset(&xval, 0, sizeof(sr_xval_t)); - xval.type = SR_XTYPE_STR; - xval.v.s = ptr->received; - xavp_add_value(&xname_received, &xval, &xavp); - } + if(reg_xavp_rcd.s==NULL || reg_xavp_rcd.len<=0) return 0; + + list = xavp_get(&reg_xavp_rcd, NULL); + xavp = list ? &list->val.v.xavp : &new_xavp; + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = ptr->ruid; + xavp_add_value(&xname_ruid, &xval, xavp); + if(ptr->received.len > 0) { memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; - xval.v.s = ptr->c; - xavp_add_value(&xname_contact, &xval, &xavp); - - if(list==NULL) - { - /* no reg_xavp_rcd xavp in root list - add it */ - xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + xval.v.s = ptr->received; + xavp_add_value(&xname_received, &xval, xavp); + } + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = ptr->c; + xavp_add_value(&xname_contact, &xval, xavp); + + if(list==NULL) { + /* no reg_xavp_rcd xavp in root list - add it */ + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = *xavp; + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(xavp); } } return 0; diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 27cc6f3bca..884012b443 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -173,8 +173,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) unsigned int ahash; unsigned short digit; int mode; - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname = {"ruid", 4}; sr_xval_t xval; @@ -212,7 +213,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) if(reg_xavp_rcd.s!=NULL) { list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; } fl = 0; @@ -334,7 +335,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + if(xavp_add_value(&xname, &xval, xavp)==NULL) { LM_ERR("cannot add ruid value to xavp\n"); } } @@ -346,14 +347,13 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) /* add xavp with details of the record (ruid, ...) */ if(reg_xavp_rcd.s!=NULL) { - if(list==NULL && xavp!=NULL) + if(list==NULL && *xavp!=NULL) { - /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; + xval.v.xavp = *xavp; if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { LM_ERR("cannot add ruid xavp to root list\n"); - xavp_destroy_list(&xavp); + xavp_destroy_list(xavp); } } }

1 0

git:5.0:2c053523: registrar: set expires field inside xavp_rcd
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: 2c05352309b1b60eb2503f8a07cef5753bd38a6e URL: https://github.com/kamailio/kamailio/commit/2c05352309b1b60eb2503f8a07cef57… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T12:37:12+01:00 registrar: set expires field inside xavp_rcd - match docs and build_contact() behaviour - part of PR #1111 (cherry picked from commit 82916f01bfcd58c80cbecbfa84f33f9763ba0d43) --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/2c05352309b1b60eb2503f8a07cef57… Patch: https://github.com/kamailio/kamailio/commit/2c05352309b1b60eb2503f8a07cef57… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 9f99d37e1f..1c0259e310 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -105,6 +105,7 @@ int xavp_rcd_helper(ucontact_t* ptr) str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; + str xname_expires = {"expires", 7}; sr_xval_t xval; if(ptr==NULL) return -1; @@ -130,6 +131,11 @@ int xavp_rcd_helper(ucontact_t* ptr) xval.v.s = ptr->c; xavp_add_value(&xname_contact, &xval, xavp); + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = (int) (ptr->expires - time(0)); + xavp_add_value(&xname_expires, &xval, xavp); + if(list==NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP;

1 0

git:5.0:94270b2f: registrar: proper linking of xavps in the xavp_rcd
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: 94270b2fe206f324bc60918dbe63f7cc5f7ba6fe URL: https://github.com/kamailio/kamailio/commit/94270b2fe206f324bc60918dbe63f7c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T12:36:51+01:00 registrar: proper linking of xavps in the xavp_rcd - avoid leaking of shm when using save() in async operations - part of PR #1111 (cherry picked from commit bb3840161acd3b2dbe41001ebfb2bd779bfd68d0) --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/94270b2fe206f324bc60918dbe63f7c… Patch: https://github.com/kamailio/kamailio/commit/94270b2fe206f324bc60918dbe63f7c… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index c9853a6953..9f99d37e1f 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -99,8 +99,9 @@ int lookup_to_dset(struct sip_msg* _m, udomain_t* _d, str* _uri) */ int xavp_rcd_helper(ucontact_t* ptr) { - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; @@ -111,29 +112,32 @@ int xavp_rcd_helper(ucontact_t* ptr) if(reg_xavp_rcd.s==NULL || reg_xavp_rcd.len<=0) return 0; list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->ruid; - xavp_add_value(&xname_ruid, &xval, &xavp); + xavp_add_value(&xname_ruid, &xval, xavp); if(ptr->received.len > 0) { memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->received; - xavp_add_value(&xname_received, &xval, &xavp); + xavp_add_value(&xname_received, &xval, xavp); } memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->c; - xavp_add_value(&xname_contact, &xval, &xavp); + xavp_add_value(&xname_contact, &xval, xavp); if(list==NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + xval.v.xavp = *xavp; + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(xavp); + } } return 0; } diff --git a/src/modules/registrar/reply.c b/src/modules/registrar/reply.c index 45568df1d2..c5eb4a3224 100644 --- a/src/modules/registrar/reply.c +++ b/src/modules/registrar/reply.c @@ -173,8 +173,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) unsigned int ahash; unsigned short digit; int mode; - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname = {"ruid", 4}; str ename = {"expires", 7}; sr_xval_t xval; @@ -213,7 +214,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) if(reg_xavp_rcd.s!=NULL) { list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; } fl = 0; @@ -336,7 +337,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + if(xavp_add_value(&xname, &xval, xavp)==NULL) { LM_ERR("cannot add ruid value to xavp\n"); } /* Add contact expiry */ @@ -344,7 +345,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) xval.type = SR_XTYPE_INT; xval.v.i = (int)(c->expires - act_time); - if(xavp_add_value(&ename, &xval, &xavp)==NULL) { + if(xavp_add_value(&ename, &xval, xavp)==NULL) { LM_ERR("cannot add expires value to xavp\n"); } } @@ -354,16 +355,16 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) } /* add xavp with details of the record (ruid, ...) */ + if(reg_xavp_rcd.s!=NULL) { - if(list==NULL && xavp!=NULL) + if(list==NULL && *xavp!=NULL) { - /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; + xval.v.xavp = *xavp; if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { LM_ERR("cannot add ruid xavp to root list\n"); - xavp_destroy_list(&xavp); + xavp_destroy_list(xavp); } } }

1 0

git:master:9d67099c: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 18 May '17

18 May '17

Module: kamailio Branch: master Commit: 9d67099ce41c897819b2164f3e17a8a454d3f2c2 URL: https://github.com/kamailio/kamailio/commit/9d67099ce41c897819b2164f3e17a8a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-18T22:01:26+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README Modified: src/modules/topos/README Modified: src/modules/uac/README Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/9d67099ce41c897819b2164f3e17a8a… Patch: https://github.com/kamailio/kamailio/commit/9d67099ce41c897819b2164f3e17a8a… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 689fae9..6e7bc5c 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1589,7 +1589,7 @@ modparam("tm", "dns_reuse_rcv_socket", 1) 3.46. xavp_contact (string) The name of XAVP storing the attributes per contact. This must be the - same as the usrloc parameter xavp_contacts. + same as the usrloc parameter xavp_contact. Default value is “NULL”. diff --git a/src/modules/topos/README b/src/modules/topos/README index 6b831f1..ab83dca 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 3.3. sanity_checks (int) 3.4. branch_expire (int) 3.5. dialog_expire (int) - 3.6. clean_inteval (int) + 3.6. clean_interval (int) List of Examples @@ -58,7 +58,7 @@ Chapter 1. Admin Guide 3.3. sanity_checks (int) 3.4. branch_expire (int) 3.5. dialog_expire (int) - 3.6. clean_inteval (int) + 3.6. clean_interval (int) 1. Overview @@ -97,7 +97,7 @@ Chapter 1. Admin Guide 3.3. sanity_checks (int) 3.4. branch_expire (int) 3.5. dialog_expire (int) - 3.6. clean_inteval (int) + 3.6. clean_interval (int) 3.1. db_url (str) @@ -161,7 +161,7 @@ modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 3600) ... -3.6. clean_inteval (int) +3.6. clean_interval (int) Interval in seconds to run the clean up of stored records. diff --git a/src/modules/uac/README b/src/modules/uac/README index 3747d8c..9623b2c 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -95,7 +95,7 @@ Ramona-Elena Modroiu 1.10. Set auth_username_avp parameter 1.11. Set auth_password_avp parameter 1.12. Set reg_db_url parameter - 1.13. Set reg_timer_inteval parameter + 1.13. Set reg_timer_interval parameter 1.14. Set reg_retry_interval parameter 1.15. Set reg_random_delay parameter 1.16. Set reg_db_table parameter @@ -434,7 +434,7 @@ modparam("uac", "reg_db_url", The default value is 90 seconds. - Example 1.13. Set reg_timer_inteval parameter + Example 1.13. Set reg_timer_interval parameter ... modparam("uac", "reg_timer_interval", 60) ... diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 9e1e450..fbddff4 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -850,7 +850,7 @@ modparam("usrloc", "timer_procs", 4) Example 1.36. Set xavp_contact parameter ... -modparam("usrloc", "xavp_contact", "ulattrs") +modparam("tm|usrloc", "xavp_contact", "ulattrs") ... 3.37. db_ops_ruid (int)

1 0

git:master:3deecfcc: modules/usrloc: synchronize example with TM module
by Mikko Lehto 18 May '17

18 May '17

Module: kamailio Branch: master Commit: 3deecfcc9491594f3c89fe330c407f3327393c62 URL: https://github.com/kamailio/kamailio/commit/3deecfcc9491594f3c89fe330c407f3… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-18T22:43:57+03:00 modules/usrloc: synchronize example with TM module --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3deecfcc9491594f3c89fe330c407f3… Patch: https://github.com/kamailio/kamailio/commit/3deecfcc9491594f3c89fe330c407f3… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index ac744ea..2ad2935 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -964,7 +964,7 @@ modparam("usrloc", "timer_procs", 4) <title>Set <varname>xavp_contact</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("usrloc", "xavp_contact", "ulattrs") +modparam("tm|usrloc", "xavp_contact", "ulattrs") ... </programlisting> </example>

1 0

git:master:b7e33ba0: modules/tm: documentation typo fix
by Mikko Lehto 18 May '17

18 May '17

Module: kamailio Branch: master Commit: b7e33ba006f5d2d81410c4785c13d99a024569cb URL: https://github.com/kamailio/kamailio/commit/b7e33ba006f5d2d81410c4785c13d99… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-18T22:43:02+03:00 modules/tm: documentation typo fix --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7e33ba006f5d2d81410c4785c13d99… Patch: https://github.com/kamailio/kamailio/commit/b7e33ba006f5d2d81410c4785c13d99… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 4d135d5..5e222b8 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1411,7 +1411,7 @@ modparam("tm", "dns_reuse_rcv_socket", 1) <title><varname>xavp_contact</varname> (string)</title> <para> The name of XAVP storing the attributes per contact. This must be the same as - the usrloc parameter <varname>xavp_contacts</varname>. + the usrloc parameter <varname>xavp_contact</varname>. </para> <para> <emphasis>

1 0

git:master:c42aca1e: modules/[topos|uac]: documentation typo fix
by Mikko Lehto 18 May '17

18 May '17

Module: kamailio Branch: master Commit: c42aca1edaee29ab8edf6d6e186a72ab674db7a6 URL: https://github.com/kamailio/kamailio/commit/c42aca1edaee29ab8edf6d6e186a72a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-18T22:41:38+03:00 modules/[topos|uac]: documentation typo fix --- Modified: src/modules/topos/doc/topos_admin.xml Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c42aca1edaee29ab8edf6d6e186a72a… Patch: https://github.com/kamailio/kamailio/commit/c42aca1edaee29ab8edf6d6e186a72a… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 76ee18f..b465713 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -173,7 +173,7 @@ modparam("topos", "dialog_expire", 3600) </example> </section> <section id="topos.p.clean_interval"> - <title><varname>clean_inteval</varname> (int)</title> + <title><varname>clean_interval</varname> (int)</title> <para> Interval in seconds to run the clean up of stored records. diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e80524a..e6ba5a2 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -401,7 +401,7 @@ modparam("uac", "reg_db_url", </para> <example> - <title>Set <varname>reg_timer_inteval</varname> parameter</title> + <title>Set <varname>reg_timer_interval</varname> parameter</title> <programlisting format="linespecific"> ... modparam("uac", "reg_timer_interval", 60)

1 0

git:master:6bc6bbca: pkg/kamailio/deb: version set to 5.1.0-dev3
by Victor Seva 18 May '17

18 May '17

Module: kamailio Branch: master Commit: 6bc6bbca0e7fd17bef51bf0fecea389c9d0870c4 URL: https://github.com/kamailio/kamailio/commit/6bc6bbca0e7fd17bef51bf0fecea389… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-18T13:15:26+02:00 pkg/kamailio/deb: version set to 5.1.0-dev3 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6bc6bbca0e7fd17bef51bf0fecea389… Patch: https://github.com/kamailio/kamailio/commit/6bc6bbca0e7fd17bef51bf0fecea389… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 00eaba6..83c1a37 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev3) unstable; urgency=medium + + * version set to 5.1.0-dev3 + + -- Victor Seva <vseva(a)debian.org> Thu, 18 May 2017 13:14:33 +0200 + kamailio (5.1.0~dev2) unstable; urgency=medium * version set to 5.1.0-dev2

1 0

git:master:a2874993: Makefile.defs: version set to 5.1.0-dev3
by Daniel-Constantin Mierla 18 May '17

18 May '17

Module: kamailio Branch: master Commit: a2874993470e6d27a68344d2062708b735b6856e URL: https://github.com/kamailio/kamailio/commit/a2874993470e6d27a68344d2062708b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-18T10:28:15+02:00 Makefile.defs: version set to 5.1.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a2874993470e6d27a68344d2062708b… Patch: https://github.com/kamailio/kamailio/commit/a2874993470e6d27a68344d2062708b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 6d4cbd6..e3cba53 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] KEMI Python: Possible bug in TM t_next_contacts (#1131)
by Sam 17 May '17

17 May '17

When using `KSR.tm.t_next_contacts` The following error is shown: ``` PYT {INVITE}: 5(11047) INFO: <core> [core/kemi.c:86]: sr_kemi_core_info(): [18:27:34.526536] Loading destination routes PYT {INVITE}: 5(11047) ERROR: *** cfgtrace:request_route=[] c=[] l=0 a=26 n=append_branch PYT {INVITE}: 5(11047) ERROR: *** cfgtrace:request_route=[] c=[] l=0 a=26 n=append_branch PYT {INVITE}: 5(11047) INFO: <core> [core/kemi.c:86]: sr_kemi_core_info(): [18:27:34.692021] Test PYT {INVITE}: 5(11047) ERROR: tm [t_fwd.c:1723]: t_forward_nonack(): no branches for forwarding PYT {INVITE}: 5(11047) ERROR: sl [sl_funcs.c:362]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) PYT {INVITE}: 5(11047) INFO: <core> [core/receive.c:277]: receive_msg(): request-route executed in: 167884 usec ``` Replacing the line that doesn't work with: `msg.call_function("t_next_contacts")` makes the script run as expected. I'm running the master branch of Kamailio pulled yesterday. -- 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/1131

2 3

Siremis: The column ipaddr isn't long enough for IPv6 addresses
by McDonald, Isaac 17 May '17

17 May '17

I opened an issue at Gihub regarding the inability to login to Siremis when using IPv6. The ipaddress column doesn't support IPv6 addresses. https://github.com/asipto/siremis/issues/15 Thanks

2 3

git:master:09eb1673: rtimer: use wrapper function to reset msg env lists (avp and xavp)
by Daniel-Constantin Mierla 17 May '17

17 May '17

Module: kamailio Branch: master Commit: 09eb1673fa922c0ced75dbcdcf8f6c90f6a84720 URL: https://github.com/kamailio/kamailio/commit/09eb1673fa922c0ced75dbcdcf8f6c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-17T08:40:12+02:00 rtimer: use wrapper function to reset msg env lists (avp and xavp) --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09eb1673fa922c0ced75dbcdcf8f6c9… Patch: https://github.com/kamailio/kamailio/commit/09eb1673fa922c0ced75dbcdcf8f6c9… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index cc916e5..e067bd6 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -37,8 +37,7 @@ #include "../../core/socket_info.h" #include "../../core/dset.h" #include "../../core/pt.h" -#include "../../core/usr_avp.h" -#include "../../core/xavp.h" +#include "../../core/receive.h" #include "../../core/timer_proc.h" #include "../../core/script_cb.h" #include "../../core/parser/parse_param.h" @@ -197,10 +196,7 @@ void stm_timer_exec(unsigned int ticks, void *param) set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[rt->route], fmsg, 0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif + ksr_msg_env_reset(); } }

1 0

git:master:46ea6b0a: core: wrapper function to reset avps/xavps from msg environment
by Daniel-Constantin Mierla 16 May '17

16 May '17

Module: kamailio Branch: master Commit: 46ea6b0a6bcf55243a0d11be41f60a2678dbbcfb URL: https://github.com/kamailio/kamailio/commit/46ea6b0a6bcf55243a0d11be41f60a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-16T17:33:10+02:00 core: wrapper function to reset avps/xavps from msg environment - use it to clean after processing received msg --- Modified: src/core/receive.c Modified: src/core/receive.h --- Diff: https://github.com/kamailio/kamailio/commit/46ea6b0a6bcf55243a0d11be41f60a2… Patch: https://github.com/kamailio/kamailio/commit/46ea6b0a6bcf55243a0d11be41f60a2… --- diff --git a/src/core/receive.c b/src/core/receive.c index 3a863be..8dc1007 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -362,11 +362,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) #ifdef STATS skipped = 0; #endif - /* free possible loaded avps -bogdan */ - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif + ksr_msg_env_reset(); LM_DBG("cleaning up\n"); free_sip_msg(msg); pkg_free(msg); @@ -392,13 +388,21 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) free_sip_msg(msg); pkg_free(msg); error00: - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif + ksr_msg_env_reset(); STATS_RX_DROPS; /* reset log prefix */ log_prefix_set(NULL); return -1; } +/** + * clean up msg environment, such as avp and xavp lists + */ +void ksr_msg_env_reset(void) +{ + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif + +} diff --git a/src/core/receive.h b/src/core/receive.h index 4e6a13d..0a928c5 100644 --- a/src/core/receive.h +++ b/src/core/receive.h @@ -33,5 +33,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info *ri); unsigned int inc_msg_no(void); +void ksr_msg_env_reset(void); #endif

1 0

git:master:33de203f: async: reset avp/xavp (msg env) from async workers
by Daniel-Constantin Mierla 16 May '17

16 May '17

Module: kamailio Branch: master Commit: 33de203fed8b592d8cb156670beb4a44220dd2e9 URL: https://github.com/kamailio/kamailio/commit/33de203fed8b592d8cb156670beb4a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-16T17:33:54+02:00 async: reset avp/xavp (msg env) from async workers - just in case they were set for non-sip routing processes (async workers) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/33de203fed8b592d8cb156670beb4a4… Patch: https://github.com/kamailio/kamailio/commit/33de203fed8b592d8cb156670beb4a4… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 64ce651..20a5a86 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -27,6 +27,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/receive.h" #include "../../core/locking.h" #include "../../core/timer.h" #include "../../core/async_task.h" @@ -174,8 +175,10 @@ void async_timer_exec(unsigned int ticks, void *param) if(ai == NULL) break; - if(ai->act != NULL) + if(ai->act != NULL) { tmb.t_continue(ai->tindex, ai->tlabel, ai->act); + ksr_msg_env_reset(); + } shm_free(ai); } } @@ -196,8 +199,10 @@ void async_exec_task(void *param) tindex = p[0]; tlabel = p[1]; - if(act != NULL) + if(act != NULL) { tmb.t_continue(tindex, tlabel, act); + ksr_msg_env_reset(); + } /* param is freed along with the async task strucutre in core */ }

1 0

git:master:82916f01: registrar: set expires field inside xavp_rcd
by Daniel-Constantin Mierla 16 May '17

16 May '17

Module: kamailio Branch: master Commit: 82916f01bfcd58c80cbecbfa84f33f9763ba0d43 URL: https://github.com/kamailio/kamailio/commit/82916f01bfcd58c80cbecbfa84f33f9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-16T17:00:26+02:00 registrar: set expires field inside xavp_rcd - match docs and build_contact() behaviour - part of PR #1111 --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/82916f01bfcd58c80cbecbfa84f33f9… Patch: https://github.com/kamailio/kamailio/commit/82916f01bfcd58c80cbecbfa84f33f9… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index bff0e0e..03be948 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -111,6 +111,7 @@ int xavp_rcd_helper(ucontact_t* ptr) str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; + str xname_expires = {"expires", 7}; sr_xval_t xval; if(ptr==NULL) return -1; @@ -136,6 +137,11 @@ int xavp_rcd_helper(ucontact_t* ptr) xval.v.s = ptr->c; xavp_add_value(&xname_contact, &xval, xavp); + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = (int) (ptr->expires - time(0)); + xavp_add_value(&xname_expires, &xval, xavp); + if(list==NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP;

1 0

git:master:bb384016: registrar: proper linking of xavps in the xavp_rcd
by Daniel-Constantin Mierla 16 May '17

16 May '17

Module: kamailio Branch: master Commit: bb3840161acd3b2dbe41001ebfb2bd779bfd68d0 URL: https://github.com/kamailio/kamailio/commit/bb3840161acd3b2dbe41001ebfb2bd7… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-16T16:56:07+02:00 registrar: proper linking of xavps in the xavp_rcd - avoid leaking of shm when using save() in async operations - part of PR #1111 --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/bb3840161acd3b2dbe41001ebfb2bd7… Patch: https://github.com/kamailio/kamailio/commit/bb3840161acd3b2dbe41001ebfb2bd7… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index cd261b1..bff0e0e 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -105,8 +105,9 @@ int lookup_to_dset(struct sip_msg* _m, udomain_t* _d, str* _uri) */ int xavp_rcd_helper(ucontact_t* ptr) { - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; @@ -117,29 +118,32 @@ int xavp_rcd_helper(ucontact_t* ptr) if(reg_xavp_rcd.s==NULL || reg_xavp_rcd.len<=0) return 0; list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->ruid; - xavp_add_value(&xname_ruid, &xval, &xavp); + xavp_add_value(&xname_ruid, &xval, xavp); if(ptr->received.len > 0) { memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->received; - xavp_add_value(&xname_received, &xval, &xavp); + xavp_add_value(&xname_received, &xval, xavp); } memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = ptr->c; - xavp_add_value(&xname_contact, &xval, &xavp); + xavp_add_value(&xname_contact, &xval, xavp); if(list==NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + xval.v.xavp = *xavp; + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(xavp); + } } return 0; } diff --git a/src/modules/registrar/reply.c b/src/modules/registrar/reply.c index 45568df..c5eb4a3 100644 --- a/src/modules/registrar/reply.c +++ b/src/modules/registrar/reply.c @@ -173,8 +173,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) unsigned int ahash; unsigned short digit; int mode; - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname = {"ruid", 4}; str ename = {"expires", 7}; sr_xval_t xval; @@ -213,7 +214,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) if(reg_xavp_rcd.s!=NULL) { list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; } fl = 0; @@ -336,7 +337,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + if(xavp_add_value(&xname, &xval, xavp)==NULL) { LM_ERR("cannot add ruid value to xavp\n"); } /* Add contact expiry */ @@ -344,7 +345,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) xval.type = SR_XTYPE_INT; xval.v.i = (int)(c->expires - act_time); - if(xavp_add_value(&ename, &xval, &xavp)==NULL) { + if(xavp_add_value(&ename, &xval, xavp)==NULL) { LM_ERR("cannot add expires value to xavp\n"); } } @@ -354,16 +355,16 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) } /* add xavp with details of the record (ruid, ...) */ + if(reg_xavp_rcd.s!=NULL) { - if(list==NULL && xavp!=NULL) + if(list==NULL && *xavp!=NULL) { - /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; + xval.v.xavp = *xavp; if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { LM_ERR("cannot add ruid xavp to root list\n"); - xavp_destroy_list(&xavp); + xavp_destroy_list(xavp); } } }

1 0

git:master:786e05f7: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 16 May '17

16 May '17

Module: kamailio Branch: master Commit: 786e05f7c771fa38fa26ab2bc4e3a47b22dcd33e URL: https://github.com/kamailio/kamailio/commit/786e05f7c771fa38fa26ab2bc4e3a47… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-16T07:31:55+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/786e05f7c771fa38fa26ab2bc4e3a47… Patch: https://github.com/kamailio/kamailio/commit/786e05f7c771fa38fa26ab2bc4e3a47… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 658d691..3ac0c7a 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -20,7 +20,7 @@ Juha Heinanen 1. Overview 2. Dependencies - 2.1. SIP Router modules + 2.1. Kamailio Modules 2.2. External libraries or applications 3. Parameters @@ -165,7 +165,7 @@ Chapter 1. Admin Guide 1. Overview 2. Dependencies - 2.1. SIP Router modules + 2.1. Kamailio Modules 2.2. External libraries or applications 3. Parameters @@ -255,10 +255,9 @@ Chapter 1. Admin Guide gateway of an LCR instance is associated with one or more <prefix, from uri pattern, from uri userpart, request uri pattern, priority, weight> tuples. A gateway matches a request if user part of Request-URI matches - a "prefix", caller URI matches a "From-URI" pattern, caller URI - userpart matches a mtree with given tree "value", and callee URI - matches a "Request-URI" pattern in a tuple that is associated with the - gateway. + "prefix", caller URI matches "from_uri" pattern, caller URI userpart + matches mtree with "mt_value", and callee URI matches "request_uri" + pattern in a tuple that is associated with the gateway. When the function load_gws() is called, matching gateways (that are not currently designated as defunct) are ordered for forwarding purposes as @@ -317,13 +316,14 @@ Chapter 1. Admin Guide 2. Dependencies - 2.1. SIP Router modules + 2.1. Kamailio Modules 2.2. External libraries or applications -2.1. SIP Router modules +2.1. Kamailio Modules The following modules must be loaded before this module: * A database module like mysql, postgres or dbtext. + * mtree module if mt_pv_values parameter is set. 2.2. External libraries or applications

1 0

git:master:bb517cda: modules/lcr: improved documentation
by Juha Heinanen 16 May '17

16 May '17

Module: kamailio Branch: master Commit: bb517cda1ae9ea0229195871338b0967a9b0a7fc URL: https://github.com/kamailio/kamailio/commit/bb517cda1ae9ea0229195871338b096… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-05-16T08:26:22+03:00 modules/lcr: improved documentation --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb517cda1ae9ea0229195871338b096… Patch: https://github.com/kamailio/kamailio/commit/bb517cda1ae9ea0229195871338b096… --- diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index 7196c56..8c4552d 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -35,9 +35,9 @@ <prefix, from uri pattern, from uri userpart, request uri pattern, priority, weight> tuples. A gateway matches a request if user part of Request-URI - matches a "prefix", caller URI matches a "From-URI" pattern, - caller URI userpart matches a mtree with given tree "value", and - callee URI matches a "Request-URI" pattern in a tuple that is + matches "prefix", caller URI matches "from_uri" pattern, + caller URI userpart matches mtree with "mt_value", and + callee URI matches "request_uri" pattern in a tuple that is associated with the gateway. </para> <para> @@ -134,7 +134,7 @@ <section> <title>Dependencies</title> <section> - <title>&siprouter; modules</title> + <title>&kamailio; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> @@ -144,6 +144,11 @@ dbtext</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>mtree module if mt_pv_values parameter is set</emphasis>. + </para> + </listitem> </itemizedlist> </para> </section>

1 0

[kamailio/kamailio] KEMI Python exists when importing requests (#1130)
by Sam 15 May '17

15 May '17

Using the Python library "requests" to make API calls via `import requests` Makes all the worker processes quit: ``` 0(2667) INFO: <core> [core/kemi.c:86]: sr_kemi_core_info(): [19:19:15.919278] ===== kamailio.child_init(0) 0(2667) INFO: <core> [main.c:759]: handle_sigs(): terminating due to SIGCHLD 1(2672) INFO: <core> [main.c:814]: sig_usr(): signal 15 received ``` Requests is a very common Python HTTP library. Can be installed via (Debian): apt-get install python-pip pip install requests -- 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/1130

2 4

[kamailio/kamailio] crash on run_rr_callbacks() from dlg_onroute() (#1059)
by Victor Seva 15 May '17

15 May '17

It seems that kamailio received two BYE messages at the same time and dlg was gone? #### Debugging Data ``` # gdb `which kamailio` core.kamailio.sig11.19255 GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/ac/30bd0b9cd954ea6a966ccc9d55affb6291beb5.debug...done. done. [New LWP 19255] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -f /etc/kamailio/proxy/kamailio.cfg -P /var/run/kamailio/kam'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f8c1d999565 in remove_dialog_timer () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dialog.so (gdb) (gdb) bt full #0 0x00007f8c1d999565 in remove_dialog_timer () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dialog.so No symbol table info available. #1 0x00007f8c1d97b4e5 in dlg_onroute () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dialog.so No symbol table info available. #2 0x00007f8c2551728d in run_rr_callbacks (req=0x7f8c28bea120, rr_param=0x7ffc7e4bee40) at rr_cb.c:96 l_param = { s = 0x9aab6a <buf+426> "lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\""..., len = 147} cbp = 0x7f8c290558c0 __FUNCTION__ = "run_rr_callbacks" #3 0x00007f8c255098a2 in after_loose (_m=0x7f8c28bea120, preloaded=2) at loose.c:928 puri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = { s = 0x9aab5a <buf+410> "Y.Y.Y.Y:5062;lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest userna"..., len = 10}, port = { s = 0x9aab65 <buf+421> "5062;lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"3562741"..., len = 4}, params = { s = 0x9aab6a <buf+426> "lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\""..., len = 147}, sip_params = { s = 0x9aab6a <buf+426> "lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\""..., len = 147}, headers = {s = 0x0, len = 0}, port_no = 5062, proto = 0, type = SIP_URI_T, flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = { s = 0x9aab6a <buf+426> "lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\""..., len = 5}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = { s = 0x9aab6d <buf+429> "on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\",re"..., len = 2}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} rt = 0x0 status = 0 uri = { s = 0x9aab56 <buf+406> "sip:Y.Y.Y.Y:5062;lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest us"..., len = 167} use_ob = 0 rparams = { s = 0x9aab6a <buf+426> "lr=on;ftag=922229c699;did=793.53a;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=cTdyd2pyYnZLVHc3VmI0VmQ3aGJxN3J3anJidktUdzdWYjRWXgJYVEE->\r\nProxy-Authorization: Digest username=\"anumber\""..., len = 147} __FUNCTION__ = "after_loose" #4 0x0000000000446650 in do_action (h=0x7ffc7e4bf560, a=0x7f8c27f994c8, msg=0x7f8c28bea120) at action.c:1060 ret = -5 v = 24865014 dst = {send_sock = 0x17b6aab, to = {s = {sa_family = 52142, sa_data = "B\000\000\000\000\000\253j{\001\000\000\000"}, sin = {sin_family = 52142, sin_port = 66, sin_addr = {s_addr = 0}, sin_zero = "\253j{\001\000\000\000"}, sin6 = {sin6_family = 52142, sin6_port = 66, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\253j{\001\000\000\000\000\205RD\000\000\000\000", __u6_addr16 = {27307, 379, 0, 0, 21125, 68, 0, 0}, __u6_addr32 = {24865451, 0, 4477573, 0}}}, sin6_scope_id = 2118906304}}, id = 32764, proto = -16 '\360', send_flags = {f = 241 '\361', blst_imask = 75 'K'}} end = 0x7ffc7e4bf560 "\001" uri = {user = {s = 0x7ffc7e4c0830 "\003", len = 938514842}, passwd = {s = 0xa00000000 <error: Cannot access memory at address 0xa00000000>, len = 22844112}, host = { s = 0x100000003 <error: Cannot access memory at address 0x100000003>, len = 681881128}, port = {s = 0x3 <error: Cannot access memory at address 0x3>, len = 0}, params = { s = 0x200000001 <error: Cannot access memory at address 0x200000001>, len = 2118906304}, sip_params = {s = 0x15c91c0 "", len = -1642256896}, headers = { s = 0x9aa9c8 <buf+8> "Y.Y.Y.Y:5080;prxroute=1 SIP/2.0\r\nRecord-Route: <sip:10.64.0.14;r2=on;lr=on;ftag=922229c699;ngcplb=yes;socket=udp:84.255.4.7:5060>\r\nRecord-Route: <sip:84.255.4.7;r2=on;lr=on;ftag=922229c699;ngcplb=y"..., len = 671147880}, port_no = 65535, proto = 65535, type = ERROR_URI_T, flags = (unknown: 683581728), transport = {s = 0x7ffc7e4c0830 "\003", len = 2118906688}, ttl = { s = 0x17b6aea "{\001", len = 4377518}, user_param = {s = 0x7f8c27f6ae20 "\001", len = 671137416}, maddr = {s = 0x7f8c28bea120 "+-\002", len = 671137528}, method = { s = 0x7e4bf280 <error: Cannot access memory at address 0x7e4bf280>, len = 623674360}, lr = {s = 0x7ffc7e4c0670 "\277\001", len = 2118906724}, r2 = {s = 0x7f8c00000000 "", len = 0}, gr = { s = 0x7ffc7e4bf4c4 "\214\177", len = -1642256896}, transport_val = {s = 0xd0de87bdb0391519 <error: Cannot access memory at address 0xd0de87bdb0391519>, len = 671137536}, ttl_val = {s = 0x0, len = 671137416}, user_param_val = {s = 0x7f8c28bea120 "+-\002", len = 671137528}, maddr_val = {s = 0x7ffc7e4bf280 "", len = 4589069}, method_val = {s = 0x0, len = 519504614}, lr_val = { s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250335224}, r2_val = {s = 0xe9a188 <error: Cannot access memory at address 0xe9a188>, len = 18100232}, gr_val = { s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 8}} next_hop = {user = {s = 0x0, len = 0}, passwd = {s = 0x1800000000 <error: Cannot access memory at address 0x1800000000>, len = 6243476}, host = { s = 0xe98ed8 <error: Cannot access memory at address 0xe98ed8>, len = -1642256896}, port = {s = 0x6afc59 <__FUNCTION__.8262> "rval_new_empty", len = 671154536}, params = { s = 0x7ffc7e4c0830 "\003", len = 683581728}, sip_params = {s = 0x7f8c2800e768 "\017", len = 683581728}, headers = {s = 0x17b6aea "{\001", len = 4479757}, port_no = 0, proto = 4096, type = ERROR_URI_T, flags = (unknown: 936), transport = {s = 0x19 <error: Cannot access memory at address 0x19>, len = 683581728}, ttl = {s = 0x7ffc7e4c0830 "\003", len = 2118908048}, ---Type <return> to continue, or q <return> to quit--- user_param = {s = 0x7f8c287c7320 "\002", len = 4349792}, maddr = {s = 0x7ffc7e4bf350 "\224\363K~\374\177", len = 4349855}, method = {s = 0x7f8c00000000 "", len = 4362395}, lr = { s = 0x7ffc7e4bf394 "6", len = 1}, r2 = {s = 0x0, len = -1642256896}, gr = {s = 0x1141e58 <error: Cannot access memory at address 0x1141e58>, len = -1642256896}, transport_val = { s = 0x1d <error: Cannot access memory at address 0x1d>, len = 0}, ttl_val = {s = 0x3600000064 <error: Cannot access memory at address 0x3600000064>, len = 532}, user_param_val = {s = 0x0, len = 1}, maddr_val = {s = 0x7f8c28bea120 "+-\002", len = 939161967}, method_val = {s = 0x0, len = 5665286}, lr_val = {s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250337280}, r2_val = {s = 0xe99938 <error: Cannot access memory at address 0xe99938>, len = -1642256896}, gr_val = {s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 497}} u = 0x7ffc7e4bf560 flags = 0 st = {flags = 0, id = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, avp = 0x5f4494 <fm_malloc+3044>} sct = 0x7ffc7e4bf560 sjt = 0x7ffc7e4bf560 mct = 0x17b6aea rv = 0x7f8c28a9d728 rv1 = 0x7f8c28bea120 c1 = {cache_type = 681970264, val_type = RV_NONE, c = {avp_val = {n = 683581728, s = {s = 0x7f8c28bea120 "+-\002", len = 0}, re = 0x7f8c28bea120}, pval = {rs = {s = 0x7f8c28bea120 "+-\002", len = 0}, ri = 939035407, flags = 32652}}, i2s = '\000' <repeats 16 times>, "\270\361K~\374\177"} s = {s = 0x1ffffffff <error: Cannot access memory at address 0x1ffffffff>, len = 683581728} srevp = {0x7ffc7e4c0670, 0x7ffc7e4bf214} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 15}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 36}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #5 0x0000000000445115 in run_actions (h=0x7f8b5fb23500, h@entry=0x7ffc7e4bf560, a=0x6, msg=0x1) at action.c:1549 ret = 2118912048 mod = 0x7f8c27f994c8 __FUNCTION__ = "run_actions" #6 0x0000000000451ae7 in run_actions_safe (h=0x7ffc7e4c0830, a=<optimized out>, msg=<optimized out>) at action.c:1614 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {140722427393376, -3396127869322586855, 140239955730720, 140722427398192, 140722427394192, 24865514, -3396127820052097767, 3397538908824868121}, __mask_was_saved = 0, __saved_mask = {__val = {5665521, 140722427393848, 140239955730720, 140722427393848, 7568605033954878976, 140722427393812, 497, 140239942814231, 140239942814231, 140722427393744, 0, 99, 5666971, 15310176, 18099168, 18453488}}}}} ret = <optimized out> ign_on_break = 0 #7 0x0000000000426c70 in rval_get_int (h=0x7ffc7e4c0830, msg=0x7f8b5fb23500, i=0x7ffc7e4bf890, rv=0x0, cache=0x9d6460 <tcp_main_ltimer+112672>) at rvalue.c:912 r_avp = 0x0 avp_val = {n = 2118907856, s = {s = 0x7ffc7e4bf7d0 "", len = 5668051}, re = 0x7ffc7e4bf7d0} pval = {rs = {s = 0x6909162d0000001f <error: Cannot access memory at address 0x6909162d0000001f>, len = 683540480}, ri = 1, flags = 32764} tmp = {s = 0x7ffc00000001 <error: Cannot access memory at address 0x7ffc00000001>, len = 670665240} s = 0x7f8c28bea120 r = 0 ret = 0 destroy_pval = 2118912048 __FUNCTION__ = "rval_get_int" #8 0x000000000042c9fc in rval_expr_eval_int (h=0x7ffc7e4c0830, msg=0x7f8c28bea120, res=0x7ffc7e4bf890, rve=0x7f8c27f995f8) at rvalue.c:1910 i1 = 32652 i2 = 1 ret = -1 c1 = {cache_type = 670665240, val_type = 32652, c = {avp_val = {n = 31, s = {s = 0x6909162d0000001f <error: Cannot access memory at address 0x6909162d0000001f>, len = 670994688}, re = 0x6909162d0000001f}, pval = {rs = {s = 0x6909162d0000001f <error: Cannot access memory at address 0x6909162d0000001f>, len = 670994688}, ri = -1642256896, flags = 1762203181}}, i2s = "\000\000\000\000\004\000\000\000ȋ\371'\214\177\000\000\000\000\000\000\000"} c2 = {cache_type = 683581728, val_type = 32652, c = {avp_val = {n = 670665664, s = {s = 0x7f8c27f98bc0 "\001", len = 670665672}, re = 0x7f8c27f98bc0}, pval = {rs = {s = 0x7f8c27f98bc0 "\001", len = 670665672}, ri = 4589069, flags = 0}}, i2s = "\304\023\000\000\001\000\000\000\260\211\371'\214\177\000\000\000\000\000\000\000"} rv1 = 0x7f8c252c7f66 <pv_set_avp+1270> rv2 = 0x10000017b6aea __FUNCTION__ = "rval_expr_eval_int" #9 0x0000000000446b27 in do_action (h=0x7ffc7e4c0830, a=0x7f8c27fe6830, msg=0x7f8c28bea120) at action.c:1030 ret = -5 ---Type <return> to continue, or q <return> to quit--- v = 0 dst = {send_sock = 0x7f8c28bea120, to = {s = {sa_family = 7, sa_data = "\000\000\000\000\000\000\260\376K~\374\177\000"}, sin = {sin_family = 7, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\260\376K~\374\177\000"}, sin6 = {sin6_family = 7, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\260\376K~\374\177\000\000 \241\276(\214\177\000", __u6_addr16 = {65200, 32331, 32764, 0, 41248, 10430, 32652, 0}, __u6_addr32 = {2118909616, 32764, 683581728, 32652}}}, sin6_scope_id = 24865514}}, id = 0, proto = 91 '[', send_flags = { f = 119 'w', blst_imask = 87 'W'}} end = 0x7f8c27f995f8 "\001" uri = {user = {s = 0x7ffc7e4bfeb0 " \241\276(\214\177", len = 683581728}, passwd = {s = 0x7ffc7e4bfeb0 " \241\276(\214\177", len = 683581728}, host = {s = 0x17b6aea "{\001", len = 4482640}, port = {s = 0x7f8c2818fe58 "\220\001", len = 687376112}, params = {s = 0x7ffc7e4c0830 "\003", len = -5}, sip_params = {s = 0x7ffc7e4bfab0 "", len = 683581728}, headers = { s = 0x1666830 "\220m\177\001", len = 2118909840}, port_no = 13540, proto = 14338, type = 32652, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 939668708), transport = {s = 0x0, len = 938508137}, ttl = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 4349792}, user_param = {s = 0x7ffc7e4bfb20 "", len = 4349855}, maddr = { s = 0x7f8c287c7320 "\002", len = 4362395}, method = {s = 0x7f8b5fb95036 "udp", len = 3}, lr = {s = 0x7f8c37f0999a <vfprintf+22490> "\200\275(\373\377\377", len = 2118909824}, r2 = { s = 0x7f8c287c7320 "\002", len = 540189421}, gr = {s = 0x7f8c20547260 <log_flag> "\377\377\377\377\001", len = 4349855}, transport_val = {s = 0x7f8c285b4f00 "\002", len = 4362395}, ttl_val = { s = 0x7ffc00000000 <error: Cannot access memory at address 0x7ffc00000000>, len = -5}, user_param_val = {s = 0x4b37 <error: Cannot access memory at address 0x4b37>, len = 10}, maddr_val = { s = 0x10000020 <error: Cannot access memory at address 0x10000020>, len = 938689182}, method_val = {s = 0x1666830 "\220m\177\001", len = 687260760}, lr_val = {s = 0x7ffc7e4c0000 "", len = 683581728}, r2_val = {s = 0x7ffc7e4c0000 "", len = 683581728}, gr_val = {s = 0x17b6aea "{\001", len = 4482640}} next_hop = {user = {s = 0x7ffc7e4bfc00 "Y\374j", len = -1642256896}, passwd = {s = 0x0, len = 687213120}, host = {s = 0x7ffc7e4c0830 "\003", len = -5}, port = {s = 0x7ffc7e4bfc10 "", len = 683581728}, params = {s = 0x17b6aea "{\001", len = 4477573}, sip_params = {s = 0x7ffc7e4bfc10 "", len = 2118908992}, headers = {s = 0x7f8c28f60a40 "\334\001", len = 683581728}, port_no = 0, proto = 0, type = SIP_URI_T, flags = (unknown: 0), transport = {s = 0x7ffc00000000 <error: Cannot access memory at address 0x7ffc00000000>, len = 0}, ttl = { s = 0x7ffc7e4c0020 " \241\276(\214\177", len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 938514842}, method = {s = 0x7f8c37f0999a <vfprintf+22490> "\200\275(\373\377\377", len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0xffffffffffffffff <error: Cannot access memory at address 0xffffffffffffffff>, len = 519504614}, gr = { s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250336336}, transport_val = {s = 0xe99d30 <error: Cannot access memory at address 0xe99d30>, len = 18099120}, ttl_val = {s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 8}, user_param_val = {s = 0x19b <error: Cannot access memory at address 0x19b>, len = -1642256896}, maddr_val = {s = 0x1142bb0 <error: Cannot access memory at address 0x1142bb0>, len = 6243476}, method_val = {s = 0x7ffc7e4c0830 "\003", len = 6978301}, lr_val = { s = 0x6afc59 <__FUNCTION__.8262> "rval_new_empty", len = -1642256896}, r2_val = {s = 0x0, len = 687224008}, gr_val = {s = 0x7ffc7e4c0830 "\003", len = -5}} u = 0x7f8c27f995f8 flags = 0 st = {flags = 2118908928, id = 32764, name = {n = -1642256896, s = {s = 0x6909162d9e1d2600 <error: Cannot access memory at address 0x6909162d9e1d2600>, len = 0}, re = 0x6909162d9e1d2600}, avp = 0x7f8c28f60a40} sct = 0x7f8c27f995f8 sjt = 0x7f8c27f995f8 mct = 0x17b6aea rv = 0x0 rv1 = 0x7f8c28bea120 c1 = {cache_type = 687185704, val_type = 32652, c = {avp_val = {n = -1642256896, s = {s = 0x6909162d9e1d2600 <error: Cannot access memory at address 0x6909162d9e1d2600>, len = 683581728}, re = 0x6909162d9e1d2600}, pval = {rs = {s = 0x6909162d9e1d2600 <error: Cannot access memory at address 0x6909162d9e1d2600>, len = 683581728}, ri = 542603232, flags = 32652}}, i2s = "\360\223\031\001F\000\000\000\000&\035\236-\026\ti\243\001\000\000\000"} s = {s = 0x186b4f57011424d8 <error: Cannot access memory at address 0x186b4f57011424d8>, len = -1642256896} srevp = {0x9aad1a <buf+858>, 0x5e7} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 15}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 36}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #10 0x0000000000445115 in run_actions (h=0x7f8b5fb23500, a=0x6, msg=0x1) at action.c:1549 ret = 1 mod = 0x7f8c27fe6830 __FUNCTION__ = "run_actions" #11 0x0000000000446d40 in do_action (h=0x7ffc7e4c0830, a=0x7f8c288d33a8, msg=0x7f8c28bea120) at action.c:678 ret = -5 v = 0 dst = {send_sock = 0x17b6aab, to = {s = {sa_family = 21125, sa_data = "D\000\000\000\000\000\300y\020(\214\177\000"}, sin = {sin_family = 21125, sin_port = 68, sin_addr = {s_addr = 0}, sin_zero = "\300y\020(\214\177\000"}, sin6 = {sin6_family = 21125, sin6_port = 68, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = "\300y\020(\214\177\000\000/\000\000\000\000\000\000", __u6_addr16 = {31168, 10256, 32652, 0, 47, 0, 0, 0}, __u6_addr32 = {672168384, 32652, 47, 0}}}, sin6_scope_id = 980445555}}, id = 32652, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} end = 0x6 <error: Cannot access memory at address 0x6> uri = {user = {s = 0x7ffc7e4c0064 "", len = 6404846}, passwd = {s = 0x7ffc7e4c0830 "\003", len = 2118910388}, host = {s = 0x17b6aea "{\001", len = -1642256896}, port = { s = 0x7f8c28bea120 "+-\002", len = 687260760}, params = {s = 0x7ffc7e4c0830 "\003", len = -5}, sip_params = {s = 0x7ffc7e4c0000 "", len = 683581728}, headers = {s = 0x17b6aea "{\001", ---Type <return> to continue, or q <return> to quit--- len = 4477573}, port_no = 0, proto = 32332, type = 32764, flags = (URI_USER_NORMALIZE | unknown: 4212331800), transport = {s = 0x7f8c28f6c458 ")\002", len = 683581728}, ttl = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 683581728}, user_param = {s = 0x7ffc7e4c0088 "", len = 2118910056}, maddr = {s = 0x7ffc7e4c0064 "", len = 5800526}, method = {s = 0x7f8c28f68630 "\001", len = 683581728}, lr = {s = 0x7ffc7e4c0830 "\003", len = 519504614}, r2 = {s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250336336}, gr = {s = 0xe99d30 <error: Cannot access memory at address 0xe99d30>, len = 18099120}, transport_val = {s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 8}, ttl_val = {s = 0x19b <error: Cannot access memory at address 0x19b>, len = -1642256896}, user_param_val = {s = 0x7f8c287c7320 "\002", len = 6233684}, maddr_val = { s = 0x7ffc7e4c0080 "", len = 679244504}, method_val = {s = 0x7f8c38263620 "", len = 0}, lr_val = {s = 0x7ffc7e4c0830 "\003", len = 683581728}, r2_val = {s = 0x7ffc7e4c0830 "\003", len = 2118910768}, gr_val = {s = 0x17b6aea "{\001", len = 4528871}} next_hop = {user = {s = 0x0, len = 1}, passwd = {s = 0x7ffc7e4c0000 "", len = 1094259993}, host = {s = 0x7f8c28bea120 "+-\002", len = 2118912048}, port = {s = 0x7ffc7e4c0330 "\001", len = 24865514}, params = {s = 0xd0de87bdacb91519 <error: Cannot access memory at address 0xd0de87bdacb91519>, len = -82635495}, sip_params = {s = 0x0, len = 544780589}, headers = { s = 0x7e4c0168 <error: Cannot access memory at address 0x7e4c0168>, len = 687244856}, port_no = 36328, proto = 10486, type = 32652, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 939139724), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x7ffc7e4c0140 "h\345\230 \214\177", len = 2118910240}, maddr = {s = 0x7f8c3a706973 <error: Cannot access memory at address 0x7f8c3a706973>, len = 683581728}, method = {s = 0x1816f60 "\340hm\001", len = 0}, lr = { s = 0x40 <error: Cannot access memory at address 0x40>, len = -1642256896}, r2 = {s = 0x300000039 <error: Cannot access memory at address 0x300000039>, len = 2118910768}, gr = { s = 0x7ffc7e4c0830 "\003", len = 4353136}, transport_val = {s = 0x1000000000000 <error: Cannot access memory at address 0x1000000000000>, len = 7200}, ttl_val = {s = 0x1541c40 "CEST", len = 623629966}, user_param_val = {s = 0x7f8b5fc10115 "5060", len = 10498376}, maddr_val = {s = 0x9a9790 <_km_log_func> "\340jA", len = 0}, method_val = { s = 0x7f8c2098e568 <_xlog_prefix> "\242\263x \214\177", len = -1642256896}, lr_val = {s = 0x416ae0 <syslog@plt> "\377%\222\310X", len = 687262272}, r2_val = { s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = 683581728}, gr_val = {s = 0x7ffc7e4c0830 "\003", len = 2118910768}} u = 0x6 flags = 32652 st = {flags = 0, id = 0, name = {n = 1, s = {s = 0x7f8c00000001 "", len = 2118909952}, re = 0x7f8c00000001}, avp = 0xd0de87b241391519} sct = 0x6 sjt = 0x6 mct = 0x17b6aea rv = 0x7f8c28f79ba8 rv1 = 0x7f8c28bea120 c1 = {cache_type = RV_CACHE_EMPTY, val_type = RV_NONE, c = {avp_val = {n = 5060, s = {s = 0x29000013c4 <error: Cannot access memory at address 0x29000013c4>, len = 2118912048}, re = 0x29000013c4}, pval = {rs = {s = 0x29000013c4 <error: Cannot access memory at address 0x29000013c4>, len = 2118912048}, ri = 672168304, flags = 32652}}, i2s = "\270y\020(\214\177\000\000\210\000L~\374\177\000\000\210\000L~\374\177"} s = {s = 0x7f8c287c766e "4", len = 3} srevp = {0x7ffc7e4c0670, 0x7f8c28bea120} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 15}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 36}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #12 0x0000000000445115 in run_actions (h=0x7f8b5fb23500, a=0x6, msg=0x1) at action.c:1549 ret = 2118912048 mod = 0x7f8c28f6c808 __FUNCTION__ = "run_actions" #13 0x0000000000446b78 in do_action (h=0x7ffc7e4c0830, a=0x7f8c28f6ee18, msg=0x7f8c28bea120) at action.c:1049 ret = 1 v = 1 dst = {send_sock = 0x7f8c28bea120, to = {s = {sa_family = 51646, sa_data = "\334%\214\177\000\000\264\000\000\000\374\177\000"}, sin = {sin_family = 51646, sin_port = 9692, sin_addr = { s_addr = 32652}, sin_zero = "\264\000\000\000\374\177\000"}, sin6 = {sin6_family = 51646, sin6_port = 9692, sin6_flowinfo = 32652, sin6_addr = {__in6_u = { __u6_addr8 = "\264\000\000\000\374\177\000\000\000\000\000\000\000\000\000", __u6_addr16 = {180, 0, 32764, 0, 0, 0, 0, 0}, __u6_addr32 = {180, 32764, 0, 0}}}, sin6_scope_id = 674766208}}, id = 32652, proto = 32 ' ', send_flags = {f = 161 '\241', blst_imask = 190 '\276'}} end = 0x7f8c28f6ca40 "\001" uri = {user = {s = 0x7ffc7e4c05dc "", len = 635512766}, passwd = {s = 0x7f8b5fdb1890 "\224*\002", len = 683581728}, host = {s = 0x5fcdb5d8 <error: Cannot access memory at address 0x5fcdb5d8>, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x4881 <error: Cannot access memory at address 0x4881>, len = -1642256896}, headers = { s = 0x6 <error: Cannot access memory at address 0x6>, len = 634972939}, port_no = 180, proto = 0, type = 32651, flags = (unknown: 2118911600), transport = {s = 0x0, len = 681887176}, ttl = { s = 0x7f8c28bea120 "+-\002", len = 1610866240}, user_param = {s = 0x7f8b6003dc38 "\240\377h_\213\177", len = 4529039}, maddr = {s = 0x0, len = 0}, method = { s = 0x4 <error: Cannot access memory at address 0x4>, len = 635512766}, lr = {s = 0x0, len = 683581728}, r2 = {s = 0x7f8b5ff2fff8 "", len = 200}, gr = {s = 0x0, len = 683581728}, transport_val = {s = 0x7f8c28837df0 <incomplete sequence \350>, len = 638037828}, ttl_val = {s = 0x7ffc7e4c05dc "", len = -1642256896}, user_param_val = { s = 0x7f8c260671f0 <tm_cfg> "h\371\220_\213\177", len = 634977214}, maddr_val = {s = 0x7f8b00000004 <error: Cannot access memory at address 0x7f8b00000004>, len = 1609884936}, method_val = { s = 0x4 <error: Cannot access memory at address 0x4>, len = 683581728}, lr_val = {s = 0xc8 <error: Cannot access memory at address 0xc8>, len = 1609885456}, r2_val = {s = 0x7f8b5ff4e508 "", len = 634984442}, gr_val = {s = 0x0, len = -1642256896}} next_hop = {user = {s = 0x7f8c28bea120 "+-\002", len = 2118911456}, passwd = {s = 0x5 <error: Cannot access memory at address 0x5>, len = 683581728}, host = { ---Type <return> to continue, or q <return> to quit--- s = 0xb4 <error: Cannot access memory at address 0xb4>, len = 1610866240}, port = {s = 0x7f8b6003dc38 "\240\377h_\213\177", len = 635245418}, params = { s = 0x7ffc000000b7 <error: Cannot access memory at address 0x7ffc000000b7>, len = 10493856}, sip_params = {s = 0xa01fa8 <def_list+8> "", len = 10493872}, headers = { s = 0xa01fb8 <def_list+24> "", len = 10493896}, port_no = 7448, proto = 160, type = ERROR_URI_T, flags = (URI_SIP_USER_PHONE | unknown: 519504612), transport = { s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 519504614}, ttl = {s = 0x0, len = 250281984}, user_param = {s = 0x0, len = 519504614}, maddr = { s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250338176}, method = {s = 0xe98c70 <error: Cannot access memory at address 0xe98c70>, len = 18097280}, lr = { s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 8}, r2 = {s = 0x1dc <error: Cannot access memory at address 0x1dc>, len = 519504614}, gr = { s = 0x10000000 <error: Cannot access memory at address 0x10000000>, len = 250341208}, transport_val = {s = 0xe989e0 <error: Cannot access memory at address 0xe989e0>, len = 18094248}, ttl_val = {s = 0x11993f0 <error: Cannot access memory at address 0x11993f0>, len = 8}, user_param_val = {s = 0x1bf <error: Cannot access memory at address 0x1bf>, len = -1642256896}, maddr_val = {s = 0x11418a8 <error: Cannot access memory at address 0x11418a8>, len = 6243476}, method_val = {s = 0x7f8c28a4c5c8 "\231\034", len = 6978301}, lr_val = { s = 0x71c670 <__FUNCTION__.7459> "parse_via", len = 1610865720}, r2_val = {s = 0xd0de87b257b91519 <error: Cannot access memory at address 0xd0de87b257b91519>, len = -82635495}, gr_val = { s = 0x0, len = -1642256896}} u = 0x7f8c28f6ca40 flags = 32651 st = {flags = 683581728, id = 32652, name = {n = 2118911456, s = {s = 0x7ffc7e4c05e0 "", len = 5}, re = 0x7ffc7e4c05e0}, avp = 0x7f8c28bea120} sct = 0x7f8c28f6ca40 sjt = 0x7f8c28f6ca40 mct = 0x17b6aea rv = 0x1 rv1 = 0x7f8c28bea120 c1 = {cache_type = 180, val_type = RV_NONE, c = {avp_val = {n = 1610865912, s = {s = 0x7f8b6003dcf8 "\264", len = 10482636}, re = 0x7f8b6003dcf8}, pval = {rs = {s = 0x7f8b6003dcf8 "\264", len = 10482636}, ri = 5, flags = 1}}, i2s = "\340\005L~\374\177\000\000\070\334\003`\213\177\000\000\240\377h_\213\177"} s = {s = 0xa48980 <_pkg_root> "\344\016p", len = 808857653} srevp = {0x7f8c27ede430, 0x7f8b6003de40} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 15}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = STRING_RVE_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 36}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #14 0x0000000000445115 in run_actions (h=0x7f8b5fb23500, h@entry=0x7ffc7e4c0830, a=0x6, a@entry=0x7f8c28f1b930, msg=0x1, msg@entry=0x7f8c28bea120) at action.c:1549 ret = 1 mod = 0x7f8c28f6ee18 __FUNCTION__ = "run_actions" #15 0x0000000000451b85 in run_top_route (a=0x7f8c28f1b930, msg=0x7f8c28bea120, c=<optimized out>) at action.c:1635 ctx = {rec_lev = 3, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {140722427398192, 3397538390581253401, 140239959079216, 140239955730720, 0, 0, -3396127868821367527, 3397538908824868121}, __mask_was_saved = 0, __saved_mask = {__val = {10136323, 1354, 7568605033954878976, 10136001, 6243476, 140239948066720, 140239955730720, 10136044, 10136000, 1354, 7568605033954878976, 0, 140239960257184, 1073741825, 140239907703544, 140239960247216}}}}} p = <optimized out> ret = <optimized out> sfbk = 0 #16 0x0000000000556f9e in receive_msg (buf=0x0, len=683581728, rcv_info=0x7ffc7e4c0b10) at receive.c:240 msg = 0x7f8c28bea120 ctx = {rec_lev = 23098816, run_flags = 0, last_retcode = 23098816, jmp_env = {{__jmpbuf = {0, 6, 140236580472680, 140236549023960, 140722427398688, 140239791653606, 268435456, 250568360}, __mask_was_saved = 15165008, __saved_mask = {__val = {10105736, 0, 140722427398950, 5, 1, 140239942050864, 140240218561991, 5, 0, 7063492, 140240210401128, 140239955456248, 140239942050864, 140240220669584, 140240218587877, 140240220669584}}}}} inb = { s = 0x9aa9c0 <buf> "BYE sip:Y.Y.Y.Y:5080;prxroute=1 SIP/2.0\r\nRecord-Route: <sip:10.64.0.14;r2=on;lr=on;ftag=922229c699;ngcplb=yes;socket=udp:84.255.4.7:5060>\r\nRecord-Route: <sip:84.255.4.7;r2=on;lr=on;ftag=922229c699;"..., len = 1354} netinfo = {data = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = 1571855534}, dst = 0x7f8c37ec9768, rcv = 0x7f8c38895000} __FUNCTION__ = "receive_msg" #17 0x0000000000479f10 in udp_rcv_loop () at udp_server.c:495 len = 1354 buf = "BYE sip:Y.Y.Y.Y:5080;prxroute=1 SIP/2.0\r\nRecord-Route: <sip:10.64.0.14;r2=on;lr=on;ftag=922229c699;ngcplb=yes;socket=udp:84.255.4.7:5060>\r\nRecord-Route: <sip:84.255.4.7;r2=on;lr=on;ftag=922229c699;"... from = 0x7f8c28ba70f8 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {234897418, 140236580472680}, addr32 = {234897418, 0, 1603290984, 32651}, addr16 = {16394, 3584, 0, 0, 18280, 24464, 32651, 0}, addr = "\n@\000\016\000\000\000\000hG\220_\213\177\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {335560714, 0}, addr32 = {335560714, 0, 0, 0}, addr16 = {16394, 5120, 0, 0, 0, 0, 0, 0}, ---Type <return> to continue, or q <return> to quit--- addr = "\n@\000\024", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5062, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304\n@\000\016\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 234897418}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 234897418, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f8c27ede430, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #18 0x00000000004ffe39 in main_loop () at main.c:1614 si_desc = "udp receiver child=5 sock=Y.Y.Y.Y:5062\000\000\000\001\000\000\000pX\300(\214\177\000\000\000\000\000\000\000\000\000\000n\000\000\000\000\000\000\000\315f_\000\000\000\000\000\003\000\000\000\000\000\000\000\000&\035\236-\026\ti\000\000\000\000\000\000\000\000\000&\035\236-\026\ti\310\002\245\000\000\000\000\000\005\000\000\000\000\000\000" woneinit = 1 __FUNCTION__ = "main_loop" #19 0x000000000041cd6c in main (argc=0, argv=0x0) at main.c:2631 cfg_stream = 0x0 r = 0 tmp = 0x7ffc7e4c2ee4 "" tmp_len = 0 port = 0 proto = 948524496 ret = 0 seed = 1296618944 debug_save = 0 debug_flag = 4 dont_fork_cnt = 0 st = {st_dev = 15, st_ino = 122623671, st_nlink = 2, st_mode = 16877, st_uid = 106, st_gid = 108, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1488564228, tv_nsec = 817944387}, st_mtim = {tv_sec = 1490749503, tv_nsec = 811780252}, st_ctim = {tv_sec = 1490749503, tv_nsec = 811780252}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" (gdb) ``` #### Log Messages  ``` Mar 29 09:02:14 sp2 proxy[19254]: NOTICE: <script>: New request on proxy - M=ACK R=sip:Y.Y.Y.Y:5080;prxroute=1 F=sip:anumber@sipwise.hello.local:5060 T=sip:bnumber@sipwise.hello.local:5060 IP=X.X.X.X:5060 (10.64.0.14:5060) ID=bf8e1a679ee462a4 UA='EPC2425-110715' Mar 29 09:03:57 sp2 proxy[19255]: NOTICE: <script>: New request on proxy - M=BYE R=sip:Y.Y.Y.Y:5080;prxroute=1 F=sip:anumber@sipwise.hello.local:5060 T=sip:bnumber@sipwise.hello.local:5060 IP=X.X.X.X:5060 (10.64.0.14:5060) ID=bf8e1a679ee462a4 UA='EPC2425-110715' Mar 29 09:03:57 sp2 proxy[19257]: NOTICE: <script>: New request on proxy - M=BYE R=sip:Y.Y.Y.Y:5080;prxroute=1 F=sip:anumber@sipwise.hello.local:5060 T=sip:bnumber@sipwise.hello.local:5060 IP=X.X.X.X:5060 (10.64.0.14:5060) ID=bf8e1a679ee462a4 UA='EPC2425-110715' Mar 29 09:03:57 sp2 proxy[19257]: NOTICE: <script>: NAT-Reply - S=200 - OK M=BYE IP=X.X.X.X:5060 (Y.Y.Y.Y:5080) ID=bf8e1a679ee462a4 UA='<null>' ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 with gcc 4.9.2 ``` This is ``NGCP`` based on 4.4.4 with tm deep cloning edb9df8ace8ff74 backported -- 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/1059

3 18

[kamailio/kamailio] Segmentation fault on udp_rcv_loop (#1120)
by Pepelux 15 May '17

15 May '17

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` # gdb kamailio /tmp/core GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio...Reading symbols from /usr/lib/debug/.build-id/4e/fae9c9a848e19a554209666ff42a678720280e.debug...done. done. [New LWP 32260] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.'. Program terminated with signal SIGSEGV, Segmentation fault. #0 subst_run (se=0x7f8b8469eb50, input=0x4 <error: Cannot access memory at #address 0x4>, msg=0x7f8b8475de28, count=0x1) at re.c:453 453 re.c: No such file or directory. (gdb) bt full #0 subst_run (se=0x7f8b8469eb50, input=0x4 <error: Cannot access memory at #address 0x4>, msg=0x7f8b8475de28, count=0x1) at re.c:453 head = 0x7f8b847606a0 r = -2073697496 eflags = 2203912 __FUNCTION__ = "subst_run" #1 0x0000000000576037 in subst_str (input=0x7f8b402c5d00 <tr_txt_buf> "\"asterisk\"", msg=0x4, se=0x6acf73, count=0x7fff95b4590c) at re.c:503 res = 0x7f8b8475de28 dest = 0x7f8b847606a0 "" __FUNCTION__ = "subst_str" #2 0x00007f8b400b65d2 in tr_txt_eval_re (msg=0x7f8b8475de28, tp=0x7f8b8469ea60, subtype=8, val=0x7fff95b459e0) at txt_var.c:87 se = 0x7f8b8469eb50 nmatches = 32651 result = 0x7f8b8475de28 tr_txt_buf = "\"asterisk\"\000\000P201\000\"", '\000' <repeats 2029 times> v = {rs = {s = 0x7fff95b45a20 "", len = 1856138293}, ri = -2073783984, flags = 32651} __FUNCTION__ = "tr_txt_eval_re" #3 0x0000000000586a50 in tr_exec (msg=0x7f8b8475de28, t=0x7f8b8469dfc0, v=0x7fff95b459e0) at pvapi.c:1681 r = -2072639840 #4 0x000000000044e6a9 in lval_pvar_assign (lv=<optimized out>, rv=<optimized out>, msg=<optimized out>, h=<optimized out>) at lvalue.c:334 r_avp = 0x7f8b847606a0 destroy_pval = -1783339264 pvar = 0x7f8b847606b8 pval = {rs = { s = 0x9ab890 <buf+144> "\"asterisk\" <sip:asterisk@X.X.X.6:5080>;tag=as785f9e00\r\nTo: <sip:zs_pbx40_trunk@XXXXXXXXXX.com>\r\nContact: <sip:asterisk@X.X.X.6:5080>\r\nCall-ID: 7feae50257e62b06765f0a4c4d60650a@185"..., len = 10}, ri = 0, flags = 4} avp_val = {n = 1, s = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -2058051944}, re = 0x1} v = -2072639840 #5 lval_assign (h=0x7fff95b46700, msg=0x7f8b8475de28, lv=0x7f8b8469df50, rve=0x7f8b8469f6e0) at lvalue.c:399 rv = 0x7f8b8469f6e8 ret = -1783339264 __FUNCTION__ = "lval_assign" #6 0x00000000005414d3 in do_action (h=0x7fff95b46700, a=0x7f8b8469ec28, msg=0x7f8b8475de28) at action.c:1430 ret = -5 v = 1 dst = {send_sock = 0x7fff95b48bd0, to = {s = {sa_family = 4346, sa_data = "O\205\213\177\000\000\001\000\000\000\001\000\000"}, sin = {sin_family = 4346, sin_port = 34127, sin_addr = {s_addr = 32651}, sin_zero = "\001\000\000\000\001\000\000"}, sin6 = {sin6_family = 4346, sin6_port = 34127, sin6_flowinfo = 32651, sin6_addr = {__in6_u = { __u6_addr8 = "\001\000\000\000\001\000\000\000\340\370\220\002\000\000\000", __u6_addr16 = {1, 0, 1, 0, 63712, 656, 0, 0}, __u6_addr32 = {1, 1, 43055328, 0}}}, sin6_scope_id = 110}}, id = 119, proto = 0 '\000', send_flags = {f = 79 'O', blst_imask = 198 '\306'}} end = 0x7fff95b46700 "\002" uri = {user = {s = 0x7fff95b45c90 "\300\270\232", len = 1130964784}, passwd = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 5615623}, host = {s = 0x0, len = 667307776}, port = {s = 0x0, len = 1036086182}, params = {s = 0x7fff95b45c80 "4\271\232", len = -1783341956}, sip_params = {s = 0x7fff00000000 <error: Cannot access memory at address 0x7fff00000000>, len = -1783342108}, headers = {s = 0x0, len = -1783341952}, port_no = 48, proto = 0, type = ERROR_URI_T, flags = (unknown: 10140004), transport = {s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 1}, ttl = {s = 0x0, len = 5615623}, user_param = {s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 667307776}, maddr = { s = 0x1ac00f <error: Cannot access memory at address 0x1ac00f>, len = -1783342012}, method = {s = 0xe5 <error: Cannot access memory at address 0xe5>, len = 0}, lr = {s = 0x7f8b8475de28 "\235\030", len = -1783341980}, r2 = {s = 0x0, len = 1138816376}, gr = {s = 0x7f8b8475de28 "\235\030", len = -1783341584}, transport_val = {s = 0x0, len = -1783341072}, ttl_val = { s = 0x7f8b43e0f588 "0@\236C\213\177", len = 5615623}, user_param_val = {s = 0x7fff95b46c50 "(\336u\204\213\177", len = 667307776}, maddr_val = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 1036492449}, method_val = { s = 0x9ab934 <buf+308> "7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-W"..., len = 50}, lr_val = { s = 0x9ab8c0 <buf+192> "as785f9e00\r\nTo: <sip:zs_pbx40_trunk@XXXXXXXXXX.com>\r\nContact: <sip:asterisk@X.X.X.6:5080>\r\nCall-ID: 7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: as"..., len = 10}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 667307776}} ---Type <return> to continue, or q <return> to quit--- next_hop = {user = {s = 0x7fff95b45f50 "", len = -2073440000}, passwd = {s = 0x7f8b8475de28 "\235\030", len = -1783341584}, host = {s = 0x0, len = -1783341072}, port = { s = 0x7f8b43e0f588 "0@\236C\213\177", len = 1036498757}, params = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 0}, sip_params = { s = 0x1 <error: Cannot access memory at address 0x1>, len = 42994560}, headers = {s = 0xe <error: Cannot access memory at address 0xe>, len = -2073418280}, port_no = 2320, proto = 33870, type = 32651, flags = URI_USER_NORMALIZE, transport = {s = 0x200000001 <error: Cannot access memory at address 0x200000001>, len = 667307776}, ttl = {s = 0x2900a70 "", len = -2073440024}, user_param = {s = 0x7fff95b45df0 "\020_\264\225\377\177", len = -2072650200}, maddr = {s = 0x7fff95b46700 "\002", len = -1783341072}, method = {s = 0x0, len = -2072650200}, lr = { s = 0x7fff95b45f10 "", len = -2073435824}, r2 = {s = 0x7fff95b46700 "\002", len = -1783341072}, gr = {s = 0x0, len = 1115878885}, transport_val = {s = 0x0, len = -2072641703}, ttl_val = {s = 0x0, len = 5717688}, user_param_val = {s = 0x7f8b84760cb0 "sip:s@185.99.186.218:5060", len = -2073435848}, maddr_val = {s = 0x7fff95b45f10 "", len = -2072650200}, method_val = { s = 0x7fff95b46700 "\002", len = -1783341072}, lr_val = {s = 0x0, len = 5795166}, r2_val = {s = 0x7f8b8469efd0 "!", len = -2073435864}, gr_val = {s = 0x7f8b8475de28 "\235\030", len = -1783339264}} u = 0x7fff95b46700 flags = 0 st = {flags = 2511626064, id = 32767, name = {n = -2073440000, s = {s = 0x7f8b8469d100 "", len = -2072650200}, re = 0x7f8b8469d100}, avp = 0x7fff95b45df0} sct = 0x7fff95b46700 sjt = 0x7fff95b46700 mct = 0x0 rv = 0x7f8b854f159d <build_trtable+2861> rv1 = 0x7f8b8475de28 c1 = {cache_type = RV_CACHE_EMPTY, val_type = RV_INT, c = {avp_val = {n = -1783341788, s = {s = 0x7fff95b45d24 "", len = -1783337904}, re = 0x7fff95b45d24}, pval = {rs = {s = 0x7fff95b45d24 "", len = -1783337904}, ri = -1783342236, flags = 32767}}, i2s = "\370", '\000' <repeats 15 times>, "D'iC\213\177"} s = {s = 0x29214a0 "\300\v\222\002", len = 43127968} srevp = {0x7f8b8469ec28, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #7 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = -1783339264 mod = 0x7f8b8469ec28 __FUNCTION__ = "run_actions" #8 0x0000000000542218 in do_action (h=0x7fff95b46700, a=0x7f8b846a0630, msg=0x7f8b8475de28) at action.c:1049 ret = 1 v = 1 dst = {send_sock = 0x920610, to = {s = {sa_family = 20224, sa_data = "\306'\320xD\247l`\264\225\377\177\000"}, sin = {sin_family = 20224, sin_port = 10182, sin_addr = {s_addr = 2806282448}, sin_zero = "l`\264\225\377\177\000"}, sin6 = {sin6_family = 20224, sin6_port = 10182, sin6_flowinfo = 2806282448, sin6_addr = {__in6_u = { __u6_addr8 = "l`\264\225\377\177\000\000hnk\204\213\177\000", __u6_addr16 = {24684, 38324, 32767, 0, 28264, 33899, 32651, 0}, __u6_addr32 = {2511626348, 32767, 2221633128, 32651}}}, sin6_scope_id = 2511627712}}, id = 32767, proto = 40 '(', send_flags = {f = 222 '\336', blst_imask = 117 'u'}} end = 0x7f8b8469efd0 "!" uri = {user = {s = 0x7fff95b461e0 "`\271\232", len = 1130860144}, passwd = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 5615623}, host = {s = 0x0, len = 667307776}, port = {s = 0x0, len = 1036086182}, params = {s = 0x7fff95b461d0 "๚", len = -1783340596}, sip_params = {s = 0x7f8b846b6e68 "\233\005", len = -2072650200}, headers = {s = 0x7fff95b463c4 "\377\177", len = -1783340592}, port_no = 71, proto = 0, type = ERROR_URI_T, flags = (unknown: 10140160), transport = {s = 0x194f15 <error: Cannot access memory at address 0x194f15>, len = 66}, ttl = {s = 0x0, len = 5615623}, user_param = {s = 0x194f15 <error: Cannot access memory at address 0x194f15>, len = 667307776}, maddr = {s = 0x1fa2da <error: Cannot access memory at address 0x1fa2da>, len = -1783340652}, method = {s = 0xee <error: Cannot access memory at address 0xee>, len = 10140069}, lr = {s = 0x7f8b8475de28 "\235\030", len = -1783340620}, r2 = {s = 0x0, len = 1134258072}, gr = {s = 0x7f8b8475de28 "\235\030", len = -1783340224}, transport_val = {s = 0x0, len = -1783339712}, ttl_val = {s = 0x7f8b439b67a8 "\300g\233C\213\177", len = 5615623}, user_param_val = { s = 0x7fff95b46c50 "(\336u\204\213\177", len = 667307776}, maddr_val = {s = 0x0, len = 1036492449}, method_val = { s = 0x9ab9e0 <buf+480> "ent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@X.X.X.6:5080\r\nVoice-Message: 0/0 (0/0)\r\n", len = 35}, lr_val = { s = 0x9ab960 <buf+352> "6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@18"..., len = 10}, r2_val = { s = 0x9ab9a5 <buf+421> "ary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@X.X.X.6:5080\r\nVoice-Message: ---Type <return> to continue, or q <return> to quit--- 0/0 (0/0)\r\n", len = 0}, gr_val = {s = 0x7fff00000000 <error: Cannot access memory at address 0x7fff00000000>, len = -1783340460}} next_hop = {user = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -2075194792}, passwd = {s = 0x7f8b8463c4a0 "\330\305c\204\213\177", len = 667307776}, host = { s = 0x7fff95b463c8 "(\336u\204\213\177", len = -2074998176}, port = {s = 0x7fff95b462c0 "|", len = -2072650200}, params = {s = 0x7fff95b463c8 "(\336u\204\213\177", len = 0}, sip_params = { s = 0x676e70 <select_cfg_var> "AWAVAUATUSH\211\363H\203\354XdH\213\004%(", len = 5636821}, headers = {s = 0x7f8b0000003d <error: Cannot access memory at address 0x7f8b0000003d>, len = 1008}, port_no = 15, proto = 0, type = ERROR_URI_T, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 60), transport = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 92}, ttl = { s = 0x0, len = 0}, user_param = {s = 0x770000006e <error: Cannot access memory at address 0x770000006e>, len = 0}, maddr = {s = 0x7c <error: Cannot access memory at address 0x7c>, len = 2698888}, method = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = -2054728160}, lr = {s = 0x3c8 <error: Cannot access memory at address 0x3c8>, len = -1783338992}, r2 = { s = 0x7fff95b46810 "\305\fv\204\213\177", len = 0}, gr = { s = 0x43b2fc <grp_hash_lookup+1420> "1҉\307A\211\302\301\357\vA\301\352\rA\001\372A\001\302\301\350\027D\001\320A\367\361Lc\312I\301\341\004O\215\064\bI\213\036I9\336u\f\353Jf\220H\213\033I9\336t@D;k\030u\362H\213{\020L\211\342H\211\356\350c\265\375\377\205\300u\337H\203\304\020H\215C([]A\\A]A^\303D\017\276\021D\211\326\301\356\003A1\362\353\210\017\037\200", len = -2058043360}, transport_val = { s = 0x6aea19 <__FUNCTION__.8262> "rval_new_empty", len = 43099520}, ttl_val = {s = 0x291a590 "\001", len = -2057746175}, user_param_val = { s = 0x43b2fc <grp_hash_lookup+1420> "1҉\307A\211\302\301\357\vA\301\352\rA\001\372A\001\302\301\350\027D\001\320A\367\361Lc\312I\301\341\004O\215\064\bI\213\036I9\336u\f\353Jf\220H\213\033I9\336t@D;k\030u\362H\213{\020L\211\342H\211\356\350c\265\375\377\205\300u\337H\203\304\020H\215C([]A\\A]A^\303D\017\276\021D\211\326\301\356\003A1\362\353\210\017\037\200", len = 43099536}, maddr_val = { s = 0x7fff95b46490 "", len = 4}, method_val = {s = 0x7fff95b46660 "\260\177\355C\213\177", len = -2057714242}, lr_val = {s = 0x7f8b846b8ce8 "\a", len = -2072650200}, r2_val = { s = 0x7fff95b46e30 "", len = -1783338768}, gr_val = {s = 0x291a510 "\001", len = -1783339456}} u = 0x7f8b8469efd0 flags = 2 st = {flags = 1, id = 0, name = {n = -2075194792, s = {s = 0x7f8b844f0a58 "\n", len = -2073836384}, re = 0x7f8b844f0a58}, avp = 0xa74478d027c64f00} sct = 0x7f8b8469efd0 sjt = 0x7f8b8469efd0 mct = 0x0 rv = 0x7fff95b46070 rv1 = 0x7f8b8475de28 c1 = {cache_type = 2511627712, val_type = 32767, c = {avp_val = {n = -2072650200, s = {s = 0x7f8b8475de28 "\235\030", len = 0}, re = -0x7f8b8475de28}, pval = {rs = {s = 0x7f8b8475de28 "\235\030", len = 0}, ri = 5512432, flags = 0}}, i2s = "\020\245\221\002", '\000' <repeats 12 times>, "\204\216gC\213\177"} s = {s = 0x291a400 "xV\207\205\213\177", len = 0} srevp = {0x7f8b846a0630, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #9 0x00000000005407b5 in run_actions (h=0x6acf73, h@entry=0x7fff95b46700, a=0x4, a@entry=0x7f8b8469d9d8, msg=0x8, msg@entry=0x7f8b8475de28) at #action.c:1549 ret = 1 mod = 0x7f8b846a0630 __FUNCTION__ = "run_actions" #10 0x000000000054d225 in run_top_route (a=0x7f8b8469d9d8, msg=0x7f8b8475de28, c=<optimized out>) at action.c:1635 ctx = {rec_lev = 2203832, run_flags = 0, last_retcode = 2695376, jmp_env = {{__jmpbuf = {2702408, 8, 237, -6393852735543423232, 2695376, 6245668, 2203768, 6999923}, __mask_was_saved = 7467126, __saved_mask = {__val = {8, 239, 12052891338166128384, 2695312, 6245668, 9569808, 140236102870397, 140236102900704, 140237199498792, 140735705016048, 35, 140237199498792, 140236116819368, 140236116819984, 6597488, 43099408}}}}} p = <optimized out> ret = <optimized out> sfbk = 0 #11 0x00007f8b4315b8e6 in prepare_new_uac (t=0x7f8b43ed7da8, i_req=0x7f8b8475de28, branch=-2075185312, uri=0x7fff95b466a0, path=0x21a108, #next_hop=0x7f8b847606b8, fsocket=0x7f8b844f2f60, snd_flags=..., fproto=0, flags=2, instance=0x7f8b8475e468, ruid=0x7f8b8475e480, location_ua=0x7f8b8475e490) at t_fwd.c:343 shbuf = 0x7fff95b466a0 "\260\fv\204\213\177" parsed_uri_bak = {user = {s = 0x7f8b84760cb4 "s@185.99.186.218:5060", len = 1}, passwd = {s = 0x0, len = 0}, host = {s = 0x7f8b84760cb6 "185.99.186.218:5060", len = 14}, port = { s = 0x7f8b84760cc5 "5060", len = 4}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 5060, proto = 0, type = SIP_URI_T, flags = (unknown: 0), ---Type <return> to continue, or q <return> to quit--- transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} ret = -2072649560 len = 0 msg_uri_bak = {s = 0x7f8b84760cb0 "sip:s@185.99.186.218:5060", len = 25} dst_uri_bak = {s = 0x0, len = 0} dst_uri_backed_up = -2075185312 path_bak = {s = 0x0, len = 0} instance_bak = {s = 0x0, len = 0} ruid_bak = {s = 0x7f8b84760640 "uloc-590b3d48-7288-95060 ", len = 20} ua_bak = {s = 0x7f8b84760d18 "Asterisk PBX SVN-branch-1.8-r434337slsda8", len = 35} force_send_socket_bak = 0x7f8b844f2f60 dst = 0x7f8b43ed8010 ctx = {rec_lev = 2, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {140735705016064, 1818402078992133173, 140237198711256, 140237199498792, 140236116819368, 140236116819984, -1818495034028692427, 1818402731650608181}, __mask_was_saved -= 0, __saved_mask = {__val = {140235982654803, -140735705017568, 1, 140735705016736, 140237198820624, -140237198822632, 10132608, 3, 6158328, 140237198820112, 140236067782550, 16777216, 140735705016324, 2206096, 140236067782550, 16777216}}}}} __FUNCTION__ = "prepare_new_uac" #12 0x00007f8b4315de45 in add_uac (t=0x7f8b43ed7da8, request=0x7f8b8475de28, uri=0x8, next_hop=0x1, path=0x21a108, proxy=0x0, fsocket=0x7f8b844f2f60, #snd_flags=..., proto=0, flags=-2072639840, instance=0x7f8b8475e468, ruid=0x7f8b8475e480, location_ua=0x7f8b8475e490) at t_fwd.c:788 branch = 0 __FUNCTION__ = "add_uac" #13 0x00007f8b4316672a in t_forward_nonack (t=0x7f8b43ed7da8, p_msg=0x7f8b8475de28, proxy=0x8, proto=1) at t_fwd.c:1667 current_uri = {s = 0x0, len = -2072650200} q = 0 t_invite = 0x2 success_branch = -2072648560 lock_replies = 2 dst_uri = {s = 0x0, len = 10485676} path = {s = 0x7f8b433a71f0 <tm_cfg> "0OkC\213\177", len = 1127903728} instance = {s = 0x7f8b433baf30 <user_rt_t1_timeout_ms> "", len = 1124934652} ruid = {s = 0x7fff95b470e0 "", len = 1125417061} location_ua = {s = 0x7f8b845cbab8 "\207\003", len = 5512432} si = 0xa74478d027c64f00 backup_bflags = 0 bflags = 0 __FUNCTION__ = "t_forward_nonack" #14 0x00007f8b43137ba3 in t_relay_to (p_msg=0x7f8b8475de28, proxy=0x0, proto=0, replicate=0) at t_funcs.c:328 ret = 1 t = 0x7f8b43ed7da8 dst = {send_sock = 0x1ac00f, to = {s = {sa_family = 27748, sa_data = "\264\225\377\177\000\000\000\000\000\000\000\000\000"}, sin = {sin_family = 27748, sin_port = 38324, sin_addr = {s_addr = 32767}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 27748, sin6_port = 38324, sin6_flowinfo = 32767, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = { 0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 2222317096}}, id = 32651, proto = -124 '\204', send_flags = {f = 108 'l', blst_imask = 180 '\264'}} host = {s = 0x7f8b845cbab8 "\207\003", len = -2072650200} __FUNCTION__ = "t_relay_to" #15 0x0000000000541cf0 in do_action (h=0x7fff95b47360, a=0x7f8b845cd4c8, msg=0x7f8b8475de28) at action.c:1060 ret = -5 v = 0 dst = {send_sock = 0x1800000000, to = {s = {sa_family = 28388, sa_data = "\264\225\377\177\000\000\000\000\000\000\000\000\000"}, sin = {sin_family = 28388, sin_port = 38324, sin_addr = { s_addr = 32767}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 28388, sin6_port = 38324, sin6_flowinfo = 32767, sin6_addr = {__in6_u = { __u6_addr8 = "\000\000\000\000\000\000\000\000\240\\\215C\213\177\000", __u6_addr16 = {0, 0, 0, 0, 23712, 17293, 32651, 0}, __u6_addr32 = {0, 0, 1133337760, 32651}}}, sin6_scope_id = 94}}, ---Type <return> to continue, or q <return> to quit--- id = 0, proto = 21 '\025', send_flags = {f = 70 'F', blst_imask = 110 'n'}} end = 0x7fff95b47360 "\001" uri = {user = {s = 0x7f8b844f36b0 "\377\377\377\377", len = 6999923}, passwd = {s = 0x6e5602 <__FUNCTION__.4797> "xavp_new_value", len = 667307776}, host = { s = 0x50 <error: Cannot access memory at address 0x50>, len = -2074236072}, port = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, params = {s = 0x7fff95b494f0 "\006", len = -1783335964}, sip_params = {s = 0x0, len = 1128019136}, headers = {s = 0x7f8b433bb000 "", len = 70}, port_no = 17941, proto = 110, type = ERROR_URI_T, flags = (unknown: 667307776), transport = { s = 0x5e <error: Cannot access memory at address 0x5e>, len = -2074296968}, ttl = {s = 0x7fff95b494f0 "\006", len = 1125128152}, user_param = {s = 0x7f8b845cbd78 "\207\003", len = 1125415371}, maddr = {s = 0x0, len = 5512432}, method = {s = 0x0, len = 5506997}, lr = {s = 0x7fff95b470e0 "", len = 1132494968}, r2 = {s = 0x7f8b845cbab8 "\207\003", len = -2072650200}, gr = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 1132494976}, transport_val = {s = 0x7f8b43808078 "\023TP|", len = 0}, ttl_val = { s = 0x7f8b00000000 <error: Cannot access memory at address 0x7f8b00000000>, len = 5581401}, user_param_val = {s = 0x7f8b437fb3b8 "H\265\177C\213\177", len = 35}, maddr_val = { s = 0x7f8b845cbd78 "\207\003", len = -2072650200}, method_val = {s = 0x7f8b438d5ce8 "oV", <incomplete sequence \370>, len = 667307776}, lr_val = {s = 0x0, len = 1085918576}, r2_val = { s = 0x7f8b8475de28 "\235\030", len = 1131035264}, gr_val = {s = 0x7f8b8475de28 "\235\030", len = 1088236936}} next_hop = {user = {s = 0x7f8b40b9cc40 <ul> "\001", len = 1083664351}, passwd = {s = 0x7f8b436a3a80 "", len = -1783336688}, host = {s = 0x7f8b40b9cc40 <ul> "\001", len = 0}, port = { s = 0x7fff95b494f0 "\006", len = -2072650200}, params = {s = 0x7fff95b494f0 "\006", len = -1783335964}, sip_params = {s = 0x0, len = 5558663}, headers = {s = 0x0, len = -1}, port_no = 28896, proto = 38324, type = 32767, flags = (URI_USER_NORMALIZE | unknown: 1355312180), transport = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, ttl = {s = 0x7fff95b473e4 "\377\177", len = 0}, user_param = {s = 0xe6c36866a6886c35 <error: Cannot access memory at address 0xe6c36866a6886c35>, len = 1856138293}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = { s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 667307776}, r2 = { s = 0x9ab80b <buf+11> "zs_pbx40_trunk(a)XXXXXXXXXX.com SIP/2.0\r\nVia: SIP/2.0/UDP X.X.X.6:5080;branch=z9hG4bK542e0106\r\nMax-Forwards: 69\r\nFrom: \"asterisk\" <sip:asterisk@X.X.X.6:5080>;tag=as785f9e00\r\nTo: <si"..., len = 14}, gr = {s = 0x0, len = 0}, transport_val = { s = 0x9ab81a <buf+26> "XXXXXXXXXX.com SIP/2.0\r\nVia: SIP/2.0/UDP X.X.X.6:5080;branch=z9hG4bK542e0106\r\nMax-Forwards: 69\r\nFrom: \"asterisk\" <sip:asterisk@X.X.X.6:5080>;tag=as785f9e00\r\nTo: <sip:zs_pbx40_trun"..., len = 25}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 667307776}, method_val = {s = 0x0, len = -1783335964}, lr_val = {s = 0x7fff95b494f0 "\006", len = 4329872}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} u = 0x7fff95b47360 flags = 0 st = {flags = 1085918272, id = 32651, name = {n = 1083664351, s = {s = 0x7f8b409767df <lookup_helper+2607> "D\211\360H\213\214$\330\003", len = 1131035264}, re = 0x7f8b409767df <lookup_helper+2607>}, avp = 0x7fff95b47110} sct = 0x7fff95b47360 sjt = 0x7fff95b47360 mct = 0x0 rv = 0x426f1c <rval_expr_eval_int+684> rv1 = 0x7f8b8475de28 c1 = {cache_type = 1127985152, val_type = 32651, c = {avp_val = {n = 72, s = {s = 0x48 <error: Cannot access memory at address 0x48>, len = 362}, re = 0x48}, pval = {rs = { s = 0x48 <error: Cannot access memory at address 0x48>, len = 362}, ri = 5615623, flags = 0}}, i2s = "\000\000\000\000\000\000\000\000\000O\306'\320xD\247\000\000\000\000\000"} s = {s = 0x0, len = 1005473107} srevp = {0x7f8b845cd4c8, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #16 0x00000000005407b5 in run_actions (h=0x6acf73, h@entry=0x7fff95b47360, a=0x4, msg=0x8) at action.c:1549 ret = -1783327504 mod = 0x7f8b845cd4c8 __FUNCTION__ = "run_actions" #17 0x000000000054d187 in run_actions_safe (h=0x7fff95b494f0, a=<optimized out>, msg=<optimized out>) at action.c:1614 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {140735705019232, -1818495031581316043, 140237197857680, 140237199498792, 140237197860160, 0, -1818495034588632011, 1818402731650608181}, __mask_was_saved = 0, __saved_mask = {__val = {12052891338166128384, 140237197857400, 140235982654803, 140735705027824, 4294967291, 140735705027824, 140237199498792, 0, 5506997, 140735705027824, 25774158030, 140237197852024, 12052891338166128384, 30064771072, 140237197861968, 140735705027824}}}}} ret = <optimized out> ---Type <return> to continue, or q <return> to quit--- ign_on_break = 0 #18 0x000000000044e4fd in lval_pvar_assign (lv=<optimized out>, rv=<optimized out>, msg=<optimized out>, h=<optimized out>) at lvalue.c:282 r_avp = 0x7f8b847606a0 destroy_pval = -1783327504 pvar = 0x7f8b847606b8 pval = {rs = {s = 0x0, len = 0}, ri = 0, flags = 24} avp_val = {n = -1783327504, s = {s = 0x7fff95b494f0 "\006", len = -2072650200}, re = 0x7fff95b494f0} v = -2072639840 #19 lval_assign (h=0x7fff95b494f0, msg=0x7f8b8475de28, lv=0x7f8b845cd390, rve=0x7f8b845cdd40) at lvalue.c:399 rv = 0x7f8b845cdd48 ret = -1783327504 __FUNCTION__ = "lval_assign" #20 0x00000000005414d3 in do_action (h=0x7fff95b494f0, a=0x7f8b845ce450, msg=0x7f8b8475de28) at action.c:1430 ret = -5 v = 1 dst = {send_sock = 0x3a706973, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\000\000\000\000\000\000\000\000\330\023\000\000\036\000\000", __u6_addr16 = {0, 0, 0, 0, 5080, 0, 30, 0}, __u6_addr32 = {0, 0, 5080, 30}}}, sin6_scope_id = 10139691}}, id = 0, proto = -88 '\250', send_flags = {f = 232 '\350', blst_imask = 117 'u'}} end = 0x7fff95b494f0 "\006" uri = {user = {s = 0x7fff95b494f0 "\006", len = -2072650200}, passwd = {s = 0x7fff95b494f0 "\006", len = -1783334604}, host = {s = 0x0, len = 5558663}, port = {s = 0x0, len = 1}, params = { s = 0x7fff95b47630 "", len = 1355312181}, sip_params = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, headers = {s = 0x7fff95b47934 "\377\177", len = 0}, port_no = 27701, proto = 37736, type = 3871565926, flags = (URI_USER_NORMALIZE | unknown: 1856138292), transport = {s = 0x7f8b00000000 <error: Cannot access memory at address 0x7f8b00000000>, len = 944}, ttl = { s = 0x19 <error: Cannot access memory at address 0x19>, len = -2072650200}, user_param = {s = 0x7fff95b494f0 "\006", len = -1783333744}, maddr = {s = 0x0, len = 4326528}, method = { s = 0x7fff95b476e0 "\206\271\232", len = 4326591}, lr = {s = 0x7f8b847637e8 "\002", len = 4339131}, r2 = { s = 0x9ab986 <buf+390> "ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@X.X.X.6:5080\r\nVoice-Message: 0/0 (0"..., len = 10}, gr = {s = 0x0, len = 5795166}, transport_val = {s = 0x7fff95b47934 "\377\177", len = 667307776}, ttl_val = {s = 0x7f8b8475de28 "\235\030", len = -1783334604}, user_param_val = {s = 0x7fff95b494f0 "\006", len = 4329872}, maddr_val = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14080880}, method_val = { s = 0x21a478 <error: Cannot access memory at address 0x21a478>, len = 2696336}, lr_val = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 8}, r2_val = { s = 0xf2 <error: Cannot access memory at address 0xf2>, len = 667307776}, gr_val = {s = 0x292490 <error: Cannot access memory at address 0x292490>, len = 667307776}} next_hop = {user = {s = 0x0, len = -2073959688}, passwd = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2072650200}, host = {s = 0x7fff95b494f0 "\006", len = -1783334604}, port = {s = 0x0, len = 4353820}, params = {s = 0xe6c3686695c86c35 <error: Cannot access memory at address 0xe6c3686695c86c35>, len = 1856138293}, sip_params = {s = 0x0, len = 944}, headers = { s = 0x19 <error: Cannot access memory at address 0x19>, len = -2072650200}, port_no = 38128, proto = 38324, type = 32767, flags = (unknown: 2511633888), transport = {s = 0x0, len = 4326528}, ttl = { s = 0x7fff95b47830 "\206\271\232", len = 4326591}, user_param = {s = 0x7f8b847637e8 "\002", len = 4339131}, maddr = { s = 0x9ab986 <buf+390> "ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@X.X.X.6:5080\r\nVoice-Message: 0/0 (0"..., len = 10}, method = {s = 0x0, len = 5795166}, lr = {s = 0x7fff95b47ab0 "", len = 667307776}, r2 = {s = 0x7f8b8475de28 "\235\030", len = -1783334732}, gr = { s = 0x7fff95b494f0 "\006", len = 1090600854}, transport_val = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14080880}, ttl_val = { s = 0x21a478 <error: Cannot access memory at address 0x21a478>, len = 2696336}, user_param_val = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 8}, maddr_val = { s = 0xf2 <error: Cannot access memory at address 0xf2>, len = 667307776}, method_val = {s = 0x292490 <error: Cannot access memory at address 0x292490>, len = 667307776}, lr_val = { s = 0x7f8b845cd390 "\002", len = -2073957880}, r2_val = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2072650200}, gr_val = {s = 0x7fff95b494f0 "\006", len = -1783334224}} u = 0x7fff95b494f0 flags = 32651 st = {flags = 0, id = 0, name = {n = -2073959688, s = {s = 0x7f8b8461e2f8 "\001", len = -1}, re = 0x7f8b8461e2f8}, avp = 0x7f8b8475de28} sct = 0x7fff95b494f0 sjt = 0x7fff95b494f0 mct = 0x0 rv = 0x7fff95b475f0 rv1 = 0x7f8b8475de28 c1 = {cache_type = 2222319856, val_type = 32651, c = {avp_val = {n = -1783335404, s = {s = 0x7fff95b47614 "\377\177", len = -1783333680}, -re = 0x7fff95b47614}, pval = {rs = { s = 0x7fff95b47614 "\377\177", len = -1783333680}, ri = 1090600854, flags = 32651}}, i2s = "\000\000\000\001\000\000\000\000p\333\326\000\000\000\000\000x\244!\000\000"} s = {s = 0x31 <error: Cannot access memory at address 0x31>, len = 10139691} ---Type <return> to continue, or q <return> to quit--- srevp = {0x7f8b845ce450, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #21 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = 1 mod = 0x7f8b845ce450 __FUNCTION__ = "run_actions" #22 0x00000000005423e0 in do_action (h=0x7fff95b494f0, a=0x7f8b84624210, msg=0x7f8b8475de28) at action.c:678 ret = -5 v = 0 dst = {send_sock = 0x0, to = {s = {sa_family = 16278, sa_data = "\001A\213\177\000\000\000\000\000\001\000\000\000"}, sin = {sin_family = 16278, sin_port = 16641, sin_addr = {s_addr = 32651}, sin_zero = "\000\000\000\001\000\000\000"}, sin6 = {sin6_family = 16278, sin6_port = 16641, sin6_flowinfo = 32651, sin6_addr = {__in6_u = { __u6_addr8 = "\000\000\000\001\000\000\000\000p\333\326\000\000\000\000", __u6_addr16 = {0, 256, 0, 0, 56176, 214, 0, 0}, __u6_addr32 = {16777216, 0, 14080880, 0}}}, sin6_scope_id = 2204792}}, id = 0, proto = 84 'T', send_flags = {f = 123 '{', blst_imask = 180 '\264'}} end = 0xa <error: Cannot access memory at address 0xa> uri = {user = {s = 0xf2 <error: Cannot access memory at address 0xf2>, len = 667307776}, passwd = {s = 0x2923b8 <error: Cannot access memory at address 0x2923b8>, len = 6245668}, host = { s = 0x28e886 <error: Cannot access memory at address 0x28e886>, len = 6999923}, port = {s = 0x6aea19 <__FUNCTION__.8262> "rval_new_empty", len = 1005473107}, params = { s = 0x400000000 <error: Cannot access memory at address 0x400000000>, len = -2074167456}, sip_params = {s = 0x0, len = -2072650200}, headers = {s = 0x7fff95b47c10 "\200Av\204\213\177", len = 4326400}, port_no = 46944, proto = 33886, type = 32651, flags = (unknown: 936), transport = {s = 0x19 <error: Cannot access memory at address 0x19>, len = -2072650200}, ttl = { s = 0x7fff95b494f0 "\006", len = -1783332400}, user_param = {s = 0x0, len = 4326528}, maddr = {s = 0x7fff95b47c20 "\206\271\232", len = 4326591}, method = {s = 0x7f8b84764180 "\002", len = 4339131}, lr = { s = 0x9ab986 <buf+390> "ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:asterisk@X.X.X.6:5080\r\nVoice-Message: 0/0 (0"..., len = 6}, r2 = {s = 0x0, len = 1090600854}, gr = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14080880}, transport_val = { s = 0x21a478 <error: Cannot access memory at address 0x21a478>, len = -1783333724}, ttl_val = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 1090600854}, user_param_val = { s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14080880}, maddr_val = {s = 0x21a478 <error: Cannot access memory at address 0x21a478>, len = 667307776}, method_val = { s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = -2074935496}, lr_val = {s = 0x7fff95b48220 "", len = -2072650200}, r2_val = {s = 0x7fff95b48220 "", len = -2072650200}, gr_val = {s = 0x0, len = 5512432}} next_hop = {user = {s = 0x6aea19 <__FUNCTION__.8262> "rval_new_empty", len = 667307776}, passwd = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2074159736}, host = { s = 0x0, len = -2072650200}, port = {s = 0x7fff95b47d60 "\350\067v\204\213\177", len = 4326400}, params = {s = 0x7f8b845ed588 "\002", len = 944}, sip_params = { s = 0x19 <error: Cannot access memory at address 0x19>, len = -2072650200}, headers = {s = 0x7fff95b494f0 "\006", len = -1783332064}, port_no = 65336, proto = 33874, type = 32651, flags = (unknown: 2222317096), transport = {s = 0x7fff95b47d70 "\360߈\002", len = 4326591}, ttl = {s = 0x7f8b847637e8 "\002", len = 4339131}, user_param = { s = 0x288dff0 "ast.zs PBX4.7-a8462c9596cb38db32", len = 10}, maddr = {s = 0x0, len = 0}, method = {s = 0x7fff95b48008 "", len = -1783332888}, lr = {s = 0x7fff95b48008 "", len = -1783333388}, r2 = { s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 1090600854}, gr = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14080880}, transport_val = { s = 0x21a478 <error: Cannot access memory at address 0x21a478>, len = 2696336}, ttl_val = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 8}, user_param_val = { s = 0xf2 <error: Cannot access memory at address 0xf2>, len = 667307776}, maddr_val = {s = 0x7fff95b47e98 "\265\aT", len = 47}, method_val = { s = 0x3a706973 <error: Cannot access memory at address 0x3a706973>, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 7}, gr_val = {s = 0x7f8b8475de28 "\235\030", len = 7}} u = 0xa flags = 32767 st = {flags = 7006745, id = 0, name = {n = 667307776, s = {s = 0xa74478d027c64f00 <error: Cannot access memory at address 0xa74478d027c64f00>, len = -1}, re = 0xa74478d027c64f00}, avp = 0x7f8b845ed588} sct = 0xa sjt = 0xa mct = 0x0 rv = 0x4204bf <rval_new_str+15> rv1 = 0x7f8b8475de28 c1 = {cache_type = 2702408, val_type = RV_NONE, c = {avp_val = {n = 1090600854, s = { ---Type <return> to continue, or q <return> to quit--- s = 0x7f8b41013f96 <pkg_proc_update_stats+70> "Hc\023H\213|$\b1\300L\213D$\020L\213L$\030L\213T$0H\215\064RH\301\346\004H\003\065\322\315 ", len = 16777216}, re = 0x7f8b41013f96 <pkg_proc_update_stats+70>}, pval = {rs = { s = 0x7f8b41013f96 <pkg_proc_update_stats+70> "Hc\023H\213|$\b1\300L\213D$\020L\213L$\030L\213T$0H\215\064RH\301\346\004H\003\065\322\315 ", len = 16777216}, ri = 14081096, flags = 0}}, i2s = "\240\243!\000\000\000\000\000\270#)\000\000\000\000\000H<)\000\000"} s = {s = 0x7f8b847637e8 "\002", len = 4339131} srevp = {0x7f8b84621018, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #23 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = 1 mod = 0x7f8b84621018 __FUNCTION__ = "run_actions" #24 0x00000000005423e0 in do_action (h=0x7fff95b494f0, a=0x7f8b84624210, msg=0x7f8b8475de28) at action.c:678 ret = -5 v = 0 dst = {send_sock = 0x7fff95b48620, to = {s = {sa_family = 56872, sa_data = "u\204\213\177\000\000 \206\264\225\377\177\000"}, sin = {sin_family = 56872, sin_port = 33909, sin_addr = {s_addr = 32651}, sin_zero = " \206\264\225\377\177\000"}, sin6 = {sin6_family = 56872, sin6_port = 33909, sin6_flowinfo = 32651, sin6_addr = {__in6_u = { __u6_addr8 = " \206\264\225\377\177\000\000(\336u\204\213\177\000", __u6_addr16 = {34336, 38324, 32767, 0, 56872, 33909, 32651, 0}, __u6_addr32 = {2511636000, 32767, 2222317096, 32651}}}, sin6_scope_id = 0}}, id = 0, proto = 7 '\a', send_flags = {f = 176 '\260', blst_imask = 85 'U'}} end = 0xf <error: Cannot access memory at address 0xf> uri = {user = {s = 0x7fff95b481f0 "\360\224\264\225\377\177", len = 1130964784}, passwd = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 5615623}, host = {s = 0x0, len = 667307776}, port = {s = 0x7f8b8475e5a0 "N\270\232", len = -2074935496}, params = {s = 0x7fff95b494f0 "\006", len = -5}, sip_params = {s = 0x7fff95b48220 "", len = -2072650200}, headers = {s = 0x0, len = 5506997}, port_no = 33312, proto = 38324, type = 32767, flags = (unknown: 10140004), transport = {s = 0x7f8b8452ff38 "\331\001", len = -2072650200}, ttl = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 5615623}, user_param = {s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 667307776}, maddr = { s = 0x1ac00f <error: Cannot access memory at address 0x1ac00f>, len = -1783332444}, method = {s = 0x7f8b845f4a70 "\001", len = 0}, lr = {s = 0x7f8b8475de28 "\235\030", len = -1783332412}, r2 = { s = 0x0, len = 1138816376}, gr = {s = 0x7f8b8475de28 "\235\030", len = -1783332016}, transport_val = {s = 0x0, len = -1783331504}, ttl_val = {s = 0x7f8b43e0f588 "0@\236C\213\177", len = 5615623}, user_param_val = {s = 0x0, len = 667307776}, maddr_val = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 667307776}, method_val = { s = 0x9ab934 <buf+308> "7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-W"..., len = 0}, lr_val = {s = 0x7fff95b494f0 "\006", len = -2072650200}, r2_val = {s = 0x7fff95b494f0 "\006", len = -1783331504}, gr_val = {s = 0x0, len = 5558663}} next_hop = {user = {s = 0x0, len = 1}, passwd = {s = 0x7fff95b48220 "", len = 1355312181}, host = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, port = {s = 0x7fff95b48550 "\001", len = 0}, params = {s = 0xe6c368677b086c35 <error: Cannot access memory at address 0xe6c368677b086c35>, len = 1856138293}, sip_params = {s = 0x0, len = 667307776}, headers = { s = 0xf1 <error: Cannot access memory at address 0xf1>, len = -2074129800}, port_no = 62232, proto = 33874, type = 32651, flags = (unknown: 2222317096), transport = {s = 0x0, len = 667307776}, ttl = {s = 0x0, len = -2074595816}, user_param = {s = 0x7fff95b48350 "", len = -2072650200}, maddr = {s = 0x7fff95b494f0 "\006", len = -1783331504}, method = {s = 0x0, len = 5795166}, lr = { s = 0x7fff95b48550 "\001", len = 667307776}, r2 = {s = 0x7f8b8475de28 "\235\030", len = -1783331504}, gr = {s = 0x7fff95b494f0 "\006", len = 4329872}, transport_val = {s = 0x0, len = -1783331980}, ttl_val = {s = 0xee <error: Cannot access memory at address 0xee>, len = -2072643184}, user_param_val = {s = 0xa49900 <_pkg_root> "\313\030p", len = -2074829352}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 667307776}, lr_val = {s = 0x7fff95b494f0 "\006", len = -2074934992}, r2_val = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2072650200}, gr_val = {s = 0x7fff95b494f0 "\006", len = -1783331504}} u = 0xf flags = 0 st = {flags = 0, id = 0, name = {n = 1, s = {s = 0x7f8b00000001 <error: Cannot access memory at address 0x7f8b00000001>, len = -1783332320}, re = 0x7f8b00000001}, avp = 0xe6c3686750c86c35} sct = 0xf sjt = 0xf mct = 0x0 rv = 0x0 rv1 = 0x7f8b8475de28 ---Type <return> to continue, or q <return> to quit--- c1 = {cache_type = 2220900400, val_type = 32651, c = {avp_val = {n = 667307776, s = {s = 0xa74478d027c64f00 <error: Cannot access memory at address 0xa74478d027c64f00>, len = -2072650200}, re = 0xa74478d027c64f00}, pval = {rs = {s = 0xa74478d027c64f00 <error: Cannot access memory at address 0xa74478d027c64f00>, len = -2072650200}, ri = -1783332668, flags = 32767}}, i2s = "\000\000\000\000\n", '\000' <repeats 11 times>, "D'iC\213\177"} s = {s = 0x66845f2c48 <error: Cannot access memory at address 0x66845f2c48>, len = -1783332764} srevp = {0x7f8b84530958, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #25 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = -1783327504 mod = 0x7f8b84530958 __FUNCTION__ = "run_actions" #26 0x0000000000542218 in do_action (h=0x7fff95b494f0, a=0x7f8b845317d0, msg=0x7f8b8475de28) at action.c:1049 ret = 1 v = 1 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000(\336u\204\213\177\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "(\336u\204\213\177\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "(\336u\204\213\177\000\000P\207\264\225\377\177\000", __u6_addr16 = {56872, 33909, 32651, 0, 34640, 38324, 32767, 0}, __u6_addr32 = {2222317096, 32651, 2511636304, 32767}}}, sin6_scope_id = 0}}, id = 0, proto = -64 '\300', send_flags = { f = 137 '\211', blst_imask = 180 '\264'}} end = 0x7f8b84530130 "\001" uri = {user = {s = 0x7fff95b48b70 "", len = -2072650200}, passwd = {s = 0x7fff95b48b70 "", len = -2072650200}, host = {s = 0x0, len = 667307776}, port = {s = 0x0, len = -2074938600}, params = { s = 0x7fff95b494f0 "\006", len = -5}, sip_params = {s = 0x7fff95b48770 "", len = -2072650200}, headers = {s = 0x0, len = 5506997}, port_no = 34672, proto = 38324, type = 32767, flags = (unknown: 10140004), transport = {s = 0x7f8b8452f318 "\327\001", len = -2072650200}, ttl = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 5615623}, user_param = { s = 0x7f8b8452a4c8 "\307\001", len = -2072650200}, maddr = {s = 0x1ac00f <error: Cannot access memory at address 0x1ac00f>, len = -1783331084}, method = {s = 0x7f8b8464f330 "\001", len = -1783331068}, lr = {s = 0x7f8b8475de28 "\235\030", len = -2074969528}, r2 = {s = 0x7f8b8475de28 "\235\030", len = -2072650200}, gr = {s = 0x7fff95b48cc0 "", len = -2072650200}, transport_val = {s = 0x0, len = 5615623}, ttl_val = {s = 0x7f8b43e0f588 "0@\236C\213\177", len = 667307776}, user_param_val = {s = 0x7fff95b494f0 "\006", len = 1081383208}, maddr_val = { s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 667307776}, method_val = { s = 0x9ab934 <buf+308> "7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-W"..., len = 0}, lr_val = {s = 0x7fff95b494f0 "\006", len = -2072650200}, r2_val = {s = 0x7fff95b494f0 "\006", len = -1783330144}, gr_val = {s = 0x0, len = 5558663}} next_hop = {user = {s = 0x0, len = -1}, passwd = {s = 0x7fff95b48770 "", len = 1355312181}, host = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, port = {s = 0x7fff95b48aa0 "", len = 0}, params = { s = 0xe6c3686775e86c35 <error: Cannot access memory at address 0xe6c3686775e86c35>, len = 1856138293}, sip_params = {s = 0x0, len = 50}, headers = { s = 0x9ab8c0 <buf+192> "as785f9e00\r\nTo: <sip:zs_pbx40_trunk@XXXXXXXXXX.com>\r\nContact: <sip:asterisk@X.X.X.6:5080>\r\nCall-ID: 7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: as"..., len = 10}, port_no = 56848, proto = 33874, type = 32651, flags = (unknown: 2222317096), transport = {s = 0x0, len = 667307776}, ttl = { s = 0x30 <error: Cannot access memory at address 0x30>, len = -2073886456}, user_param = {s = 0x7fff95b488a0 "", len = -2072650200}, maddr = {s = 0x7fff95b494f0 "\006", len = -1783330144}, method = {s = 0x0, len = 5795166}, lr = {s = 0x7fff95b48aa0 "", len = 667307776}, r2 = {s = 0x7f8b8475de28 "\235\030", len = -1783330144}, gr = {s = 0x7fff95b494f0 "\006", len = 4329872}, transport_val = {s = 0x0, len = 1138816376}, ttl_val = {s = 0x7f8b8451f028 "", len = 667307776}, user_param_val = {s = 0x7fff95b489e0 "\310\003", len = -2073657864}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 667307776}, lr_val = {s = 0x0, len = -2074938096}, r2_val = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2072650200}, gr_val = { s = 0x7fff95b494f0 "\006", len = -1783330144}} u = 0x7f8b84530130 flags = 0 st = {flags = 0, id = 0, name = {n = -1, s = {s = 0x7f8bffffffff <error: Cannot access memory at address 0x7f8bffffffff>, len = -1783330960}, re = 0x7f8bffffffff}, avp = 0xe6c3686750c86c35} sct = 0x7f8b84530130 sjt = 0x7f8b84530130 mct = 0x0 rv = 0x7fff95b485a4 rv1 = 0x7f8b8475de28 ---Type <return> to continue, or q <return> to quit--- c1 = {cache_type = RV_CACHE_EMPTY, val_type = RV_NONE, c = {avp_val = {n = 6779060, s = {s = 0x6770b4 <select_cfg_var+580> "\211E\bH\230ƀ\300¤", len = 0}, re = 0x6770b4 <select_cfg_var+580>}, pval = { rs = {s = 0x6770b4 <select_cfg_var+580> "\211E\bH\230ƀ\300¤", len = 0}, ri = -1783331308, flags = 32767}}, i2s = "\000\000\000\000\000\000\000\000\000O\306'\320xD\247D'iC\213\177"} s = {s = 0x0, len = 0} srevp = {0x7f8b845317d0, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #27 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = -1783327504 mod = 0x7f8b845317d0 __FUNCTION__ = "run_actions" #28 0x0000000000542218 in do_action (h=0x7fff95b494f0, a=0x7f8b84531900, msg=0x7f8b8475de28) at action.c:1049 ret = 1 v = 0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000O\302q\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "O\302q\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "O\302q\000\000\000\000\000\230\nO\205\213\177\000", __u6_addr16 = {49743, 113, 0, 0, 2712, 34127, 32651, 0}, __u6_addr32 = {7455311, 0, 2236549784, 32651}}}, sin6_scope_id = 720}}, id = 0, proto = -64 '\300', send_flags = {f = 90 'Z', blst_imask = 180 '\264'}} end = 0x7f8b8452f510 "\001" uri = {user = {s = 0x7fff95b48c90 "\360\224\264\225\377\177", len = 1130964784}, passwd = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 5615623}, host = {s = 0x0, len = 667307776}, port = {s = 0x0, len = -2074943984}, params = {s = 0x7fff95b494f0 "\006", len = -5}, sip_params = {s = 0x7fff95b48cc0 "", len = -2072650200}, headers = {s = 0x0, len = 5506997}, port_no = 36032, proto = 38324, type = 32767, flags = (unknown: 10140004), transport = {s = 0x7f8b8452de10 "\325\001", len = -2072650200}, ttl = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 5615623}, user_param = {s = 0x156673 <error: Cannot access memory at address 0x156673>, len = 667307776}, maddr = {s = 0x1ac00f <error: Cannot access memory at address 0x1ac00f>, len = -1783329724}, method = {s = 0x291a500 "", len = 0}, lr = {s = 0x7f8b8475de28 "\235\030", len = -1783329692}, r2 = {s = 0x0, len = 1138816376}, gr = {s = 0x7f8b8475de28 "\235\030", len = -1783329296}, transport_val = {s = 0x0, len = -1783328784}, ttl_val = {s = 0x7f8b43e0f588 "0@\236C\213\177", len = 5615623}, user_param_val = {s = 0x7fff95b494f0 "\006", len = 667307776}, maddr_val = {s = 0x91a600 <error: Cannot access memory at address 0x91a600>, len = 1036492449}, method_val = { s = 0x9ab934 <buf+308> "7feae50257e62b06765f0a4c4d60650a@X.X.X.6:5080\r\nCSeq: 102 NOTIFY\r\nUser-Agent: ast.zs PBX\r\nEvent: message-summary\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 97\r\n\r\nMessages-W"..., len = 0}, lr_val = {s = 0x7fff95b494f0 "\006", len = -2072650200}, r2_val = {s = 0x7fff95b494f0 "\006", len = -1783328784}, gr_val = {s = 0x0, len = 5558663}} next_hop = {user = {s = 0x0, len = -1}, passwd = {s = 0x7fff95b48cc0 "", len = 1355312181}, host = {s = 0x7f8b8475de28 "\235\030", len = -1783327504}, port = {s = 0x7fff95b48ff0 "", len = 0}, params = { s = 0xe6c368676e486c35 <error: Cannot access memory at address 0xe6c368676e486c35>, len = 1856138293}, sip_params = {s = 0x7f8b00000000 <error: Cannot access memory at address 0x7f8b00000000>, len = -2072648360}, headers = {s = 0x7f8b8475de28 "\235\030", len = 5615623}, port_no = 34800, proto = 33869, type = 32651, flags = URI_USER_NORMALIZE, transport = { s = 0x15ad0 <error: Cannot access memory at address 0x15ad0>, len = 667307776}, ttl = {s = 0x7f8b8475de28 "\235\030", len = -2074949176}, user_param = {s = 0x7fff95b48df0 "", len = -2072650200}, maddr = {s = 0x7fff95b494f0 "\006", len = -1783328784}, method = {s = 0x0, len = 5795166}, lr = {s = 0x7fff95b48ff0 "", len = 667307776}, r2 = {s = 0x7f8b8475de28 "\235\030", len = -1783328784}, gr = {s = 0x7fff95b494f0 "\006", len = 4329872}, transport_val = {s = 0x7f8b00000000 <error: Cannot access memory at address 0x7f8b00000000>, len = -2072648360}, ttl_val = { s = 0x7f8b8475de28 "\235\030", len = 5615623}, user_param_val = {s = 0x7f8b844f0b00 <incomplete sequence \350>, len = 667307776}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 667307776}, lr_val = {s = 0x0, len = -2074941200}, r2_val = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -2072650200}, gr_val = {s = 0x7fff95b494f0 "\006", len = -1783328784}} u = 0x7f8b8452f510 flags = 0 st = {flags = 0, id = 0, name = {n = -1, s = {s = 0x7f8bffffffff <error: Cannot access memory at address 0x7f8bffffffff>, len = -1783329600}, re = 0x7f8bffffffff}, avp = 0xe6c3686750c86c35} sct = 0x7f8b8452f510 sjt = 0x7f8b8452f510 mct = 0x0 rv = 0x7fff95b48d60 rv1 = 0x7f8b8475de28 c1 = {cache_type = 2511624888, val_type = 32767, c = {avp_val = {n = -1783338272, s = {s = 0x7fff95b46ae0 "", len = -1783342368}, re = -0x7fff95b46ae0}, pval = {rs = {s = 0x7fff95b46ae0 "", ---Type <return> to continue, or q <return> to quit--- len = -1783342368}, ri = -1783329948, flags = 32767}}, i2s = "\320\v\222\002", '\000' <repeats 12 times>, "D'iC\213\177"} s = { s = 0x43b2fc <grp_hash_lookup+1420> "1҉\307A\211\302\301\357\vA\301\352\rA\001\372A\001\302\301\350\027D\001\320A\367\361Lc\312I\301\341\004O\215\064\bI\213\036I9\336u\f\353Jf\220H\213\033I9\336t@D;k\030u\362H\213{\020L\211\342H\211\356\350c\265\375\377\205\300u\337H\203\304\020H\215C([]A\\A]A^\303D\017\276\021D\211\326\301\356\003A1\362\353\210\017\037\200", len = -1783329476} srevp = {0x7f8b84531900, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #29 0x00000000005407b5 in run_actions (h=0x6acf73, a=0x4, msg=0x8) at action.c:1549 ret = -1783327504 mod = 0x7f8b84531900 __FUNCTION__ = "run_actions" #30 0x0000000000542218 in do_action (h=0x7fff95b494f0, a=0x7f8b84531a30, msg=0x7f8b8475de28) at action.c:1049 ret = 1 v = 0 dst = {send_sock = 0x7f8b8475de28, to = {s = {sa_family = 52190, sa_data = "\020C\213\177\000\000\310\000\000\000\377\177\000"}, sin = {sin_family = 52190, sin_port = 17168, sin_addr = { s_addr = 32651}, sin_zero = "\310\000\000\000\377\177\000"}, sin6 = {sin6_family = 52190, sin6_port = 17168, sin6_flowinfo = 32651, sin6_addr = {__in6_u = { __u6_addr8 = "\310\000\000\000\377\177\000\000\300F\221C\213\177\000", __u6_addr16 = {200, 0, 32767, 0, 18112, 17297, 32651, 0}, __u6_addr32 = {200, 32767, 1133594304, 32651}}}, sin6_scope_id = 2222342528}}, id = 32651, proto = 40 '(', send_flags = {f = 222 '\336', blst_imask = 117 'u'}} end = 0x7f8b8452e8f0 "\001" uri = {user = {s = 0x7fff95b4929c "", len = -1783328540}, passwd = {s = 0x7f8b43944ca8 "\361\023", len = 1133554216}, host = {s = 0x8 <error: Cannot access memory at address 0x8>, len = -1783328508}, port = {s = 0x7f8b43551b50 "(\252\220C\213\177", len = 1133554216}, params = {s = 0xc8 <error: Cannot access memory at address 0xc8>, len = -1783328252}, sip_params = {s = 0x7fff95b49200 "", len = 0}, headers = {s = 0x7f8b4390aa28 "P\033UC\213\177", len = 5615623}, port_no = 43560, proto = 17296, type = 32651, flags = (unknown: 200), transport = {s = 0x7fff95b492a0 "", len = 1125140923}, ttl = {s = 0x7f8b8475de28 "\235\030", len = -1783328096}, user_param = {s = 0x779800000000 <error: Cannot access memory at address 0x779800000000>, len = -1}, maddr = { s = 0x7fff95b49130 "", len = -1783328364}, method = {s = 0x4 <error: Cannot access memory at address 0x4>, len = -1783328348}, lr = {s = 0x7f8b4390aa28 "P\033UC\213\177", len = 200}, r2 = { s = 0x7f8b4390aa28 "P\033UC\213\177", len = -2072650200}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x4 <error: Cannot access memory at address 0x4>, len = 5615623}, ttl_val = { s = 0x7f8b4390aa28 "P\033UC\213\177", len = -1783328268}, user_param_val = {s = 0x7f8b8475de28 "\235\030", len = 1}, maddr_val = {s = 0x7f8b4390aa28 "P\033UC\213\177", len = 1133554216}, method_val = {s = 0x4 <error: Cannot access memory at address 0x4>, len = -2072650200}, lr_val = {s = 0xc8 <error: Cannot access memory at address 0xc8>, len = 1133554736}, r2_val = { s = 0x7f8b4390aa28 "P\033UC\213\177", len = 1124929466}, gr_val = {s = 0x0, len = 1125151101}} next_hop = {user = {s = 0xc8 <error: Cannot access memory at address 0xc8>, len = -1783328096}, passwd = {s = 0x4 <error: Cannot access memory at address 0x4>, len = -2072650200}, host = { s = 0xc8 <error: Cannot access memory at address 0xc8>, len = 1133554736}, port = {s = 0x7f8b4390aa28 "P\033UC\213\177", len = 1125193098}, params = {s = 0x0, len = 10498080}, sip_params = { s = 0xa03028 <def_list+8> "", len = 10498096}, headers = {s = 0xa03038 <def_list+24> "", len = 10498120}, port_no = 10568, proto = 160, type = ERROR_URI_T, flags = (unknown: 0), transport = { s = 0x7f8b844bec80 <wr_buf> "\027\003\001\003\340k\r\203t\250\234\377\306\030\372\233\a\037\255\300[ \202\346\270\017\032Oά\362;\325Զ\227\027\t{\322_\034\336P>\001\341\327\062\027\243\211\326N\364H@d%\225s9勏\205!\342P0\370\267\070\377\247&\221i\377\206\246Aѻy\364\nrԑCH\370\v\356ǔ\255\032\064T\301\237\265\020Z)if\373\250\020u\275\202\310\031\205\224\246\303F\273\006pP\242#\305\022\022\272\324\a\217\065\200\036\033\003t\346n\250\005<\245\025\301\n\361s\236q\301G\231\267\325\354\256]]u@\021\212\375\313&7\313-\253\004\277n\275\033\216{\335\301\207ә\265\f;<\212\314rq6\305\024\253", <incomplete sequence \311>..., len = 14083112}, ttl = {s = 0x400000000 <error: Cannot access memory at address 0x400000000>, len = -1783365432}, user_param = {s = 0x0, len = 1090600854}, maddr = { s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 1005471026}, method = {s = 0x0, len = -1783327964}, lr = {s = 0x293020 <error: Cannot access memory at address 0x293020>, len = -1783327948}, r2 = {s = 0x7f8b8475de28 "\235\030", len = 1090600854}, gr = {s = 0x1000000 <error: Cannot access memory at address 0x1000000>, len = 14083728}, transport_val = { s = 0x219958 <error: Cannot access memory at address 0x219958>, len = 2693488}, ttl_val = {s = 0x293c48 <error: Cannot access memory at address 0x293c48>, len = 8}, user_param_val = { s = 0x101 <error: Cannot access memory at address 0x101>, len = 667307776}, maddr_val = {s = 0x291970 <error: Cannot access memory at address 0x291970>, len = 6245668}, method_val = { s = 0x7f8b8467fc80 "\020\005", len = 6999923}, lr_val = {s = 0x715640 <__FUNCTION__.7459> "parse_via", len = 1133594024}, r2_val = { s = 0xe6c3686759486c35 <error: Cannot access memory at address 0xe6c3686759486c35>, len = -1783327804}, gr_val = {s = 0x0, len = 10139768}} u = 0x7f8b8452e8f0 flags = 32651 st = {flags = 200, id = 0, name = {n = -1783328096, s = {s = 0x7fff95b492a0 "", len = 4}, re = 0x7fff95b492a0}, avp = 0x7f8b8475de28} sct = 0x7f8b8452e8f0 ---Type <return> to continue, or q <return> to quit--- sjt = 0x7f8b8452e8f0 mct = 0x0 rv = 0x1 rv1 = 0x7f8b8475de28 c1 = {cache_type = RV_CACHE_PVAR, val_type = RV_INT, c = {avp_val = {n = 1133594216, s = {s = 0x7f8b43914668 <incomplete sequence \310>, len = 10485504}, re = 0x7f8b43914668}, pval = {rs = { s = 0x7f8b43914668 <incomplete sequence \310>, len = 10485504}, ri = 4, flags = 1}}, i2s = "\000\222\264\225\377\177\000\000\000\347\001D\213\177\000\000\000\245aC\213\177"} s = {s = 0xa49900 <_pkg_root> "\313\030p", len = 4} srevp = {0x7f8b84531a30, 0x7f8b8475de28} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, { type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 12}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = {number = 140237199485840, string = 0x7f8b8475ab90 "\350\062]\204\213\177", str = {s = 0x7f8b8475ab90 "\350\062]\204\213\177", len = 3}, data = 0x7f8b8475ab90, attr = 0x7f8b8475ab90, select = 0x7f8b8475ab90}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #31 0x00000000005407b5 in run_actions (h=0x6acf73, h@entry=0x7fff95b494f0, a=0x4, a@entry=0x7f8b8451ee00, msg=0x8, msg@entry=0x7f8b8475de28) at #action.c:1549 ret = -1 mod = 0x7f8b84531a30 __FUNCTION__ = "run_actions" #32 0x000000000054d225 in run_top_route (a=0x7f8b8451ee00, msg=0x7f8b8475de28, c=<optimized out>) at action.c:1635 ctx = {rec_lev = 6, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {140735705027824, 1818402078992133173, 140237197143552, 140237199498792, 0, 0, -1818495031344337867, 1818402731650608181}, __mask_was_saved = 0, __saved_mask = {__val = {10139768, 595, 140237199498792, 10139709, 10139648, 595, 140237199498792, 10139709, 10139648, 595, 12052891338166128384, 0, 140237199425776, 1073741825, 140236102683928, 140237199410640}}}}} p = <optimized out> ret = <optimized out> sfbk = 0 #33 0x000000000055501e in receive_msg (buf=0x0, len=2222317096, rcv_info=0x7fff95b497d0) at receive.c:240 msg = 0x7f8b8475de28 ctx = {rec_lev = 0, run_flags = 0, last_retcode = -1, jmp_env = {{__jmpbuf = {140735705028192, 1818402078992133173, 140237198564784, 140237199498792, 0, 0, -1818495031344337867, 1818402731650608181}, __mask_was_saved = 0, __saved_mask = {__val = {10109832, 0, 140735705028582, 4, 1, 140237196963680, 140237221805511, 140234977181701, 0, 7048948, 140237213644648, 140237198483864, 140735705028452, 140237223933584, 140237198483864, 12}}}}} inb = { s = 0x9ab800 <buf> "NOTIFY sip:zs_pbx40_trunk@XXXXXXXXXX.com SIP/2.0\r\nVia: SIP/2.0/UDP X.X.X.6:5080;branch=z9hG4bK542e0106\r\nMax-Forwards: 69\r\nFrom: \"asterisk\" <sip:asterisk@X.X.X.6:5080>;tag=as785f9e"..., len = 595} netinfo = {data = {s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = 2}, dst = 0x7f8b854db768, rcv = 0x7f8b85eac000} __FUNCTION__ = "receive_msg" #34 0x0000000000467630 in udp_rcv_loop () at udp_server.c:495 len = 595 buf = "NOTIFY sip:zs_pbx40_trunk@XXXXXXXXXX.com SIP/2.0\r\nVia: SIP/2.0/UDP X.X.X.6:5080;branch=z9hG4bK542e0106\r\nMax-Forwards: 69\r\nFrom: \"asterisk\" <sip:asterisk@X.X.X.6:5080>;tag=as785f9e"... from = 0x7f8b84666198 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {940519353, 140236108241828}, addr32 = {940519353, 0, 1131060132, 32651}, addr16 = {12217, 14351, 0, 0, 39844, 17258, 32651, 0}, addr = "\271/\017\070\000\000\000\000\244\233jC\213\177\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {856633273, 0}, addr32 = {856633273, 0, 0, 0}, addr16 = {12217, 13071, 0, 0, 0, 0, 0, 0}, addr = "\271/\017\063", '\000' <repeats 11 times>}}, src_port = 5080, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023ع/\017\070\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 55315, sin_addr = {s_addr = 940519353}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 2, sin6_port = 55315, sin6_flowinfo = 940519353, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f8b844f2f60, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #35 0x00000000004eec99 in main_loop () at main.c:1614 ---Type <return> to continue, or q <return> to quit--- si_desc = "udp receiver child=4 sock=X.X.X.1:5060\000\000\000\000\000\360\205\\\204\213\177\000\000\000\000\000\000\000\000\000\000n\000\000\000\000\000\000\000]o_", '\000' <repeats 14 times>, "O\306'\320xD\247\260\304)\204\213\177\000\000\000O\306'\320xD\247\b\022\245\000\000\000\000\000\004\000\000\000\000\000\000" woneinit = 1 __FUNCTION__ = "main_loop" #36 0x000000000041cd6c in main (argc=0, argv=0x0) at main.c:2631 cfg_stream = 0x0 r = -2072639840 tmp = 0x7fff95b4aee4 "" tmp_len = 0 port = 0 proto = -2048211504 ret = 0 seed = 2234431947 debug_save = 0 debug_flag = 8 dont_fork_cnt = 0 st = {st_dev = 15, st_ino = 13588, st_nlink = 2, st_mode = 16832, st_uid = 108, st_gid = 113, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1493100498, tv_nsec = 744107611}, st_mtim = {tv_sec = 1493919466, tv_nsec = 395667252}, st_ctim = {tv_sec = 1493919466, tv_nsec = 395667252}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" (gdb) ``` #### Log Messages  #### SIP Traffic  ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux customers 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u2 (2017-03-07) x86_64 GNU/Linux ``` -- 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/1120

2 4

git:master:c4754f60: modules/lcr: forgot to copy new versions of lcr *.h files to k master
by Juha Heinanen 15 May '17

15 May '17

Module: kamailio Branch: master Commit: c4754f60f010b8ad55a3785ea362dfeeda008300 URL: https://github.com/kamailio/kamailio/commit/c4754f60f010b8ad55a3785ea362dfe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-05-15T19:02:21+03:00 modules/lcr: forgot to copy new versions of lcr *.h files to k master - thanks to Travis CI --- Modified: src/modules/lcr/hash.h Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/c4754f60f010b8ad55a3785ea362dfe… Patch: https://github.com/kamailio/kamailio/commit/c4754f60f010b8ad55a3785ea362dfe… --- diff --git a/src/modules/lcr/hash.h b/src/modules/lcr/hash.h index 33c8b58..f09e379 100644 --- a/src/modules/lcr/hash.h +++ b/src/modules/lcr/hash.h @@ -36,7 +36,8 @@ int rule_hash_table_insert(struct rule_info **hash_table, unsigned int lcr_id, unsigned int rule_id, unsigned short prefix_len, char *prefix, unsigned short from_uri_len, char *from_uri, - pcre *from_uri_re, unsigned short request_uri_len, + pcre *from_uri_re, unsigned short mt_tvalue_len, + char *mt_tvalue, unsigned short request_uri_len, char *request_uri, pcre *request_uri_re, unsigned short stopper); diff --git a/src/modules/lcr/lcr_mod.h b/src/modules/lcr/lcr_mod.h index 9d4e6f2..89e20ff 100644 --- a/src/modules/lcr/lcr_mod.h +++ b/src/modules/lcr/lcr_mod.h @@ -47,6 +47,7 @@ #define MAX_USER_LEN 64 #define MAX_PARAMS_LEN 64 #define MAX_NO_OF_REPLY_CODES 15 +#define MAX_MT_TVALUE_LEN 128 typedef enum sip_protos uri_transport; @@ -56,6 +57,8 @@ struct rule_info { unsigned short prefix_len; char from_uri[MAX_URI_LEN + 1]; unsigned short from_uri_len; + char mt_tvalue[MAX_MT_TVALUE_LEN + 1]; + unsigned short mt_tvalue_len; pcre *from_uri_re; char request_uri[MAX_URI_LEN + 1]; unsigned short request_uri_len;

1 0

git:master:7386b03b: Merge branch 'master' of https://github.com/kamailio/kamailio
by Juha Heinanen 15 May '17

15 May '17

Module: kamailio Branch: master Commit: 7386b03b5e70b9faf61d84bfabf88092afc65a8c URL: https://github.com/kamailio/kamailio/commit/7386b03b5e70b9faf61d84bfabf8809… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-05-15T19:04:48+03:00 Merge branch 'master' of https://github.com/kamailio/kamailio --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/7386b03b5e70b9faf61d84bfabf8809… Patch: https://github.com/kamailio/kamailio/commit/7386b03b5e70b9faf61d84bfabf8809…

1 0

wiki Log In link leads to unprotected (http) page
by Juha Heinanen 15 May '17

15 May '17

wiki Log In link leads to unprotected (http) page

2 1

Broken: kamailio/kamailio#4273 (master - c5127e6)
by Travis CI 15 May '17

15 May '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4273 Status: Broken Duration: 5 minutes and 20 seconds Commit: c5127e6 (master) Author: Juha Heinanen Message: modules/lcr: added possibility to match caller URI userpart to a mtree tvalue View the changeset: https://github.com/kamailio/kamailio/compare/dcd16ac30620...c5127e6d19c4 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/232479240?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:76bf1a86: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 15 May '17

15 May '17

Module: kamailio Branch: master Commit: 76bf1a8682b83c302be594b9d4d0e491f9350cae URL: https://github.com/kamailio/kamailio/commit/76bf1a8682b83c302be594b9d4d0e49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-15T17:31:22+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/76bf1a8682b83c302be594b9d4d0e49… Patch: https://github.com/kamailio/kamailio/commit/76bf1a8682b83c302be594b9d4d0e49…

1 0

git:master:c5127e6d: modules/lcr: added possibility to match caller URI userpart to a mtree tvalue
by Juha Heinanen 15 May '17

15 May '17

Module: kamailio Branch: master Commit: c5127e6d19c4f30072d81213f5eb49e4a6306bb3 URL: https://github.com/kamailio/kamailio/commit/c5127e6d19c4f30072d81213f5eb49e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-05-15T18:12:32+03:00 modules/lcr: added possibility to match caller URI userpart to a mtree tvalue --- Modified: src/lib/srdb1/schema/lcr_rule.xml Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c5127e6d19c4f30072d81213f5eb49e… Patch: https://github.com/kamailio/kamailio/commit/c5127e6d19c4f30072d81213f5eb49e…

1 0

git:master:dcd16ac3: modules: readme files regenerated - mtree ... [skip ci]
by Kamailio Dev 15 May '17

15 May '17

Module: kamailio Branch: master Commit: dcd16ac3062028a0857510ccd3dc9ec2a06b01b5 URL: https://github.com/kamailio/kamailio/commit/dcd16ac3062028a0857510ccd3dc9ec… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-15T15:46:24+02:00 modules: readme files regenerated - mtree ... [skip ci] --- Modified: src/modules/mtree/README --- Diff: https://github.com/kamailio/kamailio/commit/dcd16ac3062028a0857510ccd3dc9ec… Patch: https://github.com/kamailio/kamailio/commit/dcd16ac3062028a0857510ccd3dc9ec… --- diff --git a/src/modules/mtree/README b/src/modules/mtree/README index 18f3386..685adad 100644 --- a/src/modules/mtree/README +++ b/src/modules/mtree/README @@ -62,6 +62,13 @@ Juha Heinanen 5.3. mtree.reload 5.4. mtree.match + 2. Developer Guide + + 1. Available Functions + + 1.1. mt_load_api(api) + 1.2. mt_match(msg, mtree, value, mode) + List of Examples 1.1. Set db_url parameter @@ -407,3 +414,36 @@ kamcmd mtree.list mytree - match prefix * _mode_ - matching mode + +Chapter 2. Developer Guide + + Table of Contents + + 1. Available Functions + + 1.1. mt_load_api(api) + 1.2. mt_match(msg, mtree, value, mode) + +1. Available Functions + + 1.1. mt_load_api(api) + 1.2. mt_match(msg, mtree, value, mode) + +1.1. mt_load_api(api) + + The function imports all API functions that are exported by the mtree + module (see sections below). + + Meaning of the parameters is as follows: + * mtree_api_t* api - mtree API + +1.2. mt_match(msg, mtree, value, mode) + + Match 'value' against 'mtree' using 'mode' (see mt_match function Admin + Guide documentation). + + Meaning of the parameters is as follows: + * sip_msg_t *msg - SIP Request + * str *mtree - Name of mtree + * str *value - Value to match + * int mode - Match mode

1 0

git:master:556fab89: modules/mtree: added mt_match API function
by Juha Heinanen 15 May '17

15 May '17

Module: kamailio Branch: master Commit: 556fab89cec8d1eda726f38f4ddf0477e97bb79d URL: https://github.com/kamailio/kamailio/commit/556fab89cec8d1eda726f38f4ddf047… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-05-15T16:40:28+03:00 modules/mtree: added mt_match API function --- Added: src/modules/mtree/api.h Added: src/modules/mtree/doc/mtree_devel.xml Modified: src/modules/mtree/doc/mtree.xml Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/556fab89cec8d1eda726f38f4ddf047… Patch: https://github.com/kamailio/kamailio/commit/556fab89cec8d1eda726f38f4ddf047…

1 0

git:master:9ff4dd36: tm: use a stack of structures for faked_env()
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: 9ff4dd36ad63f60905a49f8c0e437f997e54ae70 URL: https://github.com/kamailio/kamailio/commit/9ff4dd36ad63f60905a49f8c0e437f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-15T14:58:03+02:00 tm: use a stack of structures for faked_env() - be safe if there is a new faked_env() inside another faked_env() --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h --- Diff: https://github.com/kamailio/kamailio/commit/9ff4dd36ad63f60905a49f8c0e437f9… Patch: https://github.com/kamailio/kamailio/commit/9ff4dd36ad63f60905a49f8c0e437f9…

1 0

git:master:ab346e80: kazoo: avoid creating an empty route block structure
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: ab346e80647228afdbcaf6884a8573c9221ca38b URL: https://github.com/kamailio/kamailio/commit/ab346e80647228afdbcaf6884a8573c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-15T14:31:17+02:00 kazoo: avoid creating an empty route block structure - use route_lookup() instead of route_get(), so the empty route block is not created if the route is not defined in the kamailio.cfg --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/ab346e80647228afdbcaf6884a8573c… Patch: https://github.com/kamailio/kamailio/commit/ab346e80647228afdbcaf6884a8573c… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index f7fc8c1..da31089 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2401,14 +2401,22 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->cb_route); + int n = route_lookup(&main_rt, cmd->cb_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->err_route); + int n = route_lookup(&main_rt, cmd->err_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); }

1 0

git:master:bc336bfc: core: reset avps and xavps lists in all error cases
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: bc336bfcba127a9232583a3d7b7e10d994c369eb URL: https://github.com/kamailio/kamailio/commit/bc336bfcba127a9232583a3d7b7e10d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-15T14:11:57+02:00 core: reset avps and xavps lists in all error cases - just for safety when one uses some srevent routes --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/bc336bfcba127a9232583a3d7b7e10d… Patch: https://github.com/kamailio/kamailio/commit/bc336bfcba127a9232583a3d7b7e10d… --- diff --git a/src/core/receive.c b/src/core/receive.c index 18d244c..3a863be 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -381,10 +381,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif goto error02; #endif /* NO_ONREPLY_ROUTE_ERROR */ error_req: @@ -392,15 +388,14 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); error03: - /* free possible loaded avps -bogdan */ - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif error02: free_sip_msg(msg); pkg_free(msg); error00: + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif STATS_RX_DROPS; /* reset log prefix */ log_prefix_set(NULL);

1 0

git:master:8f4c8583: sdpops: sdp_get() and sdp_transport() exported to kemi
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: 8f4c8583e5087f0e4c9c8e179d13e41c34b9eda5 URL: https://github.com/kamailio/kamailio/commit/8f4c8583e5087f0e4c9c8e179d13e41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-15T08:33:19+02:00 sdpops: sdp_get() and sdp_transport() exported to kemi --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8f4c8583e5087f0e4c9c8e179d13e41… Patch: https://github.com/kamailio/kamailio/commit/8f4c8583e5087f0e4c9c8e179d13e41… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 6cc511d..03c3a35 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -51,13 +51,13 @@ static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_with_active_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_with_transport(sip_msg_t* msg, char* transport, char *bar); static int w_sdp_with_transport_like(sip_msg_t* msg, char* transport, char *bar); -static int w_sdp_transport(sip_msg_t* msg, char *bar); +static int w_sdp_transport(sip_msg_t* msg, char *avp, char *p2); static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_remove_transport(sip_msg_t* msg, char* transport, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); -static int w_sdp_get(sip_msg_t* msg, char *bar); +static int w_sdp_get(sip_msg_t* msg, char *avp, char *p2); static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar); static int w_sdp_content_sloppy(sip_msg_t* msg, char* foo, char *bar); static int w_sdp_with_ice(sip_msg_t* msg, char* foo, char *bar); @@ -1165,7 +1165,7 @@ static int sdp_with_transport(sip_msg_t *msg, str *transport, int like) * @brief assigns common media transport (if any) of 'm' lines to pv argument * @return -1 - error; 0 - not found; 1 - found */ -static int w_sdp_transport(sip_msg_t* msg, char *avp) +static int sdp_transport_helper(sip_msg_t* msg, char *avp) { int_str avp_val; int_str avp_name; @@ -1240,6 +1240,15 @@ static int w_sdp_transport(sip_msg_t* msg, char *avp) return 1; } +static int w_sdp_transport(sip_msg_t* msg, char *avp, char *p2) +{ + return sdp_transport_helper(msg, avp); +} + +static int ki_sdp_transport(sip_msg_t* msg, str *avp) +{ + return sdp_transport_helper(msg, avp->s); +} /** * @@ -1571,7 +1580,7 @@ static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) /** * */ -static int w_sdp_get(sip_msg_t* msg, char *avp) +static int sdp_get_helper(sip_msg_t* msg, char *avp) { sdp_info_t *sdp = NULL; int_str avp_val; @@ -1627,6 +1636,19 @@ static int w_sdp_get(sip_msg_t* msg, char *avp) /** * */ +static int w_sdp_get(sip_msg_t* msg, char *avp, char *p2) +{ + return sdp_get_helper(msg, avp); +} + +static int ki_sdp_get(sip_msg_t* msg, str *avp) +{ + return sdp_get_helper(msg, avp->s); +} + +/** + * + */ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) { if(parse_sdp(msg)==0 && msg->body!=NULL) @@ -1960,6 +1982,11 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("remove_line_by_prefix"), + SR_KEMIP_INT, sdp_remove_line_by_prefix, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sdpops"), str_init("remove_media"), SR_KEMIP_INT, sdp_remove_media, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -1975,6 +2002,21 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_with_ice"), + SR_KEMIP_INT, sdp_with_ice, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_get"), + SR_KEMIP_INT, ki_sdp_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_transport"), + SR_KEMIP_INT, ki_sdp_transport, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:e8554de0: prefix_route: exported functions to kemi interface
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: e8554de0c132062183fcc332376bd2b857544bf7 URL: https://github.com/kamailio/kamailio/commit/e8554de0c132062183fcc332376bd2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-15T08:32:39+02:00 prefix_route: exported functions to kemi interface --- Modified: src/modules/prefix_route/prefix_route.c --- Diff: https://github.com/kamailio/kamailio/commit/e8554de0c132062183fcc332376bd2b… Patch: https://github.com/kamailio/kamailio/commit/e8554de0c132062183fcc332376bd2b… --- diff --git a/src/modules/prefix_route/prefix_route.c b/src/modules/prefix_route/prefix_route.c index fb99ec1..9153fe7 100644 --- a/src/modules/prefix_route/prefix_route.c +++ b/src/modules/prefix_route/prefix_route.c @@ -44,6 +44,7 @@ #include "../../core/locking.h" #include "../../core/action.h" #include "../../core/route.h" +#include "../../core/kemi.h" #include "tree.h" #include "pr.h" @@ -256,17 +257,59 @@ static int get_username(struct sip_msg* msg, str *user) /** - * SER Command "prefix_route" + * ki command "prefix_route" + */ +static int ki_prefix_route(sip_msg_t *msg, str *ruser) +{ + struct run_act_ctx ra_ctx; + int err; + int route; + + route = tree_route_get(ruser); + if (route <= 0) + return -1; + + /* If match send to route[x] */ + init_run_actions_ctx(&ra_ctx); + + err = run_actions(&ra_ctx, main_rt.rlist[route], msg); + if (err < 0) { + LOG(L_ERR, "prefix_route: run_actions failed (%d)\n", err); + return -1; + } + + /* Success */ + return (prefix_route_exit)?0:1; +} + +/** + * ki command "prefix_route" + */ +static int ki_prefix_route_uri(sip_msg_t *msg) +{ + str user; + int err; + + err = get_username(msg, &user); + if (0 != err) { + LOG(L_ERR, "prefix_route: could not get username in" + " Request URI (%d)\n", err); + return err; + } + + return ki_prefix_route(msg, &user); +} + +/** + * cfg command "prefix_route" */ static int prefix_route(struct sip_msg *msg, char *p1, char *p2) { struct run_act_ctx ra_ctx; str user; int err; - int route; /* Unused */ - (void)p1; (void)p2; /* Get request URI */ @@ -285,24 +328,8 @@ static int prefix_route(struct sip_msg *msg, char *p1, char *p2) } } - route = tree_route_get(&user); - if (route <= 0) - return -1; - - /* If match send to route[x] */ - init_run_actions_ctx(&ra_ctx); - - err = run_actions(&ra_ctx, main_rt.rlist[route], msg); - if (err < 0) { - LOG(L_ERR, "prefix_route: run_actions failed (%d)\n", err); - return -1; - } - - /* Success */ - return (prefix_route_exit)?0:1; + return ki_prefix_route(msg, &user); } - - /* * Exported functions */ @@ -338,3 +365,32 @@ struct module_exports exports = { 0, /* OnCancel function */ 0 /* Child init function */ }; + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_prefix_route_exports[] = { + { str_init("prefix_route"), str_init("prefix_route"), + SR_KEMIP_INT, ki_prefix_route, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("prefix_route"), str_init("prefix_route_uri"), + SR_KEMIP_INT, ki_prefix_route_uri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_prefix_route_exports); + return 0; +} \ No newline at end of file

1 0

git:master:ba17aad0: core: added support for aarch64 architecture for fastlock
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: ba17aad00dec0403f89842fc6db015718daddcdd URL: https://github.com/kamailio/kamailio/commit/ba17aad00dec0403f89842fc6db0157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-13T13:42:27+02:00 core: added support for aarch64 architecture for fastlock - from a patch by valentin(a)corenetdynamics.com --- Modified: src/core/fastlock.h --- Diff: https://github.com/kamailio/kamailio/commit/ba17aad00dec0403f89842fc6db0157… Patch: https://github.com/kamailio/kamailio/commit/ba17aad00dec0403f89842fc6db0157…

1 0

git:master:d2047859: sdpops: exported sdp_content() to kemi framework
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: d2047859ad4b64ac9c62242df0088cf94d755e69 URL: https://github.com/kamailio/kamailio/commit/d2047859ad4b64ac9c62242df0088cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-14T09:10:28+02:00 sdpops: exported sdp_content() to kemi framework --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2047859ad4b64ac9c62242df0088cf… Patch: https://github.com/kamailio/kamailio/commit/d2047859ad4b64ac9c62242df0088cf… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index d06affc..6cc511d 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1637,41 +1637,69 @@ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) /** * */ -static int w_sdp_content_sloppy(sip_msg_t* msg, char* foo, char *bar) +static int ki_sdp_content(sip_msg_t* msg) +{ + if(parse_sdp(msg)==0 && msg->body!=NULL) + return 1; + return -1; +} + +/** + * + */ +static int ki_sdp_content_flags(sip_msg_t *msg, int flags) { str body; int mime; + if(flags==0) { + return ki_sdp_content(msg); + } + body.s = get_body(msg); - if (body.s == NULL) return -1; + if(body.s == NULL) + return -1; body.len = msg->len - (int)(body.s - msg->buf); - if (body.len == 0) return -1; + if(body.len == 0) + return -1; mime = parse_content_type_hdr(msg); - if (mime < 0) return -1; /* error */ - if (mime == 0) return 1; /* default is application/sdp */ - - switch (((unsigned int)mime) >> 16) { - case TYPE_APPLICATION: - if ((mime & 0x00ff) == SUBTYPE_SDP) return 1; else return -1; - case TYPE_MULTIPART: - if ((mime & 0x00ff) == SUBTYPE_MIXED) { - if (_strnistr(body.s, "application/sdp", body.len) == NULL) { + if(mime < 0) + return -1; /* error */ + if(mime == 0) + return 1; /* default is application/sdp */ + + switch(((unsigned int)mime) >> 16) { + case TYPE_APPLICATION: + if((mime & 0x00ff) == SUBTYPE_SDP) + return 1; + else return -1; + case TYPE_MULTIPART: + if((mime & 0x00ff) == SUBTYPE_MIXED) { + if(_strnistr(body.s, "application/sdp", body.len) == NULL) { + return -1; + } else { + return 1; + } } else { - return 1; + return -1; } - } else { + default: return -1; - } - default: - return -1; } } /** * */ +static int w_sdp_content_sloppy(sip_msg_t *msg, char *foo, char *bar) +{ + return ki_sdp_content_flags(msg, 1); +} +/** + * + */ int sdp_with_ice(sip_msg_t* msg) { str ice, body; @@ -1937,6 +1965,16 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_content"), + SR_KEMIP_INT, ki_sdp_content, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_content_flags"), + SR_KEMIP_INT, ki_sdp_content_flags, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:b5022ed2: Makefile.defs: enable arm aarch64 architecture
by Daniel-Constantin Mierla 15 May '17

15 May '17

Module: kamailio Branch: master Commit: b5022ed2f856387380d3dd8ffa8d891f52efa6b4 URL: https://github.com/kamailio/kamailio/commit/b5022ed2f856387380d3dd8ffa8d891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-13T13:31:28+02:00 Makefile.defs: enable arm aarch64 architecture - from a patch by valentin(a)corenetdynamics.com --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b5022ed2f856387380d3dd8ffa8d891… Patch: https://github.com/kamailio/kamailio/commit/b5022ed2f856387380d3dd8ffa8d891… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index bfc9700..6d4cbd6 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -310,6 +310,8 @@ sparc64_macros= __sparcv9 __sparc_v9__ arm_macros= __arm__ __thumb__ arm6_macros= __ARM_ARCH_6__ +aarch64_macros= __aarch64__ + ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__ _ARCH_PPC ppc64_macros= __ppc64__ _ARCH_PPC64 @@ -814,6 +816,11 @@ ifeq ($(ARCH), arm6) C_DEFS+=-DNOSMP # very unlikely to have an smp arm endif +ifeq ($(ARCH), aarch64) + use_fast_lock=yes + C_DEFS+=-DNOSMP +endif + ifeq ($(ARCH), ppc) use_fast_lock=yes endif

1 0

[kamailio/kamailio] User-Agent header and Server header not sent in the requests/responses (#1126)
by logslie 13 May '17

13 May '17

### Description When configuring as a global configuration the following parameters: user_agent_header="User-Agent: Company-Product1-1.0.0" server_header="Server: Company-Product1-1.0.0" I expected to have in every responses the Server header and in every requests the User-Agent header. But I'm only see the Server header in the first 100 response and the User Agent header is never sent in the responses. #### Log Messages I don't have any error message in the log. #### SIP Traffic - First response to an INVITE with Server header. ![responsewithserverheader](https://cloud.githubusercontent.com/assets/4872125/25940195/95b610ae-3635-11e7-9447-b74088dc8a48.png) - First resquest without User-Agent header: ![requestwithoutuseragentheader](https://cloud.githubusercontent.com/assets/4872125/25940238/b79fd8b2-3635-11e7-8d7a-16aef011f9fa.png) - Second response without Server header: ![responsewithoutserverheader](https://cloud.githubusercontent.com/assets/4872125/25940257/cdbebc26-3635-11e7-9c03-431385f23fba.png) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio-4.4.5 ``` * **Operating System**: ``` Linux test200 2.6.32-642.15.1.el6.x86_64 #1 SMP Fri Feb 24 14:31:22 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` Is there something that I'm doing wrong? Thanks -- 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/1126

2 2

Siremis 4.3 CentOS 7.3
by McDonald, Isaac 12 May '17

12 May '17

Hello, I've run into several issues with Siremis 4.3 on CentOS 7.3. I get an HTTP error 500 when clicking on the login name to edit an existing user. If I highlight the user, and then select the edit button, the user details are displayed. When clicking save, I get another error 500. The relevant Apache log line is: [:error] [pid 13849] PHP Fatal error: Call to a member function getQuoted() on a non-object in /var/www/siremis-4.3.0/openbiz/bin/data/BizDataSql.php on line 237 I'm running the following software: PHP 5.4.16 CentOS Linux release 7.3.1611 (Core) Apache/2.4.6 (CentOS) 5.7.14-log MySQL Community Server (GPL) During the install I did a "make prepare24". Any idea's as to what may be going on here?

2 4

git:master:f5a0e6f1: kamcmd: increased the max reply size from 64kB to 128kB
by Daniel-Constantin Mierla 12 May '17

12 May '17

Module: kamailio Branch: master Commit: f5a0e6f19b4e04d32499f796ef59049a7c798f54 URL: https://github.com/kamailio/kamailio/commit/f5a0e6f19b4e04d32499f796ef59049… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-12T16:34:12+02:00 kamcmd: increased the max reply size from 64kB to 128kB --- Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f5a0e6f19b4e04d32499f796ef59049… Patch: https://github.com/kamailio/kamailio/commit/f5a0e6f19b4e04d32499f796ef59049… --- diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 08fb3b2..9e62c90 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -67,9 +67,9 @@ #endif #define IOVEC_CNT 20 -#define MAX_LINE_SIZE 16384 /* for non readline mode */ -#define MAX_REPLY_SIZE 65536 -#define MAX_BODY_SIZE 65536 +#define MAX_LINE_SIZE 16*1024 /* for non readline mode */ +#define MAX_REPLY_SIZE 128*1024 +#define MAX_BODY_SIZE 128*1024 #define MAX_BINRPC_ARGS 256

1 0

git:master:88612ea4: uac: explicit name of the function called many times when updating from/to
by Daniel-Constantin Mierla 12 May '17

12 May '17

Module: kamailio Branch: master Commit: 88612ea4ed49db8a10cb8b1ddf23bc0783e937c3 URL: https://github.com/kamailio/kamailio/commit/88612ea4ed49db8a10cb8b1ddf23bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-12T16:34:12+02:00 uac: explicit name of the function called many times when updating from/to --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/88612ea4ed49db8a10cb8b1ddf23bc0… Patch: https://github.com/kamailio/kamailio/commit/88612ea4ed49db8a10cb8b1ddf23bc0… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 42626fe..db5ea25 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -262,7 +262,8 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, if(get_route_type()==REQUEST_ROUTE) { if(msg->msg_flags & uac_flag) { - LM_ERR("Called uac_replace multiple times on the message\n"); + LM_ERR("called uac_replace_%s() multiple times on the message\n", + (hdr==msg->from)?"from":"to"); return -1; } }

1 0

mtree module mt_match() api function
by Juha Heinanen 12 May '17

12 May '17

LCR module load_gws() call can currently filter matching gateways based on regular expression match of From URI. I was thinking to add as an alternative to the regular expression match a match based on mt_match() of mtree module. That would require that mtree module provides an API function corresponding to mt_match() script function. Does such an API function sound like a feasible thing to implement or does there already exist better ways to achieve the same? -- Juha

1 0

git:5.0:63f6416b: Merge pull request #1128 from SipSeb/5.0
by GitHub 12 May '17

12 May '17

Module: kamailio Branch: 5.0 Commit: 63f6416b4c26530ab52201aa487beae2375eb11d URL: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-12T16:06:04+02:00 Merge pull request #1128 from SipSeb/5.0 rabbitmq: don't create reply-to queue on publish --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… Patch: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4cd69c9..05fa750 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -175,7 +175,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou int reconnect_attempts = 0; int log_ret; str exchange, routingkey, messagebody, contenttype; - amqp_bytes_t reply_to_queue; // sanity checks if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) { @@ -231,44 +230,13 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou return RABBITMQ_ERR_CHANNEL; } - // alloc queue - amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table); - if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) { - LM_ERR("FAIL: amqp_queue_declare()\n"); - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - return RABBITMQ_ERR_QUEUE; - } - - // alloc bytes - reply_to_queue = amqp_bytes_malloc_dup(r->queue); - LM_DBG("%.*s\n", (int)reply_to_queue.len, (char*)reply_to_queue.bytes); - if (reply_to_queue.bytes == NULL) { - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - LM_ERR("Out of memory while copying queue name"); - return -1; - } - // alloc properties amqp_basic_properties_t props; props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG | - AMQP_BASIC_REPLY_TO_FLAG | AMQP_BASIC_CORRELATION_ID_FLAG; props.content_type = amqp_cstring_bytes(contenttype.s); props.delivery_mode = 2; /* persistent delivery mode */ - props.reply_to = amqp_bytes_malloc_dup(reply_to_queue); - if (props.reply_to.bytes == NULL) { - // debug - LM_ERR("Out of memory while copying queue name"); - - // cleanup - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - - // error - return -1; - } props.correlation_id = amqp_cstring_bytes("1"); // publish @@ -285,7 +253,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou // cleanup amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); // error return RABBITMQ_ERR_PUBLISH; @@ -295,8 +262,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou LM_DBG("SUCCESS: amqp_basic_publish()\n"); // cleanup - amqp_bytes_free(props.reply_to); - amqp_bytes_free(reply_to_queue); amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); // success

1 0

git:5.0:9abd1e00: rabbitmq: don't create reply-to queue on publish
by Sebastian Damm 12 May '17

12 May '17

Module: kamailio Branch: 5.0 Commit: 9abd1e002e0b3f7a884093e7e76efc8afdd54a17 URL: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Sebastian Damm <damm(a)sipgate.de> Date: 2017-05-12T15:34:39+02:00 rabbitmq: don't create reply-to queue on publish When using the rabbitmq_publish function, there is no need to create a reply to queue, because it will never be read. And since there is never a real consumer, so the queue will never be deleted. This will eventually cloak up the RabbitMQ server with millions of generic reply queues. This bug has been fixed in master already, so this is basically a backport. --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… Patch: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4cd69c9..05fa750 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -175,7 +175,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou int reconnect_attempts = 0; int log_ret; str exchange, routingkey, messagebody, contenttype; - amqp_bytes_t reply_to_queue; // sanity checks if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) { @@ -231,44 +230,13 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou return RABBITMQ_ERR_CHANNEL; } - // alloc queue - amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table); - if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) { - LM_ERR("FAIL: amqp_queue_declare()\n"); - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - return RABBITMQ_ERR_QUEUE; - } - - // alloc bytes - reply_to_queue = amqp_bytes_malloc_dup(r->queue); - LM_DBG("%.*s\n", (int)reply_to_queue.len, (char*)reply_to_queue.bytes); - if (reply_to_queue.bytes == NULL) { - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - LM_ERR("Out of memory while copying queue name"); - return -1; - } - // alloc properties amqp_basic_properties_t props; props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG | - AMQP_BASIC_REPLY_TO_FLAG | AMQP_BASIC_CORRELATION_ID_FLAG; props.content_type = amqp_cstring_bytes(contenttype.s); props.delivery_mode = 2; /* persistent delivery mode */ - props.reply_to = amqp_bytes_malloc_dup(reply_to_queue); - if (props.reply_to.bytes == NULL) { - // debug - LM_ERR("Out of memory while copying queue name"); - - // cleanup - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - - // error - return -1; - } props.correlation_id = amqp_cstring_bytes("1"); // publish @@ -285,7 +253,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou // cleanup amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); // error return RABBITMQ_ERR_PUBLISH; @@ -295,8 +262,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou LM_DBG("SUCCESS: amqp_basic_publish()\n"); // cleanup - amqp_bytes_free(props.reply_to); - amqp_bytes_free(reply_to_queue); amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); // success

1 0

[kamailio/kamailio] rabbitmq: don't create reply-to queue on publish (#1128)
by Sebastian Damm 12 May '17

12 May '17

When using the rabbitmq_publish function, there is no need to create a reply-to queue, because it will never be read. And since there is never a real consumer, the queue will never be deleted. This will eventually cloak up the RabbitMQ server with millions of generic reply queues. This bug has been fixed in master already, so this is basically a backport. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1128 -- Commit Summary -- * rabbitmq: don't create reply-to queue on publish -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1128.patch https://github.com/kamailio/kamailio/pull/1128.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/1128

2 2

[kamailio/kamailio] [kamcmd] kamcmd domain.dump reply too big (#1127)
by denyspozniak 12 May '17

12 May '17

Hello! I keep into DB (kamailio.domain_attrs) around 25 domains and I can't get them via kamcmd: ``` #kamcmd domain.dump ERROR: reply too big ``` ``` # kamailio -v version: kamailio 5.1.0-dev2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 with gcc 5.3.1 ``` -- 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/1127

2 2

git:master:b02793fe: modules: readme files regenerated - sl ... [skip ci]
by Kamailio Dev 11 May '17

11 May '17

Module: kamailio Branch: master Commit: b02793fe9dab9159d6fdc404fd1293cdad1bef45 URL: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-11T17:46:40+02:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… Patch: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 520a9e0..64b10eb 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -1,4 +1,4 @@ -The SL Module - Statless request handling +The SL Module - Stateless request handling Bogdan Iancu

1 0

git:master:c75e7cf6: modules/sl: documentation typo fix [skip ci]
by Mikko Lehto 11 May '17

11 May '17

Module: kamailio Branch: master Commit: c75e7cf65907cf137be23a11ac2930a80381ea3f URL: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-11T18:39:45+03:00 modules/sl: documentation typo fix [skip ci] --- Modified: src/modules/sl/doc/sl.xml --- Diff: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… Patch: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… --- diff --git a/src/modules/sl/doc/sl.xml b/src/modules/sl/doc/sl.xml index d77f4db..c5f96e8 100644 --- a/src/modules/sl/doc/sl.xml +++ b/src/modules/sl/doc/sl.xml @@ -4,7 +4,7 @@ <book id="sl" xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> - <title>The SL Module - Statless request handling</title> + <title>The SL Module - Stateless request handling</title> <authorgroup> <author> <firstname>Bogdan</firstname>

1 0

git:5.0:40d26eae: xhttp_rpc: fix rpc_struct_printf
by Ovidiu Sas 10 May '17

10 May '17

Module: kamailio Branch: 5.0 Commit: 40d26eae8c678e7623478b5b624e401e9bb94434 URL: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-05-10T13:03:29-04:00 xhttp_rpc: fix rpc_struct_printf (cherry picked from commit 8f87e7c4c3ba925a20bd0ab69e1fc885a559d262) --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… Patch: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 7e50035..6e27409 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,7 +562,7 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } -static int rpc_struct_scan(void* s, char* fmt, ...) +static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); return -1; @@ -571,10 +571,34 @@ static int rpc_struct_scan(void* s, char* fmt, ...) /** Create a new member from formatting string and add it to a structure. */ -static int rpc_struct_printf(void* s, char* member_name, char* fmt, ...) +static int rpc_struct_printf(struct rpc_data_struct* rpc_s, char* member_name, char* fmt, ...) { - LM_ERR("Not implemented\n"); - return -1; + va_list ap; + char buf[PRINT_VALUE_BUF_LEN]; + int len; + str _name,_body; + rpc_ctx_t *ctx = rpc_s->ctx; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + + va_start(ap, fmt); + len=vsnprintf(buf, PRINT_VALUE_BUF_LEN, fmt, ap); + va_end(ap); + if ((len<0) || (len>PRINT_VALUE_BUF_LEN)){ + LM_ERR("buffer size exceeded [%d]\n", PRINT_VALUE_BUF_LEN); + return -1; + } + + _name.s = member_name; + _name.len = strlen(member_name); + _body.s = buf; + _body.len = len; + if (0!=xhttp_rpc_build_content(ctx, &_body, &_name)) return -1; + + return 0; }

1 0

git:master:8f87e7c4: xhttp_rpc: fix rpc_struct_printf
by Ovidiu Sas 10 May '17

10 May '17

Module: kamailio Branch: master Commit: 8f87e7c4c3ba925a20bd0ab69e1fc885a559d262 URL: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-05-10T13:00:57-04:00 xhttp_rpc: fix rpc_struct_printf --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… Patch: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 7e50035..6e27409 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,7 +562,7 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } -static int rpc_struct_scan(void* s, char* fmt, ...) +static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); return -1; @@ -571,10 +571,34 @@ static int rpc_struct_scan(void* s, char* fmt, ...) /** Create a new member from formatting string and add it to a structure. */ -static int rpc_struct_printf(void* s, char* member_name, char* fmt, ...) +static int rpc_struct_printf(struct rpc_data_struct* rpc_s, char* member_name, char* fmt, ...) { - LM_ERR("Not implemented\n"); - return -1; + va_list ap; + char buf[PRINT_VALUE_BUF_LEN]; + int len; + str _name,_body; + rpc_ctx_t *ctx = rpc_s->ctx; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + + va_start(ap, fmt); + len=vsnprintf(buf, PRINT_VALUE_BUF_LEN, fmt, ap); + va_end(ap); + if ((len<0) || (len>PRINT_VALUE_BUF_LEN)){ + LM_ERR("buffer size exceeded [%d]\n", PRINT_VALUE_BUF_LEN); + return -1; + } + + _name.s = member_name; + _name.len = strlen(member_name); + _body.s = buf; + _body.len = len; + if (0!=xhttp_rpc_build_content(ctx, &_body, &_name)) return -1; + + return 0; }

1 0

Live streaming from Kamailio World Conference 2017
by Daniel-Constantin Mierla 10 May '17

10 May '17

Hello, if you haven't noticed from other social networking channels, there is a live stream from Kamailio World 2017, thanks to Pascom team: - http://live.pascom.net/ Enjoy! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

2 2

git:master:3ab38fd1: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 10 May '17

10 May '17

Module: kamailio Branch: master Commit: 3ab38fd199ea72c21750b242fffe8c8a5ca85631 URL: https://github.com/kamailio/kamailio/commit/3ab38fd199ea72c21750b242fffe8c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-10T06:47:22+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/3ab38fd199ea72c21750b242fffe8c8… Patch: https://github.com/kamailio/kamailio/commit/3ab38fd199ea72c21750b242fffe8c8… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 43d283f..8ef7d7d 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -48,6 +48,7 @@ Carsten Bock 3.5. cluster (integer) 3.6. allowed_timeouts (integer) 3.7. disable_time (integer) + 3.8. flush_on_reconnect (integer) 4. Functions @@ -65,9 +66,10 @@ Carsten Bock 1.5. Set cluster parameter 1.6. Set allowed_timeots parameter 1.7. Set disable_time parameter - 1.8. redis_cmd usage - 1.9. redis_execute usage - 1.10. redis_free usage + 1.8. Set flush_on_reconnect parameter + 1.9. redis_cmd usage + 1.10. redis_execute usage + 1.11. redis_free usage Chapter 1. Admin Guide @@ -88,6 +90,7 @@ Chapter 1. Admin Guide 3.5. cluster (integer) 3.6. allowed_timeouts (integer) 3.7. disable_time (integer) + 3.8. flush_on_reconnect (integer) 4. Functions @@ -130,6 +133,7 @@ Chapter 1. Admin Guide 3.5. cluster (integer) 3.6. allowed_timeouts (integer) 3.7. disable_time (integer) + 3.8. flush_on_reconnect (integer) 3.1. server (str) @@ -259,6 +263,27 @@ modparam("ndb_redis", "allowed_timeouts", 0) modparam("ndb_redis", "disable_time", 30) ... +3.8. flush_on_reconnect (integer) + + If this is set to a non zero value, a "FLUSHALL" command is issued + after reconnecting to a REDIS server, to clear the entire database. + + When a command to a REDIS server fails, a reconnection to that server + is made, so with this parameter each failed command will result in a + flush of the database. + + This is useful in scenarios when a REDIS server does not respond to + commands, but the commands might have been issued, and the responses + lost. If this leaves the data in the db in an uncertain state, a flush + might fix any issues that may occur. + + Default value is “0” (disabled). + + Example 1.8. Set flush_on_reconnect parameter +... +modparam("ndb_redis", "flush_on_reconnect", 1) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -289,7 +314,7 @@ modparam("ndb_redis", "disable_time", 30) * value[n] - returns value of the nth element. value - returns null for an array. You need to get each element by index. - Example 1.8. redis_cmd usage + Example 1.9. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -358,7 +383,7 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. - Example 1.9. redis_execute usage + Example 1.10. redis_execute usage ... After several redis command calls: redis_pipe_cmd("srvA", "SET foo bar", "r1"); @@ -406,7 +431,7 @@ d commands. The call is not necessary function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.10. redis_free usage + Example 1.11. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r");

1 0

git:master:4bb9a95e: ndb_redis: renamed parameter flush_db_on_reconnect to flush_on_reconnect
by Daniel-Constantin Mierla 10 May '17

10 May '17

Module: kamailio Branch: master Commit: 4bb9a95ec66684d545cb97f96091ba1d48baab8b URL: https://github.com/kamailio/kamailio/commit/4bb9a95ec66684d545cb97f96091ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-10T06:45:49+02:00 ndb_redis: renamed parameter flush_db_on_reconnect to flush_on_reconnect --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/4bb9a95ec66684d545cb97f96091ba1… Patch: https://github.com/kamailio/kamailio/commit/4bb9a95ec66684d545cb97f96091ba1…

1 0

git:master:c886a9b0: ndb_redis: add flush_db_on_reconnect parameter
by Claudiu Boriga 10 May '17

10 May '17

Module: kamailio Branch: master Commit: c886a9b0578a190f23a1084317cfecc3238a0007 URL: https://github.com/kamailio/kamailio/commit/c886a9b0578a190f23a1084317cfecc… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-09T15:02:45+03:00 ndb_redis: add flush_db_on_reconnect parameter --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/c886a9b0578a190f23a1084317cfecc… Patch: https://github.com/kamailio/kamailio/commit/c886a9b0578a190f23a1084317cfecc… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index e7dc381..e72fb51 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -239,6 +239,38 @@ modparam("ndb_redis", "disable_time", 30) </programlisting> </example> </section> + <section id="ndb_redis.p.flush_db_on_reconnect"> + <title><varname>flush_db_on_reconnect</varname> (integer)</title> + <para> + If this is set to a non zero value, a "FLUSHALL" command is + issued after reconnecting to a REDIS server, to clear the + entire database. + </para> + <para> + When a command to a REDIS server fails, a reconnection + to that server is made, so with this parameter each failed + command will result in a flush of the database. + </para> + <para> + This is useful in scenarios when a REDIS server does not respond + to commands, but the commands might have been issued, and the + responses lost. If this leaves the data in the db in an uncertain + state, a flush might fix any issues that may occur. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>flush_db_on_reconnect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ndb_redis", "flush_db_on_reconnect", 1) +... + </programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 6e43849..2cac1fb 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -50,6 +50,7 @@ int redis_cmd_timeout_param = 1000; int redis_cluster_param = 0; int redis_disable_time_param=0; int redis_allowed_timeouts_param=-1; +int redis_flush_db_on_reconnect_param=0; static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); @@ -124,6 +125,7 @@ static param_export_t params[]={ {"cluster", INT_PARAM, &redis_cluster_param}, {"disable_time", INT_PARAM, &redis_disable_time_param}, {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, + {"flush_db_on_reconnect", INT_PARAM, &redis_flush_db_on_reconnect_param}, {0, 0, 0} }; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9fb7791..4683133 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -51,6 +51,7 @@ extern int redis_cmd_timeout_param; extern int redis_cluster_param; extern int redis_disable_time_param; extern int redis_allowed_timeouts_param; +extern int redis_flush_db_on_reconnect_param; /* backwards compatibility with hiredis < 0.12 */ #if (HIREDIS_MAJOR == 0) && (HIREDIS_MINOR < 12) @@ -374,7 +375,9 @@ int redisc_reconnect_server(redisc_server_t *rsrv) goto err2; if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, "SELECT %i", db)) goto err2; - + if (redis_flush_db_on_reconnect_param) + if (redisCommandNR(rsrv->ctxRedis, "FLUSHALL")) + goto err2; return 0; err2:

1 0

git:master:79e9133c: Merge pull request #1125 from claudiupb/redis_flush_on_reconnect
by GitHub 10 May '17

10 May '17

Module: kamailio Branch: master Commit: 79e9133ccd86b53b0199980d3f221e64da595344 URL: https://github.com/kamailio/kamailio/commit/79e9133ccd86b53b0199980d3f221e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-10T06:43:37+02:00 Merge pull request #1125 from claudiupb/redis_flush_on_reconnect ndb_redis: add flush_db_on_reconnect parameter --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/79e9133ccd86b53b0199980d3f221e6… Patch: https://github.com/kamailio/kamailio/commit/79e9133ccd86b53b0199980d3f221e6… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index e7dc381..e72fb51 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -239,6 +239,38 @@ modparam("ndb_redis", "disable_time", 30) </programlisting> </example> </section> + <section id="ndb_redis.p.flush_db_on_reconnect"> + <title><varname>flush_db_on_reconnect</varname> (integer)</title> + <para> + If this is set to a non zero value, a "FLUSHALL" command is + issued after reconnecting to a REDIS server, to clear the + entire database. + </para> + <para> + When a command to a REDIS server fails, a reconnection + to that server is made, so with this parameter each failed + command will result in a flush of the database. + </para> + <para> + This is useful in scenarios when a REDIS server does not respond + to commands, but the commands might have been issued, and the + responses lost. If this leaves the data in the db in an uncertain + state, a flush might fix any issues that may occur. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>flush_db_on_reconnect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ndb_redis", "flush_db_on_reconnect", 1) +... + </programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 6e43849..2cac1fb 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -50,6 +50,7 @@ int redis_cmd_timeout_param = 1000; int redis_cluster_param = 0; int redis_disable_time_param=0; int redis_allowed_timeouts_param=-1; +int redis_flush_db_on_reconnect_param=0; static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); @@ -124,6 +125,7 @@ static param_export_t params[]={ {"cluster", INT_PARAM, &redis_cluster_param}, {"disable_time", INT_PARAM, &redis_disable_time_param}, {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, + {"flush_db_on_reconnect", INT_PARAM, &redis_flush_db_on_reconnect_param}, {0, 0, 0} }; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9fb7791..4683133 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -51,6 +51,7 @@ extern int redis_cmd_timeout_param; extern int redis_cluster_param; extern int redis_disable_time_param; extern int redis_allowed_timeouts_param; +extern int redis_flush_db_on_reconnect_param; /* backwards compatibility with hiredis < 0.12 */ #if (HIREDIS_MAJOR == 0) && (HIREDIS_MINOR < 12) @@ -374,7 +375,9 @@ int redisc_reconnect_server(redisc_server_t *rsrv) goto err2; if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, "SELECT %i", db)) goto err2; - + if (redis_flush_db_on_reconnect_param) + if (redisCommandNR(rsrv->ctxRedis, "FLUSHALL")) + goto err2; return 0; err2:

1 0

[kamailio/kamailio] ndb_redis: add flush_db_on_reconnect parameter (#1125)
by Paul Claudiu Boriga 10 May '17

10 May '17

Hello, We added a new parameter to ndb_redis module. If set to 1 a "FLUSHALL" command is issued to the REDIS server when reconnecting to a server after a failed command. This way for each failed command the database is flushed. This is useful when a connection to the REDIS server may become unstable and some commands are issued but the replies are not received (it may happen that the command has reached the REDIS server but the reply was lost). If for example we increment and decrement counters this may leave the db in an invalid state. This can especially happen if the allowed_timeouts/disable_time parameters are configured, since the first commands may be issued and the next ones are never tried. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1125 -- Commit Summary -- * ndb_redis: add flush_db_on_reconnect parameter -- File Changes -- M src/modules/ndb_redis/doc/ndb_redis_admin.xml (32) M src/modules/ndb_redis/ndb_redis_mod.c (2) M src/modules/ndb_redis/redis_client.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1125.patch https://github.com/kamailio/kamailio/pull/1125.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/1125

2 2

Re: [sr-dev] presence/mwi error
by Li, Bing 10 May '17

10 May '17

It seems it didn't link to the original thread https://lists.kamailio.org//pipermail/sr-dev/2016-September/036616.html . It's not clear to me which commit is the patch. Thanks,

1 0

Re: [sr-dev] presence/mwi error
by Li, Bing 09 May '17

09 May '17

Hi, It seems I ran into the same issue on 5.0.1. Was using pua.publish and my Kamailio complained "Entity: line 1: parser error : Start tag expected, '<' not found Messages-Waiting: yes ^ 2(8) ERROR: presence [presentity.c:283]: check_if_dialog(): failed to parse xml document" The content-type is "application/simple-message-summary". Do we need the same patch in 5.0.x? Thanks, Bing

1 0

git:master:df04997c: dmq_usrloc: fix incorrectly formatted XML docbook
by Charles Chance 09 May '17

09 May '17

Module: kamailio Branch: master Commit: df04997cd1505b3687a7005c7578a9b012f25d85 URL: https://github.com/kamailio/kamailio/commit/df04997cd1505b3687a7005c7578a9b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-05-09T13:41:12+01:00 dmq_usrloc: fix incorrectly formatted XML docbook --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc.xml Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/df04997cd1505b3687a7005c7578a9b… Patch: https://github.com/kamailio/kamailio/commit/df04997cd1505b3687a7005c7578a9b… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc.xml index c6b36ac..8391296 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc.xml @@ -39,6 +39,7 @@ <copyright> <year>2014</year> </copyright> + <authorgroup> <editor> <firstname>Julien</firstname> <surname>Chavanton</surname> diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index 81be430..e936573 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -180,10 +180,12 @@ modparam("dmq_usrloc", "batch_usleep", 1000) <section id="usrloc_dmq.p.batch_msg_size"> <title><varname>batch_msg_size</varname> (int)</title> <para> - The parameter controls the size of the messages during a sync - This is to make sure the messages are never larger then 65536 (the maximum datagram size) - - Note that batch_msg_contacts will also be checked + The parameter controls the size of the messages during a sync. + This is to make sure the messages are never larger then 65536 (the maximum datagram size). + </para> + <para> + Note that batch_msg_contacts will also be checked. + </para> <para> <emphasis> Default value is 60000. @@ -204,9 +206,11 @@ modparam("dmq_usrloc", "batch_msg_size", 500000) <section id="usrloc_dmq.p.batch_msg_contacts"> <title><varname>batch_msg_contacts</varname> (int)</title> <para> - The parameter controls the amount of contact per message/transaction during a sync - - Note that batch_msg_size will also be checked + The parameter controls the amount of contact per message/transaction during a sync. + </para> + <para> + Note that batch_msg_size will also be checked. + </para> <para> <emphasis> Default value is 1. @@ -225,7 +229,6 @@ modparam("dmq_usrloc", "batch_usleep", 500000) # one batch every 500ms </programlisting> </example> </section> - </section> <section id="usrloc_dmq.p.usrloc_domain"> <title><varname>usrloc_domain</varname> (string)</title> @@ -246,6 +249,7 @@ modparam("dmq_usrloc", "usrloc_domain", "my_domain") </programlisting> </example> </section> + </section> </chapter>

2 2

git:master:e45e3b53: modules: readme files regenerated - db_text ... [skip ci]
by Kamailio Dev 09 May '17

09 May '17

Module: kamailio Branch: master Commit: e45e3b534887d42593e4fcb01c0da49660d94435 URL: https://github.com/kamailio/kamailio/commit/e45e3b534887d42593e4fcb01c0da49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-09T14:46:26+02:00 modules: readme files regenerated - db_text ... [skip ci] --- Modified: src/modules/db_text/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/e45e3b534887d42593e4fcb01c0da49… Patch: https://github.com/kamailio/kamailio/commit/e45e3b534887d42593e4fcb01c0da49…

1 0

dmq_usrloc documentation was not regenerated
by Julien Chavanton 09 May '17

09 May '17

Hi, not sure why the dmq_usrloc documentation was not regenerated, maybe a typo in the xml files https://kamailio.org/docs/modules/devel/modules/dmq_usrloc.html Julien

1 0

git:master:358cf95e: tm: t_drop_replies() exported to kemi framework
by Daniel-Constantin Mierla 09 May '17

09 May '17

Module: kamailio Branch: master Commit: 358cf95e68fd1b41ff8f7aee6478aa9c79361765 URL: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-09T06:30:55+02:00 tm: t_drop_replies() exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… Patch: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index c7dd7df..0559286 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2044,19 +2044,34 @@ int t_grep_status(struct sip_msg* msg, char* status, char* bar) /* drop all the existing replies in failure_route to make sure * that none of them is picked up again */ -static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar) +static int t_drop_replies_helper(sip_msg_t* msg, char* mode) { - if(foo==NULL) + if(mode==NULL) t_drop_replies(1); - else if(*foo=='n') + else if(*mode=='n') t_drop_replies(0); - else if(*foo=='l') + else if(*mode=='l') t_drop_replies(2); else t_drop_replies(1); return 1; } +static int w_t_drop_replies(struct sip_msg* msg, char* mode, char* bar) +{ + return t_drop_replies_helper(msg, mode); +} + +static int ki_t_drop_replies(sip_msg_t* msg, str* mode) +{ + return t_drop_replies_helper(msg, (mode)?mode->s:NULL); +} + +static int ki_t_drop_replies_all(sip_msg_t* msg) +{ + return t_drop_replies_helper(msg, NULL); +} + /* save the message lumps after t_newtran() but before t_relay() */ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) { @@ -2695,6 +2710,16 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_drop_replies_all"), + SR_KEMIP_INT, ki_t_drop_replies_all, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_drop_replies"), + SR_KEMIP_INT, ki_t_drop_replies, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:5.0:1ce6019d: topos: correct order of Route header after restoring from b_rr
by Daniel-Constantin Mierla 08 May '17

08 May '17

Module: kamailio Branch: 5.0 Commit: 1ce6019d4296603f701231cf55b090e22a137e0f URL: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T20:56:13+02:00 topos: correct order of Route header after restoring from b_rr - fixes routing with a chain of sip proxies - GH #1124 (cherry picked from commit 98d1cf0454faa8f904d8bc08c73c70dc7b15de61) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… Patch: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 462dedd..bff2b2a 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -789,7 +789,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 0)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { LM_ERR("failed to reappend b-route\n"); return -1; }

1 0

[kamailio/kamailio] topos: correct order of Route header after restoring from b_rr (#1124)
by sergey-vb 08 May '17

08 May '17

With topoh enabled I have: Route: <sip:10.56.42.37:5070;lr;ftag=IpXq-LwNvJF6WrkOcmZNf9WjmGjK5dUv;did=90c.1132;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr> But with topos enabled I have: Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr>,<sip:10.56.42.37:5070;lr;ftag=EN0cvoXXCOgdGoO2zizq-WNmE4Enf4Nt;did=434.5ce1;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> And kamailio trying to send ACK to TEST.MSS.LIFE.COM:5060 After this patch Route header are restores in from: Route: <sip:10.56.42.37:5070;lr;ftag=EN0cvoXXCOgdGoO2zizq-WNmE4Enf4Nt;did=434.5ce1;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr> Now ACK are routed correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1124 -- Commit Summary -- * topos: correct order of Route header after restoring from b_rr -- File Changes -- M src/modules/topos/tps_msg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1124.patch https://github.com/kamailio/kamailio/pull/1124.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/1124

2 2

git:master:98d1cf04: topos: correct order of Route header after restoring from b_rr
by Daniel-Constantin Mierla 08 May '17

08 May '17

Module: kamailio Branch: master Commit: 98d1cf0454faa8f904d8bc08c73c70dc7b15de61 URL: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T20:53:17+02:00 topos: correct order of Route header after restoring from b_rr - fixes routing with a chain of sip proxies - GH #1124 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… Patch: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 462dedd..bff2b2a 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -789,7 +789,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 0)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { LM_ERR("failed to reappend b-route\n"); return -1; }

1 0

git:master:653b7343: p_usrloc: limit db writes of error count
by Lucian Balaceanu 08 May '17

08 May '17

Module: kamailio Branch: master Commit: 653b7343ebcca5f53f56bace94772a982bf0f887 URL: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-05-08T19:10:00+03:00 p_usrloc: limit db writes of error count - when db_errors_treshold limit is reached kamailio should stop increasing the errors field so as not to load mysql with no use --- Modified: src/modules/p_usrloc/ul_db.c --- Diff: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… Patch: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… --- diff --git a/src/modules/p_usrloc/ul_db.c b/src/modules/p_usrloc/ul_db.c index a954259..cf1b940 100644 --- a/src/modules/p_usrloc/ul_db.c +++ b/src/modules/p_usrloc/ul_db.c @@ -162,26 +162,29 @@ int db_handle_error(ul_db_handle_t * handle, int no) { LM_ERR("can't get db.\n"); return -1; } - - if (sprintf(query, "UPDATE %.*s " - "SET %.*s=%.*s+1 " - "WHERE %.*s=%i " - "AND %.*s=%i", - reg_table.len, reg_table.s, - error_col.len, error_col.s, error_col.len, error_col.s, - id_col.len, id_col.s, handle->id, - num_col.len, num_col.s, db->no) < 0) { - LM_ERR("could not print the query\n"); - return -1; - } - tmp.s = query; - tmp.len = strlen(query); - if (mdb.write.dbf.raw_query (mdb.write.dbh, &tmp, NULL)) { - LM_ERR("error in database update.\n"); - return -1; + if (db->errors < db_error_threshold) { + if (sprintf(query, "UPDATE %.*s " + "SET %.*s=%.*s+1 " + "WHERE %.*s=%i " + "AND %.*s=%i", + reg_table.len, reg_table.s, + error_col.len, error_col.s, error_col.len, error_col.s, + id_col.len, id_col.s, handle->id, + num_col.len, num_col.s, db->no) < 0) { + LM_ERR("could not print the query\n"); + return -1; + } + + tmp.s = query; + tmp.len = strlen(query); + + if (mdb.write.dbf.raw_query (mdb.write.dbh, &tmp, NULL)) { + LM_ERR("error in database update.\n"); + return -1; + } } - + for(i=0; i<DB_NUM; i++){ if (handle->db[i].dbh && handle->db[i].dbf.close){ handle->db[i].dbf.close(handle->db[i].dbh);

1 0

git:master:e2a5608e: ndb_redis: increasing a log message level
by Lucian Balaceanu 08 May '17

08 May '17

Module: kamailio Branch: master Commit: e2a5608e421d8e10e915abaadc0d9d3d5a155b8a URL: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-05-08T13:31:19+03:00 ndb_redis: increasing a log message level --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… Patch: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 0bf9838..9fb7791 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1029,7 +1029,7 @@ int redis_check_server(redisc_server_t *rsrv) { if (get_ticks() > rsrv->disable.restore_tick) { - LM_INFO("REDIS server %.*s re-enabled",rsrv->sname->len,rsrv->sname->s); + LM_NOTICE("REDIS server %.*s re-enabled",rsrv->sname->len,rsrv->sname->s); rsrv->disable.disabled = 0; rsrv->disable.consecutive_errors = 0; }

1 0

linking WebRTC with SDR at Kamailio World?
by Daniel Pocock 08 May '17

08 May '17

Hi, There is a demo session at Kamailio World on Wednesday and I had an idea for a demo that could potentially be hacked together as a collaborative/team effort. The idea is simple: using WebRTC to control a radio transceiver. This is not so hard thanks to Software Defined Radio (SDR). It would be like RetroRTC[1], but with a radio instead of a rotary phone. I have SDR and ham equipment with me in Berlin (for use at OSCAL'17 on the weekend[2]) and but I simply wouldn't have time to put the whole thing together individually in the next two days. If anybody wants to collaborate on it with me, however, it is possible to break it into small pieces and we could get it going: - JsSIP / JSCommunicator[3] - adding a slider for squelch control - sending a SIP INFO message to send squelch level - adding a box for frequency selection - sending a SIP INFO message to change frequency - adding a PTT button - sending a SIP INFO message for PTT - adding a green LED light for RX (squelch open) and red for TX - receiving SIP INFO messages with RX and TX status (maybe some of that could be done with SUBSCRIBE/NOTIFY instead of SIP INFO?) - gqrx[4] (GNU-Radio based app developed in Python) - adding some hooks to receive commands over a message queue with Qpid Proton's Python API[5] and dispatch the commands to the button handlers - adding some hooks to send status (e.g. squelch open) over a topic with Qpid Proton - instead of sending the audio to the speaker, send it to the B2BUA or as RTP - SIP proxy or B2BUA - which one would be best? - add some glue code to map the SIP INFO messages to the Qpid Proton messages and vice versa - take the audio from gqrx (maybe regular RTP on localhost) and send it as DTLS-SRTP to the browser I had a look in Google and it doesn't find any example of anybody doing WebRTC with SDR before, so if we got this going it would be quite innovative. Regards, Daniel 1. http://retrortc.versatica.com/ 2. https://danielpocock.com/fsfe-fellowship-representative-and-upcoming-events 3. https://jscommunicator.org 4. http://gqrx.dk/ 5. https://qpid.apache.org/releases/qpid-proton-0.17.0/proton/python/book/tuto…

1 0

git:master:d5d2bbd4: log_custom: exported functions to kemi framework
by Daniel-Constantin Mierla 08 May '17

08 May '17

Module: kamailio Branch: master Commit: d5d2bbd4fd6cad48bd0dcf8e577009f95ff3f53e URL: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T07:59:56+02:00 log_custom: exported functions to kemi framework --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… Patch: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index b0ecbd7..f88a783 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -32,6 +32,7 @@ #include "../../core/forward.h" #include "../../core/resolve.h" #include "../../core/udp_server.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -71,52 +72,6 @@ struct module_exports exports = { child_init /* per child init function */ }; - -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - str dest = {0}; - int ret = 0; - struct sip_uri next_hop, *u; - char *p; - - if(_km_log_engine_type==0 || _km_log_engine_data==0) - return 0; - - - if(strcasecmp(_km_log_engine_type, "udp")!=0) - return 0; - - dest.s = _km_log_engine_data; - dest.len = strlen(dest.s); - - init_dest_info(&_lc_udp_dst); - - u = &next_hop; - u->port_no = 5060; - u->host = dest; - p = dest.s; - /* detect ipv6 */ - p = memchr(p, ']', dest.len); - if (p) p++; - else p = dest.s; - p = memchr(p, ':', dest.len - (p - dest.s)); - if (p) { - u->host.len = p - dest.s; - p++; - u->port_no = str2s(p, dest.len - (p - dest.s), NULL); - } - - ret = sip_hostport2su(&_lc_udp_dst.to, &u->host, u->port_no, - &_lc_udp_dst.proto); - if(ret!=0) { - LM_ERR("failed to resolve [%.*s]\n", u->host.len, - ZSW(u->host.s)); - return -1;; - } - - return 0; -} - /** * init module function */ @@ -195,3 +150,79 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) va_end(arglist); udp_send(&_lc_udp_dst, obuf, n); } + +int ki_log_udp(sip_msg_t *msg, str *txt) +{ + int ret; + + if(_lc_log_udp==0) + return 1; + + ret=udp_send(&_lc_udp_dst, txt->s, txt->len); + + if(ret==0) return 1; + + return ret; + +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_log_custom_exports[] = { + { str_init("log_custom"), str_init("log_udp"), + SR_KEMIP_INT, ki_log_udp, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + str dest = {0}; + int ret = 0; + struct sip_uri next_hop, *u; + char *p; + + if(_km_log_engine_type==0 || _km_log_engine_data==0) + return 0; + + + if(strcasecmp(_km_log_engine_type, "udp")!=0) + return 0; + + dest.s = _km_log_engine_data; + dest.len = strlen(dest.s); + + init_dest_info(&_lc_udp_dst); + + u = &next_hop; + u->port_no = 5060; + u->host = dest; + p = dest.s; + /* detect ipv6 */ + p = memchr(p, ']', dest.len); + if (p) p++; + else p = dest.s; + p = memchr(p, ':', dest.len - (p - dest.s)); + if (p) { + u->host.len = p - dest.s; + p++; + u->port_no = str2s(p, dest.len - (p - dest.s), NULL); + } + + ret = sip_hostport2su(&_lc_udp_dst.to, &u->host, u->port_no, + &_lc_udp_dst.proto); + if(ret!=0) { + LM_ERR("failed to resolve [%.*s]\n", u->host.len, + ZSW(u->host.s)); + return -1; + } + + sr_kemi_modules_add(sr_kemi_log_custom_exports); + return 0; +}

1 0

git:master:17be61ed: path: exported functions to kemi interface
by Daniel-Constantin Mierla 07 May '17

07 May '17

Module: kamailio Branch: master Commit: 17be61ed40dc995e301c2bf24f7e7151a3e16ff0 URL: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-07T08:22:57+02:00 path: exported functions to kemi interface --- Modified: src/modules/path/path.c Modified: src/modules/path/path.h Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715… Patch: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715…

1 0

[kamailio/kamailio] Parse error in config file with $msrp(msgid) pseudovariable (#1122)
by NGSegovia 06 May '17

06 May '17

### Description I got parse error in config file. I am using MSRP module and if I try to use (to print a log) with `$msrp(msgid)` I get an error. According to the psudovariables documentation should work.  ### Troubleshooting #### Reproduction Just use within an event_route[msrp:frame-in] block $msrp(msgid). #### Log Messages  ``` 0(9827) ERROR: msrp [msrp_vars.c:118]: pv_parse_msrp_name(): unknown PV msrp name msgid 0(9827) ERROR: <core> [pvapi.c:877]: pv_parse_spec2(): pvar "msrp" has an invalid name param [msgid] 0(9827) ERROR: <core> [pvapi.c:1032]: pv_parse_spec2(): wrong char [)/41] in [$msrp(msgid)] at [11 (5)] 0(9827) : <core> [cfg.y:3368]: yyerror_at(): parse error in config file route.cfg, line 649, column 40-51: Can't get from cache: $msrp(msgid) ERROR: bad config file (1 errors) ``` ### Additional Information * **Kamailio Version** -4.4.5 * **Operating System**:  ``` Linux test 2.6.32-642.15.1.el6.x86_64 #1 SMP Fri Feb 24 14:31:22 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1122

2 2

git:4.4:d480941d: msrp: fix missed break in parsing pv name
by Daniel-Constantin Mierla 06 May '17

06 May '17

Module: kamailio Branch: 4.4 Commit: d480941d52756a974e9f473b0474e4675c84f862 URL: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T09:19:16+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 (cherry picked from commit c32ba91fbbe59e144ddcb40be33b3379bcf3d64d) (cherry picked from commit 1686d9d7519a3a72293245687d307f0d99a2b503) --- Modified: modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… Patch: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… --- diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 98452fe..6cbf1a6 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

1 0

git:5.0:1686d9d7: msrp: fix missed break in parsing pv name
by Daniel-Constantin Mierla 06 May '17

06 May '17

Module: kamailio Branch: 5.0 Commit: 1686d9d7519a3a72293245687d307f0d99a2b503 URL: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T09:17:46+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 (cherry picked from commit c32ba91fbbe59e144ddcb40be33b3379bcf3d64d) --- Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… Patch: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… --- diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 3267bc5..fddabde 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

1 0

git:master:c32ba91f: msrp: fix missed break in parsing pv name
by Daniel-Constantin Mierla 06 May '17

06 May '17

Module: kamailio Branch: master Commit: c32ba91fbbe59e144ddcb40be33b3379bcf3d64d URL: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T08:58:25+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 --- Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… Patch: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… --- diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 3267bc5..fddabde 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

1 0

git:master:d268d935: misc/examples: fixed typo in sqlang kemi example
by GitHub 06 May '17

06 May '17

Module: kamailio Branch: master Commit: d268d935a4e1e92389ef1c7299f83933c23e6d91 URL: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-06T08:10:44+02:00 misc/examples: fixed typo in sqlang kemi example --- Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… Patch: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index e3c82f9..9eda6a9 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -336,7 +336,7 @@ function ksr_route_sipout() KSR.hdr.append_hf("P-Hint: outbound\r\n"); ksr_route_relay(); - KSR.xexit();; + KSR.x.exit(); } // Manage outgoing branches

1 0

git:master:0e84e7b1: misc/examples: fixed typo in kemi js example
by GitHub 06 May '17

06 May '17

Module: kamailio Branch: master Commit: 0e84e7b13fa934f47d1c68a2b040109db473e082 URL: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-06T07:52:43+02:00 misc/examples: fixed typo in kemi js example --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… Patch: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 733b759..f215176 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -335,7 +335,7 @@ function ksr_route_sipout() KSR.hdr.append_hf("P-Hint: outbound\r\n"); ksr_route_relay(); - KSR.xexit();; + KSR.x.exit(); } // Manage outgoing branches

1 0

git:master:37a2dc07: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 May '17

05 May '17

Module: kamailio Branch: master Commit: 37a2dc075a98ea79b44d3e1ea422b65c852d4a09 URL: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-05T16:01:21+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65… Patch: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65…

1 0

git:master:1aa2e58f: rtpengine: consume MOS values reported back by RTP proxy
by Richard Fuchs 05 May '17

05 May '17

Module: kamailio Branch: master Commit: 1aa2e58fb5d167c1fd43d3c9ba2f341379983508 URL: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-05-05T09:57:44-04:00 rtpengine: consume MOS values reported back by RTP proxy --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341… Patch: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341…

1 0

git:master:ce7c10ca: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 05 May '17

05 May '17

Module: kamailio Branch: master Commit: ce7c10ca81541137b08ae962008dcef9ecc6f7d9 URL: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-05T10:16:21+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… Patch: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 280a6f4..43d283f 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -46,6 +46,8 @@ Carsten Bock 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 4. Functions @@ -61,9 +63,11 @@ Carsten Bock 1.3. Set connect_timeout parameter 1.4. Set cmd_timeout parameter 1.5. Set cluster parameter - 1.6. redis_cmd usage - 1.7. redis_execute usage - 1.8. redis_free usage + 1.6. Set allowed_timeots parameter + 1.7. Set disable_time parameter + 1.8. redis_cmd usage + 1.9. redis_execute usage + 1.10. redis_free usage Chapter 1. Admin Guide @@ -82,6 +86,8 @@ Chapter 1. Admin Guide 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 4. Functions @@ -122,6 +128,8 @@ Chapter 1. Admin Guide 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 3.1. server (str) @@ -211,6 +219,46 @@ modparam("ndb_redis", "server", "name=127.0.0.1:26008;addr=127.0.0.1;port=26008" modparam("ndb_redis", "cluster", 1) ... +3.6. allowed_timeouts (integer) + + If this is set to a non-negative value, it sets the number of + consecutive REDIS commands that can fail before temporarily disabling + the REDIS server. This is similar to rtpengine_disable_tout parameter + from the rtpengine module. + + When communicating with a REDIS server, if redis_cmd or redis_execute + will fail for more than “allowed_timeouts” consecutive times, the + server will be temporary disabled for a number of seconds configured by + the “disable_time” parameter. + + Disabling a server means that further redis_cmd and redis_execute + commands will not do anything and return a negative value “-2”. + Messages are also logged when disabling and re-enabling a server. + + The number of consecutive fails are counted by each Kamailio process, + so when disabling a server this is done just for that process, not + globally. + + Default value is “-1” (disabled). + + Example 1.6. Set allowed_timeots parameter +... +modparam("ndb_redis", "allowed_timeouts", 3) +... + +3.7. disable_time (integer) + + If allowed_timeouts is set to a non negative value this determines the + number of seconds the REDIS server will be disabled + + Default value is “0”. + + Example 1.7. Set disable_time parameter +... +modparam("ndb_redis", "allowed_timeouts", 0) +modparam("ndb_redis", "disable_time", 30) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -241,7 +289,7 @@ modparam("ndb_redis", "cluster", 1) * value[n] - returns value of the nth element. value - returns null for an array. You need to get each element by index. - Example 1.6. redis_cmd usage + Example 1.8. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -310,7 +358,7 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. - Example 1.7. redis_execute usage + Example 1.9. redis_execute usage ... After several redis command calls: redis_pipe_cmd("srvA", "SET foo bar", "r1"); @@ -358,7 +406,7 @@ d commands. The call is not necessary function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.8. redis_free usage + Example 1.10. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r");

1 0

git:master:395699a8: ndb_redis: rename variables to avoind name conflicts
by Claudiu Boriga 05 May '17

05 May '17

Module: kamailio Branch: master Commit: 395699a80345e5721580ebac3b5944f603acdb32 URL: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-05T09:37:29+03:00 ndb_redis: rename variables to avoind name conflicts --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… Patch: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 0906aab..6e43849 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -48,8 +48,8 @@ int init_without_redis = 0; int redis_connect_timeout_param = 1000; int redis_cmd_timeout_param = 1000; int redis_cluster_param = 0; -int disable_time=0; -int allowed_timeouts=-1; +int redis_disable_time_param=0; +int redis_allowed_timeouts_param=-1; static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); @@ -122,8 +122,8 @@ static param_export_t params[]={ {"connect_timeout", INT_PARAM, &redis_connect_timeout_param}, {"cmd_timeout", INT_PARAM, &redis_cmd_timeout_param}, {"cluster", INT_PARAM, &redis_cluster_param}, - {"disable_time", INT_PARAM, &disable_time}, - {"allowed_timeouts", INT_PARAM, &allowed_timeouts}, + {"disable_time", INT_PARAM, &redis_disable_time_param}, + {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, {0, 0, 0} }; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 728a93d..0bf9838 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -49,8 +49,8 @@ extern int init_without_redis; extern int redis_connect_timeout_param; extern int redis_cmd_timeout_param; extern int redis_cluster_param; -extern int disable_time; -extern int allowed_timeouts; +extern int redis_disable_time_param; +extern int redis_allowed_timeouts_param; /* backwards compatibility with hiredis < 0.12 */ #if (HIREDIS_MAJOR == 0) && (HIREDIS_MINOR < 12) @@ -1043,17 +1043,17 @@ int redis_check_server(redisc_server_t *rsrv) int redis_count_err_and_disable(redisc_server_t *rsrv) { - if (allowed_timeouts < 0) + if (redis_allowed_timeouts_param < 0) { return 0; } rsrv->disable.consecutive_errors++; - if (rsrv->disable.consecutive_errors > allowed_timeouts) + if (rsrv->disable.consecutive_errors > redis_allowed_timeouts_param) { rsrv->disable.disabled=1; - rsrv->disable.restore_tick=get_ticks() + disable_time; - LM_WARN("REDIS server %.*s disabled for %d seconds",rsrv->sname->len,rsrv->sname->s,disable_time); + rsrv->disable.restore_tick=get_ticks() + redis_disable_time_param; + LM_WARN("REDIS server %.*s disabled for %d seconds",rsrv->sname->len,rsrv->sname->s,redis_disable_time_param); return 1; } return 0;

1 0

git:master:c55ad4e7: Merge pull request #1116 from claudiupb/redis_disable_server
by GitHub 05 May '17

05 May '17

Module: kamailio Branch: master Commit: c55ad4e71041961417370ebcca5d564daca8fa95 URL: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-05T10:05:12+02:00 Merge pull request #1116 from claudiupb/redis_disable_server ndb_redis: add disable server on failure feature --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564… Patch: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564…

1 0

git:master:d0101010: ndb_redis: add disable server on failure feature
by Claudiu Boriga 05 May '17

05 May '17

Module: kamailio Branch: master Commit: d0101010b891e60fdab0f76ae5ce899747d6586e URL: https://github.com/kamailio/kamailio/commit/d0101010b891e60fdab0f76ae5ce899… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-03T16:19:04+03:00 ndb_redis: add disable server on failure feature - if a server fails multiple consecutive times it is disabled temporarily and commands to it will not do anything. --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/d0101010b891e60fdab0f76ae5ce899… Patch: https://github.com/kamailio/kamailio/commit/d0101010b891e60fdab0f76ae5ce899…

1 0

[kamailio/kamailio] ndb_redis: add disable server on failure feature (#1116)
by Paul Claudiu Boriga 05 May '17

05 May '17

Hello, We added a new feature to the ndb_redis module, similar to how the rtpengine_disable_tout parameter of the rtpengine module works. If a number of consecutive commands to a redis server fail, that server is temporarily disabled. This is configurable by parameters: "allowed_timeouts" and "disable_time". Disabling a server means that for "disable_time" seconds any command to that sever will not send the command to the server, but an error is returned instead. For example if allowed_timeouts is configured to 0 and disable_time to 30, the first time redis_cmd or redis_execute functions fail the server will be disabled for 30 seconds. The server information is retained by each Kamailio process individually, so this means that disabling a server is done by that process only and not globally. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1116 -- Commit Summary -- * ndb_redis: add disable server on failure feature -- File Changes -- M src/modules/ndb_redis/doc/ndb_redis_admin.xml (58) M src/modules/ndb_redis/ndb_redis_mod.c (4) M src/modules/ndb_redis/redis_client.c (77) M src/modules/ndb_redis/redis_client.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1116.patch https://github.com/kamailio/kamailio/pull/1116.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/1116

2 5

git:master:ae081b25: tm: exported load contacts functions to kemi framework
by Daniel-Constantin Mierla 05 May '17

05 May '17

Module: kamailio Branch: master Commit: ae081b252e74e54509e45b3ee1163525e03e27f1 URL: https://github.com/kamailio/kamailio/commit/ae081b252e74e54509e45b3ee116352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-05T08:54:52+02:00 tm: exported load contacts functions to kemi framework --- Modified: src/modules/tm/t_serial.c Modified: src/modules/tm/t_serial.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ae081b252e74e54509e45b3ee116352… Patch: https://github.com/kamailio/kamailio/commit/ae081b252e74e54509e45b3ee116352…

1 0

[kamailio/kamailio] Malforming of sip message by multiple forwards (#1108)
by hdssdsdsdsfsdf 04 May '17

04 May '17

### Description I forward a sip message multiple times. I expect the sip messages that are forwarded after previous ones, to look the same. In stead, multiple via-headers are added for the host. If I modify the sip message after forwarding it, I expect the modifications to be correctly processed for subsequent forwards, in stead the modifications are mixed with elements from the previously forwarded sip message. For example setting $td to value x, forwarding, setting $td to value y, and forwarding again, results in a sip message with a to-domain of xy, in stead of just y. #### Reproduction To reproduce, add this to your main route and enable dispatching. For the example sip messages below, I ran this code on CANCEL messages. ``` ds_select_domain("2", "6"); $td = $nh(d); forward(); ds_next_domain(); $td = $nh(d); forward(); ``` Run wireshark to see the resulting sip-messages on the wire. #### SIP Traffic As an example of a 'double' forward along with modification of $td to send the initial sip message to both [a::3] and [b::4] (anonymized hosts): Part of the initial sip message (anonymized) CANCEL sip:x@x SIP/2.0 Via: SIP/2.0/UDP [x::1]:5060;rport;branch=z9hG4bK152CABB1BC44E9A0 From: <sip:y@x>;tag=00623356EBD9772B To: <sip:x@x> Part of the first forwarded sip message (anonymized) CANCEL sip:x@a:5060 SIP/2.0 Record-Route: <sip:[x];lr=on> Via: SIP/2.0/UDP [x:4A];branch=z9hG4bK9a21.932b3551ed4f18f509d1bfaeecb65ea5.0 Via: SIP/2.0/UDP [x::1]:5060;received=x:1;rport=5060;branch=z9hG4bK152CABB1BC44E9A0 From: <sip:y@x>;tag=00623356EBD9772B To: <sip:x@[a::3]> Part of the second forwarded sip message (anonymized) CANCEL sip:x@b:5060 SIP/2.0 Record-Route: <sip:[x];lr=on> Via: SIP/2.0/UDP [x:4A];branch=z9hG4bK9a21.932b3551ed4f18f509d1bfaeecb65ea5.0 Via: SIP/2.0/UDP [x:4A];branch=z9hG4bK9a21.932b3551ed4f18f509d1bfaeecb65ea5.0 Via: SIP/2.0/UDP [x::1]:5060;received=x:1;rport=5060;received=x:1;rport=5060;branch=z9hG4bK152CABB1BC44E9A0 From: <sip:y@x>;tag=00623356EBD9772B To: <sip:x@[a::3][b::4]> ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.4 (x86_64/linux) 852c47 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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: 852c47 compiled on 14:05:47 Mar 7 2017 with gcc 4.9.2 ``` * **Operating System**: Debian 8.7 ``` Linux x.x 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u2 (2017-03-07) x86_64 GNU/Linux ``` -- 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/1108

2 2

git:master:22fc0253: tm: use NAME define for initializing uac
by Daniel-Constantin Mierla 04 May '17

04 May '17

Module: kamailio Branch: master Commit: 22fc02538a7576bf35ef321980a607bdfb9bcc5f URL: https://github.com/kamailio/kamailio/commit/22fc02538a7576bf35ef321980a607b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T18:12:04+02:00 tm: use NAME define for initializing uac --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/22fc02538a7576bf35ef321980a607b… Patch: https://github.com/kamailio/kamailio/commit/22fc02538a7576bf35ef321980a607b… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 4e23a13..d6f0819 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -90,7 +90,7 @@ int uac_init(void) } /* calculate the initial From tag */ - src[0].s = "Long live SER server"; + src[0].s = "Long live " NAME " server"; src[0].len = strlen(src[0].s); src[1].s = si->address_str.s; src[1].len = strlen(src[1].s);

1 0

[kamailio/kamailio] Potential bug in kamailio-basic-kemi-python.py (#1117)
by Sam 04 May '17

04 May '17

In the file kamailio-basic-kemi-python.py:65 it reads ``` # handle requests within SIP dialogs self.ksr_route_withindlg(msg); ``` I wonder if it shouldn't read: ``` # handle requests within SIP dialogs if self.ksr_route_withindlg(msg) == -255: return 1 # -- only initial requests (no To tag) ``` Seems like that is the intended behavior based on the native example script and the return codes from ksr_route_withindlg(). Kamailio will always keep processing everything below line 69 regardless of the outcome of ksr_route_withindlg(). It might run fine anyway, but the comment is misleading in that case. I'm a beginner on Kamailio so any apologies if I misunderstood something here. The KEMI module is really exciting and we are developing a new project with it. So far it works great! -- 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/1117

2 2

git:master:d678d095: misc/examples: handle return code for ksr_route_withindlg() in kemy python example
by Daniel-Constantin Mierla 04 May '17

04 May '17

Module: kamailio Branch: master Commit: d678d095858271a0282b8a824840880f9994041b URL: https://github.com/kamailio/kamailio/commit/d678d095858271a0282b8a824840880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T18:06:46+02:00 misc/examples: handle return code for ksr_route_withindlg() in kemy python example - closes GH #1117 --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/d678d095858271a0282b8a824840880… Patch: https://github.com/kamailio/kamailio/commit/d678d095858271a0282b8a824840880… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 8d23a6b..b38a331 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -66,7 +66,8 @@ def ksr_request_route(self, msg): return 1; # handle requests within SIP dialogs - self.ksr_route_withindlg(msg); + if self.ksr_route_withindlg(msg)==-255 : + return 1; # -- only initial requests (no To tag)

1 0

git:master:a813dec2: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 04 May '17

04 May '17

Module: kamailio Branch: master Commit: a813dec2d82ced5ae0891f71f12e11dbd9a6cd37 URL: https://github.com/kamailio/kamailio/commit/a813dec2d82ced5ae0891f71f12e11d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-04T18:01:43+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/a813dec2d82ced5ae0891f71f12e11d… Patch: https://github.com/kamailio/kamailio/commit/a813dec2d82ced5ae0891f71f12e11d… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 8ecb5e3..5215d6f 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -857,6 +857,13 @@ rtpengine_offer(); messages. Including the “To” tag in a “delete” messages allows you to be more selective about which dialogues within a call are being torn down. + + to-tag=... - use the specified string as “To” tag instead of + the actual “To” tag from the SIP message, and force inclusion + of the tag in the message as per above. + + from-tag=... - use the specified string as “From” tag instead + of the actual “From” tag from the SIP message. + + call-id=... - use the specified string as “Call-ID” instead of + the actual “Call-ID” from the SIP message. + rtcp-mux-demux - if rtcp-mux (RFC 5761) was offered, make the RTP proxy accept the offer, but not offer it to the recipient of this message.

1 0

[kamailio/kamailio] kazoo: backports & fixes (#1119)
by lazedo 04 May '17

04 May '17

lots of fixes needed for proper operation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1119 -- Commit Summary -- * kazoo : add specific pua helpers * kazoo : code cleanup * kazoo : producer heartbeats * kazoo : add consistent worker binding option * kazoo : add broker zone to received payload * kazoo: add zone to connection event * kazoo: add exchange bindings * kazoo: create empty routing if not provided * kazoo: parse json with amqp specified bytes * kazoo: fix connection to root vhost * kazoo: add pua transaction lock type * kazoo: add more explicit fields to kz_pua * kazoo: add consistent worker key * kazoo: add time msg was received * kazoo: call cfg_update on child init * kazoo: add alternative name for sender * kazoo: missing sender alternative for presence * kazoo : fix json keys * kazoo: split exchange/queue declarations -- File Changes -- M src/modules/kazoo/defs.h (13) M src/modules/kazoo/kazoo.c (30) M src/modules/kazoo/kz_amqp.c (988) M src/modules/kazoo/kz_amqp.h (85) M src/modules/kazoo/kz_json.c (89) M src/modules/kazoo/kz_json.h (53) M src/modules/kazoo/kz_pua.c (593) M src/modules/kazoo/kz_pua.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1119.patch https://github.com/kamailio/kamailio/pull/1119.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/1119

2 3

git: new commits in branch 5.0
by lazedo 04 May '17

04 May '17

- URL: https://github.com/kamailio/kamailio/commit/42e57bdd1861bd5014a1f9156b298ac… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo : add specific pua helpers - URL: https://github.com/kamailio/kamailio/commit/e624d81c25c8fd67023f7c1aba7a119… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo : code cleanup - URL: https://github.com/kamailio/kamailio/commit/7b0983e35eb5e757e03f8b44cf714c4… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo : producer heartbeats - URL: https://github.com/kamailio/kamailio/commit/d37fc878619ce282da014a118f68bbe… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo : add consistent worker binding option - URL: https://github.com/kamailio/kamailio/commit/65b24aab0b3032fc81db561c6c593f6… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo : add broker zone to received payload - URL: https://github.com/kamailio/kamailio/commit/cadddda64276c6bc92c2b32d1581574… Author: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add zone to connection event - URL: https://github.com/kamailio/kamailio/commit/5456da50ac59f8cfa72966904821478… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add exchange bindings - URL: https://github.com/kamailio/kamailio/commit/e8773033ccc8b032da7d94575ddf336… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: create empty routing if not provided - URL: https://github.com/kamailio/kamailio/commit/2ad053ada2a267f76322a4b96312ccc… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: parse json with amqp specified bytes - URL: https://github.com/kamailio/kamailio/commit/25e6ef57cec5bcf92d507abe6efddda… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: fix connection to root vhost - URL: https://github.com/kamailio/kamailio/commit/4e68c63ed10ff11b50226f4a813eaee… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add pua transaction lock type - URL: https://github.com/kamailio/kamailio/commit/8e730d6f7170e2b5db1f4e5b05e589a… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add more explicit fields to kz_pua kz_pua.c was reformatted - URL: https://github.com/kamailio/kamailio/commit/a2fde7d6e17cbdbd195d89e14bc919a… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add consistent worker key - URL: https://github.com/kamailio/kamailio/commit/b78a90d4f123096f7c040b04440a849… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add time msg was received - URL: https://github.com/kamailio/kamailio/commit/2db35cac2b58f672a5b1d7a4f9c7d44… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: call cfg_update on child init - URL: https://github.com/kamailio/kamailio/commit/f94d13cffb300b65ea5869d81f225a5… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: add alternative name for sender - URL: https://github.com/kamailio/kamailio/commit/6d063732e931583e5316a5dca87a49c… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: missing sender alternative for presence - URL: https://github.com/kamailio/kamailio/commit/4359b5c101d08d09b7857ae2d2973ad… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo : fix json keys size of key and some refactoring - URL: https://github.com/kamailio/kamailio/commit/ae67447d24cdf2dc06469692ad10216… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:55:32+01:00 kazoo: split exchange/queue declarations

1 0

[kamailio/kamailio] kazoo: backports & fixes (#1118)
by lazedo 04 May '17

04 May '17

lots of fixes needed for proper operation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1118 -- Commit Summary -- * kazoo: backports & fixes -- File Changes -- M modules/kazoo/defs.h (13) M modules/kazoo/kazoo.c (51) M modules/kazoo/kz_amqp.c (995) M modules/kazoo/kz_amqp.h (85) M modules/kazoo/kz_hash.c (4) M modules/kazoo/kz_json.c (89) M modules/kazoo/kz_json.h (80) M modules/kazoo/kz_pua.c (593) M modules/kazoo/kz_pua.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1118.patch https://github.com/kamailio/kamailio/pull/1118.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/1118

2 3

git:4.4:548acd5f: kazoo: backports & fixes
by lazedo 04 May '17

04 May '17

Module: kamailio Branch: 4.4 Commit: 548acd5f024c655ac1bc8f8bc31b3fe9ce79ebaf URL: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe… Author: Luis Azedo <luis(a)2600hz.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:50:12+01:00 kazoo: backports & fixes --- Modified: modules/kazoo/defs.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h Modified: modules/kazoo/kz_json.c Modified: modules/kazoo/kz_json.h Modified: modules/kazoo/kz_pua.c Modified: modules/kazoo/kz_pua.h --- Diff: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe… Patch: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe…

1 0

git:master:e69579bc: rtpengine: Allow override of call_id, from/to tags
by Richard Fuchs 04 May '17

04 May '17

Module: kamailio Branch: master Commit: e69579bca5b0e08187481f228e621ece0d1b79d5 URL: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-05-04T11:48:35-04:00 rtpengine: Allow override of call_id, from/to tags closes #1103 --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec… Patch: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec…

1 0

[kamailio/kamailio] rtpengine: Delete flags & delete handling improvement (#1103)
by hdikme 04 May '17

04 May '17

-Extending rtpengine_delete() in order to enable specifying Call-ID, To-Tag and From-Tag for timed out dialogs. -Matching the calls to rtpengine machine correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1103 -- Commit Summary -- * rtpengine: Delete flags & delete handling improvement -- File Changes -- M src/modules/rtpengine/rtpengine.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1103.patch https://github.com/kamailio/kamailio/pull/1103.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/1103

2 4

git:master:c65f6393: kazoo: split exchange/queue declarations
by lazedo 04 May '17

04 May '17

Module: kamailio Branch: master Commit: c65f63934b294f39becc383f0482354c00fd9806 URL: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T15:53:17+01:00 kazoo: split exchange/queue declarations --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… Patch: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 4664c25..f7fc8c1 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1848,8 +1848,17 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) routing = kz_amqp_routing_new(""); } - exchange = kz_amqp_exchange_from_json(&exchange_s, json_obj); - queue = kz_amqp_queue_from_json(&queue_s, json_obj); + tmpObj = kz_json_get_object(json_obj, "exchange-def"); + if(tmpObj == NULL) { + tmpObj = json_obj; + } + exchange = kz_amqp_exchange_from_json(&exchange_s, tmpObj); + + tmpObj = kz_json_get_object(json_obj, "queue-def"); + if(tmpObj == NULL) { + tmpObj = json_obj; + } + queue = kz_amqp_queue_from_json(&queue_s, tmpObj); kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) {

1 0

questions about FL_RPL flag in dmq_usrloc
by 张顺通 04 May '17

04 May '17

In dmq_usrloc, a ucontact_t with FL_RPL flag will not send it's modify to other kamailio. For example, I have one edge and three kamailio(for register, name A B C). And First SIP REGISTER send to edge, and edge forward to register kamailio A, then kamailio B & C have FL_RPL flag, kamailio A do not have FL_RPL flag. In this situation, If kamailio A is crash, the second SIP REGISTER(same call-id and tag) forward to kamailio B, kamailio B will not replicate reg info to C, because kamailio B have FL_RPL flag. What is the suggestion in this case? Thanks

1 0

git:master:3ce13be0: auth: exported has_credentials() to kemi framework
by Daniel-Constantin Mierla 04 May '17

04 May '17

Module: kamailio Branch: master Commit: 3ce13be06217e7d49a5e4362bf5cf6e53ec584ac URL: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T07:31:41+02:00 auth: exported has_credentials() to kemi framework --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… Patch: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index cc66651..bdb0d7a 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -444,33 +444,40 @@ int w_consume_credentials(struct sip_msg* msg, char* s1, char* s2) /** * */ -int w_has_credentials(sip_msg_t *msg, char* realm, char* s2) +int ki_has_credentials(sip_msg_t *msg, str* srealm) { - str srealm = {0, 0}; hdr_field_t *hdr = NULL; int ret; - if (fixup_get_svalue(msg, (gparam_t*)realm, &srealm) < 0) { - LM_ERR("failed to get realm value\n"); - return -1; - } - - ret = find_credentials(msg, &srealm, HDR_PROXYAUTH_T, &hdr); + ret = find_credentials(msg, srealm, HDR_PROXYAUTH_T, &hdr); if(ret==0) { - LM_DBG("found www credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("found www credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; } - ret = find_credentials(msg, &srealm, HDR_AUTHORIZATION_T, &hdr); + ret = find_credentials(msg, srealm, HDR_AUTHORIZATION_T, &hdr); if(ret==0) { - LM_DBG("found proxy credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("found proxy credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; } - LM_DBG("no credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("no credentials with realm [%.*s]\n", srealm->len, srealm->s); return -1; } /** + * + */ +int w_has_credentials(sip_msg_t *msg, char* realm, char* s2) +{ + str srealm = {0, 0}; + + if (fixup_get_svalue(msg, (gparam_t*)realm, &srealm) < 0) { + LM_ERR("failed to get realm value\n"); + return -1; + } + return ki_has_credentials(msg, &srealm); +} +/** * @brief do WWW-Digest authentication with password taken from cfg var */ int pv_authenticate(struct sip_msg *msg, str *realm, str *passwd, @@ -1220,6 +1227,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("has_credentials"), + SR_KEMIP_INT, ki_has_credentials, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:82794924: call_control: exported functions to kemi framework
by Daniel-Constantin Mierla 04 May '17

04 May '17

Module: kamailio Branch: master Commit: 82794924a2368e671ebdfbc4156010e5d40ea699 URL: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T07:31:01+02:00 call_control: exported functions to kemi framework --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… Patch: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index 53b9464..a31892c 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -43,6 +43,7 @@ #include "../../core/script_cb.h" #include "../../core/parser/digest/digest.h" #include "../../core/parser/parse_from.h" +#include "../../core/kemi.h" #include "../dialog/dlg_load.h" #include "../dialog/dlg_hash.h" @@ -1031,8 +1032,7 @@ __dialog_loaded(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) // -2 - Locked // -3 - No provider // -5 - Internal error (message parsing, communication, ...) -static int -CallControl(struct sip_msg *msg, char *str1, char *str2) +static int ki_call_control(sip_msg_t *msg) { int result; @@ -1054,6 +1054,11 @@ CallControl(struct sip_msg *msg, char *str1, char *str2) return result; } +static int +CallControl(struct sip_msg *msg, char *str1, char *str2) +{ + return ki_call_control(msg); +} // Module management: initialization/destroy/function-parameter-fixing/... // @@ -1206,4 +1211,26 @@ postprocess_request(struct sip_msg *msg, unsigned int flags, void *_param) return 1; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_call_control_exports[] = { + { str_init("call_control"), str_init("call_control"), + SR_KEMIP_INT, ki_call_control, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_call_control_exports); + return 0; +} \ No newline at end of file

1 0

git:5.0:d69c9ce3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 May '17

03 May '17

Module: kamailio Branch: 5.0 Commit: d69c9ce30f0f8b50f4b0d308df14f5994e3d2fbe URL: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-03T14:31:13+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_ephemeral/README --- Diff: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… Patch: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… --- diff --git a/src/modules/auth_ephemeral/README b/src/modules/auth_ephemeral/README index 88a4af9..72b8c6d 100644 --- a/src/modules/auth_ephemeral/README +++ b/src/modules/auth_ephemeral/README @@ -228,7 +228,8 @@ modparam("auth_ephemeral", "username_format", 0) * 0 - SHA1 (default, as per IETF/RFC) * 1 - SHA256 - * 2 - SHA512 + * 2 - SHA384 + * 3 - SHA512 Example 1.5. sha_algorithm parameter usage ...

1 0

git:5.0:5f82475f: auth_ephemeral: Some more safety checks, added SHA384 as an option
by Carsten Bock 03 May '17

03 May '17

Module: kamailio Branch: 5.0 Commit: 5f82475f12baf669ec92e39442206c32d066f081 URL: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-05-03T14:16:34+02:00 auth_ephemeral: Some more safety checks, added SHA384 as an option --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3… Patch: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3…

1 0

git:master:ac4cc61b: modules: readme files regenerated - auth_ephemeral ... [skip ci]
by Kamailio Dev 03 May '17

03 May '17

Module: kamailio Branch: master Commit: ac4cc61b8633ececd3046d55d0c3abcef80fc05f URL: https://github.com/kamailio/kamailio/commit/ac4cc61b8633ececd3046d55d0c3abc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-03T14:16:19+02:00 modules: readme files regenerated - auth_ephemeral ... [skip ci] --- Modified: src/modules/auth_ephemeral/README --- Diff: https://github.com/kamailio/kamailio/commit/ac4cc61b8633ececd3046d55d0c3abc… Patch: https://github.com/kamailio/kamailio/commit/ac4cc61b8633ececd3046d55d0c3abc… --- diff --git a/src/modules/auth_ephemeral/README b/src/modules/auth_ephemeral/README index 88a4af9..72b8c6d 100644 --- a/src/modules/auth_ephemeral/README +++ b/src/modules/auth_ephemeral/README @@ -228,7 +228,8 @@ modparam("auth_ephemeral", "username_format", 0) * 0 - SHA1 (default, as per IETF/RFC) * 1 - SHA256 - * 2 - SHA512 + * 2 - SHA384 + * 3 - SHA512 Example 1.5. sha_algorithm parameter usage ...

1 0

git:master:ced9bfbd: auth_ephemeral: Some more safety checks, added SHA384 as an option
by Carsten Bock 03 May '17

03 May '17

Module: kamailio Branch: master Commit: ced9bfbd2ad2c538bd2e3f190a34932d3ffde276 URL: https://github.com/kamailio/kamailio/commit/ced9bfbd2ad2c538bd2e3f190a34932… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-05-03T14:15:56+02:00 auth_ephemeral: Some more safety checks, added SHA384 as an option --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ced9bfbd2ad2c538bd2e3f190a34932… Patch: https://github.com/kamailio/kamailio/commit/ced9bfbd2ad2c538bd2e3f190a34932…

1 0

git:5.0:623840e7: db_cluster: free allocated structure at init time
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: 5.0 Commit: 623840e7487cec1862531893c3644776835d9387 URL: https://github.com/kamailio/kamailio/commit/623840e7487cec1862531893c364477… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:59:35+02:00 db_cluster: free allocated structure at init time - avoid reopening driver db connections if already set (cherry picked from commit 08f8e0bc72b9f16f76b78110c9c95b1ba7f1ce25) --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/623840e7487cec1862531893c364477… Patch: https://github.com/kamailio/kamailio/commit/623840e7487cec1862531893c364477… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 1f24cc5..6ef6ec4 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -311,10 +311,12 @@ void db_cluster_close(db1_con_t* _h) LM_DBG("executing db cluster close command\n"); cls = (dbcl_cls_t*)_h->tail; cls->ref--; - if(cls->ref > 0) - return; - /* close connections */ - dbcl_close_connections(cls); + if(cls->ref <= 0) { + /* close connections */ + dbcl_close_connections(cls); + } + /* free _h - allocated for each db_cluster_init() */ + pkg_free(_h); return; } diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 534030c..47f9444 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -442,7 +442,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) { for(j=0; j<cls->rlist[i].clen; j++) { - if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0) + if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0 + && cls->rlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up read connection [%.*s]\n", cls->rlist[i].clist[j]->name.len, @@ -459,7 +460,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) } for(j=0; j<cls->wlist[i].clen; j++) { - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0) + if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0 + && cls->wlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up write connection [%.*s]\n", cls->wlist[i].clist[j]->name.len,

1 0

git:5.0:23783b89: htable: close db connection in some error cases for rpc command
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: 5.0 Commit: 23783b89d800ce75f3655a253e1d21c5fd8cad6c URL: https://github.com/kamailio/kamailio/commit/23783b89d800ce75f3655a253e1d21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:58:16+02:00 htable: close db connection in some error cases for rpc command (cherry picked from commit 1051a1bbc70cf84d6ebd7aa76a9b1ebd2e17e710) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/23783b89d800ce75f3655a253e1d21c… Patch: https://github.com/kamailio/kamailio/commit/23783b89d800ce75f3655a253e1d21c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d04143d..8f79c77 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1030,12 +1030,14 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if (rpc->scan(c, "S", &htname) < 1) { + ht_db_close_con(); rpc->fault(c, 500, "No htable name given"); return; } ht = ht_get_table(&htname); if(ht==NULL) { + ht_db_close_con(); rpc->fault(c, 500, "No such htable"); return; }

1 0

git:5.0:cfaca9f7: htable: Fix memory leak when reloading an empty htable from database
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: 5.0 Commit: cfaca9f7b468b138280c288edfa830995f714ea1 URL: https://github.com/kamailio/kamailio/commit/cfaca9f7b468b138280c288edfa8309… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:58:27+02:00 htable: Fix memory leak when reloading an empty htable from database (cherry picked from commit 07ce768fc6064867ed33d7ab6c9cbbb05db329db) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/cfaca9f7b468b138280c288edfa8309… Patch: https://github.com/kamailio/kamailio/commit/cfaca9f7b468b138280c288edfa8309… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 83a9f01..fd5ec46 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -247,6 +247,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } else { if(RES_ROW_N(db_res)==0) { + ht_dbf.free_result(ht_db_con, db_res); LM_DBG("Nothing to be loaded in hash table\n"); return 0; }

1 0

git:master:d4c392fa: statsd: functions exported to kemi interface
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: master Commit: d4c392fa4bdf7316a24063df9ae1a615d94c1711 URL: https://github.com/kamailio/kamailio/commit/d4c392fa4bdf7316a24063df9ae1a61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:37:39+02:00 statsd: functions exported to kemi interface --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/d4c392fa4bdf7316a24063df9ae1a61… Patch: https://github.com/kamailio/kamailio/commit/d4c392fa4bdf7316a24063df9ae1a61… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index c4c56ea..469f390 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -25,6 +25,7 @@ #include "../../core/usr_avp.h" #include "../../core/pvar.h" #include "../../core/lvalue.h" +#include "../../core/kemi.h" #include "lib_statsd.h" @@ -118,11 +119,21 @@ static int func_gauge(struct sip_msg* msg, char* key, char* val) return statsd_gauge(key, val); } +static int ki_statsd_gauge(sip_msg_t* msg, str* key, str* val) +{ + return statsd_gauge(key->s, val->s); +} + static int func_set(struct sip_msg* msg, char* key, char* val) { return statsd_set(key, val); } +static int ki_statsd_set(sip_msg_t* msg, str* key, str* val) +{ + return statsd_set(key->s, val->s); +} + static int func_time_start(struct sip_msg *msg, char *key) { int_str avp_key, avp_val; @@ -141,6 +152,10 @@ static int func_time_start(struct sip_msg *msg, char *key) return 1; } +static int ki_statsd_start(sip_msg_t *msg, str *key) +{ + return func_time_start(msg, key->s); +} static int func_time_end(struct sip_msg *msg, char *key) { @@ -182,18 +197,30 @@ static int func_time_end(struct sip_msg *msg, char *key) return statsd_timing(key, result); } +static int ki_statsd_stop(sip_msg_t *msg, str *key) +{ + return func_time_end(msg, key->s); +} static int func_incr(struct sip_msg *msg, char *key) { return statsd_count(key, "+1"); } +static int ki_statsd_incr(sip_msg_t *msg, str *key) +{ + return statsd_count(key->s, "+1"); +} static int func_decr(struct sip_msg *msg, char *key) { return statsd_count(key, "-1"); } +static int ki_statsd_decr(sip_msg_t *msg, str *key) +{ + return statsd_count(key->s, "-1"); +} char* get_milliseconds(char *dst){ struct timeval tv; @@ -204,3 +231,52 @@ char* get_milliseconds(char *dst){ snprintf(dst, 21, "%ld", millis); return dst; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_statsd_exports[] = { + { str_init("statsd"), str_init("statsd_gauge"), + SR_KEMIP_INT, ki_statsd_gauge, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statsd"), str_init("statsd_start"), + SR_KEMIP_INT, ki_statsd_start, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statsd"), str_init("statsd_stop"), + SR_KEMIP_INT, ki_statsd_stop, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statsd"), str_init("statsd_incr"), + SR_KEMIP_INT, ki_statsd_incr, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statsd"), str_init("statsd_decr"), + SR_KEMIP_INT, ki_statsd_decr, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statsd"), str_init("statsd_set"), + SR_KEMIP_INT, ki_statsd_set, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_statsd_exports); + return 0; +} \ No newline at end of file

1 0

git:master:fedacebc: statistics: exported functions to kemi interface
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: master Commit: fedacebc49b5abf5ee1d7543ee966072d681ef57 URL: https://github.com/kamailio/kamailio/commit/fedacebc49b5abf5ee1d7543ee96607… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:18:57+02:00 statistics: exported functions to kemi interface --- Modified: src/modules/statistics/statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/fedacebc49b5abf5ee1d7543ee96607… Patch: https://github.com/kamailio/kamailio/commit/fedacebc49b5abf5ee1d7543ee96607… --- diff --git a/src/modules/statistics/statistics.c b/src/modules/statistics/statistics.c index 80f55ec..499b419 100644 --- a/src/modules/statistics/statistics.c +++ b/src/modules/statistics/statistics.c @@ -39,6 +39,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "../../core/counters.h" #include "../../core/mem/mem.h" #include "stats_funcs.h" @@ -240,6 +241,18 @@ static int w_update_stat(struct sip_msg *msg, char *stat_p, char *long_p) return 1; } +static int ki_update_stat(sip_msg_t *msg, str *sname, int sval) +{ + stat_var *stat; + + stat = get_stat(sname); + if(stat == 0) { + LM_ERR("variable <%.*s> not defined\n", sname->len, sname->s); + return -1; + } + update_stat(stat, (long)sval); + return 1; +} static int w_reset_stat(struct sip_msg *msg, char* stat_p, char *foo) { @@ -264,8 +277,47 @@ static int w_reset_stat(struct sip_msg *msg, char* stat_p, char *foo) reset_stat( stat ); } + return 1; +} +static int ki_reset_stat(sip_msg_t *msg, str* sname) +{ + stat_var *stat; + + stat = get_stat(sname); + if(stat == 0) { + LM_ERR("variable <%.*s> not defined\n", sname->len, sname->s); + return -1; + } + reset_stat( stat ); return 1; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_statistics_exports[] = { + { str_init("statistics"), str_init("update_stat"), + SR_KEMIP_INT, ki_update_stat, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("statistics"), str_init("reset_stat"), + SR_KEMIP_INT, ki_reset_stat, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_statistics_exports); + return 0; +} \ No newline at end of file

1 0

git:master:8577eb15: statsc: exported functions to kemi interface
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: master Commit: 8577eb15d97116ce0a64c5ae2bdaa561a4d7535d URL: https://github.com/kamailio/kamailio/commit/8577eb15d97116ce0a64c5ae2bdaa56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:23:25+02:00 statsc: exported functions to kemi interface --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8577eb15d97116ce0a64c5ae2bdaa56… Patch: https://github.com/kamailio/kamailio/commit/8577eb15d97116ce0a64c5ae2bdaa56… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index cc25b2f..77c112b 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -31,6 +31,7 @@ #include "../../core/timer_proc.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "../../core/parser/parse_param.h" @@ -119,11 +120,20 @@ static void mod_destroy(void) /** * */ -static int w_statsc_reset(sip_msg_t* msg, char* p1, char* p2) +static int ki_statsc_reset(sip_msg_t* msg) { + LM_ERR("not implemented yet\n"); return 1; } +/** + * + */ +static int w_statsc_reset(sip_msg_t* msg, char* p1, char* p2) +{ + return ki_statsc_reset(msg); +} + typedef int (*statsc_func_t)(void *p, int64_t *res); typedef struct statsc_nmap { @@ -473,3 +483,26 @@ int statsc_init_rpc(void) return 0; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_statsc_exports[] = { + { str_init("statsc"), str_init("statsc_reset"), + SR_KEMIP_INT, ki_statsc_reset, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_statsc_exports); + return 0; +} \ No newline at end of file

1 0

git:master:a081a6ee: sst: exported functions to kemi interface
by Daniel-Constantin Mierla 03 May '17

03 May '17

Module: kamailio Branch: master Commit: a081a6ee5c8891b5e4c436f60110813a391c0084 URL: https://github.com/kamailio/kamailio/commit/a081a6ee5c8891b5e4c436f60110813… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-03T08:07:03+02:00 sst: exported functions to kemi interface --- Modified: src/modules/sst/sst.c Modified: src/modules/sst/sst_handlers.c Modified: src/modules/sst/sst_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/a081a6ee5c8891b5e4c436f60110813… Patch: https://github.com/kamailio/kamailio/commit/a081a6ee5c8891b5e4c436f60110813…

1 0

git:master:4751b777: kazoo : fix json keys
by lazedo 03 May '17

03 May '17

Module: kamailio Branch: master Commit: 4751b77727730ad67ea003afd07ec91b0f7cd45b URL: https://github.com/kamailio/kamailio/commit/4751b77727730ad67ea003afd07ec91… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-03T01:12:06+01:00 kazoo : fix json keys size of key and some refactoring --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/4751b77727730ad67ea003afd07ec91… Patch: https://github.com/kamailio/kamailio/commit/4751b77727730ad67ea003afd07ec91… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 65d864b..3f51cbf 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -46,10 +46,13 @@ enum json_type kz_json_get_type(struct json_object *jso) return json_object_get_type(jso); } -char** str_split(char* a_str, const char a_delim) +typedef str* json_key; +typedef json_key* json_keys; + +json_keys str_split(char* a_str, const char a_delim, int* c) { - char** result = 0; - size_t count = 0; + json_keys result = 0; + int count = 0; char* tmp = a_str; char* last_comma = 0; char delim[2]; @@ -73,34 +76,43 @@ char** str_split(char* a_str, const char a_delim) /* Add space for terminating null string so caller knows where the list of returned strings ends. */ - count++; +// count++; + *c = count; + LM_DBG("COUNT %d\n", count); - result = pkg_malloc(sizeof(char*) * count); + result = pkg_malloc(sizeof(json_key) * count); + memset(result, 0, sizeof(json_key) * count); if (result) { - size_t idx = 0; + int idx = 0; char* token = strtok(a_str, delim); while (token) { + LM_DBG("TOKEN %d : %s\n", idx, token); + assert(idx < count); + + result[idx] = pkg_malloc(sizeof(str)); len = strlen(token); - char* ptr = pkg_malloc( (len+1) * sizeof(char)); - *(result + idx) = ptr; - memcpy(ptr, token, len); - ptr[len] = '\0'; + + result[idx]->len = len; + result[idx]->s = pkg_malloc((len + 1) * sizeof(char)); + strncpy(result[idx]->s, token, len); + result[idx]->s[len] = '\0'; + int i = 0; while(i < len) { - if(ptr[i] == kz_json_escape_char) - ptr[i] = '.'; + if(result[idx]->s[i] == kz_json_escape_char) + result[idx]->s[i] = '.'; i++; } + LM_DBG("TOKEN2 %d : %s\n", idx, result[idx]->s); token = strtok(0, delim); idx++; } - assert(idx == count - 1); - *(result + idx) = 0; + assert(idx == count); } return result; @@ -108,10 +120,12 @@ char** str_split(char* a_str, const char a_delim) struct json_object * kz_json_get_field_object(str* json, str* field) { - char** tokens; + json_keys keys; + json_key key; char* dup; - char f1[25], f2[25];//, f3[25]; - int i; + char* token; + char f1[250], f2[250];//, f3[25]; + int i, parts; dup = pkg_malloc(json->len+1); memcpy(dup, json->s, json->len); @@ -132,19 +146,22 @@ struct json_object * kz_json_get_field_object(str* json, str* field) dup = pkg_malloc(field->len+1); memcpy(dup, field->s, field->len); dup[field->len] = '\0'; - tokens = str_split(dup, '.'); + keys = str_split(dup, '.', &parts); pkg_free(dup); - if (tokens) + if (keys) { jtree = j; - for (i = 0; *(tokens + i); i++) + for (i = 0; i < parts; i++) { + key = keys[i]; + LM_DBG("TOKEN %d , %p, %p : %s\n", i, keys[i], key->s, key->s); + if(jtree != NULL) { - str field = str_init(*(tokens + i)); + //str field1 = str_init(token); // check for idx [] - int sresult = sscanf(field.s, "%[^[][%[^]]]", f1, f2); //, f3); - LM_DBG("CHECK IDX %d - %s , %s, %s\n", sresult, field.s, f1, (sresult > 1? f2 : "(null)")); + int sresult = sscanf(key->s, "%[^[][%[^]]]", f1, f2); //, f3); + LM_DBG("CHECK IDX %d - %s , %s, %s\n", sresult, key->s, f1, (sresult > 1? f2 : "(null)")); jtree = kz_json_get_object(jtree, f1); if(jtree != NULL) { @@ -160,9 +177,15 @@ struct json_object * kz_json_get_field_object(str* json, str* field) } } } - pkg_free(*(tokens + i)); } - pkg_free(tokens); + + for(i = 0;i < parts; i++) { + LM_DBG("FREE %d\n", i); + pkg_free(keys[i]->s); + pkg_free(keys[i]); + } + + pkg_free(keys); }

1 0

git:master:26b072c7: ndb_redis: fix memory leak
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 26b072c7c84c03d034cd31cd80ef2d78ecb76dce URL: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T17:55:01+03:00 ndb_redis: fix memory leak - fix memory leak when re-using a reply-id --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… Patch: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 4998e65..4ebdeb1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -599,6 +599,12 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) for (i=1;i<rsrv->piped.pending_commands;i++) { rpl=rsrv->piped.replies[i]; + if(rpl->rplRedis!=NULL) + { + /* clean up previous redis reply */ + freeReplyObject(rpl->rplRedis); + rpl->rplRedis = NULL; + } if (redisGetReplyFromReader(rsrv->ctxRedis, (void**) &rpl->rplRedis) != REDIS_OK) { LM_ERR("Unable to read reply\n");

1 0

git:master:99a73cb4: Merge pull request #1115 from claudiupb/fix_redis_pipeline
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 99a73cb42e6cf786ea5a2a7ffb7577145b0e7f46 URL: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T17:48:52+02:00 Merge pull request #1115 from claudiupb/fix_redis_pipeline Fix redis pipeline --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771… Patch: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771…

1 0

git:master:9a6c06a5: ndb_redis: fix connection problems with pipelining
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 9a6c06a5d70e643d6485ffe013008dd1b6f82708 URL: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T17:55:01+03:00 ndb_redis: fix connection problems with pipelining -fix problem when a connection with a REDIS server fails and the pipelined command line is lost, while a new connection will not be established --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd… Patch: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd…

1 0

[kamailio/kamailio] Fix redis pipeline (#1115)
by Paul Claudiu Boriga 02 May '17

02 May '17

Hello, I have found some bugs with the original commit that adds redis_pipe_cmd. If a command to the server fails, this may leave the redisContext in an invalid state, and this means that a reconnect to the server needs to be performed. The problem is that when reconnecting, a new context is created, and all the contents of old redisContext is lost, including the hiredis output buffer (obuf) which stored the piped commands. This means that all the commands are lost, and when a second retry is made this contains no commands and may fail, leaving the redisContext in an invalid state. This can in some cases break the REDIS pipelining feature, and cause all commands sent using redis_pipe_cmd()/redis_execute() to fail from that point onwards. The solution is to make sure that the connection is active when adding commands to the hiredis output buffer. For this, commands are stored in a separate buffer, and are only added to the redisContext when actually sending the command (when calling redis_execute). This way it is possible to see if any errors exist by checking the err member of the redisContext structure before appending the commands, and also commands are not lost since they are stored separately and if reconnecting the new commands can be appended to the output buffer of the new redisContext. Commands are stored in buffers using the sds format hiredis offers (by calling redisFormatCommand function offered by hiredis). This way they can be directly appended to the output buffer using redisAppendFormattedCommand. There is a problem on older hiredis versions (older than 0.12) because redisAppendFormattedCommand was not exported to the library API, so for older hiredis version the buffers are appended in our code. We tested the code using hiredis library version 0.10.1 and 0.12.1 and there is no problem with this approach. In the second commit we fixed a memory leak when re-using reply ids in the same pipeline command sequence occurs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1115 -- Commit Summary -- * ndb_redis: fix connection problems with pipelining * ndb_redis: fix memory leak -- File Changes -- M src/modules/ndb_redis/redis_client.c (116) M src/modules/ndb_redis/redis_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1115.patch https://github.com/kamailio/kamailio/pull/1115.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/1115

2 1

git:4.4:e0dc5f12: Merge pull request #1114 from sergey-safarov/spec_update9-44
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: 4.4 Commit: e0dc5f12d6bca304ad359d955ce24948613c2055 URL: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T17:03:54+02:00 Merge pull request #1114 from sergey-safarov/spec_update9-44 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… Patch: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index ff0b7a6..9e68eae 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 4.4.5 %define rel 1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -210,7 +207,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -219,7 +215,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -552,10 +547,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -575,10 +567,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1060,12 +1049,10 @@ fi %{_libdir}/kamailio/modules/jsonrpc-c.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

git:4.4:d432ecbd: pkg/kamailio/centos/7: mod kazoo enabled default build
by Sergey Safarov 02 May '17

02 May '17

Module: kamailio Branch: 4.4 Commit: d432ecbded84fcf68668de0db3a4ba13f9745da2 URL: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-05-02T10:07:22-04:00 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… Patch: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index ff0b7a6..9e68eae 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 4.4.5 %define rel 1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -210,7 +207,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -219,7 +215,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -552,10 +547,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -575,10 +567,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1060,12 +1049,10 @@ fi %{_libdir}/kamailio/modules/jsonrpc-c.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

[kamailio/kamailio] pkg/kamailio/centos/7: mod kazoo enabled default build (#1114)
by sergey-safarov 02 May '17

02 May '17

backport of commit de323d80a9fc76d5bea625b1a3ad28a30dda0ea4 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1114 -- Commit Summary -- * pkg/kamailio/centos/7: mod kazoo enabled default build -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1114.patch https://github.com/kamailio/kamailio/pull/1114.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/1114

2 1

git:master:b8b900a9: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 02 May '17

02 May '17

Module: kamailio Branch: master Commit: b8b900a960e315e15f6ff2947e2ff64881882e8b URL: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-02T16:16:21+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… Patch: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1c6027e..280a6f4 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -51,7 +51,7 @@ Carsten Bock 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) List of Examples @@ -87,7 +87,7 @@ Chapter 1. Admin Guide 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) 1. Overview @@ -215,7 +215,7 @@ modparam("ndb_redis", "cluster", 1) 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) 4.1. redis_cmd(srvname, command, ..., replyid) @@ -293,17 +293,13 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. -4.3. redis_execute([srvname]) +4.3. redis_execute(srvname) Sends commands to REDIS server identified by srvname. Commands are added with redis_pipe_cmd function, and will be stored for an existing REDIS server. When this function is called all the commands will be sent in a single message to the REDIS server. - If this function is called without any parameters, it will iterate - through all existing servers and send the existing pipelined commands - for them. - When using redis_cmd together with redis_pipe_cmd it is recommended that a call to redis_execute is made before calling redis_cmd in case there are pipelined commands, otherwise when calling redis_cmd, if @@ -321,14 +317,14 @@ After several redis command calls: redis_pipe_cmd("srvB", "SET ruri $ru", "r2"); - redis_pipe_cmd("srvC", "GET foo", "r3"); + redis_pipe_cmd("srvB", "GET foo", "r3"); Send the data and retrieve the results: redis_execute("srvA"); //send command to srvA and wait for reply. Store the reply in r1 - redis_execute(); //send remaining commands (the set to srvB and get to s -rvC), wait for replies, and store the replies in r2 and r3 + redis_execute("srvB"); //send command to srvA and wait for reply. Store +the replies in r2 (for SET ruri $ru) and r3 (for GET foo) Using both redis_cmd and redis_pipe_cmd: redis_pipe_cmd("srvA", "SET foo bar", "r1");

1 0

git:master:ec0953c4: Merge pull request #1112 from claudiupb/redis_rm_execute
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: ec0953c48da112a87e2ec7bfbfbd9d8df6d81959 URL: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T16:06:42+02:00 Merge pull request #1112 from claudiupb/redis_rm_execute Redis remove redis_execute() command with no arguments --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8… Patch: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8…

1 0

git:master:bca06f79: ndb_redis: remove redis_execute command with no arguments
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: bca06f793df150fe03e83ba8c893f68b4f9bbcfb URL: https://github.com/kamailio/kamailio/commit/bca06f793df150fe03e83ba8c893f68… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T15:10:55+03:00 ndb_redis: remove redis_execute command with no arguments --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/bca06f793df150fe03e83ba8c893f68… Patch: https://github.com/kamailio/kamailio/commit/bca06f793df150fe03e83ba8c893f68…

1 0

git:master:be59c13f: ndb_redis: make redis_execute() return negative value on error
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: be59c13f0d710df1be9c68af53f4167f575d5ae5 URL: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T15:13:55+03:00 ndb_redis: make redis_execute() return negative value on error --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… Patch: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 4d655ad..36b4efd 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -546,6 +546,7 @@ static int w_redis_pipe_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, static int w_redis_execute(struct sip_msg* msg, char* ssrv) { str s; + int rv; if (redis_cluster_param) { @@ -557,7 +558,9 @@ static int w_redis_execute(struct sip_msg* msg, char* ssrv) LM_ERR("no redis server name\n"); return -1; } - redisc_exec_pipelined_cmd(&s); + rv=redisc_exec_pipelined_cmd(&s); + if (rv) + return rv; return 1; }

1 0

[kamailio/kamailio] Redis remove redis_execute() command with no arguments (#1112)
by Paul Claudiu Boriga 02 May '17

02 May '17

Hello, We realized that redis_execute should return a negative value in case of failure (just like redis_cmd), instead of always returning 1. This introduced a problem with the behavior when calling redis_execute without giving a server name. Since this function will loop through all the servers and execute the pipelined commands for each one, in case of failure the user cannot determine for what server the error occurred, by only returning a negative value. This is why we decided to remove the possibility to call redis_execute with no arguments, and have it loop through all defined servers. The user should only call redis_execute(srv_name) and check the return value for this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1112 -- Commit Summary -- * ndb_redis: remove redis_execute command with no arguments * ndb_redis: make redis_execute() return negative value on error -- File Changes -- M src/modules/ndb_redis/doc/ndb_redis_admin.xml (10) M src/modules/ndb_redis/ndb_redis_mod.c (22) M src/modules/ndb_redis/redis_client.c (20) M src/modules/ndb_redis/redis_client.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1112.patch https://github.com/kamailio/kamailio/pull/1112.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/1112

2 2

[kamailio/kamailio] core: Added IP_FREEBIND flag durring socket initialization (#1113)
by sergey-safarov 02 May '17

02 May '17

Backport of commits: 1) 7036c0ea947d6450e6a23c2e5b2428c834352de0 2) ff3cf17ff3566cb08cb0a6b9f7f7d893cd908956 3) 66595f39a4ae419b054bb433f2451a69155d580f You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1113 -- Commit Summary -- * core: Added IP_FREEBIND flag durring socket initialization -- File Changes -- M cfg.lex (2) M cfg.y (3) M globals.h (1) M modules/sctp/sctp_server.c (15) M receive.c (2) M tcp_main.c (11) M udp_server.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1113.patch https://github.com/kamailio/kamailio/pull/1113.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/1113

2 2

on reducing the number of email messages
by Juha Heinanen 02 May '17

02 May '17

Why is all K related github messages also sent to sr-dev list? There is lots of duplicate traffic because of it if sr-dev member is also watching github notifications. Or is it so that sr-dev members are not supposed to subscribe to kamailio github notifications? -- Juha

2 2

libressl support
by Timo Teras 02 May '17

02 May '17

Hi, I'm trying to fix tls.so to work with libressl. And there was already one commit handling some of the api differences. The next problem is that libressl ships the memory allocator changing function, but it's a stub that just returns "not supported". It seems that kamailio module does not load unless it can make libssl use shm_alloc. I'm wondering if this is a hard requirement? Does the tls module share libtls allocated things amongs forks? Or this purely to track memory in kamailio framework? If it's hard dependency is there any way to workaround this libressl design decision? I think one option to try is to just implement the CRYPTO_* allocation function in kamailio main executable - they should then take preference over the libcrypto ones. Thoughts? Thanks, Timo

2 1

git:master:15883fef: tm: fix warnings for compilation
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 15883fef8f5b7205bbf68b765e856dd887c42954 URL: https://github.com/kamailio/kamailio/commit/15883fef8f5b7205bbf68b765e856dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:11:23+02:00 tm: fix warnings for compilation --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/15883fef8f5b7205bbf68b765e856dd… Patch: https://github.com/kamailio/kamailio/commit/15883fef8f5b7205bbf68b765e856dd… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 90c41f7..7d3ab19 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -996,7 +996,6 @@ static int ki_t_lookup_request(struct sip_msg* msg) static int ki_t_lookup_cancel_flags(sip_msg_t* msg, int flags) { struct cell *ret; - int i=0; if (msg->REQ_METHOD==METHOD_CANCEL) { ret = t_lookupOriginalT( msg ); LM_DBG("lookup_original: t_lookupOriginalT returned: %p\n", ret);

1 0

git:master:f0609372: uac: updates to fix compile time warnings
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: f0609372d5804865ac41ba0530e84312f59f8a45 URL: https://github.com/kamailio/kamailio/commit/f0609372d5804865ac41ba0530e8431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:11:42+02:00 uac: updates to fix compile time warnings --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f0609372d5804865ac41ba0530e8431… Patch: https://github.com/kamailio/kamailio/commit/f0609372d5804865ac41ba0530e8431… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index c8454c9..d5ac592 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -98,7 +98,6 @@ static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); -static int fixup_replace_uri(void** param, int param_no); static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -734,4 +733,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_uac_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:17123659: textopsx: remove unused variables
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 171236590aab6a7dbf5a79fdcc110745af891e19 URL: https://github.com/kamailio/kamailio/commit/171236590aab6a7dbf5a79fdcc11074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:10:53+02:00 textopsx: remove unused variables --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/171236590aab6a7dbf5a79fdcc11074… Patch: https://github.com/kamailio/kamailio/commit/171236590aab6a7dbf5a79fdcc11074… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 9b78ea5..7f99a39 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -314,8 +314,6 @@ static int change_reply_status_f( { int code; str reason; - struct lump *l; - char *ch; if(get_int_fparam(&code, msg, (fparam_t *)_code) || get_str_fparam(&reason, msg, (fparam_t *)_reason)) { @@ -2163,4 +2161,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_textopsx_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:8b210310: evrexec: fixed the compile time warnings
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 8b210310e31ad1083d4fa9a83910b104c77b0a01 URL: https://github.com/kamailio/kamailio/commit/8b210310e31ad1083d4fa9a83910b10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:09:49+02:00 evrexec: fixed the compile time warnings --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8b210310e31ad1083d4fa9a83910b10… Patch: https://github.com/kamailio/kamailio/commit/8b210310e31ad1083d4fa9a83910b10… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 5d45e6f..a91ab4d 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -183,7 +183,6 @@ int evrexec_param(modparam_t type, void *val) evrexec_task_t tmp; sr_kemi_eng_t *keng = NULL; str s; - char c; if(val==NULL) return -1;

1 0

git:master:cf7ed18c: registrar: fix compilation warnings
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: cf7ed18c74343ae928ec57a7b76835eedd202dcc URL: https://github.com/kamailio/kamailio/commit/cf7ed18c74343ae928ec57a7b76835e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:10:17+02:00 registrar: fix compilation warnings --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/cf7ed18c74343ae928ec57a7b76835e… Patch: https://github.com/kamailio/kamailio/commit/cf7ed18c74343ae928ec57a7b76835e… --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index aba0eee..35bdd74 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -427,7 +427,6 @@ int pv_fetch_contacts_helper(sip_msg_t* msg, udomain_t* dt, str* uri, ucontact_t* c0; regpv_profile_t *rpp; str aor = {0, 0}; - str u = {0, 0}; int res; int olen; int ilen;

1 0

git:master:33189c2f: domain: fix compilation warnings for kemi updates
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 33189c2f7414edabac3c6618873f3a9d0f1f925e URL: https://github.com/kamailio/kamailio/commit/33189c2f7414edabac3c6618873f3a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:09:22+02:00 domain: fix compilation warnings for kemi updates --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/33189c2f7414edabac3c6618873f3a9… Patch: https://github.com/kamailio/kamailio/commit/33189c2f7414edabac3c6618873f3a9… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index 3cced3c..27951c9 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -202,7 +202,7 @@ int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix) { int_str name, val; struct attr_list *attrs; - str *prefix, did; + str did; unsigned short flags; if(_sdomain==NULL || _sdomain->s==NULL) { @@ -517,4 +517,4 @@ int reload_tables(void) res = NULL; domain_db_close(); return -1; -} \ No newline at end of file +}

1 0

git:master:ed553e3d: diversion: fix compilation warnings
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: ed553e3d4d667d454352b4b8656260936d79af18 URL: https://github.com/kamailio/kamailio/commit/ed553e3d4d667d454352b4b86562609… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:08:45+02:00 diversion: fix compilation warnings --- Modified: src/modules/diversion/diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/ed553e3d4d667d454352b4b86562609… Patch: https://github.com/kamailio/kamailio/commit/ed553e3d4d667d454352b4b86562609… --- diff --git a/src/modules/diversion/diversion.c b/src/modules/diversion/diversion.c index 21b2cf2..83bfd0d 100644 --- a/src/modules/diversion/diversion.c +++ b/src/modules/diversion/diversion.c @@ -169,8 +169,6 @@ int add_diversion_uri(sip_msg_t* msg, str* reason, str* uri) int w_add_diversion(struct sip_msg* msg, char* r, char* u) { - str div_hf; - char *at; str uri; str reason; @@ -235,4 +233,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_diversion_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:78dce879: alias_db: get rid of compilation warnings
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 78dce8799c0b3bd639b1f815b2eef28689ff1d1f URL: https://github.com/kamailio/kamailio/commit/78dce8799c0b3bd639b1f815b2eef28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T15:08:20+02:00 alias_db: get rid of compilation warnings --- Modified: src/modules/alias_db/alias_db.c --- Diff: https://github.com/kamailio/kamailio/commit/78dce8799c0b3bd639b1f815b2eef28… Patch: https://github.com/kamailio/kamailio/commit/78dce8799c0b3bd639b1f815b2eef28… --- diff --git a/src/modules/alias_db/alias_db.c b/src/modules/alias_db/alias_db.c index 5450f3c..55616fd 100644 --- a/src/modules/alias_db/alias_db.c +++ b/src/modules/alias_db/alias_db.c @@ -346,7 +346,6 @@ int bind_alias_db(struct alias_db_binds *pxb) */ static int ki_alias_db_lookup(sip_msg_t* msg, str* stable) { - str table_s; unsigned long flags; flags = 0;

1 0

git:master:65254288: kazoo: missing sender alternative for presence
by lazedo 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 6525428887b20bac61825267a30016ebdf2f29a5 URL: https://github.com/kamailio/kamailio/commit/6525428887b20bac61825267a30016e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-02T13:15:08+01:00 kazoo: missing sender alternative for presence --- Modified: src/modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/6525428887b20bac61825267a30016e… Patch: https://github.com/kamailio/kamailio/commit/6525428887b20bac61825267a30016e… --- diff --git a/src/modules/kazoo/kz_pua.c b/src/modules/kazoo/kz_pua.c index 44a7448..f512efe 100644 --- a/src/modules/kazoo/kz_pua.c +++ b/src/modules/kazoo/kz_pua.c @@ -221,6 +221,10 @@ int kz_pua_publish_presence_to_presentity(struct json_object *json_obj) { json_extract_field(BLF_JSON_ETAG, etag); json_extract_field(BLF_JSON_SENDER, sender); + if (sender.len == 0) { + json_extract_field(BLF_JSON_SWITCH_URI, sender); + } + struct json_object* ExpiresObj = kz_json_get_object(json_obj, BLF_JSON_EXPIRES); if (ExpiresObj != NULL) { expires = json_object_get_int(ExpiresObj);

1 0

git:master:de323d80: Merge pull request #1105 from sergey-safarov/spec_update9
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: de323d80a9fc76d5bea625b1a3ad28a30dda0ea4 URL: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T14:09:31+02:00 Merge pull request #1105 from sergey-safarov/spec_update9 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… Patch: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6fd642..89d8874 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 5.1.0 %define rel dev1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -228,7 +225,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -237,7 +233,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -578,10 +573,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -601,10 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1093,12 +1082,10 @@ fi %{_libdir}/kamailio/modules/jsonrpcc.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

git:master:10c5ae5f: pkg/kamailio/centos/7: mod kazoo enabled default build
by Sergey Safarov 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 10c5ae5fda39d38f5034b9dab91c8d3970b552a8 URL: https://github.com/kamailio/kamailio/commit/10c5ae5fda39d38f5034b9dab91c8d3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-04-29T11:19:51-04:00 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/10c5ae5fda39d38f5034b9dab91c8d3… Patch: https://github.com/kamailio/kamailio/commit/10c5ae5fda39d38f5034b9dab91c8d3… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6fd642..89d8874 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 5.1.0 %define rel dev1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -228,7 +225,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -237,7 +233,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -578,10 +573,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -601,10 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1093,12 +1082,10 @@ fi %{_libdir}/kamailio/modules/jsonrpcc.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

[kamailio/kamailio] pkg/kamailio/centos/7: mod kazoo enabled default build (#1105)
by sergey-safarov 02 May '17

02 May '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1105 -- Commit Summary -- * pkg/kamailio/centos/7: mod kazoo enabled default build -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1105.patch https://github.com/kamailio/kamailio/pull/1105.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/1105

3 6

[kamailio/kamailio] kazoo: Removed extra workarround for current rabbitmq-c lib (#1083)
by sergey-safarov 02 May '17

02 May '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1083 -- Commit Summary -- * kazoo: Removed extra workarround for current rabbitmq-c lib -- File Changes -- M modules/kazoo/kz_amqp.c (2) M pkg/kamailio/centos/7/kamailio.spec (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1083.patch https://github.com/kamailio/kamailio/pull/1083.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/1083

2 9

[kamailio/kamailio] src/core: Added IP_FREEBIND flag durring socket initialization (#1104)
by sergey-safarov 02 May '17

02 May '17

Pull request allow start daemon in case not initialized network. see https://github.com/proftpd/proftpd/issues/221 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1104 -- Commit Summary -- * src/core: Added IP_FREEBIND flag durring socket initialization -- File Changes -- M src/core/tcp_main.c (15) M src/core/udp_server.c (16) M src/modules/sctp/sctp_server.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1104.patch https://github.com/kamailio/kamailio/pull/1104.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/1104

2 3

git:master:66595f39: core: new parameter ip_free_bind
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 66595f39a4ae419b054bb433f2451a69155d580f URL: https://github.com/kamailio/kamailio/commit/66595f39a4ae419b054bb433f2451a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T11:05:21+02:00 core: new parameter ip_free_bind - control if binding to non local ip should be attempted - default is 0 (do not try to bind to non local ip address) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/receive.c Modified: src/core/tcp_main.c Modified: src/core/udp_server.c Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/66595f39a4ae419b054bb433f2451a6… Patch: https://github.com/kamailio/kamailio/commit/66595f39a4ae419b054bb433f2451a6…

1 0

git:master:ff3cf17f: core, sctp: check if IP_FREEBIND is defined
by Daniel-Constantin Mierla 02 May '17

02 May '17

Module: kamailio Branch: master Commit: ff3cf17ff3566cb08cb0a6b9f7f7d893cd908956 URL: https://github.com/kamailio/kamailio/commit/ff3cf17ff3566cb08cb0a6b9f7f7d89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T10:37:41+02:00 core, sctp: check if IP_FREEBIND is defined - not all os-es have it --- Modified: src/core/tcp_main.c Modified: src/core/udp_server.c Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ff3cf17ff3566cb08cb0a6b9f7f7d89… Patch: https://github.com/kamailio/kamailio/commit/ff3cf17ff3566cb08cb0a6b9f7f7d89… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b9af4e8..2b08967 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2783,12 +2783,16 @@ int tcp_init(struct socket_info* sock_info) } } - /* Allow bind to non local address. Required when daemon started before network initialized */ +#if defined(IP_FREEBIND) + /* allow bind to non local address. + * useful when daemon started before network initialized */ if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, (void*)&optval, sizeof(optval)) ==-1) { - LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + LM_WARN("setsockopt freebind failed: %s\n", strerror(errno)); /* continue since this is not critical */ } +#endif + #ifdef HAVE_TCP_DEFER_ACCEPT /* linux only */ if ((optval=cfg_get(tcp, tcp_cfg, defer_accept))){ diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 96ba8eb..2641fae 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -339,14 +339,16 @@ int udp_init(struct socket_info* sock_info) } #endif - /* Allow bind to non local address. Required when daemon started before network initialized */ +#if defined(IP_FREEBIND) + /* allow bind to non local address. + * useful when daemon started before network initialized */ optval = 1; if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, (void*)&optval, sizeof(optval)) ==-1) { - LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + LM_WARN("setsockopt freebind failed: %s\n", strerror(errno)); /* continue since this is not critical */ } - +#endif #ifdef USE_MCAST if ((sock_info->flags & SI_IS_MCAST) && (setup_mcast_rcvr(sock_info->socket, addr, sock_info->mcast.s)<0)){ diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 686139c..5d5371a 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -468,14 +468,17 @@ static int sctp_init_sock_opt_common(int s, int af) /* continue since this is not critical */ } } - - /* Allow bind to non local address. Required when daemon started before network initialized */ + +#if defined(IP_FREEBIND) + /* allow bind to non local address. + * useful when daemon started before network initialized */ optval = 1; if (setsockopt(s, IPPROTO_IP, IP_FREEBIND, (void*)&optval, sizeof(optval)) ==-1) { - LM_WARN("sctp_init_sock_opt_common: setsockopt freebind %s\n", strerror(errno)); + LM_WARN("setsockopt freebind failed: %s\n", strerror(errno)); /* continue since this is not critical */ } +#endif /* set receive buffer: SO_RCVBUF*/ if (cfg_get(sctp, sctp_cfg, so_rcvbuf)){ @@ -487,7 +490,7 @@ static int sctp_init_sock_opt_common(int s, int af) /* continue, non-critical */ } } - + /* set send buffer: SO_SNDBUF */ if (cfg_get(sctp, sctp_cfg, so_sndbuf)){ optval=cfg_get(sctp, sctp_cfg, so_sndbuf);

1 0

git:master:1af9fe36: Merge pull request #1104 from sergey-safarov/FREEBIND
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 1af9fe360780fbf723006f8e569d019788e5a2fa URL: https://github.com/kamailio/kamailio/commit/1af9fe360780fbf723006f8e569d019… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T10:24:30+02:00 Merge pull request #1104 from sergey-safarov/FREEBIND src/core: Added IP_FREEBIND flag durring socket initialization --- Modified: src/core/tcp_main.c Modified: src/core/udp_server.c Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1af9fe360780fbf723006f8e569d019… Patch: https://github.com/kamailio/kamailio/commit/1af9fe360780fbf723006f8e569d019… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 14dcaea..b9af4e8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2782,6 +2782,13 @@ int tcp_init(struct socket_info* sock_info) /* continue since this is not critical */ } } + + /* Allow bind to non local address. Required when daemon started before network initialized */ + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + /* continue since this is not critical */ + } #ifdef HAVE_TCP_DEFER_ACCEPT /* linux only */ if ((optval=cfg_get(tcp, tcp_cfg, defer_accept))){ diff --git a/src/core/udp_server.c b/src/core/udp_server.c index cff4ef0..96ba8eb 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -339,6 +339,14 @@ int udp_init(struct socket_info* sock_info) } #endif + /* Allow bind to non local address. Required when daemon started before network initialized */ + optval = 1; + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + /* continue since this is not critical */ + } + #ifdef USE_MCAST if ((sock_info->flags & SI_IS_MCAST) && (setup_mcast_rcvr(sock_info->socket, addr, sock_info->mcast.s)<0)){ diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index e2301f0..686139c 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -469,6 +469,14 @@ static int sctp_init_sock_opt_common(int s, int af) } } + /* Allow bind to non local address. Required when daemon started before network initialized */ + optval = 1; + if (setsockopt(s, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("sctp_init_sock_opt_common: setsockopt freebind %s\n", strerror(errno)); + /* continue since this is not critical */ + } + /* set receive buffer: SO_RCVBUF*/ if (cfg_get(sctp, sctp_cfg, so_rcvbuf)){ optval=cfg_get(sctp, sctp_cfg, so_rcvbuf);

1 0

git:master:7036c0ea: src/core: Added IP_FREEBIND flag durring socket initialization
by Sergey Safarov 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 7036c0ea947d6450e6a23c2e5b2428c834352de0 URL: https://github.com/kamailio/kamailio/commit/7036c0ea947d6450e6a23c2e5b2428c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-04-29T15:33:03-04:00 src/core: Added IP_FREEBIND flag durring socket initialization --- Modified: src/core/tcp_main.c Modified: src/core/udp_server.c Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/7036c0ea947d6450e6a23c2e5b2428c… Patch: https://github.com/kamailio/kamailio/commit/7036c0ea947d6450e6a23c2e5b2428c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 14dcaea..b9af4e8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2782,6 +2782,13 @@ int tcp_init(struct socket_info* sock_info) /* continue since this is not critical */ } } + + /* Allow bind to non local address. Required when daemon started before network initialized */ + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + /* continue since this is not critical */ + } #ifdef HAVE_TCP_DEFER_ACCEPT /* linux only */ if ((optval=cfg_get(tcp, tcp_cfg, defer_accept))){ diff --git a/src/core/udp_server.c b/src/core/udp_server.c index cff4ef0..96ba8eb 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -339,6 +339,14 @@ int udp_init(struct socket_info* sock_info) } #endif + /* Allow bind to non local address. Required when daemon started before network initialized */ + optval = 1; + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("setsockopt freebind: %s\n", strerror(errno)); + /* continue since this is not critical */ + } + #ifdef USE_MCAST if ((sock_info->flags & SI_IS_MCAST) && (setup_mcast_rcvr(sock_info->socket, addr, sock_info->mcast.s)<0)){ diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index e2301f0..686139c 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -469,6 +469,14 @@ static int sctp_init_sock_opt_common(int s, int af) } } + /* Allow bind to non local address. Required when daemon started before network initialized */ + optval = 1; + if (setsockopt(s, IPPROTO_IP, IP_FREEBIND, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("sctp_init_sock_opt_common: setsockopt freebind %s\n", strerror(errno)); + /* continue since this is not critical */ + } + /* set receive buffer: SO_RCVBUF*/ if (cfg_get(sctp, sctp_cfg, so_rcvbuf)){ optval=cfg_get(sctp, sctp_cfg, so_rcvbuf);

1 0

possible memory leak in registrar module (xavp_rcd_helper)
by Luis Azedo 02 May '17

02 May '17

Hi, i'm investigating a possible memory leak in registrar module, namely in xavp_rcd_helper function. noticed an increase in shared memory allocated by core, removing the modparam("registrar", "xavp_rcd", "ulrcd") seems to fix this. [root@dev-01 kamailio]# kamcmd mod.stats core shm Module: core { xavp_new_value(94): 35704 ..... } [root@dev-01 kamailio]# kamcmd mod.stats core shm Module: core { xavp_new_value(94): 164064 .... } only one client registering every 60 sec. not sure if it keeps accumulating values in the xavp or if its leaking. however, a doubt came across. the lookup function is supposed to fill the xavp if configured, but the value seems to be related to the current process and afaik xavp are allocated in shared memory making it available to all processes. now, if two requests arrive at the same time and both do a lookup on the registrar, the xavp will potentially have the wrong value for one of the requests. what am i missing here ? Thanks

1 0

git:master:d09176e2: Merge pull request #1110 from khoegh/master
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: d09176e291a0b06ebd2ea386195a1968bffd4e1a URL: https://github.com/kamailio/kamailio/commit/d09176e291a0b06ebd2ea386195a196… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T10:17:11+02:00 Merge pull request #1110 from khoegh/master htable: Fix memory leak when reloading an empty htable from database --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/d09176e291a0b06ebd2ea386195a196… Patch: https://github.com/kamailio/kamailio/commit/d09176e291a0b06ebd2ea386195a196… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 83a9f01..fd5ec46 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -247,6 +247,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } else { if(RES_ROW_N(db_res)==0) { + ht_dbf.free_result(ht_db_con, db_res); LM_DBG("Nothing to be loaded in hash table\n"); return 0; }

1 0

git:master:07ce768f: htable: Fix memory leak when reloading an empty htable from database
by Kristian HÃ¸gh 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 07ce768fc6064867ed33d7ab6c9cbbb05db329db URL: https://github.com/kamailio/kamailio/commit/07ce768fc6064867ed33d7ab6c9cbbb… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Committer: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2017-05-02T07:43:54+02:00 htable: Fix memory leak when reloading an empty htable from database --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/07ce768fc6064867ed33d7ab6c9cbbb… Patch: https://github.com/kamailio/kamailio/commit/07ce768fc6064867ed33d7ab6c9cbbb… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 83a9f01..fd5ec46 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -247,6 +247,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } else { if(RES_ROW_N(db_res)==0) { + ht_dbf.free_result(ht_db_con, db_res); LM_DBG("Nothing to be loaded in hash table\n"); return 0; }

1 0

[kamailio/kamailio] htable: Fix memory leak when reloading an empty htable from database (#1110)
by Kristian Høgh 02 May '17

02 May '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1110 -- Commit Summary -- * htable: Fix memory leak when reloading an empty htable from database -- File Changes -- M src/modules/htable/ht_db.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1110.patch https://github.com/kamailio/kamailio/pull/1110.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/1110

2 2

git: new commits in branch master
by Daniel-Constantin Mierla 02 May '17

02 May '17

- URL: https://github.com/kamailio/kamailio/commit/ae6367f4568a3775ff0c75a1a30c3f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:08:59+02:00 pv: exported sbranch functions to kemi framework - URL: https://github.com/kamailio/kamailio/commit/b7baf05bd27aec0bfb606ff1ad43c01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:08:59+02:00 registrar: add_sock_hdr() uses spve fixup - URL: https://github.com/kamailio/kamailio/commit/fe847cc0f567c38bf51d5a9bf28f654… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:08:59+02:00 registrar: extended docs about add_sock_hdr() - URL: https://github.com/kamailio/kamailio/commit/4f9143e6ce9e91165ac3916e6c142db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:08:59+02:00 uac: uac_auth() and uac_req_send() exported to kemi framework - URL: https://github.com/kamailio/kamailio/commit/69353523a758a1823c0e9d52afe5d62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:08:59+02:00 registrar: more functions exported to kemi framework - URL: https://github.com/kamailio/kamailio/commit/d88453f15d067a9e6cbc827b4dc6655… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T08:44:51+02:00 uac: exported replace from/to functions to kemi interface - URL: https://github.com/kamailio/kamailio/commit/7fb76f9c4f247a1b62609e6ff22a5ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T09:06:01+02:00 core: fixup helper functions for spve and pvar parameters - URL: https://github.com/kamailio/kamailio/commit/459f2e064789a86f6e278485ba6f5df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T09:08:55+02:00 diversion: fixed error log message - URL: https://github.com/kamailio/kamailio/commit/f68bd70eb5e84515978a137a558d45c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T09:09:25+02:00 uac: uac_reg functions use spve and igp fixup helpers - URL: https://github.com/kamailio/kamailio/commit/c1677c39a1e6255aa01d623cc2cd556… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T09:14:27+02:00 registrar: fixed typo in reg_free_contacts() kemi exports - URL: https://github.com/kamailio/kamailio/commit/b8e64d95599bd2893900360644d5516… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T09:29:18+02:00 uac: exported uac_reg functions to kemi interface - URL: https://github.com/kamailio/kamailio/commit/8fc83e83cbe6f14dc89ad1b19c2a0c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-01T22:20:32+02:00 sst: fix flag condtion in sst_check_min() - URL: https://github.com/kamailio/kamailio/commit/ee256fdd8b2c6a5ea42b703181af298… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T08:24:32+02:00 ss7ops: exported functions to kemi framework - URL: https://github.com/kamailio/kamailio/commit/f9ca87af6bef4d2dd4c3ec103e9bdcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T08:25:10+02:00 sqlops: exported functions to kemi framework - URL: https://github.com/kamailio/kamailio/commit/0b9899a503db5080c56aeb372961df4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T08:25:37+02:00 dialog: exported dlg flags functions to kemi framework - URL: https://github.com/kamailio/kamailio/commit/f335900ae40fe1552dc2fa85953f991… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-02T08:26:14+02:00 tm: retransmission management functions exported to kemi framework

1 0

[kamailio/kamailio] Error building libprint.so on Fedora 25 with gcc-6.3.1-1.fc25.x86_64 (#1088)
by Anthony Messina 30 Apr '17

30 Apr '17

### Description Error building libprint.so on Fedora 25 with gcc-6.3.1-1.fc25.x86_64. I've started seeing these build errors resulting in build failures. I'm not sure where to start resolving this :( ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.0.1/src/modules/print_lib' Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -DNAME='"kamailio"' -DVERSION='"5.0.1"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 6.3.1"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5000001 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DSER_MOD_INTERFACE -DMOD_NAME='"print_lib"' -c print_lib.c -o print_lib.o -MMD -MP make[3]: Entering directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' Makefile.defs defs skipped make[3]: Entering directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' Makefile.defs defs skipped install mode Makefile.defs defs skipped install mode Makefile.defs defs skipped gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -DNAME='"kamailio"' -DVERSION='"5.0.1"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 6.3.1"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5000001 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c print.c -o print.o -MMD -MP gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -DNAME='"kamailio"' -DVERSION='"5.0.1"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 6.3.1"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5000001 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c print.c -o print.o -MMD -MP ln: failed to create symbolic link 'libprint.so.1': File exists ../../Makefile.libs:107: recipe for target 'libprint.so.1' failed make[3]: [libprint.so.1] Error 1 (ignored) ln: failed to create symbolic link 'libprint.so': File exists make[3]: [libprint.so] Error 1 (ignored) ../../Makefile.libs:113: recipe for target 'libprint.so' failed gcc -shared -m64 -Wl,-O2 -Wl,-E -Wl,-soname,libprint.so.1 print.o -o libprint.so.1.2 gcc -shared -m64 -Wl,-O2 -Wl,-E -Wl,-soname,libprint.so.1 print.o -o libprint.so.1.2 make[4]: Entering directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' Makefile.defs defs skipped install mode touch /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio//libprint.so.1.2 install -m 755 libprint.so.1.2 /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio/ rm -f /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio//libprint.so.1 \ /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio//libprint.so cd /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio/ ; ln -s libprint.so.1.2 libprint.so.1 cd /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio/ ; ln -s libprint.so.1.2 libprint.so make[4]: Leaving directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' make[3]: Leaving directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' make[3]: Leaving directory '/builddir/build/BUILD/kamailio-5.0.1/src/lib/print' gcc -shared -m64 -Wl,-O2 -Wl,-E print_lib.o -L../../lib/print/ -lprint -Wl,-rpath,/usr/lib64/kamailio/ -o print_lib.so touch /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio/modules/print_lib.so install -m 755 print_lib.so /builddir/build/BUILDROOT/kamailio-5.0.1-2.gitfdb4538.fc25.x86_64/usr/lib64/kamailio/modules make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.0.1/src/modules/print_lib' ``` -- 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/1088

2 7

git:master:7e447329: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 7e447329d1a1281cdb84238dacdc5e045b9637d6 URL: https://github.com/kamailio/kamailio/commit/7e447329d1a1281cdb84238dacdc5e0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-29T11:31:26+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7e447329d1a1281cdb84238dacdc5e0… Patch: https://github.com/kamailio/kamailio/commit/7e447329d1a1281cdb84238dacdc5e0… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 35e4858..07ab870 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -898,12 +898,14 @@ if(method=="SUBSCRIBE") 4.3. pres_auth_status(watcher_uri, presentity_uri) - The function checks if watcher is authorized to subscribe event - 'presence' of presentity. Both watcher_uri and presentity_uri are - pseudo variables. Function returns ACTIVE_STATUS, if subscription is - allowed and PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS - otherwise. See presence/subscribe.h for the corresponding integer - codes. In case of error, function returns -1. + The function checks if watcher URI is authorized to subscribe event + 'presence' of presentity URI. Both watcher_uri and presentity_uri can + be static strings or contain pseudo variables. + + The function returns ACTIVE_STATUS, if subscription is allowed, and + PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS otherwise. See + presence/subscribe.h for the corresponding integer codes. In case of + error, function returns -1. This function can be used from REQUEST_ROUTE.

1 0

git:master:7cccc82f: presence: documentation updates for pres_auth_status()
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 7cccc82f1bdb8132d150f291158731b5c1aaa91e URL: https://github.com/kamailio/kamailio/commit/7cccc82f1bdb8132d150f291158731b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:21:35+02:00 presence: documentation updates for pres_auth_status() --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7cccc82f1bdb8132d150f291158731b… Patch: https://github.com/kamailio/kamailio/commit/7cccc82f1bdb8132d150f291158731b… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index f3b9d1a..0bedc37 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1012,14 +1012,14 @@ if(method=="SUBSCRIBE") <function moreinfo="none">pres_auth_status(watcher_uri, presentity_uri)</function> </title> <para> - The function checks if watcher is authorized to subscribe - event 'presence' of presentity. Both watcher_uri and - presentity_uri are pseudo variables. Function returns - ACTIVE_STATUS, if subscription is allowed and - PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS - otherwise. See presence/subscribe.h for the - corresponding integer codes. In case of error, function - returns -1. + The function checks if watcher URI is authorized to subscribe + event 'presence' of presentity URI. Both watcher_uri and + presentity_uri can be static strings or contain pseudo variables. + </para> + <para>The function returns ACTIVE_STATUS, if subscription is allowed, + and PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS otherwise. + See presence/subscribe.h for the corresponding integer codes. In case + of error, function returns -1. </para> <para> This function can be used from REQUEST_ROUTE.

1 0

git:master:e31516ec: presence: more functions exported to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: e31516ec061d19c83870044292d8e7c665e89c8e URL: https://github.com/kamailio/kamailio/commit/e31516ec061d19c83870044292d8e7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:25:51+02:00 presence: more functions exported to kemi framework --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/e31516ec061d19c83870044292d8e7c… Patch: https://github.com/kamailio/kamailio/commit/e31516ec061d19c83870044292d8e7c… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 116c37f..cc71171 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1433,6 +1433,15 @@ static int w_pres_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2) return pres_auth_status(_msg, watcher_uri, presentity_uri); } +int ki_pres_auth_status(sip_msg_t* msg, str* watcher_uri, str* presentity_uri) +{ + if(watcher_uri==NULL || presentity_uri==NULL) { + LM_ERR("invalid parameters\n"); + return -1; + } + return pres_auth_status(msg, *watcher_uri, *presentity_uri); +} + int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri) { str event; @@ -1907,6 +1916,11 @@ static sr_kemi_t sr_kemi_presence_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("presence"), str_init("pres_auth_status"), + SR_KEMIP_INT, ki_pres_auth_status, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:750a3707: presence: use spve fixup for pres_auth_status()
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 750a37076517c227af8fa1666229652e026b9b69 URL: https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:07:46+02:00 presence: use spve fixup for pres_auth_status() - flexibility to provide static string values or variable parameters --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… Patch: https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 3b131ba..116c37f 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -185,7 +185,7 @@ static cmd_export_t cmds[]= {"handle_subscribe", (cmd_function)w_handle_subscribe, 1, fixup_subscribe, 0, REQUEST_ROUTE}, {"pres_auth_status", (cmd_function)w_pres_auth_status, 2, - fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers, 3, fixup_refresh_watchers, 0, ANY_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers5,5, @@ -1406,52 +1406,33 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs return 0; } -static int w_pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) +static int w_pres_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2) { - pv_spec_t *sp; - pv_value_t pv_val; str watcher_uri, presentity_uri; - sp = (pv_spec_t *)_sp1; + if(fixup_get_svalue(_msg, (gparam_t *)_sp1, &watcher_uri) != 0) { + LM_ERR("invalid watcher uri parameter"); + return -1; + } - if (sp && (pv_get_spec_value(_msg, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - watcher_uri = pv_val.rs; - if (watcher_uri.len == 0 || watcher_uri.s == NULL) { - LM_ERR("missing watcher uri\n"); - return -1; - } - } else { - LM_ERR("watcher pseudo variable value is not string\n"); - return -1; - } - } else { - LM_ERR("cannot get watcher pseudo variable value\n"); + if(fixup_get_svalue(_msg, (gparam_t *)_sp2, &presentity_uri) != 0) { + LM_ERR("invalid presentity uri parameter"); return -1; } - sp = (pv_spec_t *)_sp2; + if(watcher_uri.len == 0 || watcher_uri.s == NULL) { + LM_ERR("missing watcher uri\n"); + return -1; + } - if (sp && (pv_get_spec_value(_msg, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - presentity_uri = pv_val.rs; - if (presentity_uri.len == 0 || presentity_uri.s == NULL) { - LM_DBG("missing presentity uri\n"); - return -1; - } - } else { - LM_ERR("presentity pseudo variable value is not string\n"); - return -1; - } - } else { - LM_ERR("cannot get presentity pseudo variable value\n"); + if(presentity_uri.len == 0 || presentity_uri.s == NULL) { + LM_DBG("missing presentity uri\n"); return -1; } return pres_auth_status(_msg, watcher_uri, presentity_uri); } - int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri) { str event;

1 0

git:master:8201472d: pua_usrloc: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 8201472d2c1550dffa60e9b0c6548b8340740061 URL: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:33:07+02:00 pua_usrloc: exported functions to kemi framework --- Modified: src/modules/pua_usrloc/pua_usrloc.c Modified: src/modules/pua_usrloc/pua_usrloc.h Modified: src/modules/pua_usrloc/ul_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… Patch: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… --- diff --git a/src/modules/pua_usrloc/pua_usrloc.c b/src/modules/pua_usrloc/pua_usrloc.c index b393ef2..66a1450 100644 --- a/src/modules/pua_usrloc/pua_usrloc.c +++ b/src/modules/pua_usrloc/pua_usrloc.c @@ -44,6 +44,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/pt.h" +#include "../../core/kemi.h" #include "../usrloc/usrloc_mod.h" #include "../usrloc/usrloc.h" #include "../usrloc/ul_callback.h" @@ -69,11 +70,9 @@ usrloc_api_t ul; static int mod_init(void); -int pua_set_publish(struct sip_msg* , char*, char*); - static cmd_export_t cmds[]= { - {"pua_set_publish", (cmd_function)pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, + {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -204,6 +203,30 @@ int bind_pua_usrloc(struct pua_usrloc_binds *pxb) return -1; } - pxb->pua_set_publish = pua_set_publish; + pxb->pua_set_publish = w_pua_set_publish; return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_usrloc_exports[] = { + { str_init("pua"), str_init("pua_set_publish"), + SR_KEMIP_INT, ki_pua_set_publish, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_usrloc_exports); + return 0; +} \ No newline at end of file diff --git a/src/modules/pua_usrloc/pua_usrloc.h b/src/modules/pua_usrloc/pua_usrloc.h index 89ceee5..93a918c 100644 --- a/src/modules/pua_usrloc/pua_usrloc.h +++ b/src/modules/pua_usrloc/pua_usrloc.h @@ -33,6 +33,8 @@ #include "../pua/pua_bind.h" void ul_publish(ucontact_t* c, int type, void* param); +int w_pua_set_publish(sip_msg_t*, char*, char*); +int ki_pua_set_publish(sip_msg_t*); int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param); extern str pres_prefix; diff --git a/src/modules/pua_usrloc/ul_publish.c b/src/modules/pua_usrloc/ul_publish.c index 59417c2..14b318f 100644 --- a/src/modules/pua_usrloc/ul_publish.c +++ b/src/modules/pua_usrloc/ul_publish.c @@ -45,7 +45,7 @@ #include "pua_usrloc.h" #define BUF_LEN 256 -int pua_set_publish(struct sip_msg* msg , char* s1, char* s2) +int ki_pua_set_publish(sip_msg_t* msg) { LM_DBG("set send publish\n"); pua_ul_publish= 1; @@ -54,6 +54,11 @@ int pua_set_publish(struct sip_msg* msg , char* s1, char* s2) return 1; } +int w_pua_set_publish(struct sip_msg* msg , char* s1, char* s2) +{ + return ki_pua_set_publish(msg); +} + int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param) { pua_ul_publish= 0;

1 0

git:master:eada34c7: tls: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: eada34c70aeeab42c7e4ccd5a36601d7bf666c17 URL: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:33:34+02:00 tls: exported functions to kemi framework --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… Patch: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0fd00eb..6c16c3b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -40,6 +40,7 @@ #include "../../core/rpc_lookup.h" #include "../../core/cfg/cfg.h" #include "../../core/dprint.h" +#include "../../core/kemi.h" #include "tls_init.h" #include "tls_server.h" #include "tls_domain.h" @@ -77,7 +78,7 @@ static int mod_init(void); static int mod_child(int rank); static void destroy(void); -static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2); +static int w_is_peer_verified(struct sip_msg* msg, char* p1, char* p2); MODULE_VERSION @@ -166,7 +167,7 @@ int sr_tls_renegotiation = 0; * Exported functions */ static cmd_export_t cmds[] = { - {"is_peer_verified", (cmd_function)is_peer_verified, 0, 0, 0, + {"is_peer_verified", (cmd_function)w_is_peer_verified, 0, 0, 0, REQUEST_ROUTE}, {0,0,0,0,0,0} }; @@ -261,25 +262,6 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - if (tls_disable) { - LOG(L_WARN, "tls support is disabled " - "(set enable_tls=1 in the config to enable it)\n"); - return 0; - } - - /* shm is used, be sure it is initialized */ - if(!shm_initialized() && init_shm()<0) - return -1; - - if(tls_pre_init()<0) - return -1; - - register_tls_hooks(&tls_h); - - return 0; -} static int mod_init(void) { @@ -403,7 +385,7 @@ static void destroy(void) } -static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) +static int ki_is_peer_verified(sip_msg_t* msg) { struct tcp_connection *c; SSL *ssl; @@ -466,3 +448,47 @@ static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) "...done\n"); return 1; } + +static int w_is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) +{ + return ki_is_peer_verified(msg); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_tls_exports[] = { + { str_init("tls"), str_init("is_peer_verified"), + SR_KEMIP_INT, ki_is_peer_verified, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if (tls_disable) { + LOG(L_WARN, "tls support is disabled " + "(set enable_tls=1 in the config to enable it)\n"); + return 0; + } + + /* shm is used, be sure it is initialized */ + if(!shm_initialized() && init_shm()<0) + return -1; + + if(tls_pre_init()<0) + return -1; + + register_tls_hooks(&tls_h); + sr_kemi_modules_add(sr_kemi_tls_exports); + + return 0; +} \ No newline at end of file

1 0

git:master:5b0449b5: pua: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 5b0449b583f722b070e59b0735e26aa16ca413ee URL: https://github.com/kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:32:21+02:00 pua: exported functions to kemi framework --- Modified: src/modules/pua/hash.c Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.c --- Diff: https://github.com/kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… Patch: https://github.com/kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… --- diff --git a/src/modules/pua/hash.c b/src/modules/pua/hash.c index d364651..de818e5 100644 --- a/src/modules/pua/hash.c +++ b/src/modules/pua/hash.c @@ -504,7 +504,7 @@ int is_dialog(ua_pres_t* dialog) } -int update_contact(struct sip_msg* msg, char* str1, char* str2) +int ki_pua_update_contact(struct sip_msg* msg) { ua_pres_t* p, hentity; str contact; @@ -636,6 +636,11 @@ int update_contact(struct sip_msg* msg, char* str1, char* str2) return -1; } +int w_pua_update_contact(struct sip_msg* msg, char* str1, char* str2) +{ + return ki_pua_update_contact(msg); +} + list_entry_t *get_subs_list(str *did) { int i; diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index b9a81b4..ee4c01f 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,6 +178,7 @@ static inline int get_event_flag(str* event) return -1; } -int update_contact(struct sip_msg* msg, char* str1, char* str2); +int w_pua_update_contact(struct sip_msg* msg, char* str1, char* str2); +int ki_pua_update_contact(struct sip_msg* msg); #endif diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index 360ba2d..e86c54d 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -36,6 +36,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/pt.h" +#include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../lib/srdb1/db.h" @@ -114,10 +115,10 @@ static int pua_rpc_init(void); static cmd_export_t cmds[]= { - {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, - {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, - {"pua_update_contact", (cmd_function)update_contact, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} + {"pua_update_contact", (cmd_function)w_pua_update_contact, 0, 0, 0, REQUEST_ROUTE}, + {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, + {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} }; static param_export_t params[]={ @@ -1231,3 +1232,27 @@ static int pua_rpc_init(void) } return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_exports[] = { + { str_init("pua"), str_init("pua_update_contact"), + SR_KEMIP_INT, ki_pua_update_contact, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_exports); + return 0; +} \ No newline at end of file

1 0

git:master:da8690dd: presence: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: da8690ddce4bff65a251351a1df588e31b266c26 URL: https://github.com/kamailio/kamailio/commit/da8690ddce4bff65a251351a1df588e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:31:15+02:00 presence: exported functions to kemi framework --- Modified: src/modules/presence/bind_presence.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/publish.c Modified: src/modules/presence/publish.h Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/da8690ddce4bff65a251351a1df588e… Patch: https://github.com/kamailio/kamailio/commit/da8690ddce4bff65a251351a1df588e…

1 0

git:master:c5429ebe: presence_xml: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: c5429ebe40b0e8dea71bca3fa348d61584bdac30 URL: https://github.com/kamailio/kamailio/commit/c5429ebe40b0e8dea71bca3fa348d61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:31:36+02:00 presence_xml: exported functions to kemi framework --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/c5429ebe40b0e8dea71bca3fa348d61… Patch: https://github.com/kamailio/kamailio/commit/c5429ebe40b0e8dea71bca3fa348d61…

1 0

git:5.0:5738001c: topos: proper storing of b-side record routing
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: 5.0 Commit: 5738001c0f2ab2c1fd6bee9dbfdec5414fb9bce0 URL: https://github.com/kamailio/kamailio/commit/5738001c0f2ab2c1fd6bee9dbfdec54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T18:55:59+02:00 topos: proper storing of b-side record routing - special credits to Sergey Basov for troubleshooting (cherry picked from commit fec80f51a64ab102aca79c44d61c6c783b0baa46) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5738001c0f2ab2c1fd6bee9dbfdec54… Patch: https://github.com/kamailio/kamailio/commit/5738001c0f2ab2c1fd6bee9dbfdec54… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 41dcd90..462dedd 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -443,8 +443,15 @@ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) ptsd->a_rr.len++; } else { /* sip response - get b-side record route */ + if(i==1) { + ptsd->b_rr.s = ptsd->cp; + } + if(i>1) { + *ptsd->cp = ','; + ptsd->cp++; + ptsd->b_rr.len++; + } *ptsd->cp = '<'; - ptsd->b_rr.s = ptsd->cp; ptsd->cp++; ptsd->b_rr.len++; memcpy(ptsd->cp, rr->nameaddr.uri.s, rr->nameaddr.uri.len);

1 0

git:master:fec80f51: topos: proper storing of b-side record routing
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: fec80f51a64ab102aca79c44d61c6c783b0baa46 URL: https://github.com/kamailio/kamailio/commit/fec80f51a64ab102aca79c44d61c6c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T16:10:59+02:00 topos: proper storing of b-side record routing - special credits to Sergey Basov for troubleshooting --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/fec80f51a64ab102aca79c44d61c6c7… Patch: https://github.com/kamailio/kamailio/commit/fec80f51a64ab102aca79c44d61c6c7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 41dcd90..462dedd 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -443,8 +443,15 @@ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) ptsd->a_rr.len++; } else { /* sip response - get b-side record route */ + if(i==1) { + ptsd->b_rr.s = ptsd->cp; + } + if(i>1) { + *ptsd->cp = ','; + ptsd->cp++; + ptsd->b_rr.len++; + } *ptsd->cp = '<'; - ptsd->b_rr.s = ptsd->cp; ptsd->cp++; ptsd->b_rr.len++; memcpy(ptsd->cp, rr->nameaddr.uri.s, rr->nameaddr.uri.len);

1 0

[kamailio/kamailio] Fix redis pipeline (#1102)
by Paul Claudiu Boriga 28 Apr '17

28 Apr '17

Hello, I have found some bugs with the original commit that adds redis_pipe_cmd. If a command to the server fails, this may leave the redisContext in an invalid state, and this means that a reconnect to the server needs to be performed. The problem is that when reconnecting, a new context is created, and all the contents of old redisContext is lost, including the hiredis output buffer (obuf) which stored the piped commands. This means that all the commands are lost, and when a second retry is made this contains no commands and may fail, leaving the redisContext in an invalid state. This can in some cases break the REDIS pipelining feature, and cause all commands sent using redis_pipe_cmd()/redis_execute() to fail from that point onwards. The solution is to make sure that the connection is active when adding commands to the hiredis output buffer. For this, commands are stored in a separate buffer, and are only added to the redisContext when actually sending the command (when calling redis_execute). This way it is possible to see if any errors exist by checking the err member of the redisContext structure before appending the commands, and also commands are not lost since they are stored separately and if reconnecting the new commands can be appended to the output buffer of the new redisContext. Commands are stored in buffers using the sds format hiredis offers (by calling redisFormatCommand function offered by hiredis). This way they can be directly appended to the output buffer using redisAppendFormattedCommand. There is a problem on older hiredis versions (older than 0.12) because redisAppendFormattedCommand was not exported to the library API, so for older hiredis version the buffers are appended in our code. We tested the code using hiredis library version 0.10.1 and 0.12.1 and there is no problem with this approach. In the second commit we fixed a memory leak when re-using reply ids in the same pipeline command sequence occurs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1102 -- Commit Summary -- * ndb_redis: fix connection problems with pipelining * ndb_redis: fix memory leak -- File Changes -- M src/modules/ndb_redis/redis_client.c (118) M src/modules/ndb_redis/redis_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1102.patch https://github.com/kamailio/kamailio/pull/1102.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/1102

3 3

git:5.0:51f214f1: Add and fix #includes for more strict POSIX compliance
by Timo TerÃ¤s 28 Apr '17

28 Apr '17

Module: kamailio Branch: 5.0 Commit: 51f214f1c2a0b0e566ba367e5b1ac2557a05e8bd URL: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T13:01:47+03:00 Add and fix #includes for more strict POSIX compliance - sys/poll.h is non-standard, posix defines poll.h - sys/time.h is needed in addition to time.h for e.g. struct timeval Notable this fixes some build errors against musl libc (cherry picked from commit 4d485707f7e53e798466dc6ae2166eddbe874b95) --- Modified: src/core/tsend.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/tls/tls_server.c Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… Patch: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… --- diff --git a/src/core/tsend.c b/src/core/tsend.c index 97463fc..60c70af 100644 --- a/src/core/tsend.c +++ b/src/core/tsend.c @@ -27,7 +27,7 @@ #include <string.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/modules/ldap/ld_session.h b/src/modules/ldap/ld_session.h index 08a752c..0591f79 100644 --- a/src/modules/ldap/ld_session.h +++ b/src/modules/ldap/ld_session.h @@ -28,6 +28,7 @@ #ifndef LD_SESSION_H #define LD_SESSION_H +#include <sys/time.h> #include <ldap.h> #include "iniparser.h" diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 05581d5..b9c720f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -25,7 +25,7 @@ #include <string.h>/*strcmp,memset*/ #include <errno.h>/*errno*/ #include <unistd.h>/*close(),read(),pipe,fork,pid_t*/ -#include <sys/poll.h>/*poll*/ +#include <poll.h>/*poll*/ #include <signal.h>/*signal*/ #include <time.h>/*time*/ #include <string.h>/*memcmp*/ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index da04f08..5b713ec 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -26,7 +26,7 @@ */ -#include <sys/poll.h> +#include <poll.h> #include <openssl/err.h> #include <openssl/ssl.h> #include "../../core/dprint.h" diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 56124ca..08fb3b2 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -41,6 +41,7 @@ #include <netdb.h> /* gethostbyname */ #include <fcntl.h> #include <time.h> /* time */ +#include <sys/time.h> #ifdef USE_READLINE #include <readline/readline.h>

1 0

git:5.0:3bd91a27: tls: add a level of libressl compatibility
by Timo TerÃ¤s 28 Apr '17

28 Apr '17

Module: kamailio Branch: 5.0 Commit: 3bd91a27ddd731d2e741dfc5d34bcaf432afbbc7 URL: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T13:01:54+03:00 tls: add a level of libressl compatibility libressl is the openbsd openssl fork that is getting more popular. It defines OPENSSL_VERSION_NUMBER 0x20000000L and introduces a new LIBRESSL_VERSION_NUMBER that reflects the true libressl version. As openssl made major changes between 1.0.1 and 1.1.0, and libressl being closer to 1.0.1 series, it needs to be specifically detected in certain cases. This commit updates the compat logic to implement missing api functions as inline function where sensible needed in order to minimize the #ifdef clutter and make the code more readable and less prone to bugs. (cherry picked from commit 0a87b5a9b0af5e3a277e462d41a8ffc3ca3f246e) --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… Patch: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index ea4f6ec..567ed6f 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -63,7 +63,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s); static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2); -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) static BIO_METHOD tls_mbuf_method = { BIO_TYPE_TLS_MBUF, /* type */ "sr_tls_mbuf", /* name */ @@ -76,6 +76,27 @@ static BIO_METHOD tls_mbuf_method = { tls_bio_mbuf_free, /* destroy(free) function */ 0 /* ctrl callback */ }; + +static void *CRYPTO_zalloc(size_t num, const char *file, int line) +{ + void *ret = CRYPTO_malloc(num, file, line); + if (ret != NULL) + memset(ret, 0, num); + return ret; +} +# define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) +static void *BIO_get_data(BIO *b) +{ + return b->ptr; +} +static void BIO_set_data(BIO *b, void *ptr) +{ + b->ptr = ptr; +} +static void BIO_set_init(BIO *b, int init) +{ + b->init = init; +} #else static BIO_METHOD *tls_mbuf_method = NULL; #endif @@ -84,7 +105,7 @@ static BIO_METHOD *tls_mbuf_method = NULL; /** returns a custom tls_mbuf BIO. */ BIO_METHOD* tls_BIO_mbuf(void) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) return &tls_mbuf_method; #else if(tls_mbuf_method != NULL) { @@ -137,22 +158,14 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif if (unlikely(d == 0)){ BUG("null BIO ptr data\n"); return 0; } d->rd = rd; d->wr = wr; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 1; -#else BIO_set_init(b, 1); -#endif return 1; } @@ -167,25 +180,12 @@ static int tls_bio_mbuf_new(BIO* b) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 0; /* not initialized yet */ - b->num = 0; - b->ptr = 0; - b->flags = 0; - d = OPENSSL_malloc(sizeof(*d)); - if (unlikely(d == 0)) - return 0; - d->rd = 0; - d->wr = 0; - b->ptr = d; -#else BIO_set_init(b, 0); BIO_set_data(b, NULL); d = OPENSSL_zalloc(sizeof(*d)); if (unlikely(d == 0)) return 0; BIO_set_data(b, d); -#endif return 1; } @@ -200,13 +200,6 @@ static int tls_bio_mbuf_free(BIO* b) TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (likely(b->ptr)){ - OPENSSL_free(b->ptr); - b->ptr = 0; - b->init = 0; - } -#else do { struct tls_bio_mbuf_data* d; d = BIO_get_data(b); @@ -216,7 +209,6 @@ static int tls_bio_mbuf_free(BIO* b) BIO_set_init(b, 0); } } while(0); -#endif return 1; } @@ -235,11 +227,7 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) ret = 0; if (likely(dst)) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) @@ -291,11 +279,7 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) int ret; ret = 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fafaf70..2849e15 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -124,7 +124,7 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) /* libssl >= v1.1.0 */ DH_set0_pqg(dh, p, NULL, g); #else

1 0

git:master:4f839fbf: utils: exported functions to kemi framework
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 4f839fbf3793cd605dc9d185e18467a708092c02 URL: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T11:20:17+02:00 utils: exported functions to kemi framework --- Modified: src/modules/utils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… Patch: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… --- diff --git a/src/modules/utils/utils.c b/src/modules/utils/utils.c index d5aed32..026eb23 100644 --- a/src/modules/utils/utils.c +++ b/src/modules/utils/utils.c @@ -44,6 +44,7 @@ #include "../../core/resolve.h" #include "../../core/locking.h" #include "../../core/script_cb.h" +#include "../../core/kemi.h" #include "../../core/mem/shm_mem.h" #include "../../lib/srdb1/db.h" @@ -322,6 +323,29 @@ int utils_forward(struct sip_msg *msg, int id, int proto) return ret; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_utils_exports[] = { + { str_init("utils"), str_init("xcap_auth_status"), + SR_KEMIP_INT, ki_xcap_auth_status, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_utils_exports); + return 0; +} #ifdef MI_REMOVED /* FIFO functions */

1 0

git:master:f352a0e0: utils: use spve fixup - more flexibility in allowing strings and variables
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: f352a0e0b785e42100ba967b385911a266e84bfc URL: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T11:16:26+02:00 utils: use spve fixup - more flexibility in allowing strings and variables --- Modified: src/modules/utils/utils.c Modified: src/modules/utils/xcap_auth.c Modified: src/modules/utils/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a… Patch: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a…

1 0

git:master:ad3ce52d: xmlrpc: exported functions to kemi interface
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: ad3ce52d25185c021d01a91100690ec7efa36d7e URL: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T10:55:50+02:00 xmlrpc: exported functions to kemi interface --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec… Patch: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec…

1 0

git:master:08f8e0bc: db_cluster: free allocated structure at init time
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 08f8e0bc72b9f16f76b78110c9c95b1ba7f1ce25 URL: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T09:37:16+02:00 db_cluster: free allocated structure at init time - avoid reopening driver db connections if already set --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… Patch: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 1f24cc5..6ef6ec4 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -311,10 +311,12 @@ void db_cluster_close(db1_con_t* _h) LM_DBG("executing db cluster close command\n"); cls = (dbcl_cls_t*)_h->tail; cls->ref--; - if(cls->ref > 0) - return; - /* close connections */ - dbcl_close_connections(cls); + if(cls->ref <= 0) { + /* close connections */ + dbcl_close_connections(cls); + } + /* free _h - allocated for each db_cluster_init() */ + pkg_free(_h); return; } diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 534030c..47f9444 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -442,7 +442,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) { for(j=0; j<cls->rlist[i].clen; j++) { - if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0) + if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0 + && cls->rlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up read connection [%.*s]\n", cls->rlist[i].clist[j]->name.len, @@ -459,7 +460,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) } for(j=0; j<cls->wlist[i].clen; j++) { - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0) + if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0 + && cls->wlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up write connection [%.*s]\n", cls->wlist[i].clist[j]->name.len,

1 0

git:master:0a87b5a9: tls: add a level of libressl compatibility
by Timo TerÃ¤s 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 0a87b5a9b0af5e3a277e462d41a8ffc3ca3f246e URL: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T10:18:32+03:00 tls: add a level of libressl compatibility libressl is the openbsd openssl fork that is getting more popular. It defines OPENSSL_VERSION_NUMBER 0x20000000L and introduces a new LIBRESSL_VERSION_NUMBER that reflects the true libressl version. As openssl made major changes between 1.0.1 and 1.1.0, and libressl being closer to 1.0.1 series, it needs to be specifically detected in certain cases. This commit updates the compat logic to implement missing api functions as inline function where sensible needed in order to minimize the #ifdef clutter and make the code more readable and less prone to bugs. --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… Patch: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index ea4f6ec..567ed6f 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -63,7 +63,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s); static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2); -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) static BIO_METHOD tls_mbuf_method = { BIO_TYPE_TLS_MBUF, /* type */ "sr_tls_mbuf", /* name */ @@ -76,6 +76,27 @@ static BIO_METHOD tls_mbuf_method = { tls_bio_mbuf_free, /* destroy(free) function */ 0 /* ctrl callback */ }; + +static void *CRYPTO_zalloc(size_t num, const char *file, int line) +{ + void *ret = CRYPTO_malloc(num, file, line); + if (ret != NULL) + memset(ret, 0, num); + return ret; +} +# define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) +static void *BIO_get_data(BIO *b) +{ + return b->ptr; +} +static void BIO_set_data(BIO *b, void *ptr) +{ + b->ptr = ptr; +} +static void BIO_set_init(BIO *b, int init) +{ + b->init = init; +} #else static BIO_METHOD *tls_mbuf_method = NULL; #endif @@ -84,7 +105,7 @@ static BIO_METHOD *tls_mbuf_method = NULL; /** returns a custom tls_mbuf BIO. */ BIO_METHOD* tls_BIO_mbuf(void) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) return &tls_mbuf_method; #else if(tls_mbuf_method != NULL) { @@ -137,22 +158,14 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif if (unlikely(d == 0)){ BUG("null BIO ptr data\n"); return 0; } d->rd = rd; d->wr = wr; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 1; -#else BIO_set_init(b, 1); -#endif return 1; } @@ -167,25 +180,12 @@ static int tls_bio_mbuf_new(BIO* b) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 0; /* not initialized yet */ - b->num = 0; - b->ptr = 0; - b->flags = 0; - d = OPENSSL_malloc(sizeof(*d)); - if (unlikely(d == 0)) - return 0; - d->rd = 0; - d->wr = 0; - b->ptr = d; -#else BIO_set_init(b, 0); BIO_set_data(b, NULL); d = OPENSSL_zalloc(sizeof(*d)); if (unlikely(d == 0)) return 0; BIO_set_data(b, d); -#endif return 1; } @@ -200,13 +200,6 @@ static int tls_bio_mbuf_free(BIO* b) TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (likely(b->ptr)){ - OPENSSL_free(b->ptr); - b->ptr = 0; - b->init = 0; - } -#else do { struct tls_bio_mbuf_data* d; d = BIO_get_data(b); @@ -216,7 +209,6 @@ static int tls_bio_mbuf_free(BIO* b) BIO_set_init(b, 0); } } while(0); -#endif return 1; } @@ -235,11 +227,7 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) ret = 0; if (likely(dst)) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) @@ -291,11 +279,7 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) int ret; ret = 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fafaf70..2849e15 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -124,7 +124,7 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) /* libssl >= v1.1.0 */ DH_set0_pqg(dh, p, NULL, g); #else

1 0

git:master:1051a1bb: htable: close db connection in some error cases for rpc command
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 1051a1bbc70cf84d6ebd7aa76a9b1ebd2e17e710 URL: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T09:10:04+02:00 htable: close db connection in some error cases for rpc command --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… Patch: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 18a3ab8..f4c4e96 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1064,12 +1064,14 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if (rpc->scan(c, "S", &htname) < 1) { + ht_db_close_con(); rpc->fault(c, 500, "No htable name given"); return; } ht = ht_get_table(&htname); if(ht==NULL) { + ht_db_close_con(); rpc->fault(c, 500, "No such htable"); return; }

1 0

git:master:4d485707: Add and fix #includes for more strict POSIX compliance
by Timo TerÃ¤s 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 4d485707f7e53e798466dc6ae2166eddbe874b95 URL: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T10:02:40+03:00 Add and fix #includes for more strict POSIX compliance - sys/poll.h is non-standard, posix defines poll.h - sys/time.h is needed in addition to time.h for e.g. struct timeval Notable this fixes some build errors against musl libc --- Modified: src/core/tsend.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/tls/tls_server.c Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… Patch: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… --- diff --git a/src/core/tsend.c b/src/core/tsend.c index 97463fc..60c70af 100644 --- a/src/core/tsend.c +++ b/src/core/tsend.c @@ -27,7 +27,7 @@ #include <string.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/modules/ldap/ld_session.h b/src/modules/ldap/ld_session.h index 08a752c..0591f79 100644 --- a/src/modules/ldap/ld_session.h +++ b/src/modules/ldap/ld_session.h @@ -28,6 +28,7 @@ #ifndef LD_SESSION_H #define LD_SESSION_H +#include <sys/time.h> #include <ldap.h> #include "iniparser.h" diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 05581d5..b9c720f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -25,7 +25,7 @@ #include <string.h>/*strcmp,memset*/ #include <errno.h>/*errno*/ #include <unistd.h>/*close(),read(),pipe,fork,pid_t*/ -#include <sys/poll.h>/*poll*/ +#include <poll.h>/*poll*/ #include <signal.h>/*signal*/ #include <time.h>/*time*/ #include <string.h>/*memcmp*/ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index da04f08..5b713ec 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -26,7 +26,7 @@ */ -#include <sys/poll.h> +#include <poll.h> #include <openssl/err.h> #include <openssl/ssl.h> #include "../../core/dprint.h" diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 56124ca..08fb3b2 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -41,6 +41,7 @@ #include <netdb.h> /* gethostbyname */ #include <fcntl.h> #include <time.h> /* time */ +#include <sys/time.h> #ifdef USE_READLINE #include <readline/readline.h>

1 0

git:master:6af11bf9: Merge pull request #1101 from codyherzog/master
by GitHub 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 6af11bf9858921deb74cce351013b734e1b29a6f URL: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-28T08:35:55+02:00 Merge pull request #1101 from codyherzog/master core: Don't terminate on harmless SIGCHLD. --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… Patch: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… --- diff --git a/src/main.c b/src/main.c index 7781901..3fdf070 100644 --- a/src/main.c +++ b/src/main.c @@ -675,6 +675,7 @@ void handle_sigs(void) { pid_t chld; int chld_status; + int any_chld_stopped; int memlog; switch(sig_flag){ @@ -730,7 +731,9 @@ void handle_sigs(void) break; case SIGCHLD: + any_chld_stopped=0; while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { + any_chld_stopped=1; if (WIFEXITED(chld_status)) LM_ALERT("child process %ld exited normally," " status=%d\n", (long)chld, @@ -747,6 +750,16 @@ void handle_sigs(void) " signal %d\n", (long)chld, WSTOPSIG(chld_status)); } + + /* If it appears that no child process has stopped, then do not terminate on SIGCHLD. + Certain modules like app_python can run external scripts which cause child processes to be started and + stopped. That can result in SIGCHLD being received here even though there is no real problem. Therefore, + we do not terminate Kamailio unless we can find the child process which has stopped. */ + if (!any_chld_stopped) { + LM_INFO("SIGCHLD received, but no child has stopped, ignoring it\n"); + break; + } + #ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n");

1 0

git:master:1c5e1660: core: Don't terminate on harmless SIGCHLD.
by codyherzog 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: 1c5e166001306a1a9d9d8412f0a54910093109cb URL: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… Author: codyherzog <cherzog(a)intouchhealth.com> Committer: codyherzog <cherzog(a)intouchhealth.com> Date: 2017-04-27T14:04:35-07:00 core: Don't terminate on harmless SIGCHLD. If it appears that no child process has stopped, then do not terminate on SIGCHLD. Certain modules like app_python can run external scripts which cause child processes to be started and stopped. That can result in SIGCHLD being received even though there is no real problem. Therefore, we do not terminate Kamailio unless we can find the child process which has stopped. --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… Patch: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… --- diff --git a/src/main.c b/src/main.c index 7781901..3fdf070 100644 --- a/src/main.c +++ b/src/main.c @@ -675,6 +675,7 @@ void handle_sigs(void) { pid_t chld; int chld_status; + int any_chld_stopped; int memlog; switch(sig_flag){ @@ -730,7 +731,9 @@ void handle_sigs(void) break; case SIGCHLD: + any_chld_stopped=0; while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { + any_chld_stopped=1; if (WIFEXITED(chld_status)) LM_ALERT("child process %ld exited normally," " status=%d\n", (long)chld, @@ -747,6 +750,16 @@ void handle_sigs(void) " signal %d\n", (long)chld, WSTOPSIG(chld_status)); } + + /* If it appears that no child process has stopped, then do not terminate on SIGCHLD. + Certain modules like app_python can run external scripts which cause child processes to be started and + stopped. That can result in SIGCHLD being received here even though there is no real problem. Therefore, + we do not terminate Kamailio unless we can find the child process which has stopped. */ + if (!any_chld_stopped) { + LM_INFO("SIGCHLD received, but no child has stopped, ignoring it\n"); + break; + } + #ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n");

1 0

[kamailio/kamailio] core: Don't terminate on harmless SIGCHLD. (#1101)
by codyherzog 28 Apr '17

28 Apr '17

If it appears that no child process has stopped, then do not terminate on SIGCHLD. Certain modules like app_python can run external scripts which cause child processes to be started and stopped. That can result in SIGCHLD being received even though there is no real problem. Therefore, we do not terminate Kamailio unless we can find the child process which has stopped. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1101 -- Commit Summary -- * core: Don't terminate on harmless SIGCHLD. -- File Changes -- M src/main.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1101.patch https://github.com/kamailio/kamailio/pull/1101.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/1101

2 2

git:5.0:c270da3c: ims_icscf: Fix fixup functions
by Carsten Bock 28 Apr '17

28 Apr '17

Module: kamailio Branch: 5.0 Commit: c270da3cd3200e7074fd7368f0899e679c38c5c2 URL: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-28T08:10:54+02:00 ims_icscf: Fix fixup functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… Patch: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… --- diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 07eb29c..47813e2 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -270,15 +270,14 @@ static int fixup_uar(void** param, int param_no) { if (strlen((char*) *param) <= 0) { LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; + return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0){ - LM_ERR("fixup spve failed on %d\n", param_no); - return -1; - } - return 0; + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); } return 0; @@ -291,11 +290,12 @@ static int fixup_lir(void** param, int param_no) return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0) - return -1; - return 0; - } + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); + } return 0; }

1 0

git:master:ca39ea81: Packaging: Update Centos 7 Spec file
by Carsten Bock 28 Apr '17

28 Apr '17

Module: kamailio Branch: master Commit: ca39ea810c01f6947db70870cc1d786e95cb4bc3 URL: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-28T08:05:28+02:00 Packaging: Update Centos 7 Spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… Patch: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index e4339fa..d6fd642 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -38,6 +38,7 @@ 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 +Conflicts: kamailio-sqlang < %ver BuildRequires: bison, flex, gcc, make, redhat-rpm-config %description @@ -552,6 +553,14 @@ BuildRequires: libuuid-devel %description uuid UUID module for Kamailio. +%package sqlang +Summary: Squirrel Language (SQLang) for Kamailio +Group: System Environment/Daemons +Requires: squirrel-libs, kamailio = %version +BuildRequires: squirrel-devel gcc-c++ + +%description sqlang +app_sqlang module for Kamailio. %prep %setup -n %{name}-%{ver} @@ -767,6 +776,9 @@ fi %doc %{_docdir}/kamailio/modules/README.jsonrpcs %doc %{_docdir}/kamailio/modules/README.nosip %doc %{_docdir}/kamailio/modules/README.tsilo +%doc %{_docdir}/kamailio/modules/README.call_obj +%doc %{_docdir}/kamailio/modules/README.evrexec +%doc %{_docdir}/kamailio/modules/README.keepalive %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio @@ -906,7 +918,9 @@ fi %{_libdir}/kamailio/modules/jsonrpcs.so %{_libdir}/kamailio/modules/nosip.so %{_libdir}/kamailio/modules/tsilo.so - +%{_libdir}/kamailio/modules/call_obj.so +%{_libdir}/kamailio/modules/evrexec.so +%{_libdir}/kamailio/modules/keepalive.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1037,6 +1051,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.statsc @@ -1056,6 +1071,7 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so +%{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/statsc.so @@ -1230,7 +1246,9 @@ fi %files redis %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.ndb_redis +%doc %{_docdir}/kamailio/modules/README.topos_redis %{_libdir}/kamailio/modules/ndb_redis.so +%{_libdir}/kamailio/modules/topos_redis.so %files regex @@ -1341,8 +1359,19 @@ fi %doc %{_docdir}/kamailio/modules/README.uuid %{_libdir}/kamailio/modules/uuid.so +%files sqlang +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.app_sqlang +%{_libdir}/kamailio/modules/app_sqlang.so %changelog +* Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> + - added ims_diameter_server module + - added topos_redis module + - added call_obj module + - added evrexec module + - added keepalive module + - added app_sqlang module * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - Updated version to 5.1.0-dev1 * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com>

1 0

[kamailio/kamailio] Bug in function replace_body() (#1100)
by Alberto Llamas 28 Apr '17

28 Apr '17

### Description  ``` We are using the functions: replace_body("RTP/AVP 96 97 0 101 98", "RTP/AVP 101 96 97 0 98"); msg_apply_changes(); We expect it replace the 'RTP/AVP 96 97 0 101 98' for 'RTP/AVP 101 96 97 0 98' And what kamailio does is append 'RTP/AVP 101 96 97 0 98' to the end of the SDP body. ``` #### Log Messages  ``` We are not getting any error message ``` ### Possible Solutions  ```` We've got the opportunity to test on version 4.0.3 and it does the work properly. ```` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 with gcc 4.9.2 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 8.7 (jessie) Release: 8.7 Codename: jessie Linux devcomphe 3.16.0-4-amd64 #1 SMP Debian 3.16.36-1+deb8u2 (2016-10-19) x86_64 GNU/Linux ``` -- 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/1100

2 3

git:4.4:9df06be7: Merge pull request #1091 from sergey-safarov/spec_update8-44
by GitHub 27 Apr '17

27 Apr '17

Module: kamailio Branch: 4.4 Commit: 9df06be7a5d97154374f2e53b39c47692cda99d0 URL: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-27T23:02:50+02:00 Merge pull request #1091 from sergey-safarov/spec_update8-44 pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… Patch: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 23dc939..ff0b7a6 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -214,8 +214,8 @@ json string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, rabbitmq-c, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, rabbitmq-c-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev