sr-dev

sr-dev@lists.kamailio.org

17 participants
45428 discussions

[kamailio/kamailio] json_pua: new module (#1408)
by Emmanuel Schmidbauer 25 Jan '18

25 Jan '18

this module adds a new function `json_pua_publish()` which allows json data objects to be parsed and inserted into the presentity table. the function is borrowed from the nsq and kazoo modules. it allows presence to be controlled without loading the nsq or kazoo modules. this can be quite powerful as it will allow users to control presence by sending http json data objects to kamailio, for example: ``` event_route[xhttp:request] { $var(call-id) = $(rb{json.parse,Call-ID}); if ($(rb{json.parse,Event-Package}) == "dialog") { json_pua_publish($rb); pres_refresh_watchers("$(rb{json.parse,From})", "$(rb{json.parse,Event-Package})", 1); } xhttp_reply("200", "OK", "text/html", "$rb"); } ``` example curl request to send presence update: ``` curl -d '{"Call-ID":"user01(a)my.domain.io","Event-Category":"presence","Event-Name":"update","Event-Package":"dialog","Expires":"3600","From":"sip:user01@my.domain.io","From-User":"user01","From-Realm":"my.domain.io","To":"sip:park+6003@my.domain.io","To-User":"park+6003","To-Realm":"my.domain.io","State":"confirmed"}' http://localhost:8080/presence/ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1408 -- Commit Summary -- * json_pua: new module -- File Changes -- M src/modules/json/json_funcs.c (33) M src/modules/json/json_funcs.h (35) A src/modules/json_pua/Makefile (20) A src/modules/json_pua/README (0) A src/modules/json_pua/defs.h (130) A src/modules/json_pua/doc/Makefile (4) A src/modules/json_pua/doc/json_pua.xml (37) A src/modules/json_pua/doc/json_pua_admin.xml (170) A src/modules/json_pua/json_pua_mod.c (125) A src/modules/json_pua/json_pua_mod.h (50) A src/modules/json_pua/json_pua_publish.c (538) A src/modules/json_pua/json_pua_publish.h (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1408.patch https://github.com/kamailio/kamailio/pull/1408.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/1408

2 3

git:master:cda1d086: pua: proper safety check on subs->extra_headers->s for subscribe_cbparam()
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: cda1d086c164052a5b79b54a8d0e5cf6e5fb3e1c URL: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T15:03:27+01:00 pua: proper safety check on subs->extra_headers->s for subscribe_cbparam() - dicovered via GH PR #1409 --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… Patch: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index b75290b936..254e77e7fd 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -821,7 +821,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) { CONT_COPY(hentity, hentity->id, subs->id); } - if(subs->extra_headers && hentity->extra_headers->s) + if(subs->extra_headers && subs->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

Errored: kamailio/kamailio#5427 (master - 3ebf070)
by Travis CI 25 Jan '18

25 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5427 Status: Errored Duration: 10 minutes and 52 seconds Commit: 3ebf070 (master) Author: Victor Seva Message: pkg/kamailio/deb: version set to 5.2.0~dev3 View the changeset: https://github.com/kamailio/kamailio/compare/0aa43efe604c...3ebf070467ae View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/333184928?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

Errored: kamailio/kamailio#5426 (master - 0aa43ef)
by Travis CI 25 Jan '18

25 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5426 Status: Errored Duration: 10 minutes and 47 seconds Commit: 0aa43ef (master) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-dev3 View the changeset: https://github.com/kamailio/kamailio/compare/44dc6caa2b0f...0aa43efe604c View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/333181714?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:3ebf0704: pkg/kamailio/deb: version set to 5.2.0~dev3
by Victor Seva 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 3ebf070467aecd4a7e3d5e287b776831f31b25d8 URL: https://github.com/kamailio/kamailio/commit/3ebf070467aecd4a7e3d5e287b77683… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-25T10:35:09+01:00 pkg/kamailio/deb: version set to 5.2.0~dev3 --- Modified: pkg/kamailio/deb/buster/changelog 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/3ebf070467aecd4a7e3d5e287b77683… Patch: https://github.com/kamailio/kamailio/commit/3ebf070467aecd4a7e3d5e287b77683…

1 0

git:master:0aa43efe: Makefile.defs: version set to 5.2.0-dev3
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 0aa43efe604c99da9a1e579ed19407fae4d8f2f9 URL: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T10:24:35+01:00 Makefile.defs: version set to 5.2.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… Patch: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 48ec3c919d..2355d8b3df 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2fc3be57: siptrace: use formatted string instead of series of concatenations
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 2fc3be572afe4dc666f7345c733a5bc1c8e94932 URL: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T10:18:20+01:00 siptrace: use formatted string instead of series of concatenations --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… Patch: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 851bf6e0f8..d936e4fbb6 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1179,22 +1179,30 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) strcpy(statusbuf, int2str(ps->code, &sto.status.len)); sto.status.s = statusbuf; - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format fromip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } if(trace_local_ip.s && trace_local_ip.len > 0) { sto.toip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.dst_ip), (int)msg->rcv.dst_port); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "in"; @@ -1280,12 +1288,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(trace_local_ip.s && trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&req->rcv.dst_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(req->rcv.dst_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&req->rcv.dst_ip), (int)req->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format fromip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } strcpy(statusbuf, int2str(ps->code, &sto.status.len)); @@ -1298,13 +1310,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); - siptrace_copy_proto(dst->proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&to_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, - int2str((unsigned long)su_getport(&dst->to), &len)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(dst->proto), + ip_addr2a(&to_ip), (int)su_getport(&dst->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "out";

1 0

Errored: kamailio/kamailio#5422 (master - 64303a9)
by Travis CI 24 Jan '18

24 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5422 Status: Errored Duration: 10 minutes and 50 seconds Commit: 64303a9 (master) Author: Daniel-Constantin Mierla Message: nathelper: add_rcv_param() - do not enclose to double quotes if URI param - restrict adding the param to contact URI only for UDP, otherwise a second transport parameter appears in the URI - do not enclose the value in double quotes when adding as URI param, it is not allowed by SIP specs grammar - discussed on GH PR #1203 View the changeset: https://github.com/kamailio/kamailio/compare/f540ff43e526...64303a9398af View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/332729892?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:44dc6caa: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 44dc6caa2b0ff5ac17d5ae14830feae6d8f9ebd7 URL: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-24T12:01:31+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… Patch: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 102a639ea0..d21c31c502 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -517,12 +517,14 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; 5.3. add_rcv_param([flag]), - Add a received parameter to the “Contact” header fields or the Contact - URI. The parameter will contain the URI created from the source IP, - port, and protocol of the packet containing the SIP message. The - parameter can be then processed by another registrar. This is useful, - for example, when replicating register messages using t_replicate - function to another registrar. + Add a received parameter to the “Contact” header fields (available for + all transports) or to the Contact URI (available only for UDP traffic). + + The parameter will contain the URI created from the source IP, port, + and protocol (if different than UDP) of the packet containing the SIP + message. The parameter can be then processed by another registrar. This + is useful, for example, when replicating register messages using + t_replicate function to another registrar. Meaning of the parameters is as follows: * flag - flags to indicate if the parameter should be added to

1 0

[kamailio/kamailio] nathelper: correct Contact received param (#1203)
by Sebastian Damm 24 Jan '18

24 Jan '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - Received param was enclosed in quotes, making some UACs stumble upon it. This fix removes the quotes, adding the received param the same way as it is done for example in the path module. - Reported by Arslan Aseed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1203 -- Commit Summary -- * nathelper: correct Contact received param -- File Changes -- M src/modules/nathelper/nathelper.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1203.patch https://github.com/kamailio/kamailio/pull/1203.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/1203

3 10

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev