sr-dev

sr-dev@lists.kamailio.org

17 participants
45431 discussions

git:master:2f04f057: Merge pull request #1416 from kamailio/json-api
by GitHub 27 Jan '18

27 Jan '18

Module: kamailio Branch: master Commit: 2f04f057c50344b6e204862b40e2bab83431912f URL: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-27T16:22:19+01:00 Merge pull request #1416 from kamailio/json-api json: add API for json_parse and json_extract_field --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Patch: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#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_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

1 0

git:master:a9b8682f: json: add API
by Emmanuel Schmidbauer 27 Jan '18

27 Jan '18

Module: kamailio Branch: master Commit: a9b8682f522f46c56144e61ff029cb1ab0413274 URL: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-26T09:20:40-07:00 json: add API --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Patch: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#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_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

1 0

[kamailio/kamailio] json: add API for json_parse and json_extract_field (#1416)
by Emmanuel Schmidbauer 27 Jan '18

27 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1416 -- Commit Summary -- * json: add API -- File Changes -- A src/modules/json/api.h (57) M src/modules/json/json_mod.c (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1416.patch https://github.com/kamailio/kamailio/pull/1416.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/1416

2 1

git:master:038c3f16: Merge pull request #1413 from armenb/ws_check_bounds_before_reading_mask
by GitHub 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 038c3f16d9a8371f00b1b8e34d37d6509465a471 URL: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-26T08:50:54+01:00 Merge pull request #1413 from armenb/ws_check_bounds_before_reading_mask websocket: check bounds before reading mask --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… Patch: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 2739ecbc11..2d7ca8ec5a 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -470,13 +470,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, } else mask_start = 2; - /* Decode mask */ - frame->masking_key[0] = (buf[mask_start + 0] & 0xff); - frame->masking_key[1] = (buf[mask_start + 1] & 0xff); - frame->masking_key[2] = (buf[mask_start + 2] & 0xff); - frame->masking_key[3] = (buf[mask_start + 3] & 0xff); - - /* Decode and unmask payload */ if((unsigned long long)len != (unsigned long long)frame->payload_len + mask_start + 4) { LM_WARN("message not complete frame size %u but received %u\n", @@ -492,7 +485,15 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, *err_text = str_status_message_too_big; return -1; } + /* Decode mask */ + frame->masking_key[0] = (buf[mask_start + 0] & 0xff); + frame->masking_key[1] = (buf[mask_start + 1] & 0xff); + frame->masking_key[2] = (buf[mask_start + 2] & 0xff); + frame->masking_key[3] = (buf[mask_start + 3] & 0xff); + frame->payload_data = &buf[mask_start + 4]; + + /* Decode and unmask payload */ for(i = 0; i < frame->payload_len; i++) { j = i % 4; frame->payload_data[i] = frame->payload_data[i] ^ frame->masking_key[j];

1 0

git:master:4fabe253: websocket: check bounds before reading mask
by Armen Babikyan 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 4fabe253a1eb0f9b494521cfa98365523a93adcf URL: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-01-25T17:43:33-08:00 websocket: check bounds before reading mask --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… Patch: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..32a1f4bf6a 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -470,13 +470,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, } else mask_start = 2; - /* Decode mask */ - frame->masking_key[0] = (buf[mask_start + 0] & 0xff); - frame->masking_key[1] = (buf[mask_start + 1] & 0xff); - frame->masking_key[2] = (buf[mask_start + 2] & 0xff); - frame->masking_key[3] = (buf[mask_start + 3] & 0xff); - - /* Decode and unmask payload */ if((unsigned long long)len != (unsigned long long)frame->payload_len + mask_start + 4) { LM_WARN("message not complete frame size %u but received %u\n", @@ -492,7 +485,15 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, *err_text = str_status_message_too_big; return -1; } + /* Decode mask */ + frame->masking_key[0] = (buf[mask_start + 0] & 0xff); + frame->masking_key[1] = (buf[mask_start + 1] & 0xff); + frame->masking_key[2] = (buf[mask_start + 2] & 0xff); + frame->masking_key[3] = (buf[mask_start + 3] & 0xff); + frame->payload_data = &buf[mask_start + 4]; + + /* Decode and unmask payload */ for(i = 0; i < frame->payload_len; i++) { j = i % 4; frame->payload_data[i] = frame->payload_data[i] ^ frame->masking_key[j];

1 0

[kamailio/kamailio] websocket: check bounds before reading mask (#1413)
by Armen Babikyan 26 Jan '18

26 Jan '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1413 -- Commit Summary -- * websocket: check bounds before reading mask -- File Changes -- M src/modules/websocket/ws_frame.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1413.patch https://github.com/kamailio/kamailio/pull/1413.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/1413

2 2

git:master:9811e318: Merge pull request #1412 from armenb/ws_cid85650_fix
by GitHub 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 9811e318359b3099c3b1d7dff3673b642f8ccd0a URL: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-26T08:50:16+01:00 Merge pull request #1412 from armenb/ws_cid85650_fix websocket: handle unrecognized subprotocol better --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… Patch: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..2739ecbc11 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -678,6 +678,9 @@ int ws_frame_receive(sr_event_param_t *evp) return -1; } + } else { + LM_ERR("Unrecognized WebSocket subprotocol: %u\n", frame.wsc->sub_protocol); + return -1; } case OPCODE_CLOSE:

1 0

[kamailio/kamailio] websocket: handle unrecognized subprotocol better (#1412)
by Armen Babikyan 26 Jan '18

26 Jan '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1412 -- Commit Summary -- * websocket: handle unrecognized subprotocol better -- File Changes -- M src/modules/websocket/ws_frame.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1412.patch https://github.com/kamailio/kamailio/pull/1412.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/1412

2 2

git:master:91c38814: websocket: handle unrecognized subprotocol better
by Armen Babikyan 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 91c388147a9328743582a92c6f1184141aa268fb URL: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-01-25T17:20:35-08:00 websocket: handle unrecognized subprotocol better --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… Patch: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..2739ecbc11 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -678,6 +678,9 @@ int ws_frame_receive(sr_event_param_t *evp) return -1; } + } else { + LM_ERR("Unrecognized WebSocket subprotocol: %u\n", frame.wsc->sub_protocol); + return -1; } case OPCODE_CLOSE:

1 0

git:master:1caf97ee: usrloc: proper condition when using rm_expired_delay
by Daniel-Constantin Mierla 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 1caf97eee90fa5711b60f5cb7bf3a21a0144d4b6 URL: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-26T08:41:19+01:00 usrloc: proper condition when using rm_expired_delay --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… Patch: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index a3d948ad0b..8f5bfe3061 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -902,7 +902,7 @@ int db_timer_udomain(udomain_t* _d) keys[0] = &expires_col; ops[0] = "<"; vals[0].nul = 0; - UL_DB_EXPIRES_SET(&vals[0], act_time + 1 + ul_rm_expired_delay); + UL_DB_EXPIRES_SET(&vals[0], act_time + 1 - ul_rm_expired_delay); keys[1] = &expires_col; ops[1] = OP_NEQ;

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