sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
320 discussions

git:master:7289417c: presence: free db result when get_dialog_state() retrieves no rows
by Daniel-Constantin Mierla 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: 7289417c39939f61ea116fe8dc8d23cdea6401be URL: https://github.com/kamailio/kamailio/commit/7289417c39939f61ea116fe8dc8d23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-19T20:58:31+02:00 presence: free db result when get_dialog_state() retrieves no rows - db result and columns in the query are allocated --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/7289417c39939f61ea116fe8dc8d23c… Patch: https://github.com/kamailio/kamailio/commit/7289417c39939f61ea116fe8dc8d23c… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index b5d7b65..d81b90e 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -503,9 +503,11 @@ int get_dialog_state(presentity_t* presentity, char** state) if(result == NULL) return -3; - // No results from query definitely means no dialog exists - if (result->n <= 0) + /* no results from query definitely means no dialog exists */ + if (result->n <= 0) { + pa_dbf.free_result(pa_db, result); return 0; + } // Loop the rows returned from the DB for (i=0; i < result->n; i++)

1 0

Re: [sr-dev] [kamailio/kamailio] ims_qos: create a proper flow description for the SIP signaling (ab3d42c)
by richardgood 19 Sep '16

19 Sep '16

Hi @vingarzan I just want to check with you before I do a change related to this commit. With this change Rx AAR for subscription to signalling status now uses the general flow-usage: AVP_EPC_Flow_Usage_No_Information instead of AVP_EPC_Flow_Usage_AF_Signaling as it previously did. I want to change this so the the correct flow-usage is used (even though there is now a proper flow description as well). Let me know if agreed. Regards Richard. -- 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/commit/ab3d42c47d52b1b7b315272c00daf12…

1 0

git:master:85bcf011: modules/ims_usrloc_scscf: put checks to ensure shm_str_dup not called on empty strings
by jaybeepee 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: 85bcf011063772936ea75f7c332788241f09f590 URL: https://github.com/kamailio/kamailio/commit/85bcf011063772936ea75f7c3327882… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-19T17:10:08+02:00 modules/ims_usrloc_scscf: put checks to ensure shm_str_dup not called on empty strings --- Modified: modules/ims_usrloc_scscf/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/85bcf011063772936ea75f7c3327882… Patch: https://github.com/kamailio/kamailio/commit/85bcf011063772936ea75f7c3327882… --- diff --git a/modules/ims_usrloc_scscf/ucontact.c b/modules/ims_usrloc_scscf/ucontact.c index ac18d15..2d882b5 100644 --- a/modules/ims_usrloc_scscf/ucontact.c +++ b/modules/ims_usrloc_scscf/ucontact.c @@ -123,8 +123,18 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ curr->len = param->len; curr->type = param->type; curr->next = 0; - if (shm_str_dup(&curr->body, &param->body) < 0) goto error; - if (shm_str_dup(&curr->name, &param->name) < 0) goto error; + if (param->body.len > 0 && param->body.s) { + if (shm_str_dup(&curr->body, &param->body) < 0) goto error; + } else { + curr->body.s = 0; + curr->body.len = 0; + } + if (param->name.len > 0 && param->name.s) { + if (shm_str_dup(&curr->name, &param->name) < 0) goto error; + } else { + curr->name.s = 0; + curr->name.len = 0; + } if(first) { c->params = curr; @@ -138,15 +148,24 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ } if (shm_str_dup(&c->c, _contact) < 0) goto error; - if (shm_str_dup(&c->callid, _ci->callid) < 0) goto error; - if (shm_str_dup(&c->user_agent, _ci->user_agent) < 0) goto error; - if (shm_str_dup(&c->aor, _aor) < 0) goto error; - if (shm_str_dup(&c->domain, _dom) < 0) goto error; + + if (_ci->callid && _ci->callid->len > 0) { + if (shm_str_dup(&c->callid, _ci->callid) < 0) goto error; + } + if (_ci->user_agent && _ci->user_agent->len > 0) { + if (shm_str_dup(&c->user_agent, _ci->user_agent) < 0) goto error; + } + if (_aor && _aor->len > 0) { + if (shm_str_dup(&c->aor, _aor) < 0) goto error; + } + if (_dom && _dom->len > 0) { + if (shm_str_dup(&c->domain, _dom) < 0) goto error; + } - if (_ci->received.s && _ci->received.len) { + if (_ci->received.len > 0) { if (shm_str_dup(&c->received, &_ci->received) < 0) goto error; } - if (_ci->path && _ci->path->len) { + if (_ci->path && _ci->path->len > 0) { if (shm_str_dup(&c->path, _ci->path) < 0) goto error; }

1 0

git:master:d150d5ae: Makefile.groups: added group for rabbitmq module
by Daniel-Constantin Mierla 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: d150d5ae4be2e538ef5e53be9c1bc9df0fa407f8 URL: https://github.com/kamailio/kamailio/commit/d150d5ae4be2e538ef5e53be9c1bc9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-19T15:19:51+02:00 Makefile.groups: added group for rabbitmq module --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/d150d5ae4be2e538ef5e53be9c1bc9d… Patch: https://github.com/kamailio/kamailio/commit/d150d5ae4be2e538ef5e53be9c1bc9d… --- diff --git a/Makefile.groups b/Makefile.groups index ffe017a..e441f62 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -175,7 +175,7 @@ mod_list_uuid=uuid # - modules depending on ev library mod_list_ev=evapi -# - modules depending on kazoo/rabitmq +# - modules depending on kazoo/rabbitmq mod_list_kazoo=kazoo # - modules depending on mongodb @@ -193,6 +193,9 @@ mod_list_systemd=log_systemd # - modules depending on libnsq (+libev libevbuffsock liblcurl libjson-c) library mod_list_nsq=nsq +# - modules depending on librabbitmq library +mod_list_rabbitmq=rabbitmq + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -220,7 +223,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mongodb) $(mod_list_cnxcc) \ $(mod_list_jansson) $(mod_list_geoip2) \ $(mod_list_erlang) $(mod_list_systemd) \ - $(mod_list_http_async) $(mod_list_nsq)) + $(mod_list_http_async) $(mod_list_nsq) \ + $(mod_list_rabbitmq)) @@ -414,6 +418,9 @@ module_group_ksystemd=$(mod_list_systemd) # K nsq modules module_group_knsq=$(mod_list_nsq) +# K rabbitmq modules +module_group_krabbitmq=$(mod_list_rabbitmq) + # list of static modules # static_modules:=

1 0

git:master:ae882fa9: rabbitmq: use pkg-config if available to get the path for cflags and libs
by Daniel-Constantin Mierla 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: ae882fa9e9848747a5f78052725324302272f80a URL: https://github.com/kamailio/kamailio/commit/ae882fa9e9848747a5f780527253243… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-19T15:19:51+02:00 rabbitmq: use pkg-config if available to get the path for cflags and libs --- Modified: modules/rabbitmq/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ae882fa9e9848747a5f780527253243… Patch: https://github.com/kamailio/kamailio/commit/ae882fa9e9848747a5f780527253243… --- diff --git a/modules/rabbitmq/Makefile b/modules/rabbitmq/Makefile index f4667de..9b26c4e 100644 --- a/modules/rabbitmq/Makefile +++ b/modules/rabbitmq/Makefile @@ -5,9 +5,22 @@ auto_gen= NAME=rabbitmq.so LIBS= -DEFS+=-DKAMAILIO_MOD_INTERFACE -LIBS+=-lrabbitmq +ifeq ($(CROSS_COMPILE),) +RMQ_BUILDER=$(shell \ + if pkg-config --exists librabbitmq; then \ + echo 'pkg-config librabbitmq'; \ + fi) +endif + +ifneq ($(RMQ_BUILDER),) + DEFS += $(shell $(RMQ_BUILDER) --cflags) + LIBS += $(shell $(RMQ_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lrabbitmq +endif +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore

1 0

git:master:3c9f88b9: rabbitmq: Add MIT License
by Stefan Mititelu 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: 3c9f88b96849e54af1559a85d61d04e2ac00cd4c URL: https://github.com/kamailio/kamailio/commit/3c9f88b96849e54af1559a85d61d04e… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2016-09-19T16:17:14+03:00 rabbitmq: Add MIT License Update MIT License for all dev files. --- Modified: modules/rabbitmq/rabbitmq.c Modified: modules/rabbitmq/rabbitmq.h Modified: modules/rabbitmq/utils.c Modified: modules/rabbitmq/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/3c9f88b96849e54af1559a85d61d04e… Patch: https://github.com/kamailio/kamailio/commit/3c9f88b96849e54af1559a85d61d04e…

1 0

git:master:7393cd0e: Merge pull request #786 from smititelu/master
by GitHub 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: 7393cd0e769a77def0d63b7fb13a44765b51b162 URL: https://github.com/kamailio/kamailio/commit/7393cd0e769a77def0d63b7fb13a447… Author: Stefan Mititelu <smititelu(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2016-09-19T16:04:23+03:00 Merge pull request #786 from smititelu/master rabbitmq: Add new module --- Added: modules/rabbitmq/Makefile Added: modules/rabbitmq/README Added: modules/rabbitmq/doc/Makefile Added: modules/rabbitmq/doc/rabbitmq.xml Added: modules/rabbitmq/doc/rabbitmq_admin.xml Added: modules/rabbitmq/rabbitmq.c Added: modules/rabbitmq/rabbitmq.h Added: modules/rabbitmq/utils.c Added: modules/rabbitmq/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/7393cd0e769a77def0d63b7fb13a447… Patch: https://github.com/kamailio/kamailio/commit/7393cd0e769a77def0d63b7fb13a447…

1 0

git:master:82440761: rabbitmq: Add new module
by Stefan Mititelu 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: 824407610509b00dd2aa15df96c354accb5991c5 URL: https://github.com/kamailio/kamailio/commit/824407610509b00dd2aa15df96c354a… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2016-09-19T15:16:46+03:00 rabbitmq: Add new module Add new rabbitmq module. --- Added: modules/rabbitmq/Makefile Added: modules/rabbitmq/README Added: modules/rabbitmq/doc/Makefile Added: modules/rabbitmq/doc/rabbitmq.xml Added: modules/rabbitmq/doc/rabbitmq_admin.xml Added: modules/rabbitmq/rabbitmq.c Added: modules/rabbitmq/rabbitmq.h Added: modules/rabbitmq/utils.c Added: modules/rabbitmq/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/824407610509b00dd2aa15df96c354a… Patch: https://github.com/kamailio/kamailio/commit/824407610509b00dd2aa15df96c354a…

1 0

[kamailio/kamailio] examples/[pis]cscf: adds example database structures for the P/I/S-CSCFs (#718)
by Dragos Vingarzan 19 Sep '16

19 Sep '16

This helps first timers and casual users a lot, as they won't have to dig through the history of Kamailio and various modules to find these structures. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/718 -- Commit Summary -- * examples/[pis]cscf: adds example database structures for the P/I/S-CSCFs -- File Changes -- A examples/icscf/icscf.mysql.sql (137) A examples/pcscf/pcscf.mysql.sql (193) A examples/scscf/scscf.mysql.sql (448) -- Patch Links -- https://github.com/kamailio/kamailio/pull/718.patch https://github.com/kamailio/kamailio/pull/718.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/718

3 6

git:master:dd8f47e3: Examples: Interrogating-CSCF: Add database structure and note about database structure
by Carsten Bock 19 Sep '16

19 Sep '16

Module: kamailio Branch: master Commit: dd8f47e3cf472463fc1f2110da05969caaf4d06c URL: https://github.com/kamailio/kamailio/commit/dd8f47e3cf472463fc1f2110da05969… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-09-19T14:43:44+02:00 Examples: Interrogating-CSCF: Add database structure and note about database structure --- Added: examples/icscf/README.md Added: examples/icscf/icscf.sql --- Diff: https://github.com/kamailio/kamailio/commit/dd8f47e3cf472463fc1f2110da05969… Patch: https://github.com/kamailio/kamailio/commit/dd8f47e3cf472463fc1f2110da05969… --- diff --git a/examples/icscf/README.md b/examples/icscf/README.md new file mode 100644 index 0000000..85cb411 --- /dev/null +++ b/examples/icscf/README.md @@ -0,0 +1,10 @@ +# Kamailio - Interrogating-CSCF Example Configuration File + +Project Website: + + * http://www.kamailio.org + +## Database Structure + +The necessary Database files for the Interrogating-CSCF are included in this folder. + diff --git a/examples/icscf/icscf.sql b/examples/icscf/icscf.sql new file mode 100644 index 0000000..e8b8534 --- /dev/null +++ b/examples/icscf/icscf.sql @@ -0,0 +1,94 @@ +-- phpMyAdmin SQL Dump +-- version 4.4.13.1 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Generation Time: 17. Mrz 2016 um 17:36 +-- Server version: 5.5.47-0+deb7u1 +-- PHP Version: 5.4.45-0+deb7u2 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + +-- +-- Database: `icscf` +-- + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `nds_trusted_domains` +-- + +CREATE TABLE IF NOT EXISTS `nds_trusted_domains` ( + `id` int(11) NOT NULL, + `trusted_domain` varchar(83) NOT NULL DEFAULT '' +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `s_cscf` +-- + +CREATE TABLE IF NOT EXISTS `s_cscf` ( + `id` int(11) NOT NULL, + `name` varchar(83) NOT NULL DEFAULT '', + `s_cscf_uri` varchar(83) NOT NULL DEFAULT '' +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `s_cscf_capabilities` +-- + +CREATE TABLE IF NOT EXISTS `s_cscf_capabilities` ( + `id` int(11) NOT NULL, + `id_s_cscf` int(11) NOT NULL DEFAULT '0', + `capability` int(11) NOT NULL DEFAULT '0' +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `nds_trusted_domains` +-- +ALTER TABLE `nds_trusted_domains` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `s_cscf` +-- +ALTER TABLE `s_cscf` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `s_cscf_capabilities` +-- +ALTER TABLE `s_cscf_capabilities` + ADD PRIMARY KEY (`id`), + ADD KEY `idx_capability` (`capability`), + ADD KEY `idx_id_s_cscf` (`id_s_cscf`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `nds_trusted_domains` +-- +ALTER TABLE `nds_trusted_domains` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; +-- +-- AUTO_INCREMENT for table `s_cscf` +-- +ALTER TABLE `s_cscf` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; +-- +-- AUTO_INCREMENT for table `s_cscf_capabilities` +-- +ALTER TABLE `s_cscf_capabilities` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016