sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:59538b66: core: parser - fix comment typo [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: 59538b66e8b8f17512b3f73c160e5de734a85a8e URL: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 core: parser - fix comment typo [skip ci] --- Modified: src/core/parser/parse_param.c Modified: src/core/parser/parse_param.h --- Diff: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… Patch: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 31b14c8835..336bf88a8a 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -460,7 +460,7 @@ static inline int parse_param_body(str *_s, param_t *_c, char separator) * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ static inline int parse_param2( str *_s, pclass_t _c, param_hooks_t *_h, param_t *t, char separator) @@ -533,7 +533,7 @@ static inline int parse_param2( * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) { diff --git a/src/core/parser/parse_param.h b/src/core/parser/parse_param.h index 5622df998e..1007358125 100644 --- a/src/core/parser/parse_param.h +++ b/src/core/parser/parse_param.h @@ -141,7 +141,7 @@ typedef union param_hooks { * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ extern int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t);

7 years, 5 months

git:master:877f768d: modules/dispatcher: comment typo [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: 877f768de281f9422a68bc82d1e9f87462eb398d URL: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 modules/dispatcher: comment typo [skip ci] --- Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… Patch: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… --- diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 5ab51d7945..6ab8d5661e 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -175,7 +175,7 @@ typedef struct _ds_set { int nr; /*!< number of items in dst set */ int last; /*!< last used item in dst set (round robin) */ int wlast; /*!< last used item in dst set (by weight) */ - int rwlast; /*!< last used item in dst set (by relaitive weight) */ + int rwlast; /*!< last used item in dst set (by relative weight) */ ds_dest_t *dlist; unsigned int wlist[100]; unsigned int rwlist[100];

7 years, 5 months

git:master:1c8aa5b7: modules/pike: fix documentation typo [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: 1c8aa5b7d6569bd758d3f74c84310c4634f1ce7b URL: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 modules/pike: fix documentation typo [skip ci] --- Modified: src/modules/pike/doc/pike_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… Patch: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… --- diff --git a/src/modules/pike/doc/pike_admin.xml b/src/modules/pike/doc/pike_admin.xml index fdc329b040..fe6891e330 100644 --- a/src/modules/pike/doc/pike_admin.xml +++ b/src/modules/pike/doc/pike_admin.xml @@ -110,7 +110,7 @@ modparam("pike", "reqs_density_per_unit", 30) <section id="pike.p.remove_latency"> <title><varname>remove_latency</varname> (integer)</title> <para> - Speciies for how long the IP address will be kept in memory after the last + 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' that does not

7 years, 5 months

git:master:f3e1a9b9: modules: fix common typo [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: f3e1a9b90952040a4275b81a57e4f78f8f235e5e URL: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:02+03:00 modules: fix common typo [skip ci] --- Modified: src/modules/ims_auth/cxdx_avp.c Modified: src/modules/ims_auth/cxdx_avp.h Modified: src/modules/ims_icscf/scscf_list.c Modified: src/modules/ims_icscf/scscf_list.h Modified: src/modules/ims_registrar_scscf/cxdx_avp.c Modified: src/modules/ims_registrar_scscf/cxdx_avp.h Modified: src/modules/seas/doc/seas_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78… Patch: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78…

7 years, 5 months

git:master:16bfd2de: examples, modules: fix common typo [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: 16bfd2deedb5a66186b77e317453561c339b3c72 URL: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:39:58+03:00 examples, modules: fix common typo [skip ci] --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-native.cfg Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq Modified: src/modules/app_java/kamailio_java_folder/java-untested/Kamailio.java Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg Modified: src/modules/sl/doc/sl_functions.xml Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561… Patch: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561…

7 years, 5 months

[kamailio/kamailio] pv: add received ip/port pvars for advertised ip/port (#1158)

by lazedo

adds $RAi , $RAp if advertise is not set, defaults to reveived ip/port You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1158 -- Commit Summary -- * pv: add received ip/port pvars for advertised ip/port -- File Changes -- M src/modules/pv/pv.c (8) M src/modules/pv/pv_core.c (28) M src/modules/pv/pv_core.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1158.patch https://github.com/kamailio/kamailio/pull/1158.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/1158

7 years, 5 months

git:master:20a96162: Merge pull request #1158 from kamailio/pv-received-adv-address

by GitHub

Module: kamailio Branch: master Commit: 20a961624bbe164d9120b7c9ac60df8ff1daaae4 URL: https://github.com/kamailio/kamailio/commit/20a961624bbe164d9120b7c9ac60df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T18:54:12+02:00 Merge pull request #1158 from kamailio/pv-received-adv-address pv: add received ip/port pvars for advertised ip/port --- 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/20a961624bbe164d9120b7c9ac60df8… Patch: https://github.com/kamailio/kamailio/commit/20a961624bbe164d9120b7c9ac60df8… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d619517c07..e9dc36c4d5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"RAi", (sizeof("RAi")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_ip, 0, + 0, 0, 0, 0}, + {{"RAp", (sizeof("RAp")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_port, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, @@ -950,4 +956,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} \ No newline at end of file +} diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cf0b60670f..c39f105852 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -739,6 +739,34 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + } + + return pv_get_rcvip(msg, param, res); +} + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + } + + return pv_get_rcvport(msg, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 98e6b56554..3a112a1e31 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -142,6 +142,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

7 years, 5 months

git:master:5a825ddf: pv: add received ip/port pvars for advertised ip/port

by lazedo

Module: kamailio Branch: master Commit: 5a825ddf6bd97f7a309ba7b663496c04a6895899 URL: https://github.com/kamailio/kamailio/commit/5a825ddf6bd97f7a309ba7b663496c0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-20T15:24:09+01:00 pv: add received ip/port pvars for advertised ip/port adds $RAi , $RAp if advertise is not set, defaults to reveived ip/port --- 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/5a825ddf6bd97f7a309ba7b663496c0… Patch: https://github.com/kamailio/kamailio/commit/5a825ddf6bd97f7a309ba7b663496c0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d619517c07..e9dc36c4d5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"RAi", (sizeof("RAi")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_ip, 0, + 0, 0, 0, 0}, + {{"RAp", (sizeof("RAp")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_port, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, @@ -950,4 +956,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} \ No newline at end of file +} diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cf0b60670f..c39f105852 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -739,6 +739,34 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + } + + return pv_get_rcvip(msg, param, res); +} + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + } + + return pv_get_rcvport(msg, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 98e6b56554..3a112a1e31 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -142,6 +142,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

7 years, 5 months

git:master:10129d05: core: faked msg - functions to get next fmsg with clear branches

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10129d056e3660a33b6ebc7b487b1de0f616dcc9 URL: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-20T16:00:00+02:00 core: faked msg - functions to get next fmsg with clear branches --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… Patch: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index ba83a5b876..888032517a 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -69,16 +69,33 @@ int faked_msg_init(void) return 0; } -sip_msg_t* faked_msg_next(void) +static inline sip_msg_t* faked_msg_next_id(int mode) { _faked_msg.id = 1 + _faked_msg_no++; _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); + if(mode) clear_branches(); return &_faked_msg; } +sip_msg_t* faked_msg_next(void) +{ + return faked_msg_next_id(0); +} + +sip_msg_t* faked_msg_next_clear(void) +{ + return faked_msg_next_id(1); +} + sip_msg_t* faked_msg_get_next(void) { faked_msg_init(); return faked_msg_next(); } + +sip_msg_t* faked_msg_get_next_clear(void) +{ + faked_msg_init(); + return faked_msg_next_clear(); +} diff --git a/src/core/fmsg.h b/src/core/fmsg.h index ada40c15a0..b279100269 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -27,5 +27,7 @@ int faked_msg_init(void); sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); +sip_msg_t* faked_msg_next_clear(void); +sip_msg_t* faked_msg_get_next_clear(void); #endif

7 years, 5 months

git:master:81dd019c: Merge pull request #1157 from eloycoto/evapi

by GitHub

Module: kamailio Branch: master Commit: 81dd019c6afc0681fe23e281c139a5c63188e02f URL: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T15:42:34+02:00 Merge pull request #1157 from eloycoto/evapi evapi: Improved error message --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… Patch: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 1639c5d4d8..5429d6913b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -492,7 +492,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent csock = accept(watcher->fd, (struct sockaddr *)&caddr, &clen); if (csock < 0) { - LM_ERR("cannot accept the client\n"); + LM_ERR("cannot accept the client '%s' err='%d'\n", gai_strerror(csock), csock); free(evapi_client); return; }

7 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017