sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
531 discussions

[kamailio] Improve for correct working with all RADIUS AV pairs (#14)
by borikinternet 20 Jan '15

20 Jan '15

In this pull request I`d correct work with retrieved from RADIUS AV pairs for modules auth_radius, misc_radius and peering. Now this modules correctly put to $avp() all retrieved params: - integer name and integer value - integer name and string value - string name and integer value - string name and string value All above said and for SIP-AVP params too. You can merge this Pull Request by running: git pull https://github.com/borikinternet/kamailio master Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/14 -- Commit Summary -- * Improve for correct working with all RADIUS AV pairs -- File Changes -- M modules/auth_radius/sterman.c (180) M modules/misc_radius/functions.c (228) M modules/peering/verify.c (205) -- Patch Links -- https://github.com/kamailio/kamailio/pull/14.patch https://github.com/kamailio/kamailio/pull/14.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/14

3 3

git:master:10ce2e5e: modules/ims_registrar_scscf: new parameter notification_list_size_threshold. Once the
by Richard Good 20 Jan '15

20 Jan '15

Module: kamailio Branch: master Commit: 10ce2e5e1b6a2e158ce031487426230afb370682 URL: https://github.com/kamailio/kamailio/commit/10ce2e5e1b6a2e158ce031487426230… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-20T10:59:25+02:00 modules/ims_registrar_scscf: new parameter notification_list_size_threshold. Once the notification list exceeds this size a warning is logged. --- Modified: modules/ims_registrar_scscf/reg_mod.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/10ce2e5e1b6a2e158ce031487426230… Patch: https://github.com/kamailio/kamailio/commit/10ce2e5e1b6a2e158ce031487426230… --- diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index 87ec202..f1ced68 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -156,6 +156,8 @@ int subscription_min_expires = 10; /**< minimum subscription expiration time * int subscription_max_expires = 1000000; /**< maximum subscription expiration time */ int subscription_expires_range = 0; +int notification_list_size_threshold = 0; /**Threshold for size of notification list after which a warning is logged */ + extern reg_notification_list *notification_list; /**< list of notifications for reg to be sent */ @@ -251,6 +253,7 @@ static param_export_t params[] = { {"ue_unsubscribe_on_dereg", INT_PARAM, &ue_unsubscribe_on_dereg}, {"subscription_expires_range", INT_PARAM, &subscription_expires_range}, {"user_data_always", INT_PARAM, &user_data_always}, + {"notification_list_size_threshold", INT_PARAM, &notification_list_size_threshold}, {0, 0, 0} }; diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 38762c0..2ab9ec0 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -77,6 +77,8 @@ reg_notification_list *notification_list = 0; //< List of pending notifications extern struct tm_binds tmb; +extern int notification_list_size_threshold; + extern int subscription_default_expires; extern int subscription_min_expires; extern int subscription_max_expires; @@ -121,6 +123,7 @@ int notify_init() { return 0; } notification_list->lock = lock_init(notification_list->lock); + notification_list->size = 0; sem_new(notification_list->empty, 0); //pre-locked - as we assume list is empty at start return 1; } @@ -1995,6 +1998,11 @@ void add_notification(reg_notification * n) { if (notification_list->tail) notification_list->tail->next = n; notification_list->tail = n; if (!notification_list->head) notification_list->head = n; + notification_list->size++; + if(notification_list_size_threshold > 0 && notification_list->size > notification_list_size_threshold) { + LM_WARN("notification_list is size [%d] and has exceed notification_list_size_threshold of [%d]", notification_list->size, notification_list_size_threshold); + } + sem_release(notification_list->empty); lock_release(notification_list->lock); } @@ -2019,6 +2027,7 @@ reg_notification* get_notification() { notification_list->tail = 0; } n->next = 0; //make sure whoever gets this cant access our list + notification_list->size--; lock_release(notification_list->lock); return n; diff --git a/modules/ims_registrar_scscf/registrar_notify.h b/modules/ims_registrar_scscf/registrar_notify.h index 3dd8c17..1a44412 100644 --- a/modules/ims_registrar_scscf/registrar_notify.h +++ b/modules/ims_registrar_scscf/registrar_notify.h @@ -88,6 +88,7 @@ typedef struct { reg_notification *head; /**< first notification in the list */ reg_notification *tail; /**< last notification in the list */ gen_sem_t *empty; + int size; } reg_notification_list; /** Events for subscriptions */

1 0

git:master:72e1189c: modules/ims_qos: new parameter cdp_event_list_size_threshold. Once the
by Richard Good 20 Jan '15

20 Jan '15

Module: kamailio Branch: master Commit: 72e1189cbf81bc6ce07e9980784e42510e763c33 URL: https://github.com/kamailio/kamailio/commit/72e1189cbf81bc6ce07e9980784e425… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-20T10:56:00+02:00 modules/ims_qos: new parameter cdp_event_list_size_threshold. Once the queue exceeds this size a warning is logged. --- Modified: modules/ims_qos/cdpeventprocessor.c Modified: modules/ims_qos/cdpeventprocessor.h Modified: modules/ims_qos/doc/ims_qos_admin.xml Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72e1189cbf81bc6ce07e9980784e425… Patch: https://github.com/kamailio/kamailio/commit/72e1189cbf81bc6ce07e9980784e425…

1 0

git:master:70f74204: modules/ims_registrar_pcscf: use separate process to manage reginfo subscribes and publishes
by Richard Good 20 Jan '15

20 Jan '15

Module: kamailio Branch: master Commit: 70f74204b59266f012e00d1568a9d492040a7201 URL: https://github.com/kamailio/kamailio/commit/70f74204b59266f012e00d1568a9d49… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-20T10:50:23+02:00 modules/ims_registrar_pcscf: use separate process to manage reginfo subscribes and publishes --- Modified: modules/ims_registrar_pcscf/async_reginfo.c Modified: modules/ims_registrar_pcscf/async_reginfo.h Modified: modules/ims_registrar_pcscf/reg_mod.c Modified: modules/ims_registrar_pcscf/subscribe.c Modified: modules/ims_registrar_pcscf/ul_callback.c --- Diff: https://github.com/kamailio/kamailio/commit/70f74204b59266f012e00d1568a9d49… Patch: https://github.com/kamailio/kamailio/commit/70f74204b59266f012e00d1568a9d49…

1 0

git:master:1de57a47: modules/pua: new parameter db_table_lock_write
by Richard Good 20 Jan '15

20 Jan '15

Module: kamailio Branch: master Commit: 1de57a47c3a26b860785cf2efc2a558d1e65f911 URL: https://github.com/kamailio/kamailio/commit/1de57a47c3a26b860785cf2efc2a558… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-20T10:46:56+02:00 modules/pua: new parameter db_table_lock_write New parameter db_table_lock_write: enable (=1) or disable (=0) the locks for table during an transaction. --- Modified: modules/pua/doc/pua_admin.xml Modified: modules/pua/pua.c Modified: modules/pua/send_publish.c Modified: modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/1de57a47c3a26b860785cf2efc2a558… Patch: https://github.com/kamailio/kamailio/commit/1de57a47c3a26b860785cf2efc2a558…

1 0

git:master:bcdfd563: ims_usrloc_scscf: Properly parse params when loading from database (caused crash)
by Carsten Bock 19 Jan '15

19 Jan '15

Module: kamailio Branch: master Commit: bcdfd563d4469761be29588c53d82bc150913ece URL: https://github.com/kamailio/kamailio/commit/bcdfd563d4469761be29588c53d82bc… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-01-19T23:56:11+02:00 ims_usrloc_scscf: Properly parse params when loading from database (caused crash) --- Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/bcdfd563d4469761be29588c53d82bc… Patch: https://github.com/kamailio/kamailio/commit/bcdfd563d4469761be29588c53d82bc… --- diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index c5d569f..c639bd7 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -6,6 +6,7 @@ #include "math.h" #include "subscribe.h" #include "../../lib/ims/useful_defs.h" +#include "../../parser/parse_param.h" str id_col = str_init(ID_COL); /*!< Name of column containing ID (gen. auto_increment field */ str impu_id_col = str_init(IMPU_ID_COL); /*!< Name of column containing impu ID in mapping table */ @@ -507,17 +508,20 @@ int inline int_to_str_len(int i) { } static inline int dbrow2contact(db_val_t* val, ucontact_info_t* ci) { - static str path, user_agent, callid; - + static str path, user_agent, callid, params; + param_hooks_t hooks; - //TODO FIX PARAMS -// /* params */ -// if (!VAL_NULL(val + 1)) { -// params.s = (char*)VAL_STRING(val + 1); -// params.len = strlen(params.s); -// } -// ci->params = &params; -// LM_DBG("Loading contact params: [%.*s]", ci->params->len, ci->params->s); + // Set ci to 0: + memset( ci, 0, sizeof(ucontact_info_t)); + + /* params */ + if (!VAL_NULL(val + 1)) { + params.s = (char*)VAL_STRING(val + 1); + params.len = strlen(params.s); + if (parse_params(&params, CLASS_CONTACT, &hooks, &ci->params) < 0) { + LM_WARN("Error while parsing parameters: %.*s\n", params.len, params.s); + } + } /* path */ if (!VAL_NULL(val + 2)) {

1 0

Fwd: Write access for Patric Marschall
by Lucian Balaceanu 19 Jan '15

19 Jan '15

Hi Daniel, My 1&1 colleague Patric Marschall is going to help us maintain the p_usrloc, carrierroute, userblacklist modules in Kamailio and I wonder if you could add him to Kamailio Git Hub giving him rights to change the code. His account is: https://github.com/pmarschall. Thank you, Lucian Balaceanu

2 1

[kamailio] call_control :: Depends on pv (#36)
by Olle E. Johansson 19 Jan '15

19 Jan '15

Call_control depends on pv, but it's not documented in the README 0(70806) ERROR: <core> [pvapi.c:790]: pv_parse_spec2(): error searching pvar "avp" 0(70806) ERROR: <core> [pvapi.c:994]: pv_parse_spec2(): wrong char [s/115] in [$avp(s:can_uri)] at [5 (5)] 0(70806) : call_control [call_control.c:1076]: mod_init(): invalid AVP specification for canonical_uri_avp: `$avp(s:can_uri)' 0(70806) ERROR: <core> [sr_module.c:945]: init_mod(): Error while initializing module call_control --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/36

3 4

EVAPI reuse socket
by Alex Balashov 18 Jan '15

18 Jan '15

Hi, I think the EVAPI listening socket should be bound with setsockopt SO_REUSEADDR. Often, when I restart Kamailio, I cannot immediately get it to stop because the listening descriptor was seemingly not shutdown()'d/close()'d cleanly: Jan 18 13:14:09 sip-xmpp kamailio[24771]: ERROR: evapi [evapi_dispatch.c:474]: evapi_run_dispatcher(): cannot bind to local address and port [0.0.0.0:8010] Jan 18 13:14:09 sip-xmpp kamailio[24771]: ERROR: evapi [evapi_mod.c:181]: child_init(): failed to initialize disptacher process Jan 18 13:14:09 sip-xmpp kamailio[24771]: ERROR: <core> [sr_module.c:923]: init_mod_child(): Error while initializing module evapi (/usr/local/lib64/kamailio/modules/evapi.so) Jan 18 13:14:09 sip-xmpp kamailio[24771]: ERROR: <core> [main.c:1707]: main_loop(): error in init_child Jan 18 13:14:09 sip-xmpp kamailio[24752]: ALERT: <core> [main.c:781]: handle_sigs(): child process 24771 exited normally, status=255 Jan 18 13:14:09 sip-xmpp kamailio[24752]: INFO: <core> [main.c:799]: handle_sigs(): terminating due to SIGCHLD ... but there is nothing listening: [root@peacock kamailio]# telnet localhost 8010 Trying ::1... telnet: connect to address ::1: Connection refused Trying 127.0.0.1... telnet: connect to address 127.0.0.1: Connection refused The SO_REUSEADDR option would solve that problem I think. -- Alex -- Alex Balashov - Principal Evariste Systems LLC 235 E Ponce de Leon Ave Suite 106 Decatur, GA 30030 United States Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/

2 2

git:master:cd1a59f2: evapi: Listening socket will be bound with SO_REUSEADDR option so that rebinding does not have to wait for TIME_WAIT connections to clear.
by Alex Balashov 18 Jan '15

18 Jan '15

Module: kamailio Branch: master Commit: cd1a59f223e2806ca4c16ab4a8dc1e0ff2b219d1 URL: https://github.com/kamailio/kamailio/commit/cd1a59f223e2806ca4c16ab4a8dc1e0… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: 2015-01-18T17:08:18-05:00 evapi: Listening socket will be bound with SO_REUSEADDR option so that rebinding does not have to wait for TIME_WAIT connections to clear. --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cd1a59f223e2806ca4c16ab4a8dc1e0… Patch: https://github.com/kamailio/kamailio/commit/cd1a59f223e2806ca4c16ab4a8dc1e0… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 6ee7e3d..1ba1c0b 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -434,6 +434,7 @@ int evapi_run_dispatcher(char *laddr, int lport) struct hostent *h = NULL; struct ev_io io_server; struct ev_io io_notify; + int yes_true = 1; LM_DBG("starting dispatcher processing\n"); @@ -469,6 +470,18 @@ int evapi_run_dispatcher(char *laddr, int lport) evapi_srv_addr.sin_port = htons((short)lport); evapi_srv_addr.sin_addr = *(struct in_addr*)h->h_addr; + /* Set SO_REUSEADDR option on listening socket so that we don't + * have to wait for connections in TIME_WAIT to go away before + * re-binding. + */ + + if(setsockopt(evapi_srv_sock, SOL_SOCKET, SO_REUSEADDR, + &yes_true, sizeof(int)) < 0) { + LM_ERR("cannot set SO_REUSEADDR option on descriptor\n"); + close(evapi_srv_sock); + return -1; + } + if (bind(evapi_srv_sock, (struct sockaddr*)&evapi_srv_addr, sizeof(evapi_srv_addr)) < 0) { LM_ERR("cannot bind to local address and port [%s:%d]\n", laddr, lport);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015