sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:master:9866f62c: Merge pull request #232 from kelchy/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9866f62c462075db1d0ac4fb20a35fe13c7d2c4d URL: https://github.com/kamailio/kamailio/commit/9866f62c462075db1d0ac4fb20a35fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-06T14:26:22+02:00 Merge pull request #232 from kelchy/master jansson: prevent from shuffling key order in json --- Modified: modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/9866f62c462075db1d0ac4fb20a35fe… Patch: https://github.com/kamailio/kamailio/commit/9866f62c462075db1d0ac4fb20a35fe… --- diff --git a/modules/jansson/jansson_utils.c b/modules/jansson/jansson_utils.c index 85f87ad..4919b0e 100644 --- a/modules/jansson/jansson_utils.c +++ b/modules/jansson/jansson_utils.c @@ -33,7 +33,7 @@ int jansson_to_val(pv_value_t* val, char** freeme, json_t* v) { val->flags = 0; if(json_is_object(v) || json_is_array(v)) { - const char* value = json_dumps(v, JSON_COMPACT); + const char* value = json_dumps(v, JSON_COMPACT|JSON_PRESERVE_ORDER); *freeme = (char*)value; val->rs.s = (char*)value; val->rs.len = strlen(value);

8 years, 10 months

git:master:140d0c6f: prevent jansson from shuffling key order in json

by kelchy

Module: kamailio Branch: master Commit: 140d0c6fc89d3c72bbd45627ca627e19e45b4e53 URL: https://github.com/kamailio/kamailio/commit/140d0c6fc89d3c72bbd45627ca627e1… Author: kelchy <kelchy(a)bitbucket.org> Committer: kelchy <kelchy(a)bitbucket.org> Date: 2015-07-06T19:21:41+08:00 prevent jansson from shuffling key order in json --- Modified: modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/140d0c6fc89d3c72bbd45627ca627e1… Patch: https://github.com/kamailio/kamailio/commit/140d0c6fc89d3c72bbd45627ca627e1… --- diff --git a/modules/jansson/jansson_utils.c b/modules/jansson/jansson_utils.c index 85f87ad..4919b0e 100644 --- a/modules/jansson/jansson_utils.c +++ b/modules/jansson/jansson_utils.c @@ -33,7 +33,7 @@ int jansson_to_val(pv_value_t* val, char** freeme, json_t* v) { val->flags = 0; if(json_is_object(v) || json_is_array(v)) { - const char* value = json_dumps(v, JSON_COMPACT); + const char* value = json_dumps(v, JSON_COMPACT|JSON_PRESERVE_ORDER); *freeme = (char*)value; val->rs.s = (char*)value; val->rs.len = strlen(value);

8 years, 10 months

[kamailio] prevent jansson from shuffling key order in json (#232)

by kelchy

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/232 -- Commit Summary -- * prevent jansson from shuffling key order in json -- File Changes -- M modules/jansson/jansson_utils.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/232.patch https://github.com/kamailio/kamailio/pull/232.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/232

8 years, 10 months

git:master:e5b7d9f0: Revert "modules/cdp: CER/CEA retry if send/receive FD disappeared"

by jaybeepee

Module: kamailio Branch: master Commit: e5b7d9f0319f24b712c441fa9461c83ae479e504 URL: https://github.com/kamailio/kamailio/commit/e5b7d9f0319f24b712c441fa9461c83… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-06T11:11:45+02:00 Revert "modules/cdp: CER/CEA retry if send/receive FD disappeared" This reverts commit 867a29d80aebaddaa0e1c960b9e1d459b7a9fb4d. --- Modified: modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/e5b7d9f0319f24b712c441fa9461c83… Patch: https://github.com/kamailio/kamailio/commit/e5b7d9f0319f24b712c441fa9461c83… --- diff --git a/modules/cdp/peerstatemachine.c b/modules/cdp/peerstatemachine.c index f7ec548..6434ae4 100644 --- a/modules/cdp/peerstatemachine.c +++ b/modules/cdp/peerstatemachine.c @@ -615,11 +615,9 @@ static inline void Snd_CE_add_applications(AAAMessage *msg,peer *p) */ void I_Snd_CER(peer *p) { - int retries = 3; AAAMessage *cer=0; // AAA_AVP *avp; unsigned long ip; - peer_event_t next_event; union { struct sockaddr addr; struct sockaddr_in in; @@ -633,19 +631,8 @@ void I_Snd_CER(peer *p) cer->hopbyhopId = next_hopbyhop(); cer->endtoendId = next_endtoend(); addrlen = sizeof(addr_u); - -retry: if (getsockname(p->I_sock,&(addr_u.addr), &addrlen) == -1) { + if (getsockname(p->I_sock,&(addr_u.addr), &addrlen) == -1) { LM_ERR("I_Snd_CER(): Error on finding local host address > %s\n",strerror(errno)); - //try and create a new FD - if (retries > 0) { - p->state = Wait_Conn_Ack; - next_event = I_Snd_Conn_Req(p); - if (next_event==I_Rcv_Conn_NAck) { - sm_process(p, next_event, 0, 1, p->I_sock); - retries--; - goto retry; - } - } }else{ switch(addr_u.addr.sa_family){ case AF_INET: @@ -1019,10 +1006,8 @@ int Process_CER(peer *p,AAAMessage *cer) */ void Snd_CEA(peer *p,AAAMessage *cer,int result_code,int sock) { - int retries=3; AAAMessage *cea; unsigned int ip; - peer_event_t next_event; union { struct sockaddr addr; struct sockaddr_in in; @@ -1035,18 +1020,8 @@ void Snd_CEA(peer *p,AAAMessage *cer,int result_code,int sock) if (!cea) goto done; addrlen = sizeof(addr_u); -retry: if (getsockname(sock, &(addr_u.addr), &addrlen) == -1) { + if (getsockname(sock, &(addr_u.addr), &addrlen) == -1) { LM_ERR("Snd_CEA(): Error on finding local host address > %s\n",strerror(errno)); - //try and create a new FD - if (retries > 0) { - p->state = Wait_Conn_Ack; - next_event = I_Snd_Conn_Req(p); - if (next_event==I_Rcv_Conn_NAck) { - sm_process(p, next_event, 0, 1, p->I_sock); - retries--; - goto retry; - } - } }else{ switch(addr_u.addr.sa_family){ case AF_INET:

8 years, 10 months

git:master:657fb58a: Merge pull request #224 from kamailio/vseva/routename_fix

by Victor Seva

Module: kamailio Branch: master Commit: 657fb58a9274f7fc163533b8eb476c59390cff85 URL: https://github.com/kamailio/kamailio/commit/657fb58a9274f7fc163533b8eb476c5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-06T09:10:15+02:00 Merge pull request #224 from kamailio/vseva/routename_fix core: clean previous routename --- Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/657fb58a9274f7fc163533b8eb476c5… Patch: https://github.com/kamailio/kamailio/commit/657fb58a9274f7fc163533b8eb476c5… --- diff --git a/cfg.y b/cfg.y index 85e69a6..154cb44 100644 --- a/cfg.y +++ b/cfg.y @@ -1778,8 +1778,8 @@ route_name: NUMBER { ; -route_main: ROUTE { ; } - | ROUTE_REQUEST { ; } +route_main: ROUTE { routename=NULL; } + | ROUTE_REQUEST { routename=NULL; } ; route_stm: @@ -1845,8 +1845,8 @@ failure_route_stm: ; -route_reply_main: ROUTE_ONREPLY { ; } - | ROUTE_REPLY { ; } +route_reply_main: ROUTE_ONREPLY { routename=NULL; } + | ROUTE_REPLY { routename=NULL; } ;

8 years, 10 months

git:master:11bcc806: core: clean previous routename in order to get the correct default_routename

by Victor Seva

Module: kamailio Branch: master Commit: 11bcc8066ce856cabfc95949b65712d891976194 URL: https://github.com/kamailio/kamailio/commit/11bcc8066ce856cabfc95949b65712d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-29T10:25:14+02:00 core: clean previous routename in order to get the correct default_routename fix c44685cbcefb8f6ecfa6f11369699906db832c39 --- Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/11bcc8066ce856cabfc95949b65712d… Patch: https://github.com/kamailio/kamailio/commit/11bcc8066ce856cabfc95949b65712d… --- diff --git a/cfg.y b/cfg.y index 85e69a6..154cb44 100644 --- a/cfg.y +++ b/cfg.y @@ -1778,8 +1778,8 @@ route_name: NUMBER { ; -route_main: ROUTE { ; } - | ROUTE_REQUEST { ; } +route_main: ROUTE { routename=NULL; } + | ROUTE_REQUEST { routename=NULL; } ; route_stm: @@ -1845,8 +1845,8 @@ failure_route_stm: ; -route_reply_main: ROUTE_ONREPLY { ; } - | ROUTE_REPLY { ; } +route_reply_main: ROUTE_ONREPLY { routename=NULL; } + | ROUTE_REPLY { routename=NULL; } ;

8 years, 10 months

[kamailio] core: clean previous routename (#224)

by Victor Seva

fix c44685cbcefb8f6ecfa6f11369699906db832c39 routename is not been reset when no name is use like on main or reply route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/224 -- Commit Summary -- * core: clean previous routename in order to get the correct default_routename -- File Changes -- M cfg.y (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/224.patch https://github.com/kamailio/kamailio/pull/224.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/224

8 years, 10 months

git:master:894796f6: nathelper: support filter contacts by server_id

by Victor Seva

Module: kamailio Branch: master Commit: 894796f6f1fa2d2778ace5c56f58d204ea06efc2 URL: https://github.com/kamailio/kamailio/commit/894796f6f1fa2d2778ace5c56f58d20… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-04T10:09:06+02:00 nathelper: support filter contacts by server_id --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/894796f6f1fa2d2778ace5c56f58d20… Patch: https://github.com/kamailio/kamailio/commit/894796f6f1fa2d2778ace5c56f58d20… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index f6791db..5f20a5f 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -358,7 +358,8 @@ static unsigned int raw_ip = 0; static unsigned short raw_port = 0; static int nh_keepalive_timeout = 0; static request_method_t sipping_method_id = 0; - +/* filter contacts by server_id */ +static int nh_filter_srvid = 0; /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state=0; @@ -426,6 +427,7 @@ static param_export_t params[] = { {"keepalive_timeout", INT_PARAM, &nh_keepalive_timeout }, {"udpping_from_path", INT_PARAM, &udpping_from_path }, {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, + {"filter_server_id", INT_PARAM, &nh_filter_srvid }, {0, 0, 0} }; @@ -2067,6 +2069,7 @@ nh_timer(unsigned int ticks, void *timer_idx) char *path_ip_str = NULL; unsigned int path_ip = 0; unsigned short path_port = 0; + int options = 0; if((*natping_state) == 0) goto done; @@ -2079,9 +2082,10 @@ nh_timer(unsigned int ticks, void *timer_idx) goto done; } } + if(nh_filter_srvid) options |= GAU_OPT_SERVER_ID; rval = ul.get_all_ucontacts(buf, cblen, (ping_nated_only?ul.nat_flag:0), ((unsigned int)(unsigned long)timer_idx)*natping_interval+iteration, - natping_processes*natping_interval); + natping_processes*natping_interval, options); if (rval<0) { LM_ERR("failed to fetch contacts\n"); goto done; @@ -2097,7 +2101,7 @@ nh_timer(unsigned int ticks, void *timer_idx) } rval = ul.get_all_ucontacts(buf,cblen,(ping_nated_only?ul.nat_flag:0), ((unsigned int)(unsigned long)timer_idx)*natping_interval+iteration, - natping_processes*natping_interval); + natping_processes*natping_interval, options); if (rval != 0) { pkg_free(buf); goto done;

8 years, 10 months

git:master:aa02102c: Merge pull request #229 from kamailio/vseva/usrloc_server_id

by Victor Seva

Module: kamailio Branch: master Commit: aa02102cecce271371e54994c1b653e122d68d2b URL: https://github.com/kamailio/kamailio/commit/aa02102cecce271371e54994c1b653e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-06T09:03:11+02:00 Merge pull request #229 from kamailio/vseva/usrloc_server_id usrloc|nathelper: add filtering by server_id support --- Modified: modules/nathelper/nathelper.c Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/udomain.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/aa02102cecce271371e54994c1b653e… Patch: https://github.com/kamailio/kamailio/commit/aa02102cecce271371e54994c1b653e…

8 years, 10 months

git:master:aedd970a: usrloc: add module option to support preload using server_id as filter

by Victor Seva

Module: kamailio Branch: master Commit: aedd970a97fef3e00c9e490e458f6f9af19df4d2 URL: https://github.com/kamailio/kamailio/commit/aedd970a97fef3e00c9e490e458f6f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-04T09:43:41+02:00 usrloc: add module option to support preload using server_id as filter --- Modified: modules/usrloc/udomain.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/aedd970a97fef3e00c9e490e458f6f9… Patch: https://github.com/kamailio/kamailio/commit/aedd970a97fef3e00c9e490e458f6f9… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 2bb1707..9b31a3b 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -379,6 +379,9 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) db_row_t *row; db_key_t columns[21]; db1_res_t* res = NULL; + db_key_t keys[1]; /* where */ + db_val_t vals[1]; + db_op_t ops[1]; str user, contact; char* domain; int i; @@ -418,9 +421,21 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) LM_NOTICE("load start time [%d]\n", (int)time(NULL)); #endif + if (ul_db_srvid) { + LM_NOTICE("filtered by server_id[%d]\n", server_id); + keys[0] = &srv_id_col; + ops[0] = OP_EQ; + vals[0].type = DB1_INT; + vals[0].nul = 0; + vals[0].val.int_val = server_id; + } + if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) { - if (ul_dbf.query(_c, 0, 0, 0, columns, 0, (use_domain)?(21):(20), 0, - 0) < 0) { + if (ul_dbf.query(_c, (ul_db_srvid)?(keys):(0), + (ul_db_srvid)?(ops):(0), (ul_db_srvid)?(vals):(0), + columns, (ul_db_srvid)?(1):(0), + (use_domain)?(21):(20), 0, 0) < 0) + { LM_ERR("db_query (1) failed\n"); return -1; } @@ -429,8 +444,11 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) return -1; } } else { - if (ul_dbf.query(_c, 0, 0, 0, columns, 0, (use_domain)?(21):(20), 0, - &res) < 0) { + if (ul_dbf.query(_c, (ul_db_srvid)?(keys):(0), + (ul_db_srvid)?(ops):(0), (ul_db_srvid)?(vals):(0), + columns, (ul_db_srvid)?(1):(0), + (use_domain)?(21):(20), 0, &res) < 0) + { LM_ERR("db_query failed\n"); return -1; } diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 1ad69e3..f0728c5 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -173,7 +173,8 @@ unsigned int init_flag = 0; db1_con_t* ul_dbh = 0; /* Database connection handle */ db_func_t ul_dbf; - +/* filter on load by server id */ +unsigned int ul_db_srvid = 0; /*! \brief * Exported functions @@ -229,6 +230,7 @@ static param_export_t params[] = { {"expires_type", PARAM_INT, &ul_expires_type}, {"db_raw_fetch_type", PARAM_INT, &ul_db_raw_fetch_type}, {"db_insert_null", PARAM_INT, &ul_db_insert_null}, + {"server_id_filter", PARAM_INT, &ul_db_srvid}, {0, 0, 0} }; diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index 1e3b08d..3809cf8 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -98,6 +98,8 @@ extern str ul_xavp_contact_name; extern db1_con_t* ul_dbh; /* Database connection handle */ extern db_func_t ul_dbf; +/* filter on load by server id */ +extern unsigned int ul_db_srvid; /* * Matching algorithms

8 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015