sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
389 discussions

git:master:b151e9d6: core: create runtime dir if doesn't exist
by Daniel-Constantin Mierla 28 Sep '15

28 Sep '15

Module: kamailio Branch: master Commit: b151e9d6071b1affe814f4edf2e87b132f0accb8 URL: https://github.com/kamailio/kamailio/commit/b151e9d6071b1affe814f4edf2e87b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-28T23:02:27+02:00 core: create runtime dir if doesn't exist - test and create runtime dir (default /var/run/kamailio) - do chown of runtime dir if user/group parameters are set for kamailio --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/b151e9d6071b1affe814f4edf2e87b1… Patch: https://github.com/kamailio/kamailio/commit/b151e9d6071b1affe814f4edf2e87b1… --- diff --git a/main.c b/main.c index 4fd168d..1eae997 100644 --- a/main.c +++ b/main.c @@ -1799,6 +1799,7 @@ int main(int argc, char** argv) int dont_fork_cnt; struct name_lst* n_lst; char *p; + struct stat st = {0}; /*init*/ time(&up_since); @@ -2343,6 +2344,19 @@ int main(int argc, char** argv) } sock_gid = gid; } + /* create runtime dir if doesn't exist */ + if (stat(runtime_dir, &st) == -1) { + if(mkdir(runtime_dir, 0700) == -1) { + fprintf(stderr, "failed to create runtime dir\n"); + goto error; + } + if(sock_uid!=-1 || sock_gid!=-1) { + if(chown(runtime_dir, sock_uid, sock_gid) == -1) { + fprintf(stderr, "failed to change owner of runtime dir\n"); + goto error; + } + } + } if (fix_all_socket_lists()!=0){ fprintf(stderr, "failed to initialize list addresses\n"); goto error;

1 0

git:master:859ee540: ims_usr_pcscf: Updated DB-Schema
by Carsten Bock 28 Sep '15

28 Sep '15

Module: kamailio Branch: master Commit: 859ee540c593c25a2a96893795ac1ec6e22b9c22 URL: https://github.com/kamailio/kamailio/commit/859ee540c593c25a2a96893795ac1ec… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-28T18:07:42+02:00 ims_usr_pcscf: Updated DB-Schema --- Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/859ee540c593c25a2a96893795ac1ec… Patch: https://github.com/kamailio/kamailio/commit/859ee540c593c25a2a96893795ac1ec… --- diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index aa41ef6..1240afa 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -1,13 +1,15 @@ INSERT INTO version (table_name, table_version) values ('location','6'); CREATE TABLE `location` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `domain` varchar(64) DEFAULT NULL, + `domain` varchar(64) NOT NULL, `aor` varchar(255) NOT NULL, - `contact` varchar(255) DEFAULT NULL, + `host` varchar(100) NOT NULL, + `port` int(10) NOT NULL, `received` varchar(128) DEFAULT NULL, `received_port` int(10) unsigned DEFAULT NULL, `received_proto` int(10) unsigned DEFAULT NULL, `path` varchar(512) DEFAULT NULL, + `rinstance` varchar(255) DEFAULT NULL, `rx_session_id` varchar(256) DEFAULT NULL, `reg_state` tinyint(4) DEFAULT NULL, `expires` datetime DEFAULT '2030-05-28 21:32:15',

1 0

git:master:eaa76b29: pv: Add $utime and $utimef pv's to retrieve time in UTC
by Hugh Waite 28 Sep '15

28 Sep '15

Module: kamailio Branch: master Commit: eaa76b2907cbc24f9f0f46321af5db47a6e9bc7c URL: https://github.com/kamailio/kamailio/commit/eaa76b2907cbc24f9f0f46321af5db4… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2015-09-26T01:15:31+01:00 pv: Add $utime and $utimef pv's to retrieve time in UTC - $utime is the UTC equivalent to $time for localtime - $utimef is the UTC equivalent to $timef for localtime --- Modified: modules/pv/pv.c Modified: modules/pv/pv_time.c Modified: modules/pv/pv_time.h --- Diff: https://github.com/kamailio/kamailio/commit/eaa76b2907cbc24f9f0f46321af5db4… Patch: https://github.com/kamailio/kamailio/commit/eaa76b2907cbc24f9f0f46321af5db4…

1 0

git:master:87674722: modules/ims_registrar_scscf: ignore port from RURI when looking up S-CSCF IMPU
by jaybeepee 28 Sep '15

28 Sep '15

Module: kamailio Branch: master Commit: 87674722ea28bbcff6d14ba30a1e4c12537f4526 URL: https://github.com/kamailio/kamailio/commit/87674722ea28bbcff6d14ba30a1e4c1… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-28T14:20:52+02:00 modules/ims_registrar_scscf: ignore port from RURI when looking up S-CSCF IMPU --- Modified: modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/87674722ea28bbcff6d14ba30a1e4c1… Patch: https://github.com/kamailio/kamailio/commit/87674722ea28bbcff6d14ba30a1e4c1… --- diff --git a/modules/ims_registrar_scscf/lookup.c b/modules/ims_registrar_scscf/lookup.c index 9beaba4..671e211 100644 --- a/modules/ims_registrar_scscf/lookup.c +++ b/modules/ims_registrar_scscf/lookup.c @@ -76,8 +76,8 @@ int lookup(struct sip_msg* _m, udomain_t* _d) { if (_m->new_uri.s) aor = _m->new_uri; else aor = _m->first_line.u.request.uri; - for (i = 0; i < aor.len; i++) - if (aor.s[i] == ';' || aor.s[i] == '?') { + for (i = 4; i < aor.len; i++) + if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { aor.len = i; break; }

1 0

git:master:ab0e23c3: ims_usrloc_pscscf: Set contact-port to 5060, if no port present
by Carsten Bock 27 Sep '15

27 Sep '15

Module: kamailio Branch: master Commit: ab0e23c32b154ea38730f8be550b072a0ec10186 URL: https://github.com/kamailio/kamailio/commit/ab0e23c32b154ea38730f8be550b072… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-27T21:10:15+02:00 ims_usrloc_pscscf: Set contact-port to 5060, if no port present --- Modified: modules/ims_usrloc_pcscf/pcontact.c Modified: modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0e23c32b154ea38730f8be550b072… Patch: https://github.com/kamailio/kamailio/commit/ab0e23c32b154ea38730f8be550b072… --- diff --git a/modules/ims_usrloc_pcscf/pcontact.c b/modules/ims_usrloc_pcscf/pcontact.c index 33e4a8a..04106bd 100644 --- a/modules/ims_usrloc_pcscf/pcontact.c +++ b/modules/ims_usrloc_pcscf/pcontact.c @@ -182,7 +182,7 @@ int new_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci, s (*_c)->rinstance.len = rinstance.len; (*_c)->contact_host.s = sip_uri.host.s; (*_c)->contact_host.len = sip_uri.host.len; - (*_c)->contact_port = sip_uri.port_no; + (*_c)->contact_port = sip_uri.port_no?sip_uri.port_no:5060; (*_c)->contact_user.s = sip_uri.user.s; (*_c)->contact_user.len = sip_uri.user.len; diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index b3b431b..6aeda65 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -506,9 +506,10 @@ int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** for (i = 0; i < _d->table[sl].n; i++) { LM_DBG("comparing contact with aorhash [%u], aor [%.*s]\n", c->aorhash, c->aor.len, c->aor.s); LM_DBG(" contact host [%.*s:%d]\n", c->contact_host.len, c->contact_host.s, c->contact_port); + if ((c->aorhash == aorhash) && (c->contact_host.len == contact_info->via_host.len) && (memcmp(contact_info->via_host.s, c->contact_host.s, c->contact_host.len)==0) && (c->contact_port == contact_info->via_port) && (!(contact_info->searchflag&SEARCH_RECEIVED) || ((contact_info->searchflag&SEARCH_RECEIVED) - && (c->received_host.len == contact_info->received_host.len && (memcmp(c->received_host.s, contact_info->received_host.s, contact_info->received_host.len)==0)) + && ((c->received_host.len == contact_info->received_host.len) && (memcmp(c->received_host.s, contact_info->received_host.s, contact_info->received_host.len)==0)) && (c->received_port == contact_info->received_port)))) { LM_DBG("found contact with URI [%.*s]\n", c->aor.len, c->aor.s); if (has_rinstance) {

1 0

git:master:eb81caaa: ims_usrloc_pcscf: Add some debug output for asserting identities
by Carsten Bock 27 Sep '15

27 Sep '15

Module: kamailio Branch: master Commit: eb81caaa6a05ac1b0f2234c37b0ad9de13d9610b URL: https://github.com/kamailio/kamailio/commit/eb81caaa6a05ac1b0f2234c37b0ad9d… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-27T19:25:35+02:00 ims_usrloc_pcscf: Add some debug output for asserting identities --- Modified: modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/eb81caaa6a05ac1b0f2234c37b0ad9d… Patch: https://github.com/kamailio/kamailio/commit/eb81caaa6a05ac1b0f2234c37b0ad9d… --- diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 421cf52..b3b431b 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -505,6 +505,7 @@ int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** for (i = 0; i < _d->table[sl].n; i++) { LM_DBG("comparing contact with aorhash [%u], aor [%.*s]\n", c->aorhash, c->aor.len, c->aor.s); + LM_DBG(" contact host [%.*s:%d]\n", c->contact_host.len, c->contact_host.s, c->contact_port); if ((c->aorhash == aorhash) && (c->contact_host.len == contact_info->via_host.len) && (memcmp(contact_info->via_host.s, c->contact_host.s, c->contact_host.len)==0) && (c->contact_port == contact_info->via_port) && (!(contact_info->searchflag&SEARCH_RECEIVED) || ((contact_info->searchflag&SEARCH_RECEIVED) && (c->received_host.len == contact_info->received_host.len && (memcmp(c->received_host.s, contact_info->received_host.s, contact_info->received_host.len)==0))

1 0

git:master:e0bcdcdd: usrloc: rpc responses use array for contact records
by Daniel-Constantin Mierla 27 Sep '15

27 Sep '15

Module: kamailio Branch: master Commit: e0bcdcddcb30f6221a92bd08221f2b50831c8b6b URL: https://github.com/kamailio/kamailio/commit/e0bcdcddcb30f6221a92bd08221f2b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-27T08:55:52+02:00 usrloc: rpc responses use array for contact records --- Modified: modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e0bcdcddcb30f6221a92bd08221f2b5… Patch: https://github.com/kamailio/kamailio/commit/e0bcdcddcb30f6221a92bd08221f2b5… --- diff --git a/modules/usrloc/ul_rpc.c b/modules/usrloc/ul_rpc.c index e547c21..505f75a 100644 --- a/modules/usrloc/ul_rpc.c +++ b/modules/usrloc/ul_rpc.c @@ -203,6 +203,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) ucontact_t* c; void* th; void* ah; + void* bh; void* ih; void* sh; int max, n, i; @@ -219,7 +220,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating top rpc"); return; } - if(rpc->struct_add(th, "Sd{", + if(rpc->struct_add(th, "Sd[", "Domain", &dl->name, "Size", (int)dom->size, "AoRs", &ah)<0) @@ -242,7 +243,14 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) return; } } else { - if(rpc->struct_add(ah, "Sd{", + if(rpc->struct_add(ah, "{", + "Info", &bh)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, "Internal error creating aor struct"); + return; + } + if(rpc->struct_add(bh, "Sd[", "AoR", &r->aor, "HashID", r->aorhash, "Contacts", &ih)<0) @@ -340,6 +348,7 @@ static void ul_rpc_lookup(rpc_t* rpc, void* ctx) str table = {0, 0}; str aor = {0, 0}; void* th; + void* ih; urecord_t *rec; ucontact_t* con; int ret; @@ -381,15 +390,24 @@ static void ul_rpc_lookup(rpc_t* rpc, void* ctx) if (rpc->add(ctx, "{", &th) < 0) { + unlock_udomain(dom, &aor); rpc->fault(ctx, 500, "Internal error creating outer rpc"); return; } + if(rpc->struct_add(th, "S[", + "AoR", &aor, + "Contacts", &ih)<0) + { + unlock_udomain(dom, &aor); + rpc->fault(ctx, 500, "Internal error creating aor struct"); + return; + } /* We have contacts, list them */ for( con=rec->contacts ; con ; con=con->next) { if (VALID_CONTACT( con, act_time)) { rpl_tree++; - if (rpc_dump_contact(rpc, ctx, th, con) == -1) { + if (rpc_dump_contact(rpc, ctx, ih, con) == -1) { unlock_udomain(dom, &aor); return; }

1 0

git:master:e174617a: Makefile Add curl module
by Olle E. Johansson 27 Sep '15

27 Sep '15

Module: kamailio Branch: master Commit: e174617a2a8be3d47eab44f113ef8026f7046003 URL: https://github.com/kamailio/kamailio/commit/e174617a2a8be3d47eab44f113ef802… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-27T08:40:57+02:00 Makefile Add curl module --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e174617a2a8be3d47eab44f113ef802… Patch: https://github.com/kamailio/kamailio/commit/e174617a2a8be3d47eab44f113ef802… --- diff --git a/Makefile.groups b/Makefile.groups index 10bfdd0..c0a8a4e 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -80,7 +80,7 @@ mod_list_carrierroute=carrierroute mod_list_berkeley=db_berkeley # - modules depending on curl library -mod_list_utils=utils +mod_list_utils=utils curl # - modules depending on purple library mod_list_purple=purple

1 0

git:master:0a7e2439: jsonrpc-s: input buffer for fifo transport increased to 8k
by Daniel-Constantin Mierla 26 Sep '15

26 Sep '15

Module: kamailio Branch: master Commit: 0a7e24398a564d1703f4484834b823e988cf64db URL: https://github.com/kamailio/kamailio/commit/0a7e24398a564d1703f4484834b823e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-26T22:19:17+02:00 jsonrpc-s: input buffer for fifo transport increased to 8k --- Modified: modules/jsonrpc-s/jsonrpc-s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0a7e24398a564d1703f4484834b823e… Patch: https://github.com/kamailio/kamailio/commit/0a7e24398a564d1703f4484834b823e… --- diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index a5c877b..62f2506 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -1670,7 +1670,7 @@ FILE *jsonrpc_open_reply_fifo(str *srpath) return 0; } -#define JSONRPC_BUF_IN_SIZE 4096 +#define JSONRPC_BUF_IN_SIZE 8192 static void jsonrpc_run_fifo_server(FILE *fifo_stream) { FILE *reply_stream;

1 0

git:master:8cced16d: core: mem - reworked f_malloc free chunks management
by Daniel-Constantin Mierla 25 Sep '15

25 Sep '15

Module: kamailio Branch: master Commit: 8cced16d7055939a885b6dc6bdb8a346748a0fcd URL: https://github.com/kamailio/kamailio/commit/8cced16d7055939a885b6dc6bdb8a34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-25T23:38:56+02:00 core: mem - reworked f_malloc free chunks management - credits to Juha Heinanen for heling with testing --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/8cced16d7055939a885b6dc6bdb8a34… Patch: https://github.com/kamailio/kamailio/commit/8cced16d7055939a885b6dc6bdb8a34…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
39
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015