sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:master:a0368f99: p_usrloc Remove SVN ID and history entries
by Olle E. Johansson 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: a0368f9933a6c824c67c6cbeb757bfe960e085ea URL: https://github.com/kamailio/kamailio/commit/a0368f9933a6c824c67c6cbeb757bfe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-18T16:55:28+01:00 p_usrloc Remove SVN ID and history entries --- Modified: modules/p_usrloc/dlist.c Modified: modules/p_usrloc/dlist.h Modified: modules/p_usrloc/hslot.c Modified: modules/p_usrloc/hslot.h Modified: modules/p_usrloc/p_usrloc_mod.c Modified: modules/p_usrloc/p_usrloc_mod.h Modified: modules/p_usrloc/ucontact.c Modified: modules/p_usrloc/ucontact.h Modified: modules/p_usrloc/udomain.c Modified: modules/p_usrloc/udomain.h Modified: modules/p_usrloc/ul_callback.c Modified: modules/p_usrloc/ul_mi.c Modified: modules/p_usrloc/ul_mi.h Modified: modules/p_usrloc/urecord.c Modified: modules/p_usrloc/urecord.h Modified: modules/p_usrloc/usrloc.c Modified: modules/p_usrloc/utime.c Modified: modules/p_usrloc/utime.h --- Diff: https://github.com/kamailio/kamailio/commit/a0368f9933a6c824c67c6cbeb757bfe… Patch: https://github.com/kamailio/kamailio/commit/a0368f9933a6c824c67c6cbeb757bfe…

1 0

git:master:a926cd85: websocket Remove SVN ID's
by Olle E. Johansson 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: a926cd85e393913dadd1ccc0712335c23afbebef URL: https://github.com/kamailio/kamailio/commit/a926cd85e393913dadd1ccc0712335c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-18T16:50:25+01:00 websocket Remove SVN ID's --- Modified: modules/websocket/config.c Modified: modules/websocket/config.h Modified: modules/websocket/utf8_decode.h Modified: modules/websocket/ws_conn.c Modified: modules/websocket/ws_conn.h Modified: modules/websocket/ws_frame.c Modified: modules/websocket/ws_frame.h Modified: modules/websocket/ws_handshake.c Modified: modules/websocket/ws_handshake.h Modified: modules/websocket/ws_mod.c Modified: modules/websocket/ws_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/a926cd85e393913dadd1ccc0712335c… Patch: https://github.com/kamailio/kamailio/commit/a926cd85e393913dadd1ccc0712335c… --- diff --git a/modules/websocket/config.c b/modules/websocket/config.c index 4fc73e0..0747d88 100644 --- a/modules/websocket/config.c +++ b/modules/websocket/config.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/config.h b/modules/websocket/config.h index bf70f0c..a866f15 100644 --- a/modules/websocket/config.h +++ b/modules/websocket/config.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/utf8_decode.h b/modules/websocket/utf8_decode.h index bb2d4bf..4853d41 100644 --- a/modules/websocket/utf8_decode.h +++ b/modules/websocket/utf8_decode.h @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern(a)hoehrmann.de> * * MIT License diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 06f7b13..87d593d 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index ef4635e..029d570 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index a6b4f90..e890770 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 7479605..8e45a1e 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 37c61bb..f8dae83 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index 9d46b1d..eb110d5 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index ecebca3..827dd61 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index f9ce213..b267cf9 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server.

1 0

git:master:f1f0abde: uac_redirect Remove SVN ID, remove history
by Olle E. Johansson 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: f1f0abdeb100721a3e1cf23ef88490fba83a3e4c URL: https://github.com/kamailio/kamailio/commit/f1f0abdeb100721a3e1cf23ef88490f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-18T16:48:18+01:00 uac_redirect Remove SVN ID, remove history --- Modified: modules/uac_redirect/rd_filter.c Modified: modules/uac_redirect/rd_filter.h Modified: modules/uac_redirect/rd_funcs.c Modified: modules/uac_redirect/rd_funcs.h Modified: modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/f1f0abdeb100721a3e1cf23ef88490f… Patch: https://github.com/kamailio/kamailio/commit/f1f0abdeb100721a3e1cf23ef88490f… --- diff --git a/modules/uac_redirect/rd_filter.c b/modules/uac_redirect/rd_filter.c index a4a169a..647cd4e 100644 --- a/modules/uac_redirect/rd_filter.c +++ b/modules/uac_redirect/rd_filter.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -20,9 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * - * History: - * --------- - * 2005-06-22 first version (bogdan) */ diff --git a/modules/uac_redirect/rd_filter.h b/modules/uac_redirect/rd_filter.h index a446963..027708c 100644 --- a/modules/uac_redirect/rd_filter.h +++ b/modules/uac_redirect/rd_filter.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -19,10 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * - * History: - * --------- - * 2005-06-22 first version (bogdan) */ diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c index a96ec31..6be86bd 100644 --- a/modules/uac_redirect/rd_funcs.c +++ b/modules/uac_redirect/rd_funcs.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -20,10 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * - * History: - * --------- - * 2005-06-22 first version (bogdan) - * 2006-05-23 push also q value into branches (bogdan) */ diff --git a/modules/uac_redirect/rd_funcs.h b/modules/uac_redirect/rd_funcs.h index 97764ca..b20aad0 100644 --- a/modules/uac_redirect/rd_funcs.h +++ b/modules/uac_redirect/rd_funcs.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -19,10 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * - * History: - * --------- - * 2005-06-22 first version (bogdan) */ diff --git a/modules/uac_redirect/uac_redirect.c b/modules/uac_redirect/uac_redirect.c index d8cecae..096ac0f 100644 --- a/modules/uac_redirect/uac_redirect.c +++ b/modules/uac_redirect/uac_redirect.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -19,10 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * - * History: - * --------- - * 2005-06-22 first version (bogdan) */ #include <sys/types.h> /* for regex */

1 0

git:master:5e9ee1dd: xmpp Remove svn ID's
by Olle E. Johansson 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: 5e9ee1dd3e95790d48e57b07bff7389ac6c233c2 URL: https://github.com/kamailio/kamailio/commit/5e9ee1dd3e95790d48e57b07bff7389… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-18T16:37:58+01:00 xmpp Remove svn ID's --- Modified: modules/xmpp/network.c Modified: modules/xmpp/network.h Modified: modules/xmpp/sha.c Modified: modules/xmpp/util.c Modified: modules/xmpp/xmpp.c Modified: modules/xmpp/xmpp.h Modified: modules/xmpp/xmpp_api.c Modified: modules/xmpp/xmpp_api.h Modified: modules/xmpp/xmpp_component.c Modified: modules/xmpp/xmpp_server.c Modified: modules/xmpp/xode.c Modified: modules/xmpp/xode.h Modified: modules/xmpp/xode_from.c Modified: modules/xmpp/xode_str.c Modified: modules/xmpp/xpool.c Modified: modules/xmpp/xsnprintf.c Modified: modules/xmpp/xstream.c --- Diff: https://github.com/kamailio/kamailio/commit/5e9ee1dd3e95790d48e57b07bff7389… Patch: https://github.com/kamailio/kamailio/commit/5e9ee1dd3e95790d48e57b07bff7389…

1 0

git:master:6719a6db: modules/ims_qos: corrected fixup bug when passing in empty sub id and sub type
by Richard Good 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: 6719a6db100d3ab63c2e95b0e1d076989c65fa12 URL: https://github.com/kamailio/kamailio/commit/6719a6db100d3ab63c2e95b0e1d0769… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-02-18T17:20:55+02:00 modules/ims_qos: corrected fixup bug when passing in empty sub id and sub type --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6719a6db100d3ab63c2e95b0e1d0769… Patch: https://github.com/kamailio/kamailio/commit/6719a6db100d3ab63c2e95b0e1d0769… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 49f3707..acb35ae 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -1204,9 +1204,10 @@ static int fixup_aar_register(void** param, int param_no) { static int fixup_aar(void** param, int param_no) { str s; - unsigned int num; + int num; - if (strlen((char*) *param) <= 0) { + //param 3 can be empty + if (param_no != 3 && strlen((char*) *param) <= 0) { LM_ERR("empty parameter %d not allowed\n", param_no); return -1; } @@ -1221,12 +1222,12 @@ static int fixup_aar(void** param, int param_no) { /*convert to int */ s.s = (char*)*param; s.len = strlen(s.s); - if (str2int(&s, &num)==0) { + if (str2sint(&s, &num)==0) { pkg_free(*param); *param = (void*)(unsigned long)num; return 0; } - LM_ERR("Bad reservation units: <%s>n", (char*)(*param)); + LM_ERR("Bad subscription id: <%s>n", (char*)(*param)); return E_CFG; }

1 0

git:master:848394fa: modules/dispatcher: fixed ds_print_mi_list when a gateway doesn't have attrs defined
by Federico Cabiddu 18 Feb '15

18 Feb '15

Module: kamailio Branch: master Commit: 848394fa7615b56d86d255d6e05d7c4690893d35 URL: https://github.com/kamailio/kamailio/commit/848394fa7615b56d86d255d6e05d7c4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-02-18T08:04:12+01:00 modules/dispatcher: fixed ds_print_mi_list when a gateway doesn't have attrs defined - reported by Luis Azedo --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/848394fa7615b56d86d255d6e05d7c4… Patch: https://github.com/kamailio/kamailio/commit/848394fa7615b56d86d255d6e05d7c4… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index c33df25..6394ae8 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -344,7 +344,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, hostent2ip_addr(&dp->ip_address, he, 0); /* Copy the port out of the URI */ - dp->port = puri.port_no; + dp->port = puri.port_no; /* Copy the proto out of the URI */ dp->proto = puri.proto; @@ -1899,7 +1899,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, unsigned int limit, in /* add to avp */ for(i=hash-1; i>=0 && cnt<limit; i--) - { + { if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; @@ -1947,7 +1947,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, unsigned int limit, in } for(i=idx->nr-1; i>hash && cnt<limit; i--) - { + { if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; @@ -2238,10 +2238,10 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) /* reset the bits used for states */ idx->dlist[i].flags &= ~(DS_STATES_ALL); - + /* we need the initial state for inactive counter */ init_state = state; - + if((state & DS_TRYING_DST) && (old_state & DS_INACTIVE_DST)) { /* old state is inactive, new state is trying => keep it inactive @@ -2257,7 +2257,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) } else { idx->dlist[i].flags |= state; } - + if(state & DS_TRYING_DST) { idx->dlist[i].message_count++; @@ -2281,7 +2281,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) /* Destination has enough replied messages.. Bringing it to active state */ idx->dlist[i].message_count = 0; } - }else{ + }else{ idx->dlist[i].message_count = 0; } } @@ -2563,9 +2563,6 @@ int ds_print_mi_list(struct mi_node* rpl) if(node == NULL) return -1; - if(attr == 0) - return -1; - memset(&c, 0, sizeof(c)); if (list->dlist[j].flags & DS_INACTIVE_DST) c[0] = 'I';

1 0

error intoduced in commit
by Luis Azedo 17 Feb '15

17 Feb '15

Hi Federico, your commit aae775859f54f84734ba2cfc2945c02c52b95e1f on 12 Nov 2014 added this condition to ds_print_mi_list if(attr == 0) return -1; attr will always be 0 on first pass. were you adding something above that set attr ? as a result of this change, kamctl fifo ds_list will always fail. cheers

1 0

[kamailio] nathelper - add received_ui pvar (#90)
by lazedo 17 Feb '15

17 Feb '15

allows comparison with persisted value in usrloc. if($ulc(exp=>received) == $received_uri) { .... } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/90 -- Commit Summary -- * nathelper - add received_ui pvar -- File Changes -- M modules/nathelper/nathelper.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/90.patch https://github.com/kamailio/kamailio/pull/90.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/90

2 10

[kamailio] registrar : add lookup_to_dset optional uri param as in lookup (#84)
by lazedo 17 Feb '15

17 Feb '15

lookup function has an optional uri param for looking up based on that param. lookup_to_dset is used if we don't want to overwritte the Request-URI but there is option to lookup based on a uri. during tests i noticed that the append_branch was being called when i did a lookup_to_dset("location", "$fu") and kamailio exited because of that. i made the append_branch to depend on the _mode ( 0 = lookup ) which seemed to fixed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/84 -- Commit Summary -- * registrar : add lookup_to_dset optional uri param as in lookup -- File Changes -- M modules/registrar/lookup.c (34) M modules/registrar/reg_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/84.patch https://github.com/kamailio/kamailio/pull/84.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/84

3 6

git:master:a6510bbb: tls: regenerated the readme file
by Daniel-Constantin Mierla 17 Feb '15

17 Feb '15

Module: kamailio Branch: master Commit: a6510bbb2d3bcf29f672c2e649a9e4d63487bca7 URL: https://github.com/kamailio/kamailio/commit/a6510bbb2d3bcf29f672c2e649a9e4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-17T14:50:57+01:00 tls: regenerated the readme file --- Modified: modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/a6510bbb2d3bcf29f672c2e649a9e4d… Patch: https://github.com/kamailio/kamailio/commit/a6510bbb2d3bcf29f672c2e649a9e4d…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015