sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:5.1:53f46ab7: kazoo: replaced obsolete json is_error() macro

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 53f46ab7b6eb311137033f6cdb27ef73d87cb3f2 URL: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:47+02:00 kazoo: replaced obsolete json is_error() macro (cherry picked from commit 7d3766614832ef22433e36ef0791fa41796829a2) --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… Patch: https://github.com/kamailio/kamailio/commit/53f46ab7b6eb311137033f6cdb27ef7… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 3e161839dc..36e7ea0843 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1241,7 +1241,7 @@ int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; } @@ -1304,7 +1304,7 @@ int kz_amqp_async_query(struct sip_msg* msg, char* _exchange, char* _routing_key json_obj = json_tokener_parse(json_s.s); - if (is_error(json_obj)) { + if (json_obj==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); goto error; } @@ -1457,7 +1457,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); return -1; } diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 7911489eaf..4fd30998f6 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -132,7 +132,7 @@ struct json_object * kz_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

6 years, 5 months

git:5.1:352af1b5: core: pv - default number of buffer slots set to 40

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 352af1b5a878daf90e16f5ae012f5ecb87fabbff URL: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:25:36+02:00 core: pv - default number of buffer slots set to 40 - it was 10 - allow handling more chained evaluations in large strings (cherry picked from commit c087b1d1dd06a1fd417998fe0a51dedcfe02e8c6) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… Patch: https://github.com/kamailio/kamailio/commit/352af1b5a878daf90e16f5ae012f5ec… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index dac770a0f3..841b1801fe 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2025,7 +2025,7 @@ static char **_pv_print_buffer = NULL; static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */ -#define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 +#define PV_DEFAULT_PRINT_BUFFER_SLOTS 40 static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; static int _pv_print_buffer_slots_active = 0; static int _pv_print_buffer_index = 0;

6 years, 5 months

[kamailio/kamailio] TLS module: different TLS parameters based on domain names for server role (#1570)

by VolodyaIvanets

Sorry for not being specific in [#1567](https://github.com/kamailio/kamailio/issues/1567). I had to clarify that I was talking about server role only. >From what I understood server role configurations can be distinguish one from another only by socket, provided in their configuration. TLS module documentation says: > "... different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs)". Which hints that additional tests for matching incoming connections against configured server profiles were in mind. I would like to request a feature which could allow matching them against domain name if that's possible. One of the options may be checking client's certificate CN if _require_certificate_ parameter is set to yes. Thank you! -- 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/issues/1570

6 years, 5 months

git:master:04fffc77: pdbt and pdb_server: add version output to help and as a dedicated switch

by Henning Westerholt

Module: kamailio Branch: master Commit: 04fffc77bb0dba4c13d76347a3352894b2821846 URL: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-20T17:43:43+02:00 pdbt and pdb_server: add version output to help and as a dedicated switch --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… Patch: https://github.com/kamailio/kamailio/commit/04fffc77bb0dba4c13d76347a335289… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 4dac0ce13a..7f25cb01ae 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -40,8 +40,8 @@ void print_usage(char *program) { set_log_level(LOG_INFO); - LINFO("Listens on a UDP port for queries and sends answer UDP\n"); - LINFO("packets back.\n"); + LINFO("version: pdb_server %d\n", PDB_VERSION); + LINFO("Listens on a UDP port for queries and sends answer UDP packets back.\n"); LINFO("\n"); LINFO("Usage: %s [<option>...]\n", program); LINFO(" %s -m <data file> [-i <bind addr>] [-p <port>] [-d <log level>]\n", program); @@ -62,6 +62,7 @@ void print_usage(char *program) { LINFO(" %ld for emergency level.\n", LOG_EMERG); LINFO(" %ld to disable all messages.\n", LOG_EMERG-1); LINFO(" Default is warning level.\n"); + LINFO(" -v: Print the version\n"); LINFO(" -h: Print this help.\n"); } @@ -212,7 +213,7 @@ int main(int argc, char *argv[]) { int so; struct sockaddr_in sa; - while ((opt = getopt(argc, argv, "m:i:p:hdl:")) != -1) { + while ((opt = getopt(argc, argv, "m:i:p:vhdl:")) != -1) { switch (opt) { case 'm': backend_data_filename = optarg; @@ -229,6 +230,11 @@ int main(int argc, char *argv[]) { } bind_port=ret; break; + case 'v': + set_log_level(LOG_INFO); + LINFO("version: pdb_server %d\n", PDB_VERSION); + return 0; + break; case 'h': init_log("pdb_server", use_syslog); print_usage(argv[0]); diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index afd36956b2..6521985b2b 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -50,6 +50,7 @@ typedef int (*query_func_t)(char *number, char *comment, void *data); void print_usage(char *program) { set_log_level(LOG_INFO); + LINFO("version: pdbt %d\n", PDB_VERSION); LINFO("Usage: %s [<option>...] <command> [<param>...]\n", program); LINFO(" %s -s <csv file> -m <mmap file> [-k <ids>] [-o] [-u <tree file>] [-l <log level>] build\n", program); LINFO(" %s (-m <mmap file>|-r <host>:<port>) [-q <timeout>] [-f <query file>] [-t <carrier text file>] [-l <log level>] query <number>...\n", program); @@ -93,6 +94,7 @@ void print_usage(char *program) { LINFO(" %ld for emergency level.\n", LOG_EMERG); LINFO(" %ld to disable all messages.\n", LOG_EMERG-1); LINFO(" Default is info level.\n"); + LINFO(" -v: Print the version\n"); LINFO(" -h: Print this help.\n"); } @@ -678,7 +680,7 @@ int main(int argc, char *argv[]) { init_log("pdbt", 0); - while ((opt = getopt(argc, argv, "s:m:f:u:t:r:q:k:ol:h")) != -1) { + while ((opt = getopt(argc, argv, "s:m:f:u:t:r:q:k:ol:vh")) != -1) { switch (opt) { case 's': csv_file = optarg; @@ -752,6 +754,11 @@ int main(int argc, char *argv[]) { } log_level=ret; break; + case 'v': + set_log_level(LOG_INFO); + LINFO("version: pdbt %d\n", PDB_VERSION); + return 0; + break; case 'h': print_usage(argv[0]); return 0;

6 years, 5 months

[kamailio/kamailio] TLS module: different TLS parameters based on domain names (#1567)

by VolodyaIvanets

TLS module documentation says: "different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs)". It would be nice feature if it could use same socket and distinguish connections by domain name. -- 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/issues/1567

6 years, 5 months

[kamailio/kamailio] ims_charging unlink_unsafe_ro_session (#1549)

by thulasizwe-n

Apologies if i have not kept with the reporting standard. Insertion attempts of out-of-credit replies from resume_on_initial_ccr callback, are corrupting the ro_session list. i.e. they nullify the first and last fields, which under certain conditions the first entry gets restored but not the last.This then crashes the process at ro_session_hash.c (link_ro_session), where the first entry has a valid address but the last does not. Solution: ro_session_hash.h - unlink_unsafe_ro_session - check if the session to be linked is actually part of list i.e if ((ro_session->next == 0x00) && (ro_session->prev == 0x00) && (ro_session != ro_session_entry->first) ) { ro_session, &(ro_session->ro_tl), ro_session->callid.len, ro_session->callid.len, ro_session->callid.s); return; } rest of the code .... -- 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/issues/1549

6 years, 5 months

git:master:f42e5420: ims_charging: check if the session to be linked is actually part of list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f42e5420f5f761bd08952b221a3f60ac925d6c99 URL: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:32:00+02:00 ims_charging: check if the session to be linked is actually part of list - issue reported and patch suggested by GH #1549 --- Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… Patch: https://github.com/kamailio/kamailio/commit/f42e5420f5f761bd08952b221a3f60a… --- diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index 4b677b3c0a..b81e843245 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -158,6 +158,13 @@ extern struct ro_session_table *ro_session_table; * \param ro_session unlinked ro_session */ static inline void unlink_unsafe_ro_session(struct ro_session_entry *ro_session_entry, struct ro_session *ro_session) { + if ((ro_session->next == 0x00) && + (ro_session->prev == 0x00) && + (ro_session != ro_session_entry->first) ) + { + return; + } + if (ro_session->next) ro_session->next->prev = ro_session->prev; else

6 years, 5 months

git:master:a0594f0e: Merge pull request #1562 from christoph-v/bugfix_prm18_0001045_contact_remove

by GitHub

Module: kamailio Branch: master Commit: a0594f0e70dd860a22e94733f965b151ff99e641 URL: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-20T08:27:49+02:00 Merge pull request #1562 from christoph-v/bugfix_prm18_0001045_contact_remove ims_usrloc_scscf: bugfix erraneous unlinking of deleted contact --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… Patch: https://github.com/kamailio/kamailio/commit/a0594f0e70dd860a22e94733f965b15… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

6 years, 5 months

git:master:f2db229a: ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact

by frie

Module: kamailio Branch: master Commit: f2db229ae450d6443da51950976e92d5eaa7ecd0 URL: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… Author: frie <peter.friedrich(a)kapsch.net> Committer: frie <peter.friedrich(a)kapsch.net> Date: 2018-06-12T16:44:06+02:00 ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact impurecord.c: corrected small bug in remove_impucontact_from_list() --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… Patch: https://github.com/kamailio/kamailio/commit/f2db229ae450d6443da51950976e92d… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

6 years, 5 months

[kamailio/kamailio] ims_usrloc_scscf: bugfix erraneous unlinking of deleted contact (#1562)

by Christoph VALENTIN

impurecord.c: corrected small bug in remove_impucontact_from_list()   #### 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 - [x] Tested changes locally against Version 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  corrected 2 small bugs in function remove_impucontact_from_list: nullify tail->next if tail removed in remove mid-list the pointer to previous contact was not set correctly These issues were brought up by https://github.com/thulasizwe-n at another pull request: https://github.com/kamailio/kamailio/pull/1547#issuecomment-395767031 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1562 -- Commit Summary -- * ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1562.patch https://github.com/kamailio/kamailio/pull/1562.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/1562

6 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018