sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:2f278aa5: dispatcher: fix compile warning - unused variable 'buf' in ds_add_xavp_record

by Henning Westerholt

Module: kamailio Branch: master Commit: 2f278aa565e2ee991205f109dc887b106d7d9c24 URL: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:23:05+02:00 dispatcher: fix compile warning - unused variable 'buf' in ds_add_xavp_record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… Patch: https://github.com/kamailio/kamailio/commit/2f278aa565e2ee991205f109dc887b1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index f5707c11e2..9caaaca8e8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1802,7 +1802,6 @@ int ds_add_xavp_record(ds_set_t *dsidx, int pos, int set, int alg, { sr_xavp_t *nxavp=NULL; sr_xval_t nxval; - char buf[2 + 16 + 1]; /* add destination uri field */ memset(&nxval, 0, sizeof(sr_xval_t));

6 years, 5 months

git:master:74847c38: core: better protection against invalid name lookup in DNS caching support

by Henning Westerholt

Module: kamailio Branch: master Commit: 74847c386f627ba89a0cb282e85d653388d45e24 URL: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:13:51+02:00 core: better protection against invalid name lookup in DNS caching support --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… Patch: https://github.com/kamailio/kamailio/commit/74847c386f627ba89a0cb282e85d653… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 554c7c9903..d9fc6a21cc 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -510,6 +510,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); LM_DBG("(%.*s(%d), %d), h=%d\n", name->len, name->s, name->len, type, *h);

6 years, 5 months

git:master:b55b6fa1: dispatcher: added ds_set_dst() and dst_set_domain()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b55b6fa199828669e48354c10607541d9ae05184 URL: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T08:54:02+02:00 dispatcher: added ds_set_dst() and dst_set_domain() - unlike the ds_next_...() variants, these functions just push to destination the current xavp_dst, without consuming it --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541… Patch: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541…

6 years, 5 months

git:master:94385af9: dispatcher: fixed the conflict in the function names and api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 94385af9143e4b320f05dad501ccb5c446b5048b URL: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T13:33:45+02:00 dispatcher: fixed the conflict in the function names and api --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… Patch: https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 18e4f51bc3..f5707c11e2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1663,7 +1663,7 @@ int ds_load_unset(struct sip_msg *msg) /** * */ -static inline int ds_update_dst( +static inline int ds_push_dst( struct sip_msg *msg, str *uri, struct socket_info *sock, int mode) { struct action act; @@ -2065,7 +2065,7 @@ int ds_select_dst_limit( hash = i; if(mode!=DS_SETOP_XAVP) { - if(ds_update_dst(msg, &idx->dlist[hash].uri, idx->dlist[hash].sock, + if(ds_push_dst(msg, &idx->dlist[hash].uri, idx->dlist[hash].sock, mode) != 0) { LM_ERR("cannot set next hop address with: %.*s\n", idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); @@ -2208,7 +2208,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return -1; } - if(ds_update_dst(msg, &lxavp->val.v.s, sock, mode) != 0) { + if(ds_push_dst(msg, &lxavp->val.v.s, sock, mode) != 0) { LM_ERR("cannot set dst addr: %.*s\n", lxavp->val.v.s.len, lxavp->val.v.s.s); return -1; @@ -3053,6 +3053,11 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } +int ds_next_dst_api(sip_msg_t *msg, int mode) +{ + return ds_update_dst(msg, DS_USE_NEXT, mode); +} + int bind_dispatcher(dispatcher_api_t *api) { if(!api) { @@ -3060,7 +3065,7 @@ int bind_dispatcher(dispatcher_api_t *api) return -1; } api->select = ds_select_dst; - api->next = ds_next_dst; + api->next = ds_next_dst_api; api->mark = ds_mark_dst; api->is_from = ds_is_from_list; return 0;

6 years, 5 months

git:master:145e3a1e: core: raw sock - reset the rcv_msg and proper test for totlen

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 145e3a1e461dd53fb1e06bae619d20a09dcffe75 URL: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T11:50:31+02:00 core: raw sock - reset the rcv_msg and proper test for totlen --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… Patch: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index a8beb6691e..9dd65d2340 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -228,6 +228,7 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, iov[0].iov_base=buf; iov[0].iov_len=len; + memset(&rcv_msg, 0, sizeof(struct msghdr)); rcv_msg.msg_name=from; rcv_msg.msg_namelen=sockaddru_len(*from); rcv_msg.msg_control=msg_ctrl_buf; @@ -603,7 +604,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, int ret; totlen = len + sizeof(hdr); - if (unlikely(totlen) > 65535) + if (unlikely(totlen > 65535)) return -2; memset(&snd_msg, 0, sizeof(snd_msg)); snd_msg.msg_name=&to->sin;

6 years, 5 months

git:master:d988af9d: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d988af9dcdfd739fe33aa3b381c9668367647b8b URL: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-15T09:01:57+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668… Patch: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668…

6 years, 5 months

git:master:540450a2: dispatcher: documentation for ds_set_dst() and ds_next_domain()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 540450a223a536e0ee8f63ae62c45b5f6c6bb522 URL: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-15T08:55:24+02:00 dispatcher: documentation for ds_set_dst() and ds_next_domain() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… Patch: https://github.com/kamailio/kamailio/commit/540450a223a536e0ee8f63ae62c45b5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 2706683ed5..501a07d7fb 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1276,6 +1276,30 @@ if(ds_select("1", "$var(a)")) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> </section> + <section id="dispatcher.f.ds_set_dst"> + <title> + <function moreinfo="none">ds_set_dst()</function> + </title> + <para> + Takes the current destination address from the corresponding XAVPs + and sets the dst_uri (outbound proxy address). + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + </section> + <section id="dispatcher.f.ds_set_domain"> + <title> + <function moreinfo="none">ds_set_domain()</function> + </title> + <para> + Takes the current destination address from the corresponding XAVPs + and sets the domain part of the request URI. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + </section> <section id="dispatcher.f.ds_mark_dst"> <title> <function moreinfo="none">ds_mark_dst([state])</function>

6 years, 5 months

git:master:3b412293: db_redis: Fix memleaks on delete

by Andreas Granig

Module: kamailio Branch: master Commit: 3b412293c559c955bb2447cb24cb3ab27efb9ad9 URL: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-06-14T15:49:11+02:00 db_redis: Fix memleaks on delete Make sure to release pkg memory on delete operations. Improve error handling to avoid segfault on broken connection. Warn on full table scans to help improve key definition. --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/db_redis_mod.h Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_dbase.h Modified: src/modules/db_redis/redis_table.c Modified: src/modules/db_redis/redis_table.h --- Diff: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab… Patch: https://github.com/kamailio/kamailio/commit/3b412293c559c955bb2447cb24cb3ab…

6 years, 5 months

git:master:502d503d: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 502d503d77a6fc0420db1cace84e839c3b593b9e URL: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-14T15:31:36+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… Patch: https://github.com/kamailio/kamailio/commit/502d503d77a6fc0420db1cace84e839… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 40cf564576..a3baacf621 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1941,12 +1941,12 @@ kamcmd dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 Parameters: * callid - callid of dialog to be terminated * from_tag - from tag of the dialog to terminated - * totag - to tag of the dialog to terminated + * to_tag - to tag of the dialog to terminated The command works only for confirmed dialogs. RPC Command Format: - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 9.6. dlg.end_dlg

6 years, 5 months

git:master:a10d04dd: dialog: docs - fixed example for rpc dlg.terminate_dlg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a10d04ddca3a357e8e589a4c3eaba7989dce7de9 URL: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T15:29:16+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Patch: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index a1bc8959a1..e1d2bc275d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2462,7 +2462,7 @@ if(has_totag()) { <emphasis>from_tag</emphasis> - from tag of the dialog to terminated </para></listitem> <listitem><para> - <emphasis>totag</emphasis> - to tag of the dialog to terminated + <emphasis>to_tag</emphasis> - to tag of the dialog to terminated </para></listitem> </itemizedlist> <para> @@ -2470,7 +2470,7 @@ if(has_totag()) { </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> <section>

6 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018