sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

git:master:c855fdb2: mqtt: docs - use kamailio docbook entity and small text updates
by Daniel-Constantin Mierla 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: c855fdb24678c5ea3ac2993ac133a00f2d333f95 URL: https://github.com/kamailio/kamailio/commit/c855fdb24678c5ea3ac2993ac133a00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-06T18:06:49+01:00 mqtt: docs - use kamailio docbook entity and small text updates --- Modified: src/modules/mqtt/doc/mqtt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c855fdb24678c5ea3ac2993ac133a00… Patch: https://github.com/kamailio/kamailio/commit/c855fdb24678c5ea3ac2993ac133a00… --- diff --git a/src/modules/mqtt/doc/mqtt_admin.xml b/src/modules/mqtt/doc/mqtt_admin.xml index 20277ff289..90e43b80eb 100644 --- a/src/modules/mqtt/doc/mqtt_admin.xml +++ b/src/modules/mqtt/doc/mqtt_admin.xml @@ -17,11 +17,11 @@ <title>Overview</title> <para> The MQTT module allows bidirectional publish/subscribe communication - by connection Kamailio to a MQTT Broker. + by connecting &kamailio; to a MQTT Broker. </para> <para> Messages can be published from any point in the routing script. - Also subscription can be fully controlled by scripting commands. + Also the subscriptions can be fully controlled by scripting commands. </para> </section> @@ -52,7 +52,7 @@ <section id="mqtt.p.host"> <title><varname>host</varname> (str)</title> <para> - MQTT Broker IP/Hostname + MQTT Broker IP/Hostname. </para> <para> <emphasis>

1 0

git:master:006949d1: Makefile.groups: added group for mqtt module
by Daniel-Constantin Mierla 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 006949d1779f79d4407c2780865cf5de4c1d59c2 URL: https://github.com/kamailio/kamailio/commit/006949d1779f79d4407c2780865cf5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-06T13:33:55+01:00 Makefile.groups: added group for mqtt module - depends on libmosquitto and libev --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/006949d1779f79d4407c2780865cf5d… Patch: https://github.com/kamailio/kamailio/commit/006949d1779f79d4407c2780865cf5d… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4af03d8363..dbe25cd7ca 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -210,6 +210,9 @@ mod_list_phonenum=phonenum # - modules depending on rdkafka library mod_list_kafka=kafka +# - modules depending on mqtt mosquitto and ev library +mod_list_mqtt=mqtt + # - modules depending on oRTP and mediastreamer2 libraries mod_list_rtp_media_server=rtp_media_server @@ -247,6 +250,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_rabbitmq) $(mod_list_jsdt)) \ $(mod_list_phonenum) \ $(mod_list_kafka) \ + $(mod_list_mqtt) \ $(mod_list_rtp_media_server) @@ -464,6 +468,9 @@ module_group_kphonenum=$(mod_list_phonenum) # K kafka modules module_group_kkafka=$(mod_list_kafka) +# K mqtt modules +module_group_kmqtt=$(mod_list_mqtt) + # K rtp_media_server modules module_group_krtp_media_server=$(mod_list_rtp_media_server)

1 0

git:master:4c8be66d: Merge pull request #2187 from pascomnet/mqtt_module
by GitHub 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 4c8be66d6bc33bd09f58da13b40167273cb1c2f4 URL: https://github.com/kamailio/kamailio/commit/4c8be66d6bc33bd09f58da13b401672… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-06T13:28:58+01:00 Merge pull request #2187 from pascomnet/mqtt_module mqtt: module to support mqtt pubsub messaging --- Added: src/modules/mqtt/Makefile Added: src/modules/mqtt/README Added: src/modules/mqtt/doc/Makefile Added: src/modules/mqtt/doc/mqtt.xml Added: src/modules/mqtt/doc/mqtt_admin.xml Added: src/modules/mqtt/mqtt_dispatch.c Added: src/modules/mqtt/mqtt_dispatch.h Added: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4c8be66d6bc33bd09f58da13b401672… Patch: https://github.com/kamailio/kamailio/commit/4c8be66d6bc33bd09f58da13b401672…

1 0

git:master:ea699419: mqtt: expose received message qos level via pv
by Thomas Weber 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: ea699419df555b4453e1eb96659cfec8912ac3bc URL: https://github.com/kamailio/kamailio/commit/ea699419df555b4453e1eb96659cfec… Author: Thomas Weber <thomas.weber(a)pascom.net> Committer: Thomas Weber <thomas.weber(a)pascom.net> Date: 2020-01-03T17:31:34+01:00 mqtt: expose received message qos level via pv --- Modified: src/modules/mqtt/doc/mqtt_admin.xml Modified: src/modules/mqtt/mqtt_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ea699419df555b4453e1eb96659cfec… Patch: https://github.com/kamailio/kamailio/commit/ea699419df555b4453e1eb96659cfec… --- diff --git a/src/modules/mqtt/doc/mqtt_admin.xml b/src/modules/mqtt/doc/mqtt_admin.xml index 791daa5920..20277ff289 100644 --- a/src/modules/mqtt/doc/mqtt_admin.xml +++ b/src/modules/mqtt/doc/mqtt_admin.xml @@ -563,6 +563,9 @@ event_route[mqtt:message] { <listitem><para> <emphasis>$mqtt(msg)</emphasis> - Received message (only in mqtt:message) </para></listitem> + <listitem><para> + <emphasis>$mqtt(qos)</emphasis> - The received message QOS level: 0, 1 ,2 (only in mqtt:message) + </para></listitem> </itemizedlist> <para> Exported pseudo-variables are documented at &kamwikilink;. diff --git a/src/modules/mqtt/mqtt_dispatch.c b/src/modules/mqtt/mqtt_dispatch.c index 7a39ede29b..a32d8c312d 100644 --- a/src/modules/mqtt/mqtt_dispatch.c +++ b/src/modules/mqtt/mqtt_dispatch.c @@ -354,11 +354,13 @@ void mqtt_on_message(struct mosquitto *mosquitto, void *userdata, const struct m sip_msg_t tmsg; str topic, payload; + int qos; topic.s = message->topic; topic.len = strlen(message->topic); payload.s = (char*) message->payload; payload.len = message->payloadlen; - LM_DBG("mqtt message [%s] -> [%s]\n", topic.s, payload.s); + qos = message->qos; + LM_DBG("mqtt message [%s] -> [%s] (qos %d)\n", topic.s, payload.s, qos); cfg_update(); @@ -425,6 +427,8 @@ int pv_parse_mqtt_name(pv_spec_t *sp, str *in) case 3: if(strncmp(in->s, "msg", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "qos", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; case 5: @@ -452,6 +456,7 @@ int pv_get_mqtt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { struct mosquitto_message* message; str topic, payload; + int qos; if(param==NULL || res==NULL) return -1; @@ -467,6 +472,7 @@ int pv_get_mqtt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) topic.len = strlen(message->topic); payload.s = (char*) message->payload; payload.len = message->payloadlen; + qos = message->qos; } // populate value depeding on the param name @@ -477,6 +483,8 @@ int pv_get_mqtt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &topic); case 1: return pv_get_strval(msg, param, res, &payload); + case 2: + return pv_get_sintval(msg, param, res, qos); default: return pv_get_null(msg, param, res); }

1 0

git:master:81852e5b: mqtt: add tls support
by Thomas Weber 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 81852e5ba1fa6983df44f591c40154ea5fcef6b8 URL: https://github.com/kamailio/kamailio/commit/81852e5ba1fa6983df44f591c40154e… Author: Thomas Weber <thomas.weber(a)pascom.net> Committer: Thomas Weber <thomas.weber(a)pascom.net> Date: 2020-01-03T17:05:14+01:00 mqtt: add tls support --- Modified: src/modules/mqtt/doc/mqtt_admin.xml Modified: src/modules/mqtt/mqtt_dispatch.c Modified: src/modules/mqtt/mqtt_dispatch.h Modified: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/81852e5ba1fa6983df44f591c40154e… Patch: https://github.com/kamailio/kamailio/commit/81852e5ba1fa6983df44f591c40154e…

1 0

[kamailio/kamailio] mqtt: module to support mqtt pubsub messaging (#2187)
by Thomas Weber 06 Jan '20

06 Jan '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  New Module to participate in a MQTT pub/sub messaging system. Initial Features: - automatic reconnect with connected/disconnected event routes - support mqtt last will feature - subscribe and unsubscribe topics via script code - receive messages via event route - send messages from script code - full KEMI support You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2187 -- Commit Summary -- * mqtt: module to support mqtt pubsub messaging -- File Changes -- A src/modules/mqtt/Makefile (37) A src/modules/mqtt/README (349) A src/modules/mqtt/doc/Makefile (4) A src/modules/mqtt/doc/mqtt.xml (37) A src/modules/mqtt/doc/mqtt_admin.xml (399) A src/modules/mqtt/mqtt_dispatch.c (711) A src/modules/mqtt/mqtt_dispatch.h (71) A src/modules/mqtt/mqtt_mod.c (394) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2187.patch https://github.com/kamailio/kamailio/pull/2187.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/2187

3 13

git:master:9b3a7227: mqtt: module to support mqtt pubsub messaging
by Thomas Weber 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 9b3a7227e2dc12823be28bf1b261de1ebdb3f954 URL: https://github.com/kamailio/kamailio/commit/9b3a7227e2dc12823be28bf1b261de1… Author: Thomas Weber <thomas.weber(a)pascom.net> Committer: Thomas Weber <thomas.weber(a)pascom.net> Date: 2020-01-02T13:40:55+01:00 mqtt: module to support mqtt pubsub messaging --- Added: src/modules/mqtt/Makefile Added: src/modules/mqtt/README Added: src/modules/mqtt/doc/Makefile Added: src/modules/mqtt/doc/mqtt.xml Added: src/modules/mqtt/doc/mqtt_admin.xml Added: src/modules/mqtt/mqtt_dispatch.c Added: src/modules/mqtt/mqtt_dispatch.h Added: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9b3a7227e2dc12823be28bf1b261de1… Patch: https://github.com/kamailio/kamailio/commit/9b3a7227e2dc12823be28bf1b261de1…

1 0

git:master:bf57a7ab: tm: added missing $T(reply_reason)
by Daniel-Constantin Mierla 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: bf57a7ab50949ddbeec787331548dfcb023c238f URL: https://github.com/kamailio/kamailio/commit/bf57a7ab50949ddbeec787331548dfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-06T11:25:32+01:00 tm: added missing $T(reply_reason) --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/bf57a7ab50949ddbeec787331548dfc… Patch: https://github.com/kamailio/kamailio/commit/bf57a7ab50949ddbeec787331548dfc… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 9fd28ee44b..1f83eca50d 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -682,6 +682,8 @@ int pv_parse_t_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "branch_index", 12)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "reply_reason", 12)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default: @@ -713,6 +715,8 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, return pv_get_tm_reply_code(msg, param, res); case 4: return pv_get_tm_branch_idx(msg, param, res); + case 10: + return pv_get_tm_reply_reason(msg, param, res); } t = _tmx_tmb.t_gett();

1 0

git:5.3:fd489d71: pkg/docker: update submodule [skip ci]
by Sergey Safarov 04 Jan '20

04 Jan '20

Module: kamailio Branch: 5.3 Commit: fd489d716fae87c4b57bbc41e6dc5f89cdb00de3 URL: https://github.com/kamailio/kamailio/commit/fd489d716fae87c4b57bbc41e6dc5f8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-04T23:53:10+03:00 pkg/docker: update submodule [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/fd489d716fae87c4b57bbc41e6dc5f8… Patch: https://github.com/kamailio/kamailio/commit/fd489d716fae87c4b57bbc41e6dc5f8… --- diff --git a/pkg/docker b/pkg/docker index 25986598eb..a6955b1834 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 25986598ebed3a3a89fcdf77a76498c30b842630 +Subproject commit a6955b1834dbd3180bbc1cc256ba8aac0269739b

1 0

git:master:8c318356: pkg/docker: update submodule
by Sergey Safarov 04 Jan '20

04 Jan '20

Module: kamailio Branch: master Commit: 8c3183569aa79214cf6b74196438962f63f8ef9e URL: https://github.com/kamailio/kamailio/commit/8c3183569aa79214cf6b74196438962… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-04T23:51:42+03:00 pkg/docker: update submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/8c3183569aa79214cf6b74196438962… Patch: https://github.com/kamailio/kamailio/commit/8c3183569aa79214cf6b74196438962… --- diff --git a/pkg/docker b/pkg/docker index 0a9a2f2633..a6955b1834 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 0a9a2f26337a98d5a349cfb4fc16d588df9912c7 +Subproject commit a6955b1834dbd3180bbc1cc256ba8aac0269739b

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020