sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:5.1:f0395bf2: xhttp_rpc: fix array printing

by Ovidiu Sas

Module: kamailio Branch: 5.1 Commit: f0395bf20816a96f688643d61a4b19706624db78 URL: https://github.com/kamailio/kamailio/commit/f0395bf20816a96f688643d61a4b197… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-11-16T10:33:20-05:00 xhttp_rpc: fix array printing (cherry picked from commit 41754b645f986175f3385498057bae8bd33646af) --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f0395bf20816a96f688643d61a4b197… Patch: https://github.com/kamailio/kamailio/commit/f0395bf20816a96f688643d61a4b197… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 4e3c62e474..0298b6ecb3 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -564,6 +564,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"); @@ -670,8 +726,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; @@ -866,4 +921,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_xhttp_rpc_exports); return 0; -} \ No newline at end of file +} +

7 years, 1 month

git:master:41754b64: xhttp_rpc: fix array printing

by Ovidiu Sas

Module: kamailio Branch: master Commit: 41754b645f986175f3385498057bae8bd33646af URL: https://github.com/kamailio/kamailio/commit/41754b645f986175f3385498057bae8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-11-16T09:54:08-05:00 xhttp_rpc: fix array printing --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/41754b645f986175f3385498057bae8… Patch: https://github.com/kamailio/kamailio/commit/41754b645f986175f3385498057bae8… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 4e3c62e474..0298b6ecb3 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -564,6 +564,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"); @@ -670,8 +726,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; @@ -866,4 +921,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_xhttp_rpc_exports); return 0; -} \ No newline at end of file +} +

7 years, 1 month

git:master:b83de84e: modules: readme files regenerated - drouting ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b83de84e8bbbf5e73c96d8648d313dc0444f75e4 URL: https://github.com/kamailio/kamailio/commit/b83de84e8bbbf5e73c96d8648d313dc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-16T15:46:37+01:00 modules: readme files regenerated - drouting ... [skip ci] --- Modified: src/modules/drouting/README --- Diff: https://github.com/kamailio/kamailio/commit/b83de84e8bbbf5e73c96d8648d313dc… Patch: https://github.com/kamailio/kamailio/commit/b83de84e8bbbf5e73c96d8648d313dc… --- diff --git a/src/modules/drouting/README b/src/modules/drouting/README index 8e45c5ecf1..b07550a069 100644 --- a/src/modules/drouting/README +++ b/src/modules/drouting/README @@ -295,7 +295,8 @@ Chapter 1. Admin Guide Each user must be member of only one routing group. It must be specified in user's profile. b. prefix column - Destination URI must start with prefix value to match the rule. + Destination URI must start with prefix value to match the rule. The + prefix value can contain only digits (0..9), '+', '*' or '#'. c. time rec column A date-time expression that defines the time recurrence to match for current rule. Time recurrences are based closely on the

7 years, 1 month

git:master:8a40437e: drouting: note in docs about supported characters in prefix values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a40437e54d9a5f2e3141c3434fd672a9f2d0e13 URL: https://github.com/kamailio/kamailio/commit/8a40437e54d9a5f2e3141c3434fd672… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-16T15:43:46+01:00 drouting: note in docs about supported characters in prefix values - these are the digits (0..9), +, * and # --- Modified: src/modules/drouting/doc/drouting_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a40437e54d9a5f2e3141c3434fd672… Patch: https://github.com/kamailio/kamailio/commit/8a40437e54d9a5f2e3141c3434fd672… --- diff --git a/src/modules/drouting/doc/drouting_admin.xml b/src/modules/drouting/doc/drouting_admin.xml index ddd0eb433a..ecdfdc3b7c 100644 --- a/src/modules/drouting/doc/drouting_admin.xml +++ b/src/modules/drouting/doc/drouting_admin.xml @@ -368,7 +368,8 @@ <emphasis>prefix column</emphasis> </para> <para> - Destination URI must start with prefix value to match the rule. + Destination URI must start with prefix value to match the rule. The prefix + value can contain only digits (0..9), '+', '*' or '#'. </para> </listitem> <listitem>

7 years, 1 month

git:master:e76a0acf: drouting: clang format the source code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e76a0acfccdd2a76252f220a2b530b19c5dfa1ba URL: https://github.com/kamailio/kamailio/commit/e76a0acfccdd2a76252f220a2b530b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-16T15:34:17+01:00 drouting: clang format the source code --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_load.h Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/drouting.c Modified: src/modules/drouting/parse.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/e76a0acfccdd2a76252f220a2b530b1… Patch: https://github.com/kamailio/kamailio/commit/e76a0acfccdd2a76252f220a2b530b1…

7 years, 1 month

git:master:2dd28a62: drouting: removed svn ids and history

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2dd28a6285b688606b69691d33000d30f877c9a4 URL: https://github.com/kamailio/kamailio/commit/2dd28a6285b688606b69691d33000d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-16T14:33:28+01:00 drouting: removed svn ids and history --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_load.h Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/drouting.c Modified: src/modules/drouting/parse.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/2dd28a6285b688606b69691d33000d3… Patch: https://github.com/kamailio/kamailio/commit/2dd28a6285b688606b69691d33000d3…

7 years, 1 month

[kamailio/kamailio] core: removing the condition for second record_route ipv6 header (#1314)

by Surendra Tiwari

#### 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/1314 -- Commit Summary -- * core: removing the condition for second record_route ipv6 header -- File Changes -- M src/core/msg_translator.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1314.patch https://github.com/kamailio/kamailio/pull/1314.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/1314

7 years, 1 month

git:master:941490e8: modules: readme files regenerated - xcap_client ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 941490e86577a6125fda5499494a0a7d44e205c8 URL: https://github.com/kamailio/kamailio/commit/941490e86577a6125fda5499494a0a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-15T09:01:50+01:00 modules: readme files regenerated - xcap_client ... [skip ci] --- Modified: src/modules/xcap_client/README --- Diff: https://github.com/kamailio/kamailio/commit/941490e86577a6125fda5499494a0a7… Patch: https://github.com/kamailio/kamailio/commit/941490e86577a6125fda5499494a0a7… --- diff --git a/src/modules/xcap_client/README b/src/modules/xcap_client/README index c61e6f640f..be340df07a 100644 --- a/src/modules/xcap_client/README +++ b/src/modules/xcap_client/README @@ -28,12 +28,11 @@ Anca-Maria Vamanu 3.3. periodical_query(int) 3.4. query_period(int) - 4. Functions - 5. RPC Commands + 4. RPC Commands - 5.1. xcap_client.refreshXcapDoc + 4.1. xcap_client.refreshXcapDoc - 6. Remarks + 5. Remarks 2. Developer Guide @@ -66,12 +65,11 @@ Chapter 1. Admin Guide 3.3. periodical_query(int) 3.4. query_period(int) - 4. Functions - 5. RPC Commands + 4. RPC Commands - 5.1. xcap_client.refreshXcapDoc + 4.1. xcap_client.refreshXcapDoc - 6. Remarks + 5. Remarks 1. Overview @@ -171,15 +169,11 @@ modparam("xcap_client", "periodical_query", 0) modparam("xcap_client", "query_period", 50) ... -4. Functions +4. RPC Commands - None to be used in configuration file. + 4.1. xcap_client.refreshXcapDoc -5. RPC Commands - - 5.1. xcap_client.refreshXcapDoc - -5.1. xcap_client.refreshXcapDoc +4.1. xcap_client.refreshXcapDoc Management command that should be sent by an XCAP server when a stored document changes. @@ -197,7 +191,7 @@ kamcmd xcap_client.refreshXcapDoc /xcap-root/resource-lists/users/eyebeam/buddies-resource-list.xml 8000 ... -6. Remarks +5. Remarks Note: libcurl leak in CentOS 6 - this module uses libcurl library and in case if you are using CentOS 6, be aware that standard

7 years, 1 month

git:master:86cbc437: xcap_client: removed empty section for functions in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86cbc43788b140dbbd3f35c7245a81dcbfa2d291 URL: https://github.com/kamailio/kamailio/commit/86cbc43788b140dbbd3f35c7245a81d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-15T08:53:48+01:00 xcap_client: removed empty section for functions in docs --- Modified: src/modules/xcap_client/doc/xcap_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86cbc43788b140dbbd3f35c7245a81d… Patch: https://github.com/kamailio/kamailio/commit/86cbc43788b140dbbd3f35c7245a81d… --- diff --git a/src/modules/xcap_client/doc/xcap_client_admin.xml b/src/modules/xcap_client/doc/xcap_client_admin.xml index f080301419..681c004fb0 100644 --- a/src/modules/xcap_client/doc/xcap_client_admin.xml +++ b/src/modules/xcap_client/doc/xcap_client_admin.xml @@ -75,7 +75,7 @@ <section> <title>Parameters</title> - <section> + <section id="xcap_client.p.db_url"> <title><varname>db_url</varname>(str)</title> <para> The database url. @@ -93,7 +93,7 @@ modparam("xcap_client", "db_url", "&exampledb;") </programlisting> </example> </section> - <section> + <section id="xcap_client.p.xcap_table"> <title><varname>xcap_table</varname>(str)</title> <para> The name of the db table where XCAP documents are stored. @@ -111,7 +111,7 @@ modparam("xcap_client", "xcap_table", "xcaps") </programlisting> </example> </section> - <section> + <section id="xcap_client.p.peridical_query"> <title><varname>periodical_query</varname>(int)</title> <para> A flag to disable periodical query as an update method for @@ -136,7 +136,7 @@ modparam("xcap_client", "periodical_query", 0) </programlisting> </example> </section> - <section> + <section id="xcap_client.p.query_period"> <title><varname>query_period</varname>(int)</title> <para> Should be set if periodical query is not disabled. @@ -162,13 +162,6 @@ modparam("xcap_client", "query_period", 50) </section> <section> - <title>Functions</title> - <para> - None to be used in configuration file. - </para> -</section> - -<section> <title>RPC Commands</title> <section id="xcap_client.rpc.refreshXcapDoc"> <title>

7 years, 1 month

[kamailio/kamailio] app_sqlang: fix static make and gcc in Makefiles (#1204)

by Rick

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - app_sqlang now uses $(MAKE) and $(CC) variables in Makefiles, so it builds on systems with gnu make named different then make and compiles with different compiler than gcc You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1204 -- Commit Summary -- * app_sqlang: fix static make and gcc in Makefiles -- File Changes -- M src/modules/app_sqlang/Makefile (4) M src/modules/app_sqlang/squirrel/sqstdlib/Makefile (6) M src/modules/app_sqlang/squirrel/squirrel/Makefile (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1204.patch https://github.com/kamailio/kamailio/pull/1204.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/1204

7 years, 1 month

← Newer
1
...
28
29
30
31
32
33
34
...
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