sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

[kamailio/kamailio] Fix compiler warnings for unused static symbols (#1154)
by Corey Farrell 22 Jun '17

22 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1154 -- Commit Summary -- * Fix compiler warnings for unused static symbols -- File Changes -- M src/modules/carrierroute/cr_fifo.c (6) M src/modules/ims_auth/authorize.c (6) M src/modules/xhttp_pi/xhttp_pi_fnc.c (7) M src/modules/xhttp_rpc/xhttp_rpc_fnc.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1154.patch https://github.com/kamailio/kamailio/pull/1154.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/1154

2 2

git:master:ff4e81eb: xhttp_rpc: removed unused static constants
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: ff4e81eb977fbf6394cc53b4055a8b62efc5f4e4 URL: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:09:56+02:00 xhttp_rpc: removed unused static constants --- Modified: src/modules/xhttp_rpc/xhttp_rpc_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… Patch: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc_fnc.c b/src/modules/xhttp_rpc/xhttp_rpc_fnc.c index f9fa7d9343..835a14180d 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -171,9 +171,6 @@ static const str XHTTP_RPC_SLASH = str_init("/"); static const str XHTTP_RPC_SEMICOLON = str_init(": "); static const str XHTTP_RPC_NODE_INDENT = str_init("\t"); -static const str XHTTP_RPC_NODE_SEPARATOR = str_init(":: "); -static const str XHTTP_RPC_ATTR_SEPARATOR = str_init(" "); -static const str XHTTP_RPC_ATTR_VAL_SEPARATOR = str_init("="); const str XHTTP_RPC_BREAK = str_init("<br/>"); static const str XHTTP_RPC_CODE_1 = str_init("<pre>"); @@ -185,12 +182,6 @@ static const str XHTTP_RPC_Post_1 = str_init("\n"\ " <input type=\"submit\" value=\"Submit\"/>\n"\ " </form>\n"); -static const str XHTTP_RPC_Post_1a = str_init("\n"\ -" <form name=\"input\" method=\"get\">\n"\ -" <textarea name=\"arg\" rows=\"2\" cols=\"60\"></textarea>\n"\ -" <input type=\"submit\" value=\"Submit\"/>\n"\ -" </form>\n"); - static const str XHTTP_RPC_Response_Foot = str_init(\ "\n</center>\n<div align=\"center\" class=\"foot\" style=\"margin:20px auto\">"\ "<span style='margin-left:5px;'></span>"\

1 0

git:master:f885de1a: xhttp_pi: removed unused static constants
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: f885de1abcfe6ed2e981527dbbfd82f71e189be5 URL: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:08:52+02:00 xhttp_pi: removed unused static constants --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… Patch: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index e87beef406..1a26b6dba3 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -345,18 +345,11 @@ static const str XHTTP_PI_Response_Menu_Cmd_Table_2 = str_init("</tbody></table> static const str XHTTP_PI_NBSP = str_init(" "); static const str XHTTP_PI_SLASH = str_init("/"); -static const str XHTTP_PI_SEMICOLON = str_init(" : "); static const str XHTTP_PI_SQUOT_GT = str_init("'>"); -static const str XHTTP_PI_NODE_INDENT = str_init("\t"); -static const str XHTTP_PI_NODE_SEPARATOR = str_init(":: "); static const str XHTTP_PI_ATTR_SEPARATOR = str_init(" "); static const str XHTTP_PI_ATTR_VAL_SEPARATOR = str_init("="); -static const str XHTTP_PI_BREAK = str_init("<br/>"); -static const str XHTTP_PI_CODE_1 = str_init("<pre>"); -static const str XHTTP_PI_CODE_2 = str_init("</pre>"); - static const str XHTTP_PI_Post_Form_1 = str_init("\n"\ " <form name=\"input\" method=\"get\">\n" " <input type=hidden name=cmd value=\"on\">\n");

1 0

git:master:cc737b9d: ims_auth: removed empty get_ha1() static function
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: cc737b9d926aac26437ad37ba378012b60c9b494 URL: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:07:47+02:00 ims_auth: removed empty get_ha1() static function --- Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… Patch: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… --- diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 3b13a06565..260c65085e 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -155,12 +155,6 @@ unsigned char get_auth_scheme_type(str scheme) { return AUTH_UNKNOWN; } -static int get_ha1(struct username* _username, str* _domain, - const str* _table, char* _ha1, db1_res_t** res) { - - return 0; -} - /* * Authorize digest credentials */

1 0

git:master:e6aeda06: carrierroute: undefine code related to mi commands
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: e6aeda065cea8626ef5cd5fb7fee459b5ff43935 URL: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:05:36+02:00 carrierroute: undefine code related to mi commands - fixes compiler warnings for unused static symbols --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… Patch: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 8ae012333d..bab8bab41f 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -59,6 +59,7 @@ static unsigned int opt_settings[5][3] = { int fifo_err; +#ifdef MI_REMOVED static int updated; static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]); @@ -67,7 +68,6 @@ static int update_route_data(fifo_opt_t * opts); static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domain, fifo_opt_t * opts); -#ifdef MI_REMOVED static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, char *prefix); static struct mi_root* print_replace_help(void); @@ -75,6 +75,7 @@ static struct mi_root* print_replace_help(void); static struct mi_root* print_fifo_err(void); #endif +#ifdef MI_REMOVED static int str_toklen(str * str, const char * delims) { int len; @@ -94,6 +95,7 @@ static int str_toklen(str * str, const char * delims) return len; } +#endif #ifdef MI_REMOVED /** @@ -737,6 +739,7 @@ static int update_route_data(fifo_opt_t * opts) { #endif +#ifdef MI_REMOVED /** * Does the work for update_route_data by recursively * traversing the routing tree @@ -903,7 +906,6 @@ static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domai return 0; } -#ifdef MI_REMOVED /** * prints a short help text for fifo command usage */

1 0

git:master:5326e1fe: Merge pull request #1162 from SipSeb/master
by GitHub 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: 5326e1fe459983a32e62646c7bd8e6fc2d63f4f4 URL: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-22T22:02:42+02:00 Merge pull request #1162 from SipSeb/master app_lua: add "NOTICE" loglevel to sr.log --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… Patch: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d23ddaca70..f999de3e37 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -96,6 +96,8 @@ static int lua_sr_log (lua_State *L) LM_DBG("%s", txt); } else if(strcasecmp(level, "info")==0) { LM_INFO("%s", txt); + } else if(strcasecmp(level, "notice")==0) { + LM_NOTICE("%s", txt); } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) {

1 0

git:master:c2a27bc0: app_lua: add "NOTICE" loglevel to sr.log
by Sebastian Damm 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: c2a27bc0875aaaec877c75e9b50fbf41011918b1 URL: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Sebastian Damm <damm(a)sipgate.de> Date: 2017-06-22T16:22:49+02:00 app_lua: add "NOTICE" loglevel to sr.log --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… Patch: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d23ddaca70..f999de3e37 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -96,6 +96,8 @@ static int lua_sr_log (lua_State *L) LM_DBG("%s", txt); } else if(strcasecmp(level, "info")==0) { LM_INFO("%s", txt); + } else if(strcasecmp(level, "notice")==0) { + LM_NOTICE("%s", txt); } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) {

1 0

git:master:01afb3bb: pv: $siz - return source ip, with enclosing square brackets for ipv6
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: 01afb3bb1a06c929ffd5bd1f0aaee03df28764a0 URL: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T08:45:36+02:00 pv: $siz - return source ip, with enclosing square brackets for ipv6 --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… Patch: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index e9dc36c4d5..483faa2d19 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -396,6 +396,9 @@ static pv_export_t mod_pvs[] = { {{"si", (sizeof("si")-1)}, /* */ PVT_OTHER, pv_get_srcip, 0, 0, 0, 0, 0}, + {{"siz", (sizeof("siz")-1)}, /* */ + PVT_OTHER, pv_get_srcipz, 0, + 0, 0, 0, 0}, { {"sid", (sizeof("sid")-1)}, /* server id */ PVT_OTHER, pv_get_server_id, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c39f105852..acd9105cb2 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -665,6 +665,18 @@ int pv_get_srcip(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &s); } +int pv_get_srcipz(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str s; + if(msg==NULL) + return -1; + + s.s = ip_addr2strz(&msg->rcv.src_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); +} + int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 3a112a1e31..905fc89db5 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -127,6 +127,9 @@ int pv_get_callid(struct sip_msg *msg, pv_param_t *param, int pv_get_srcip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_srcipz(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a526764c: core: updated log macros for parse rpid
by Daniel-Constantin Mierla 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: a526764c65ffea767fecbb13021ba48304524882 URL: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-21T23:58:37+02:00 core: updated log macros for parse rpid --- Modified: src/core/parser/parse_rpid.c --- Diff: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… Patch: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… --- diff --git a/src/core/parser/parse_rpid.c b/src/core/parser/parse_rpid.c index 6dbb8ae57e..c9290e835f 100644 --- a/src/core/parser/parse_rpid.c +++ b/src/core/parser/parse_rpid.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -23,7 +23,7 @@ * * \ingroup parser */ - + #include "parse_from.h" #include "parse_to.h" #include <stdlib.h> @@ -33,7 +33,7 @@ #include "../ut.h" #include "../mem/mem.h" - + /*! \brief * This method is used to parse RPID header. * @@ -44,34 +44,34 @@ int parse_rpid_header( struct sip_msg *msg ) { struct to_body* rpid_b; - - if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) { - goto error; - } - - /* maybe the header is already parsed! */ - if (msg->rpid->parsed) - return 0; - - /* bad luck! :-( - we have to parse it */ - /* first, get some memory */ - rpid_b = pkg_malloc(sizeof(struct to_body)); - if (rpid_b == 0) { - LOG(L_ERR, "ERROR:parse_rpid_header: out of pkg_memory\n"); - goto error; - } - - /* now parse it!! */ - memset(rpid_b, 0, sizeof(struct to_body)); - parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b); - if (rpid_b->error == PARSE_ERROR) { - LOG(L_ERR, "ERROR:parse_rpid_header: bad rpid header\n"); - free_to(rpid_b); - goto error; - } - msg->rpid->parsed = rpid_b; - - return 0; - error: - return -1; + + if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) { + goto error; + } + + /* maybe the header is already parsed! */ + if (msg->rpid->parsed) + return 0; + + /* needs to parse it */ + /* first, get some memory */ + rpid_b = pkg_malloc(sizeof(struct to_body)); + if (rpid_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(rpid_b, 0, sizeof(struct to_body)); + parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b); + if (rpid_b->error == PARSE_ERROR) { + LM_ERR("bad rpid header\n"); + free_to(rpid_b); + goto error; + } + msg->rpid->parsed = rpid_b; + + return 0; +error: + return -1; }

1 0

git:master:155160c7: modules: readme files regenerated - pike ... [skip ci]
by Kamailio Dev 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 155160c73a95cd7647f246a4a19ea0962afdc5c3 URL: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-21T20:46:26+02:00 modules: readme files regenerated - pike ... [skip ci] --- Modified: src/modules/pike/README Modified: src/modules/seas/README Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… Patch: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… --- diff --git a/src/modules/pike/README b/src/modules/pike/README index 92cd2a330a..58dc8ba39f 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -143,7 +143,7 @@ modparam("pike", "reqs_density_per_unit", 30) 3.3. remove_latency (integer) - Speciies for how long the IP address will be kept in memory after the + Specifies for how long the IP address will be kept in memory after the last request from that IP address. It's a sort of timeout value, in seconds. Note that it is not the duration to keep the IP in state 'blocked'. An IP is unblocked next occurence of 'sampling_time_unit' diff --git a/src/modules/seas/README b/src/modules/seas/README index abffbd8bc8..0ffda049cb 100644 --- a/src/modules/seas/README +++ b/src/modules/seas/README @@ -188,7 +188,7 @@ Chapter 1. The Sip Express Application Server User's Guide Application Server. The Application Server then executes some call-control logic code, and tells Kamailio to take some actions, ie. forward the message downstream, or respond to the message with a SIP - repy, etc. + reply, etc. The module acts implements a network protocol acting as the interface between Kamailio internal API and the external Application Server diff --git a/src/modules/sl/README b/src/modules/sl/README index 64b10ebfcf..24f7ec8b0d 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -246,7 +246,7 @@ sl_reply_error(); 3.4. sl_forward _reply([ code, [ reason ] ]) - Forward statelessy the current received SIP reply, with the option to + Forward statelessly the current received SIP reply, with the option to change the status code and reason text. The new code has to be in the same class. The received reply is forwarded as well by core when the config execution ended, unless it is dropped from config.

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017