sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:2fda4db2: path: updating the exported expected parameters to match the functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2fda4db20ef258ac09c3680b8fab50b988a90f43 URL: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 path: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… Patch: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… --- diff --git a/src/modules/path/path_mod.c b/src/modules/path/path_mod.c index 013e34003a..42c2023964 100644 --- a/src/modules/path/path_mod.c +++ b/src/modules/path/path_mod.c @@ -164,7 +164,7 @@ static int mod_init(void) static sr_kemi_t sr_kemi_path_exports[] = { { str_init("path"), str_init("add_path"), SR_KEMIP_INT, ki_add_path, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("path"), str_init("add_path_user"), @@ -179,7 +179,7 @@ static sr_kemi_t sr_kemi_path_exports[] = { }, { str_init("path"), str_init("add_path_received"), SR_KEMIP_INT, ki_add_path_received, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("path"), str_init("add_path_received_user"),

7 years

git:master:ed2c9153: dialog: updating the exported expected parameters to match the functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ed2c91533960c2b94a1394a671292c07d94b049b URL: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 dialog: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… Patch: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 3fc51f9b9f..e6ff0e9bc3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1826,7 +1826,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("set_dlg_profile_static"), SR_KEMIP_INT, ki_set_dlg_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("set_dlg_profile"), @@ -1836,7 +1836,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("unset_dlg_profile_static"), SR_KEMIP_INT, ki_unset_dlg_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("unset_dlg_profile"), @@ -1846,7 +1846,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("is_in_profile_static"), SR_KEMIP_INT, ki_is_in_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("is_in_profile"),

7 years

[kamailio/kamailio] Patches to the KEMI framework exports (#1338)

by Sam

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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 Updated some issues I found in the KEMI exports while reviewing the implementation. There is some name change there hence the breaking change. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1338 -- Commit Summary -- * dialog: updating the exported expected parameters to match the functions * path: updating the exported expected parameters to match the functions * permissions: correcting KEMI allow_address * rtpengine: updating the exported expected parameters to match the functions * sipcapture: updating the exported expected parameters to match the functions * textops: updating the exported expected parameters to match the functions * textopsx: updating the exported expected parameters to match the functions * xhttp: updating name of function and parameter type * debugger: correcting function utilized by KEMI * kex: updating the exported expected parameters to match the functions * lcr: updating the exported expected parameters to match the functions * maxfwd: Updating code formatting * nathelper: updating the exported expected parameters to match the functions -- File Changes -- M src/modules/debugger/debugger_mod.c (8) M src/modules/dialog/dialog.c (6) M src/modules/kex/kex_mod.c (2) M src/modules/lcr/lcr_mod.c (2) M src/modules/maxfwd/maxfwd.c (9) M src/modules/nathelper/nathelper.c (2) M src/modules/path/path_mod.c (4) M src/modules/permissions/permissions.c (2) M src/modules/rtpengine/rtpengine.c (2) M src/modules/sipcapture/sipcapture.c (2) M src/modules/textops/textops.c (4) M src/modules/textopsx/textopsx.c (2) M src/modules/xhttp/xhttp_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1338.patch https://github.com/kamailio/kamailio/pull/1338.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/1338

7 years

.clang-format error on debian stretch

by Juha Heinanen

clang-format command on debian stretch cannot hand kamailio .clang-format without errors. first one is this: YAML:58:21: error: unknown key 'IncludeIsMainRegex' IncludeIsMainRegex: '$' second is this: YAML:61:19: error: unknown key 'JavaScriptQuotes' JavaScriptQuotes: Leave is it OK if I clean the file? -- Juha

7 years

git:5.0:c9685fa4: xhttp_rpc: fix array printing

by root

Module: kamailio Branch: 5.0 Commit: c9685fa4705fc5a56bead6ec9a045a329b461efe URL: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… Author: root <root(a)ProxyC2.localdomain> Committer: root <root(a)ProxyC2.localdomain> Date: 2017-11-26T17:43:36-05:00 xhttp_rpc: fix array printing - manual backport for 41754b645f986175f3385498057bae8bd33646af --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… Patch: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 6e27409435..0261be9638 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,6 +562,62 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } +/** Adds a new member to array. + */ +static int rpc_array_add(struct rpc_data_struct* rpc_s, char* fmt, ...) +{ + va_list ap; + void **void_ptr; + rpc_ctx_t *ctx = rpc_s->ctx; + struct rpc_data_struct *ds, *s; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + if (!ctx->data_structs) { + LM_ERR("Invalid structs\n"); + return -1; + } + s = ds = ctx->data_structs; + ctx->struc_depth = 0; + while (s) { + if (s == rpc_s) { + if (s->next) { + free_data_struct(s->next); + s->next = NULL; + } + break; + } + ctx->struc_depth++; + ds = s; + s = s->next; + } + if (!s) + s = ds; + va_start(ap, fmt); + while(*fmt) { + if (*fmt == '{' || *fmt == '[') { + void_ptr = va_arg(ap, void**); + ds = new_data_struct(ctx); + if (!ds) goto err; + s->next = ds; + *void_ptr = ds; + if (0!=xhttp_rpc_build_content(ctx, NULL, NULL)) + goto err; + } else { + if (print_value(ctx, *fmt, &ap, NULL) < 0) goto err; + } + fmt++; + } + va_end(ap); + return 0; +err: + va_end(ap); + return -1; +} + + static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); @@ -668,8 +724,7 @@ static int mod_init(void) func_param.scan = (rpc_scan_f)rpc_scan; func_param.rpl_printf = (rpc_rpl_printf_f)rpc_rpl_printf; func_param.struct_add = (rpc_struct_add_f)rpc_struct_add; - /* use rpc_struct_add for array_add */ - func_param.array_add = (rpc_struct_add_f)rpc_struct_add; + func_param.array_add = (rpc_array_add_f)rpc_array_add; func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan; func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf; func_param.capabilities = (rpc_capabilities_f)rpc_capabilities;

7 years

[kamailio/kamailio] dialog: updating the quantity of params for certain kemi exports (#1337)

by Sam

- Updating KEMI exports of certain dialog functions to match the expected quantity of parameters   #### 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 - [ ] 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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1337 -- Commit Summary -- * dialog: updating the quantity of params for certain kemi exports -- File Changes -- M src/modules/dialog/dialog.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1337.patch https://github.com/kamailio/kamailio/pull/1337.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/1337

7 years

[kamailio/kamailio] dialog: correcting expectations of parameters (#1336)

by Sam

- Updating KEMI export of ki_set_dlg_profile_static() since the function only takes one parameter.   #### 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 - [ ] 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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1336 -- Commit Summary -- * dialog: correcting expectations of parameters -- File Changes -- M src/modules/dialog/dialog.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1336.patch https://github.com/kamailio/kamailio/pull/1336.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/1336

7 years

git:5.1:4b5a889c: xmlrpc: define _XOPEN_SOURCE to 600

by Ovidiu Sas

Module: kamailio Branch: 5.1 Commit: 4b5a889cf438138d0846ee9adcd8785ea2b94a95 URL: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-11-25T17:51:33-05:00 xmlrpc: define _XOPEN_SOURCE to 600 - needed for snprintf() and variants - reported by GH #1312 (cherry picked from commit 6e680c71b6a5d1571a38023427335922946a4160) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… Patch: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 2e7c644279..7b0066d988 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -18,16 +18,28 @@ * with this program; if not, write to the Free Software Foundation, Inc., 59 * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*This define breaks on Solaris OS */ + +/** + * make strptime available + * use 600 for 'Single UNIX Specification, Version 3' + * _XOPEN_SOURCE creates conflict in header definitions in Solaris + */ #ifndef __OS_solaris -#define _XOPEN_SOURCE 4 /* strptime */ + #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + * of the above define on + * features.h/unistd.h syscall() */ + #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ + #define _DARWIN_C_SOURCE 1 + + #define _SVID_SOURCE 1 /* timegm for old glib */ +#else + #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif -#define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ -#define _SVID_SOURCE 1 /* timegm */ -#define _DEFAULT_SOURCE 1 /* _SVID_SOURCE is deprecated */ -#include <strings.h> #include <time.h> + +#include <strings.h> #include <string.h> #include <stdlib.h> #include <stdio.h>

7 years

Errored: sergey-safarov/kamailio#31 (master - 9826158)

by Travis CI

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #31 Status: Errored Duration: 38 seconds Commit: 9826158 (master) Author: Sergey Safarov Message: pkg/docker: Updated reference to docker scripts View the changeset: https://github.com/sergey-safarov/kamailio/compare/2980674f86b4...982615820… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/307225932?utm_source=e… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years

add_contact_alias(0) is proto differs

by Juha Heinanen

Currently add_contact_alias() works like this: Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter is only added if received ip and port differ from those in contact URI. Now I noticed that a broken UA does not add a proper ;transport param to contact uri and therefore received transport does not match contact uri transport. Therefore transport proto does not match, but ip and port do match. It would be useful is add_contact_alias() would add ;alias param also if transports do not match. Is it OK if I make the change? After that README would read: Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter is only added if received ip, port, and transport protocol differ from those in contact URI. -- Juha

7 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017