sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:caefbb2c: modules: readme files regenerated - cfgt ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: caefbb2c97eed2313d5cca95fa7a510a96237377 URL: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-07T17:31:39+02:00 modules: readme files regenerated - cfgt ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Patch: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index eb4ead159c..c237d1e9d1 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -74,7 +74,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * pv. 2.2. External Libraries or Applications

6 years, 6 months

[kamailio/kamailio] cfgt: wrong route name if onsend_route is not declared at the beginning (#1536)

by Marco Capetta

kamailio version: kamailio 5.1.2 (x86_64/linux) If "onsend_route" routing block is defined at the beginning of the kamailio.cfg routing part, the name defined in "src/core/cfg.lex" file (DEFAULT_SEND) is used when printed in the json files. Instead, if this routing block is defined in between the configuration, its name is changed to the previous defined block. For example, if the cfg file looks like the following: route[TEST_1] { ... } onsend_route { ... } route[TEST_2] { ... } then in the output json file, the "onsend_route" block is called TEST_1. The issue doesn't happen for "request_route" block. -- 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/1536

6 years, 6 months

git:master:7d217232: cfgt: documment that pv module has to be loaded in order to work

by Victor Seva

Module: kamailio Branch: master Commit: 7d21723205ad02374364c3f0143b618d1a649d4d URL: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:16:16+02:00 cfgt: documment that pv module has to be loaded in order to work --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Patch: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index ce6fb16c4f..c85cae4335 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

6 years, 6 months

git:master:92f8fdab: core: unset routename when default_routename is set

by Victor Seva

Module: kamailio Branch: master Commit: 92f8fdabcffd84e315d749bae8ded3490f8de014 URL: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:15:48+02:00 core: unset routename when default_routename is set fix #1536 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Patch: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 192b488938..ddef8a03ea 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -569,23 +569,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

6 years, 6 months

git:master:513a1763: dispatcher: print runtime details in rpc command output

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 513a176394247a3378ee218bf9df611da7296061 URL: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T13:05:04+02:00 dispatcher: print runtime details in rpc command output - contains dialog loads per destination if the call load algorithm is enabled --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Patch: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index bcb085c624..72aa94d1e2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1282,7 +1282,8 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) void *sh; void *vh; void *wh; - void *lh; // latency stats handle + void *lh; + void *dh; int j; char c[3]; str data = STR_NULL; @@ -1327,23 +1328,22 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) c[1] = 'X'; if(node->dlist[j].attrs.body.s) { - if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority, "ATTRS", &wh) - < 0) { + if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, + "FLAGS", c, + "PRIORITY", node->dlist[j].priority, + "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddS", "BODY", - &(node->dlist[j].attrs.body), "DUID", - (node->dlist[j].attrs.duid.s) - ? &(node->dlist[j].attrs.duid) - : &data, - "MAXLOAD", node->dlist[j].attrs.maxload, "WEIGHT", - node->dlist[j].attrs.weight, "RWEIGHT", - node->dlist[j].attrs.rweight, "SOCKET", - (node->dlist[j].attrs.socket.s) - ? &(node->dlist[j].attrs.socket) - : &data) + if(rpc->struct_add(wh, "SSdddS", + "BODY", &(node->dlist[j].attrs.body), + "DUID", (node->dlist[j].attrs.duid.s) + ? &(node->dlist[j].attrs.duid) : &data, + "MAXLOAD", node->dlist[j].attrs.maxload, + "WEIGHT", node->dlist[j].attrs.weight, + "RWEIGHT", node->dlist[j].attrs.rweight, + "SOCKET", (node->dlist[j].attrs.socket.s) + ? &(node->dlist[j].attrs.socket) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; @@ -1371,6 +1371,16 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return -1; } } + if (ds_hash_size>0) { + if(rpc->struct_add(vh, "{", "RUNTIME", &dh) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime struct"); + return -1; + } + if (rpc->struct_add(dh, "d", "DLGLOAD", node->dlist[j].dload) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime attrs"); + return -1; + } + } } return 0;

6 years, 6 months

git:master:20eb9951: Merge pull request #1555 from sergey-safarov/my-master

by GitHub

Module: kamailio Branch: master Commit: 20eb9951a574a5ef3163d975bd0c360471d09180 URL: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-07T12:44:53+02:00 Merge pull request #1555 from sergey-safarov/my-master pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Patch: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360…

6 years, 6 months

git:master:8a274cb4: pkg/kamailio/centos: Removed not updated packaging files

by Sergey Safarov

Module: kamailio Branch: master Commit: 8a274cb474799428b4ec838da53000fedd16abd8 URL: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-06-07T09:51:19Z pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Patch: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f…

6 years, 6 months

[kamailio/kamailio] pkg/kamailio/centos: Removed not updated packaging files (#1555)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1555 -- Commit Summary -- * pkg/kamailio/centos: Removed not updated packaging files -- File Changes -- D pkg/kamailio/centos/6/README (29) D pkg/kamailio/centos/6/kamailio.init (134) D pkg/kamailio/centos/6/kamailio.spec (1279) D pkg/kamailio/centos/6/kamailio.sysconfig (30) D pkg/kamailio/centos/7/README (16) D pkg/kamailio/centos/7/kamailio.init (141) D pkg/kamailio/centos/7/kamailio.service (27) D pkg/kamailio/centos/7/kamailio.spec (1468) D pkg/kamailio/centos/7/kamailio.sysconfig (30) D pkg/kamailio/centos/7/kamailio.tmpfiles (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1555.patch https://github.com/kamailio/kamailio/pull/1555.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/1555

6 years, 6 months

git:master:f5792d1c: core: new rpc command - core.ppdefines_full

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5792d1c61702526f6382d4250c16ba0deacff6f URL: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T12:40:13+02:00 core: new rpc command - core.ppdefines_full - print preprocess defines with their details --- Modified: src/core/cfg.lex Modified: src/core/core_cmd.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Patch: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 65507e7dfb..192b488938 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1724,6 +1724,13 @@ str* pp_get_define_name(int idx) return &pp_defines[idx].name; } +ksr_ppdefine_t* pp_get_define(int idx) +{ + if(idx<0 || idx>=pp_num_defines) + return NULL; + return &pp_defines[idx]; +} + static int pp_lookup(int len, const char * text) { str var = {(char *)text, len}; @@ -1768,7 +1775,7 @@ int pp_define(int len, const char * text) pp_defines[ppos].value.len = 0; pp_defines[ppos].value.s = NULL; } - pp_defines[ppos].type = pp_define_type; + pp_defines[ppos].dtype = pp_define_type; return 0; } else { LM_CRIT("already defined: %.*s\n", len, text); @@ -1786,7 +1793,7 @@ int pp_define(int len, const char * text) pp_defines[pp_num_defines].name.s[len] = '\0'; pp_defines[pp_num_defines].value.len = 0; pp_defines[pp_num_defines].value.s = NULL; - pp_defines[pp_num_defines].type = pp_define_type; + pp_defines[pp_num_defines].dtype = pp_define_type; pp_define_index = pp_num_defines; pp_num_defines++; diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 4dc5554671..d1ceb88cef 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -998,6 +998,44 @@ static void core_ppdefines(rpc_t* rpc, void* c) } } +/** + * + */ +static const char* core_ppdefines_full_doc[] = { + "List preprocessor defines with full details", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list listen sockets for SIP server + */ +static void core_ppdefines_full(rpc_t* rpc, void* c) +{ + ksr_ppdefine_t *ppdef; + void *vp; + int i=0; + + while((ppdef=pp_get_define(i))!=NULL && ppdef->name.s!=NULL) { + if (rpc->add(c, "{", &vp) < 0) { + rpc->fault(c, 500, "Server Failure"); + return; + } + if(ppdef->value.s!=NULL) { + rpc->struct_add(vp, "SdS", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", &ppdef->value); + } else { + rpc->struct_add(vp, "Sds", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", "none"); + } + + i++; + } +} + /* * RPC Methods exported by core */ @@ -1036,6 +1074,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index c28258b71f..5524b9fd58 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -28,10 +28,11 @@ typedef struct ksr_ppdefine { str name; str value; - int type; + int dtype; } ksr_ppdefine_t; str* pp_get_define_name(int idx); +ksr_ppdefine_t* pp_get_define(int idx); int pp_subst_add(char *data); int pp_substdef_add(char *data, int mode);

6 years, 6 months

git:master:c33cb7af: core: use a structure for preprocessor defines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c33cb7afd02b1ee92e462574ba54b671895ee8c0 URL: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T11:58:08+02:00 core: use a structure for preprocessor defines - used to be an array of two str - store type of define operation in structure --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67… Patch: https://github.com/kamailio/kamailio/commit/c33cb7afd02b1ee92e462574ba54b67…

6 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
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