sr-dev

sr-dev@lists.kamailio.org

8 participants
45480 discussions

git:master:3ca68d12: Merge pull request #1435 from kamailio/cchance/presence
by GitHub 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: 3ca68d1246b801f37054c965eac8a24bda89b325 URL: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-09T15:02:42Z Merge pull request #1435 from kamailio/cchance/presence presence: delay freeing generated etag string --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… Patch: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 1c7c4240b9..514e89036c 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1100,10 +1100,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - goto done; } } @@ -1232,10 +1228,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - if(!body) goto done; } @@ -1266,6 +1258,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + if(cur_ruid.s) pkg_free(cur_ruid.s); cur_ruid.s= NULL;

1 0

git:master:fab3f881: presence: delay freeing generated etag string
by Charles Chance 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: fab3f881634b1233e6c5446ffafbd30ab07c0bc6 URL: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-02-09T09:37:24Z presence: delay freeing generated etag string - it may still be needed for replication --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… Patch: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 1c7c4240b9..514e89036c 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1100,10 +1100,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - goto done; } } @@ -1232,10 +1228,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - if(!body) goto done; } @@ -1266,6 +1258,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + if(cur_ruid.s) pkg_free(cur_ruid.s); cur_ruid.s= NULL;

1 0

[kamailio/kamailio] presence: delay freeing generated etag string (#1435)
by Charles Chance 09 Feb '18

09 Feb '18

This is a minor bugfix for earlier commit (b7a5016). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1435 -- Commit Summary -- * presence: delay freeing generated etag string -- File Changes -- M src/modules/presence/presentity.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1435.patch https://github.com/kamailio/kamailio/pull/1435.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/1435

2 2

git:master:32564156: CONTRIBUTING.md: note about formatting the code
by Daniel-Constantin Mierla 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: 32564156a4ad3efd93099d7ae2c98758cf4ec9b0 URL: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-09T13:52:58+01:00 CONTRIBUTING.md: note about formatting the code - use clang-format or match the style of the existing component --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… Patch: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e74babc78f..1705611aaa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -31,6 +31,7 @@ In order to be easily able to track the changes and have a coherent ChangLog and commit history, there are several *rules* required for each contribution. ## Contributing Code Or Content ## + ### Basic Rules ### * github pull requests are the favourited mechanism to submit contributions @@ -47,7 +48,7 @@ and commit history, there are several *rules* required for each contribution. * a module (code inside subfolder modules/) * a tool (code inside subfolder utils/) * an example or main configs (files inside subfolders etc/ or examples/) - * commit messages **should** be formatted as specified in the next section + * commit messages **has to be formatted** as specified in the next section * commit message must describe the changes done by the patch * other details (e.g., how to reproduce, backtrace, sip packets, ...) belong to content (comments) of the pull request @@ -73,6 +74,9 @@ and commit history, there are several *rules* required for each contribution. likely to rise merge conflicts. With separate commit, that won't be backported, only the commit to xml doc file, then README will be manually regenerated in the corresponding branch. + * code **should** be formatted with **clang-format** or to match the style of + the component that the commit applies to. The `.clang-format` file is part of + Kamailio source code tree, in the root folder. ### Commit Message Format ### @@ -89,12 +93,12 @@ as "Subject" in the generated commit emails and it will also be used when generating the Changelog (e.g. git log --pretty=oneline). Please start always with the prefix of the component (subsystem) that is modified by the commit, for example: - * core: typo fixes to log messages - * tcp: stun fixes - * mem: added faster malloc - * module_name: support for foo rfc extension - * lib_name: critical bug fix for abc case - * kamctl: added support for management of module xyz + * `core`: typo fixes to log messages + * `tcp`: stun fixes + * `mem`: added faster malloc + * `module_name`: support for foo rfc extension + * `lib_name`: critical bug fix for abc case + * `kamctl`: added support for management of module xyz #### Examples Of Commit Messages ####

1 0

git:master:92bd7a31: Makefile.groups: pua_json added to json group
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 92bd7a3161e3f8d9ae5b3ddd983424f8e6e96618 URL: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:33:46+01:00 Makefile.groups: pua_json added to json group - depends on libjson-c --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… Patch: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 52bad0b12f..b3d8045040 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -141,7 +141,7 @@ mod_list_sqlite=db_sqlite mod_list_oracle=db_oracle # - modules depending on json library -mod_list_json=json +mod_list_json=json pua_json # - modules depending on json (+libevent) library mod_list_json_event=jsonrpcc

1 0

git:master:f6346e93: pua_json: better detection of paths for json-c library
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: f6346e93d27ee1eb6f06ec1c9e7247440f433ab9 URL: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:19:29+01:00 pua_json: better detection of paths for json-c library --- Modified: src/modules/pua_json/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… Patch: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… --- diff --git a/src/modules/pua_json/Makefile b/src/modules/pua_json/Makefile index cfbd69d6b5..a496b62584 100644 --- a/src/modules/pua_json/Makefile +++ b/src/modules/pua_json/Makefile @@ -8,9 +8,28 @@ include ../../Makefile.defs auto_gen= NAME=pua_json.so +LIBS= +JLIB=json -LIBS=-ljson-c -DEFS+=-I$(LOCALBASE)/include -I/usr/local/include $(shell pkg-config --cflags json-c) +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) +else + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) +endif + +ifneq ($(JSONC),) + JLIB=json-c +endif + +ifeq ($(BUILDER),) + DEFS+=-I/usr/include/$(JLIB) -I$(LOCALBASE)/include/$(JLIB) \ + -I$(LOCALBASE)/include + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -l$(JLIB) +else + DEFS+= $(shell pkg-config --cflags $(JLIB)) + LIBS+= $(shell pkg-config --libs $(JLIB)) +endif DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master:75c4ca0b: rtpengine: get again body pointer only when read_sdp_pv is set
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 75c4ca0bb69bd4f1ba42c6d964697737813fa81e URL: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:14:02+01:00 rtpengine: get again body pointer only when read_sdp_pv is set - reported by GH #1434 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… Patch: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f9e630f60e..3b41789bbf 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3351,12 +3351,17 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - /* get the body from the message as body ptr may have changed */ - cur_body.len = 0; - cur_body.s = get_body(msg); - cur_body.len = msg->buf + msg->len - cur_body.s; - - anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + if (read_sdp_pvar_str.len > 0) { + /* get the body from the message as body ptr may have changed + * when using read_sdp_pv */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + } if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

Broacasting calls using Kamailio
by Ranadeep Mukherjee 08 Feb '18

08 Feb '18

Hi All, I am looking for a SPI SDK Server which can help to solve the following requirements: 1. Broadcast calls/(recorded | customized) messages to multiple numbers 2. Automated IVR during Inbound/Outbound calling 3. Record voice and IVR options selected 4. Recorded information should reach the client or its answering machine and not get played during an automated IVR/answering machine message, should be able to detect human voice 5. Should be able to connect to any SIP provider of our choice [cid:image002.jpg@01D3A0CB.0A026250] I am an employee of IXTROM Group Inc.<https://www.ixtrom.com/> which specializes in software engineering and the development of intelligent solutions for Situational Awareness Command and Control Systems (C4ISR). We want to use SIP SDK to broadcast calls to 100+ connections at one time. Regards, Ranadeep

1 0

git:master:4244ccd3: pua_json: remove contributors from source
by Emmanuel Schmidbauer 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 4244ccd34f525a2dbabfd7734747aaac2caa9318 URL: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2018-02-08T09:29:47-05:00 pua_json: remove contributors from source --- Modified: src/modules/pua_json/defs.h Modified: src/modules/pua_json/pua_json_publish.c Modified: src/modules/pua_json/pua_json_publish.h --- Diff: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… Patch: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… --- diff --git a/src/modules/pua_json/defs.h b/src/modules/pua_json/defs.h index 47db1434b8..f8c3b6a209 100644 --- a/src/modules/pua_json/defs.h +++ b/src/modules/pua_json/defs.h @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */ diff --git a/src/modules/pua_json/pua_json_publish.c b/src/modules/pua_json/pua_json_publish.c index e601337476..dd2334bd3d 100644 --- a/src/modules/pua_json/pua_json_publish.c +++ b/src/modules/pua_json/pua_json_publish.c @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */ diff --git a/src/modules/pua_json/pua_json_publish.h b/src/modules/pua_json/pua_json_publish.h index 2379247089..749e35ca3a 100644 --- a/src/modules/pua_json/pua_json_publish.h +++ b/src/modules/pua_json/pua_json_publish.h @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */

1 0

git:master:02cb90c9: Merge pull request #1424 from kamailio/eschmidbauer/pua_json
by GitHub 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 02cb90c978bde896e541d69ac2c9b64ef49dada7 URL: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-08T09:27:42-05:00 Merge pull request #1424 from kamailio/eschmidbauer/pua_json pua_json: new module to update presence using JSON data objects --- Added: src/modules/pua_json/Makefile Added: src/modules/pua_json/README Added: src/modules/pua_json/defs.h Added: src/modules/pua_json/doc/Makefile Added: src/modules/pua_json/doc/pua_json.xml Added: src/modules/pua_json/doc/pua_json_admin.xml Added: src/modules/pua_json/pua_json_mod.c Added: src/modules/pua_json/pua_json_mod.h Added: src/modules/pua_json/pua_json_publish.c Added: src/modules/pua_json/pua_json_publish.h Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64… Patch: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64…

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