sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
369 discussions

git:master:26b09ae0: json: pass str pointer to API
by Emmanuel Schmidbauer 30 Jan '18

30 Jan '18

Module: kamailio Branch: master Commit: 26b09ae0d9b36dfed9688536e7f8cd6ff22d89fd URL: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-29T12:42:29-07:00 json: pass str pointer to API --- Modified: src/modules/json/api.h Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… Patch: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h index c900dd5c0d..0610eaffeb 100644 --- a/src/modules/json/api.h +++ b/src/modules/json/api.h @@ -26,7 +26,7 @@ typedef struct json_object *(*json_parse_f) (const char *str); typedef struct json_object *(*json_get_object_f) (struct json_object *json_obj, const char *str); -typedef str (*json_extract_field_f) (struct json_object *json_obj, char *json_name); +typedef int (*json_extract_field_f) (struct json_object *json_obj, char *json_name, str *var); typedef struct json_api { json_parse_f json_parse; diff --git a/src/modules/json/json_funcs.h b/src/modules/json/json_funcs.h index 331d1e3df8..747232efac 100644 --- a/src/modules/json/json_funcs.h +++ b/src/modules/json/json_funcs.h @@ -29,18 +29,18 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst); -#define json_extract_field(json_name, field) \ - do { \ +#define json_extract_field(json_name, field) \ + do { \ struct json_object *obj = json_get_object(json_obj, json_name); \ - field.s = (char *)json_object_get_string(obj); \ - if(field.s == NULL) { \ - LM_DBG("Json-c error - failed to extract field [%s]\n", \ - json_name); \ - field.s = ""; \ - } else { \ - field.len = strlen(field.s); \ - } \ - LM_DBG("%s: [%s]\n", json_name, field.s ? field.s : "Empty"); \ + field->s = (char *)json_object_get_string(obj); \ + if(field->s == NULL) { \ + LM_DBG("Json-c error - failed to extract field [%s]\n", \ + json_name); \ + field->s = ""; \ + } else { \ + field->len = strlen(field->s); \ + } \ + LM_DBG("%s: [%s]\n", json_name, field->s ? field->s : "Empty"); \ } while(0); diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 051da4dd59..f5de53d692 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -65,10 +65,9 @@ struct module_exports exports = { 0 /* per-child init function */ }; -str _json_extract_field(struct json_object *json_obj, char *json_name) { - str val = {0, 0}; +int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) { json_extract_field(json_name, val); - return val; + return 0; } /**

1 0

[kamailio/kamailio] json: pass str pointer to API (#1418)
by Emmanuel Schmidbauer 30 Jan '18

30 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1418 -- Commit Summary -- * json: pass str pointer to API -- File Changes -- M src/modules/json/api.h (2) M src/modules/json/json_funcs.h (22) M src/modules/json/json_mod.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1418.patch https://github.com/kamailio/kamailio/pull/1418.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/1418

1 1

git:5.1:f17dd0d8: Merge pull request #1415 from christoph-v/wrong_query_buffer_assignment_5.1
by GitHub 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: f17dd0d8c884f0264a1bfb64124caa69e119ca23 URL: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-29T20:17:26+01:00 Merge pull request #1415 from christoph-v/wrong_query_buffer_assignment_5.1 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() - 5.1 --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… Patch: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

git:5.1:df97c48f: ims_usrloc_scscf: assignment of length missing for query_buffer in
by Christoph Valentin 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: df97c48f94e8c8ce28ca0624bc3cfe4a86c89259 URL: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-26T10:20:14+01:00 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" (cherry picked from commit 11c179ab232222f1c78f19557032afd49bef7324) --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… Patch: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

[kamailio/kamailio] ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() - 5.1 (#1415)
by Christoph VALENTIN 29 Jan '18

29 Jan '18

When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" (cherry picked from commit 11c179ab232222f1c78f19557032afd49bef7324)   #### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Created by cherry-pick from master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1415 -- Commit Summary -- * ims_usrloc_scscf: assignment of length missing for query_buffer in -- File Changes -- M src/modules/ims_usrloc_scscf/usrloc_db.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1415.patch https://github.com/kamailio/kamailio/pull/1415.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/1415

2 1

git:5.1:9ec46e94: Merge pull request #1414 from christoph-v/missing_record_route_assignment_5.1
by GitHub 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: 9ec46e94915294f2824abe828c0a1ec66e82c808 URL: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-29T20:17:10+01:00 Merge pull request #1414 from christoph-v/missing_record_route_assignment_5.1 ims_usrloc_scscf: missing assignment of record_route (5.1) --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… Patch: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

git:5.1:acbc230e: ims_usrloc_scscf: missing assignment of record_route
by Christoph Valentin 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: acbc230e8f24ac838598631d9366f23d05218d73 URL: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-26T10:11:46+01:00 ims_usrloc_scscf: missing assignment of record_route In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. (cherry picked from commit 595b8fe06165328366865328e43c14a9ca23c386) --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… Patch: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

[kamailio/kamailio] ims_usrloc_scscf: missing assignment of record_route (5.1) (#1414)
by Christoph VALENTIN 29 Jan '18

29 Jan '18

In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. (cherry picked from commit 595b8fe06165328366865328e43c14a9ca23c386)   #### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Changes cherry-picked from master branch, same title plus "(5.1)" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1414 -- Commit Summary -- * ims_usrloc_scscf: missing assignment of record_route -- File Changes -- M src/modules/ims_usrloc_scscf/subscribe.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1414.patch https://github.com/kamailio/kamailio/pull/1414.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/1414

2 1

Re: [sr-dev] [kamailio/kamailio] json: add get_object API and fix str init (5fe8618)
by Daniel-Constantin Mierla 29 Jan '18

29 Jan '18

Looking at the code I think it is better to change the prototype of: ``` str _json_extract_field(struct json_object *json_obj, char *json_name) ``` to: ``` int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) ``` Now it returns a variable declared on the stack, which could work with recent compilers, being returned by value. `str` itself is not a large structure, but returning structure values is not recommended in C, code analyzers complain about (same for passing a structure value as parameter -- it is recommended to use pointers). -- 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/5fe86186e2856ce5039c0133e1f53b6…

1 0

git:master:5fe86186: json: add get_object API and fix str init
by Emmanuel Schmidbauer 29 Jan '18

29 Jan '18

Module: kamailio Branch: master Commit: 5fe86186e2856ce5039c0133e1f53b62df2be485 URL: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-29T07:32:11-07:00 json: add get_object API and fix str init --- Modified: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… Patch: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h index 80d18c2c25..c900dd5c0d 100644 --- a/src/modules/json/api.h +++ b/src/modules/json/api.h @@ -25,11 +25,12 @@ #include "../../core/sr_module.h" typedef struct json_object *(*json_parse_f) (const char *str); -typedef str (*json_extract_field_f)( - struct json_object *json_obj, char *json_name); +typedef struct json_object *(*json_get_object_f) (struct json_object *json_obj, const char *str); +typedef str (*json_extract_field_f) (struct json_object *json_obj, char *json_name); typedef struct json_api { json_parse_f json_parse; + json_get_object_f get_object; json_extract_field_f extract_field; } json_api_t; diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index a008c13085..051da4dd59 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -65,9 +65,8 @@ struct module_exports exports = { 0 /* per-child init function */ }; -str _json_extract_field(struct json_object *json_obj, char *json_name) -{ - str val; +str _json_extract_field(struct json_object *json_obj, char *json_name) { + str val = {0, 0}; json_extract_field(json_name, val); return val; } @@ -81,6 +80,7 @@ int bind_json(json_api_t *api) { return -1; } api->json_parse = json_parse; + api->get_object = json_get_object; api->extract_field = _json_extract_field; return 0; }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018