sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

[kamailio/kamailio] db_unixodbc: added support for async queries (#1311)

by Federico Cabiddu

#### 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) - [ X] 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 Add async queries support to db_unixodbc through the core async framework. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1311 -- Commit Summary -- * db_unixodbc: added support for async queries -- File Changes -- M src/modules/db_unixodbc/db_unixodbc.c (4) M src/modules/db_unixodbc/dbase.c (88) M src/modules/db_unixodbc/dbase.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1311.patch https://github.com/kamailio/kamailio/pull/1311.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/1311

7 years

git:master:550cb6f7: Merge pull request #1310 from kamailio/cchance/registrar

by GitHub

Module: kamailio Branch: master Commit: 550cb6f775af01b29b38a8fbddfd5d01bf0983f5 URL: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-12T12:01:57+01:00 Merge pull request #1310 from kamailio/cchance/registrar registrar: added server_id to ulc pv attributes --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… Patch: https://github.com/kamailio/kamailio/commit/550cb6f775af01b29b38a8fbddfd5d0… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 00b68018b8..6db4de5aed 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1598,7 +1598,11 @@ event_route[usrloc:contact-expired] { <listitem> <para><emphasis>conid</emphasis> - TCP socket internal connection ID ($null if UDP) </para> - </listitem> + </listitem> + <listitem> + <para><emphasis>server_id</emphasis> - server_id value + </para> + </listitem> </itemizedlist> <para> The pseudo-variable accepts positive index value to access diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index e90625cdc4..b6fad8856f 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -273,6 +273,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, if (c->sock && (c->sock->proto == PROTO_TCP || c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto == PROTO_WSS)) return pv_get_sintval(msg, param, res, c->tcpconn_id); break; + case 22: /* server_id */ + return pv_get_uintval(msg, param, res, c->server_id); + break; } return pv_get_null(msg, param, res); @@ -400,6 +403,10 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 20; else goto error; break; + case 9: + if(strncmp(pa.s, "server_id", 9)==0) + rp->attr = 22; + break; case 10: if(strncmp(pa.s, "user_agent", 10)==0) rp->attr = 12;

7 years

git:master:616a89f2: registrar: added server_id to pv attributes

by Charles Chance

Module: kamailio Branch: master Commit: 616a89f281bfe77c4d31719dc3d7bd27de5c6bac URL: https://github.com/kamailio/kamailio/commit/616a89f281bfe77c4d31719dc3d7bd2… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-10T13:52:01Z registrar: added server_id to pv attributes --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/616a89f281bfe77c4d31719dc3d7bd2… Patch: https://github.com/kamailio/kamailio/commit/616a89f281bfe77c4d31719dc3d7bd2… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 00b68018b8..6db4de5aed 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1598,7 +1598,11 @@ event_route[usrloc:contact-expired] { <listitem> <para><emphasis>conid</emphasis> - TCP socket internal connection ID ($null if UDP) </para> - </listitem> + </listitem> + <listitem> + <para><emphasis>server_id</emphasis> - server_id value + </para> + </listitem> </itemizedlist> <para> The pseudo-variable accepts positive index value to access diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index e90625cdc4..b6fad8856f 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -273,6 +273,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, if (c->sock && (c->sock->proto == PROTO_TCP || c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto == PROTO_WSS)) return pv_get_sintval(msg, param, res, c->tcpconn_id); break; + case 22: /* server_id */ + return pv_get_uintval(msg, param, res, c->server_id); + break; } return pv_get_null(msg, param, res); @@ -400,6 +403,10 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 20; else goto error; break; + case 9: + if(strncmp(pa.s, "server_id", 9)==0) + rp->attr = 22; + break; case 10: if(strncmp(pa.s, "user_agent", 10)==0) rp->attr = 12;

7 years

[kamailio/kamailio] registrar: added server_id to ulc pv attributes (#1310)

by Charles Chance

#### 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/1310 -- Commit Summary -- * registrar: added server_id to pv attributes -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (6) M src/modules/registrar/regpv.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1310.patch https://github.com/kamailio/kamailio/pull/1310.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/1310

7 years

git:master:0facb02d: Merge pull request #1309 from kamailio/cchance/usrloc

by GitHub

Module: kamailio Branch: master Commit: 0facb02ddecee62ab31ba9bebdc9980e08294049 URL: https://github.com/kamailio/kamailio/commit/0facb02ddecee62ab31ba9bebdc9980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-12T12:01:33+01:00 Merge pull request #1309 from kamailio/cchance/usrloc usrloc: copy server_id when updating contact in memory --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/0facb02ddecee62ab31ba9bebdc9980… Patch: https://github.com/kamailio/kamailio/commit/0facb02ddecee62ab31ba9bebdc9980… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 54cac0e4e0..a43c5c6c00 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -308,6 +308,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->server_id = _ci->server_id; _c->tcpconn_id = _ci->tcpconn_id; return 0;

7 years

git:master:282cb439: usrloc: copy server_id when updating contact in memory

by Charles Chance

Module: kamailio Branch: master Commit: 282cb4395b5c31476f97a168f509b2904727e88a URL: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b29… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-09T15:11:03Z usrloc: copy server_id when updating contact in memory --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b29… Patch: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b29… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 54cac0e4e0..a43c5c6c00 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -308,6 +308,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->server_id = _ci->server_id; _c->tcpconn_id = _ci->tcpconn_id; return 0;

7 years

git:master:3177a6fe: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3177a6fe5497fd0e0c0fc736e641f6e1e02853d0 URL: https://github.com/kamailio/kamailio/commit/3177a6fe5497fd0e0c0fc736e641f6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-11T11:01:33+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/3177a6fe5497fd0e0c0fc736e641f6e… Patch: https://github.com/kamailio/kamailio/commit/3177a6fe5497fd0e0c0fc736e641f6e… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index be0e9ec61a..7e4f706c1a 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -51,11 +51,12 @@ Muhammad Shahzad Shafi 5. RPC Commands - 5.1. corex.list_sockets - 5.2. corex.list_aliases - 5.3. corex.shm_status - 5.4. corex.shm_summary - 5.5. corex.pkg_summary + 5.1. corex.debug + 5.2. corex.list_sockets + 5.3. corex.list_aliases + 5.4. corex.shm_status + 5.5. corex.shm_summary + 5.6. corex.pkg_summary 6. Event Routes @@ -113,11 +114,12 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. corex.list_sockets - 5.2. corex.list_aliases - 5.3. corex.shm_status - 5.4. corex.shm_summary - 5.5. corex.pkg_summary + 5.1. corex.debug + 5.2. corex.list_sockets + 5.3. corex.list_aliases + 5.4. corex.shm_status + 5.5. corex.shm_summary + 5.6. corex.pkg_summary 6. Event Routes @@ -386,41 +388,52 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } 5. RPC Commands - 5.1. corex.list_sockets - 5.2. corex.list_aliases - 5.3. corex.shm_status - 5.4. corex.shm_summary - 5.5. corex.pkg_summary + 5.1. corex.debug + 5.2. corex.list_sockets + 5.3. corex.list_aliases + 5.4. corex.shm_status + 5.5. corex.shm_summary + 5.6. corex.pkg_summary -5.1. corex.list_sockets +5.1. corex.debug + + Set or get the global log level (the value for global parameter + 'debug'). To set the debug, provide an integer parameter. If no + parameter is provided, then the current value is returned. + + Example: + kamcmd corex.debug + kamcmd corex.debug 2 + +5.2. corex.list_sockets Print the list of sockets the application is listening on. Example: kamcmd corex.list_sockets -5.2. corex.list_aliases +5.3. corex.list_aliases Print the list of hostname aliases used to match the myself condition. Example: kamcmd corex.list_aliases -5.3. corex.shm_status +5.4. corex.shm_status Trigger shm status dump to syslog. Example: kamcmd corex.shm_status -5.4. corex.shm_summary +5.5. corex.shm_summary Trigger shm summary dump to syslog. Example: kamcmd corex.shm_summary -5.5. corex.pkg_summary +5.6. corex.pkg_summary Trigger pkg summary dump to syslog for a specific pid or process index. It has two parameters: first to specify what matching type is desired

7 years

git:master:dfbffd71: corex: documentation for corex.debug rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dfbffd71ed01fe72022babd3836966299283994b URL: https://github.com/kamailio/kamailio/commit/dfbffd71ed01fe72022babd38369662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-11T08:14:37+01:00 corex: documentation for corex.debug rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dfbffd71ed01fe72022babd38369662… Patch: https://github.com/kamailio/kamailio/commit/dfbffd71ed01fe72022babd38369662… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index cc424367d9..2a83f2cd2e 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -414,6 +414,23 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } <section> <title>RPC Commands</title> + <section id="corex.rpc.debug"> + <title> + <function moreinfo="none">corex.debug</function> + </title> + <para> + Set or get the global log level (the value for global parameter + 'debug'). To set the debug, provide an integer parameter. If + no parameter is provided, then the current value is returned. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcmd; corex.debug + &kamcmd; corex.debug 2 + </programlisting> + </section> <section id="corex.rpc.list_sockets"> <title> <function moreinfo="none">corex.list_sockets</function>

7 years

git:master:05f388ad: corex: rpc command to control debug level

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 05f388adf04060978b995bdc83605d2faf2359f5 URL: https://github.com/kamailio/kamailio/commit/05f388adf04060978b995bdc83605d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-11T08:08:40+01:00 corex: rpc command to control debug level - corex.debug - get the equivalent for former mi command --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/05f388adf04060978b995bdc83605d2… Patch: https://github.com/kamailio/kamailio/commit/05f388adf04060978b995bdc83605d2… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index d9ee4eac3c..e113f53e96 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -224,6 +224,59 @@ static void corex_rpc_pkg_summary(rpc_t* rpc, void* c) } } +static const char* corex_rpc_debug_doc[2] = { + "Control the global level of debug", + 0 +}; + +/* + * RPC command to dump shm summary to syslog + */ +static void corex_rpc_debug(rpc_t* rpc, void* ctx) +{ + int newdbg = 0; + int olddbg = 0; + int setdbg = 0; + str gname = {"core", 4}; + str vname = {"debug", 5}; + void *vval = 0; + unsigned int vtype; + void* th; + + if (rpc->scan(ctx, "*d", &newdbg) == 1) { + setdbg = 1; + } + if(cfg_get_by_name(_cfg_corex_ctx, &gname, NULL /* group id */, + &vname, &vval, &vtype)!=0) { + rpc->fault(ctx, 500, "Operation failed"); + return; + } + olddbg = (int)(long)vval; + if(setdbg==1) { + cfg_set_now(_cfg_corex_ctx, &gname, NULL /* group id */, &vname, + (void *)(long)newdbg, CFG_VAR_INT); + } + /* add structure node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Failed creating response"); + return; + } + if(setdbg==1) { + if(rpc->struct_add(th, "dd", + "old", olddbg, + "new", newdbg)<0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } + } else { + if(rpc->struct_add(th, "d", + "debug", olddbg)<0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } + } +} + rpc_export_t corex_rpc_cmds[] = { {"corex.list_sockets", corex_rpc_list_sockets, corex_rpc_list_sockets_doc, RET_ARRAY}, @@ -235,6 +288,8 @@ rpc_export_t corex_rpc_cmds[] = { corex_rpc_shm_summary_doc, 0}, {"corex.pkg_summary", corex_rpc_pkg_summary, corex_rpc_pkg_summary_doc, 0}, + {"corex.debug", corex_rpc_debug, + corex_rpc_debug_doc, 0}, {0, 0, 0, 0} };

7 years

git:master:2a80ed80: tm: use relayed_code for active type check in TMCB RESPONSE OUT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a80ed8030419ca15c4a954ea83531bb131e66b0 URL: https://github.com/kamailio/kamailio/commit/2a80ed8030419ca15c4a954ea83531b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-10T09:51:48+01:00 tm: use relayed_code for active type check in TMCB RESPONSE OUT - relayed_msg can be a fake reply and accessing the status field causes a crash (issue introduced by previous patch) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/2a80ed8030419ca15c4a954ea83531b… Patch: https://github.com/kamailio/kamailio/commit/2a80ed8030419ca15c4a954ea83531b… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e6bc4dbff1..ae6befd835 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1978,7 +1978,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ LOCK_REPLIES( t ); - if(relayed_msg->REPLY_STATUS==uas_rb->activ_type) { + if(relayed_code==uas_rb->activ_type) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, relayed_msg, TMCB_NONE_F); }

7 years

← Newer
1
...
34
35
36
37
38
39
40
...
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