sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:4.2:9524b347: db_text : missing OP_NEQ

by Luis Azedo

Module: kamailio Branch: 4.2 Commit: 9524b3471802c09361fd290cf35b2d5096ac0767 URL: https://github.com/kamailio/kamailio/commit/9524b3471802c09361fd290cf35b2d5… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-19T17:52:06Z db_text : missing OP_NEQ this affects the presence package when it queries for active_watchers (cherry picked from commit 5adbfc6cc62be393ac55d296cab79f7e60b17ae4) --- Modified: modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/9524b3471802c09361fd290cf35b2d5… Patch: https://github.com/kamailio/kamailio/commit/9524b3471802c09361fd290cf35b2d5… --- diff --git a/modules/db_text/dbt_res.c b/modules/db_text/dbt_res.c index c64a7f2..5eb75e8 100644 --- a/modules/db_text/dbt_res.c +++ b/modules/db_text/dbt_res.c @@ -208,6 +208,11 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, if(res!=0) return 0; }else{ + if(!strcmp(_op[i], OP_NEQ)) + { + if(res==0) + return 0; + }else{ if(!strcmp(_op[i], OP_LT)) { if(res!=-1) @@ -229,7 +234,7 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, return 0; }else{ return 0; - }}}}} + }}}}}} } return 1; }

9 years, 4 months

git:master:367887d6: Merge pull request #92 from kamailio/lazedo-patch-1

by lazedo

Module: kamailio Branch: master Commit: 367887d6437db5f1c5e70258d3838f3a2acbd084 URL: https://github.com/kamailio/kamailio/commit/367887d6437db5f1c5e70258d3838f3… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-02-19T17:50:22Z Merge pull request #92 from kamailio/lazedo-patch-1 db_text : missing OP_NEQ --- Modified: modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/367887d6437db5f1c5e70258d3838f3… Patch: https://github.com/kamailio/kamailio/commit/367887d6437db5f1c5e70258d3838f3… --- diff --git a/modules/db_text/dbt_res.c b/modules/db_text/dbt_res.c index f115992..bff71b0 100644 --- a/modules/db_text/dbt_res.c +++ b/modules/db_text/dbt_res.c @@ -208,6 +208,11 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, if(res!=0) return 0; }else{ + if(!strcmp(_op[i], OP_NEQ)) + { + if(res==0) + return 0; + }else{ if(!strcmp(_op[i], OP_LT)) { if(res!=-1) @@ -229,7 +234,7 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, return 0; }else{ return 0; - }}}}} + }}}}}} } return 1; }

9 years, 4 months

git:master:5adbfc6c: db_text : missing OP_NEQ

by lazedo

Module: kamailio Branch: master Commit: 5adbfc6cc62be393ac55d296cab79f7e60b17ae4 URL: https://github.com/kamailio/kamailio/commit/5adbfc6cc62be393ac55d296cab79f7… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-02-18T23:01:57Z db_text : missing OP_NEQ this affects the presence package when it queries for active_watchers --- Modified: modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/5adbfc6cc62be393ac55d296cab79f7… Patch: https://github.com/kamailio/kamailio/commit/5adbfc6cc62be393ac55d296cab79f7… --- diff --git a/modules/db_text/dbt_res.c b/modules/db_text/dbt_res.c index f115992..bff71b0 100644 --- a/modules/db_text/dbt_res.c +++ b/modules/db_text/dbt_res.c @@ -208,6 +208,11 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, if(res!=0) return 0; }else{ + if(!strcmp(_op[i], OP_NEQ)) + { + if(res==0) + return 0; + }else{ if(!strcmp(_op[i], OP_LT)) { if(res!=-1) @@ -229,7 +234,7 @@ int dbt_row_match(dbt_table_p _dtp, dbt_row_p _drp, int* _lkey, return 0; }else{ return 0; - }}}}} + }}}}}} } return 1; }

9 years, 4 months

[kamailio] db_text : missing OP_NEQ (#92)

by lazedo

this affects the presence package when it queries for active_watchers You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/92 -- Commit Summary -- * db_text : missing OP_NEQ -- File Changes -- M modules/db_text/dbt_res.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/92.patch https://github.com/kamailio/kamailio/pull/92.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/92

9 years, 4 months

git:master:d5ac2a0b: tcpops: check protocol of current message

by Camille Oudot

Module: kamailio Branch: master Commit: d5ac2a0b21c51f0759c16ff39e6d28e1bc8730d7 URL: https://github.com/kamailio/kamailio/commit/d5ac2a0b21c51f0759c16ff39e6d28e… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-19T18:18:57+01:00 tcpops: check protocol of current message --- Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5ac2a0b21c51f0759c16ff39e6d28e… Patch: https://github.com/kamailio/kamailio/commit/d5ac2a0b21c51f0759c16ff39e6d28e… --- diff --git a/modules/tcpops/tcpops_mod.c b/modules/tcpops/tcpops_mod.c index 49c92a6..d4b90c4 100644 --- a/modules/tcpops/tcpops_mod.c +++ b/modules/tcpops/tcpops_mod.c @@ -45,15 +45,15 @@ static int w_tcp_keepalive_enable3(sip_msg_t* msg, char* idle, char *cnt, char * static int w_tcp_keepalive_disable1(sip_msg_t* msg, char* con); static int w_tcp_keepalive_disable0(sip_msg_t* msg); -static int fixup_tcp_keepalive_numpv(void** param, int param_no); +static int fixup_numpv(void** param, int param_no); static cmd_export_t cmds[]={ - {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, fixup_tcp_keepalive_numpv, + {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, fixup_numpv, 0, ANY_ROUTE}, - {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, fixup_tcp_keepalive_numpv, + {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, fixup_tcp_keepalive_numpv, + {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, fixup_numpv, 0, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, @@ -148,7 +148,13 @@ static int w_tcp_keepalive_enable3(sip_msg_t* msg, char* idle, char *cnt, char * { int fd; - if (msg == NULL) { + if (unlikely(msg == NULL)) { + return -1; + } + + if(unlikely(msg->rcv.proto != PROTO_TCP && msg->rcv.proto != PROTO_TLS && msg->rcv.proto != PROTO_WS && msg->rcv.proto != PROTO_WSS)) + { + LM_ERR("the current message does not come from a TCP connection\n"); return -1; } @@ -188,9 +194,15 @@ static int w_tcp_keepalive_disable0(sip_msg_t* msg) { int fd; - if (msg == NULL) + if (unlikely(msg == NULL)) return -1; + if(unlikely(msg->rcv.proto != PROTO_TCP && msg->rcv.proto != PROTO_TLS && msg->rcv.proto != PROTO_WS && msg->rcv.proto != PROTO_WSS)) + { + LM_ERR("the current message does not come from a TCP connection\n"); + return -1; + } + if (!tcpops_get_current_fd(msg->rcv.proto_reserved1, &fd)) { return -1; } @@ -201,7 +213,7 @@ static int w_tcp_keepalive_disable0(sip_msg_t* msg) /** * */ -static int fixup_tcp_keepalive_numpv(void** param, int param_no) +static int fixup_numpv(void** param, int param_no) { return fixup_igp_null(param, 1); }

9 years, 4 months

git:master:1dbcc939: Merge pull request #93 from tsearle/master

by tsearle

Module: kamailio Branch: master Commit: 1dbcc93952db87fb158886b05b03f82626ff933c URL: https://github.com/kamailio/kamailio/commit/1dbcc93952db87fb158886b05b03f82… Author: tsearle <tsearle(a)gmail.com> Committer: tsearle <tsearle(a)gmail.com> Date: 2015-02-19T10:24:43+01:00 Merge pull request #93 from tsearle/master modules/sipt: added the ability to modify the first byte of Backwards Call Indication Parameters --- Modified: modules/sipt/README Modified: modules/sipt/doc/sipt_admin.xml Modified: modules/sipt/sipt.c Modified: modules/sipt/ss7.h Modified: modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/1dbcc93952db87fb158886b05b03f82… Patch: https://github.com/kamailio/kamailio/commit/1dbcc93952db87fb158886b05b03f82…

9 years, 4 months

git:master:059c9a33: modules/sipt: fix example values in documentation

by Torrey Searle

Module: kamailio Branch: master Commit: 059c9a33fd451b59b83f913f86a0843e2c5bbefa URL: https://github.com/kamailio/kamailio/commit/059c9a33fd451b59b83f913f86a0843… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: 2015-02-19T09:24:37+01:00 modules/sipt: fix example values in documentation --- Modified: modules/sipt/README Modified: modules/sipt/doc/sipt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/059c9a33fd451b59b83f913f86a0843… Patch: https://github.com/kamailio/kamailio/commit/059c9a33fd451b59b83f913f86a0843… --- diff --git a/modules/sipt/README b/modules/sipt/README index 2fd94bc..5e33c7c 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -135,8 +135,8 @@ e2e_indicator) Example 1.2. sipt_destination(destination, hops, nai) usage ... -# set bci for e2e internetworking, and no charging -sipt_set_bci_1("0", "0", "0", "1"); +# set bci for charging, subscriber free, ordinary, no e2e available +sipt_set_bci_1("2", "1", "1", "0"); ... 3.3. sipt_set_calling(origin, nai, presentation, screening) diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 8ef065f..42e329c 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -68,8 +68,8 @@ sipt_destination($rU, 31, 4); <title><function moreinfo="none">sipt_destination(destination, hops, nai)</function> usage</title> <programlisting format="linespecific"> ... -# set bci for e2e internetworking, and no charging -sipt_set_bci_1("0", "0", "0", "1"); +# set bci for charging, subscriber free, ordinary, no e2e available +sipt_set_bci_1("2", "1", "1", "0"); ... </programlisting> </example>

9 years, 4 months

git:master:a7f8ee27: add ability to modify BCI header

by Torrey Searle

Module: kamailio Branch: master Commit: a7f8ee271acca095fa6a7c2dddf0dcba62102efd URL: https://github.com/kamailio/kamailio/commit/a7f8ee271acca095fa6a7c2dddf0dcb… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: 2015-02-18T20:48:11+01:00 add ability to modify BCI header --- Modified: modules/sipt/README Modified: modules/sipt/doc/sipt_admin.xml Modified: modules/sipt/sipt.c Modified: modules/sipt/ss7.h Modified: modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/a7f8ee271acca095fa6a7c2dddf0dcb… Patch: https://github.com/kamailio/kamailio/commit/a7f8ee271acca095fa6a7c2dddf0dcb…

9 years, 4 months

[kamailio] added the ability to modify the first byte of Backwards Call Indication Parameters (#93)

by tsearle

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/93 -- Commit Summary -- * add ability to modify BCI header * modules/sipt: fix example values in documentation -- File Changes -- M modules/sipt/README (61) M modules/sipt/doc/sipt_admin.xml (18) M modules/sipt/sipt.c (70) M modules/sipt/ss7.h (1) M modules/sipt/ss7_parser.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/93.patch https://github.com/kamailio/kamailio/pull/93.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/93

9 years, 4 months

git:master:3be5902a: pv: fixed the definition of the new $sut variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3be5902a697caca2dd70fae2e17a1e0acb87c089 URL: https://github.com/kamailio/kamailio/commit/3be5902a697caca2dd70fae2e17a1e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-19T09:36:57+01:00 pv: fixed the definition of the new $sut variable - reported by Luis Azedo --- Modified: modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/3be5902a697caca2dd70fae2e17a1e0… Patch: https://github.com/kamailio/kamailio/commit/3be5902a697caca2dd70fae2e17a1e0… --- diff --git a/modules/pv/pv.c b/modules/pv/pv.c index af9728f..2f99a53 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -381,7 +381,7 @@ static pv_export_t mod_pvs[] = { {{"td", (sizeof("td")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, - {{"su", (sizeof("sut")-1)}, /* */ + {{"sut", (sizeof("sut")-1)}, /* */ PVT_OTHER, pv_get_srcaddr_uri_full, 0, 0, 0, 0, 0}, {{"to.domain", (sizeof("to.domain")-1)}, /* */

9 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015