sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
302 discussions

git:4.3:41a211e6: modules/rls: normalize RLS entry URIs
by Juha Heinanen 03 Jul '15

03 Jul '15

Module: kamailio Branch: 4.3 Commit: 41a211e6c13dcecaa6752238d63dfae932433ea7 URL: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-07-03T21:54:22+03:00 modules/rls: normalize RLS entry URIs - RLS entry URI is xs:AnyURI, which may be an absolute or relative URI. In relative URI, URI scheme is missing. (cherry picked from commit 68bb6b35098f5555ca35ddb21527660e46b7336a) --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… Patch: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index 09d988b..a4735b2 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -982,23 +982,32 @@ int send_resource_subs(char* uri, void* param) str pres_uri, *tmp_str; struct sip_uri parsed_pres_uri; int duplicate = 0; + str *normalized_uri; subs_info_t *s = (subs_info_t *) ((void**)param)[0]; list_entry_t **rls_contact_list = (list_entry_t **) ((void**)param)[1]; pres_uri.s = uri; pres_uri.len = strlen(uri); - if (parse_uri(pres_uri.s, pres_uri.len, &parsed_pres_uri) < 0) - { - LM_ERR("bad uri: %.*s\n", pres_uri.len, pres_uri.s); - return -1; + + normalized_uri = normalize_sip_uri(&pres_uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) { + LM_ERR("failed to normalize RLS entry URI %.*s\n", + pres_uri.len, pres_uri.s); + return -1; + } + + if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) + < 0) { + LM_ERR("bad uri: %.*s\n", normalized_uri->len, normalized_uri->s); + return -1; } if (check_self(&parsed_pres_uri.host, 0, PROTO_NONE) != 1 && rls_disable_remote_presence != 0) { LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", - pres_uri.len, pres_uri.s, + normalized_uri->len, normalized_uri->s, s->watcher_uri->len, s->watcher_uri->s); return 1; @@ -1009,8 +1018,8 @@ int send_resource_subs(char* uri, void* param) if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) return 1; - s->pres_uri = &pres_uri; - s->remote_target = &pres_uri; + s->pres_uri = normalized_uri; + s->remote_target = normalized_uri; /* Build list of contacts... checking each contact exists only once */ if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) @@ -1024,8 +1033,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - memcpy(tmp_str->s, pres_uri.s, pres_uri.len); - tmp_str->len = pres_uri.len; + memcpy(tmp_str->s, normalized_uri->s, normalized_uri->len); + tmp_str->len = normalized_uri->len; *rls_contact_list = list_insert(tmp_str, *rls_contact_list, &duplicate); if (duplicate != 0) {

1 0

git:master:fa33cd0b: modules/ims_usrloc_scscf, ims_registrar_scscf, ims_qos: improvements, optimisations, cleanup
by jaybeepee 03 Jul '15

03 Jul '15

Module: kamailio Branch: master Commit: fa33cd0b2e651a49545b48ff36be815448a4b2a1 URL: https://github.com/kamailio/kamailio/commit/fa33cd0b2e651a49545b48ff36be815… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-03T15:34:06+02:00 modules/ims_usrloc_scscf,ims_registrar_scscf,ims_qos: improvements, optimisations, cleanup - the module needed some cleanup as well as a possible deadlock situation which is now fixed --- Modified: modules/ims_isc/checker.c Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_registrar_scscf/lookup.c Modified: modules/ims_registrar_scscf/path.c Modified: modules/ims_registrar_scscf/path.h Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/regpv.c Modified: modules/ims_registrar_scscf/save.c Modified: modules/ims_registrar_scscf/save.h Modified: modules/ims_registrar_scscf/userdata_parser.c Modified: modules/ims_registrar_scscf/usrloc_cb.c Modified: modules/ims_usrloc_scscf/hslot.c Modified: modules/ims_usrloc_scscf/hslot.h Modified: modules/ims_usrloc_scscf/hslot_sp.c Modified: modules/ims_usrloc_scscf/hslot_sp.h Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/impurecord.h Modified: modules/ims_usrloc_scscf/subscribe.c Modified: modules/ims_usrloc_scscf/ucontact.c Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/ims_usrloc_scscf/ul_callback.c Modified: modules/ims_usrloc_scscf/ul_mod.c Modified: modules/ims_usrloc_scscf/ul_scscf_stats.c Modified: modules/ims_usrloc_scscf/ul_scscf_stats.h Modified: modules/ims_usrloc_scscf/usrloc.c Modified: modules/ims_usrloc_scscf/usrloc.h Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/fa33cd0b2e651a49545b48ff36be815… Patch: https://github.com/kamailio/kamailio/commit/fa33cd0b2e651a49545b48ff36be815…

1 0

git:master:68bb6b35: modules/rls: normalize RLS entry URIs
by Juha Heinanen 03 Jul '15

03 Jul '15

Module: kamailio Branch: master Commit: 68bb6b35098f5555ca35ddb21527660e46b7336a URL: https://github.com/kamailio/kamailio/commit/68bb6b35098f5555ca35ddb21527660… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-07-03T11:27:12+03:00 modules/rls: normalize RLS entry URIs - RLS entry URI is xs:AnyURI, which may be an absolute or relative URI. In relative URI, URI scheme is missing. --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/68bb6b35098f5555ca35ddb21527660… Patch: https://github.com/kamailio/kamailio/commit/68bb6b35098f5555ca35ddb21527660… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index 09d988b..a4735b2 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -982,23 +982,32 @@ int send_resource_subs(char* uri, void* param) str pres_uri, *tmp_str; struct sip_uri parsed_pres_uri; int duplicate = 0; + str *normalized_uri; subs_info_t *s = (subs_info_t *) ((void**)param)[0]; list_entry_t **rls_contact_list = (list_entry_t **) ((void**)param)[1]; pres_uri.s = uri; pres_uri.len = strlen(uri); - if (parse_uri(pres_uri.s, pres_uri.len, &parsed_pres_uri) < 0) - { - LM_ERR("bad uri: %.*s\n", pres_uri.len, pres_uri.s); - return -1; + + normalized_uri = normalize_sip_uri(&pres_uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) { + LM_ERR("failed to normalize RLS entry URI %.*s\n", + pres_uri.len, pres_uri.s); + return -1; + } + + if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) + < 0) { + LM_ERR("bad uri: %.*s\n", normalized_uri->len, normalized_uri->s); + return -1; } if (check_self(&parsed_pres_uri.host, 0, PROTO_NONE) != 1 && rls_disable_remote_presence != 0) { LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", - pres_uri.len, pres_uri.s, + normalized_uri->len, normalized_uri->s, s->watcher_uri->len, s->watcher_uri->s); return 1; @@ -1009,8 +1018,8 @@ int send_resource_subs(char* uri, void* param) if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) return 1; - s->pres_uri = &pres_uri; - s->remote_target = &pres_uri; + s->pres_uri = normalized_uri; + s->remote_target = normalized_uri; /* Build list of contacts... checking each contact exists only once */ if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) @@ -1024,8 +1033,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - memcpy(tmp_str->s, pres_uri.s, pres_uri.len); - tmp_str->len = pres_uri.len; + memcpy(tmp_str->s, normalized_uri->s, normalized_uri->len); + tmp_str->len = normalized_uri->len; *rls_contact_list = list_insert(tmp_str, *rls_contact_list, &duplicate); if (duplicate != 0) {

1 1

[kamailio] IMS server with a core network (#227)
by arbalete 02 Jul '15

02 Jul '15

Hello, I have installed Kamailio 4.2 and I would like to use it as IMS server but I don't have any ideas how to do this. I have a LTE core network which includes HSS ans PCRF. I saw on this page ( http://www.kamailio.org/w/2013/05/ims-kamailio/ ) that is apparently easy, just need to take the P-CSCF, S-CSCF and I-CSCF Kamailio and Diameter config files in the examples folder and run kamailio but I don't know how to use them and I didn't find any tutorials about it. Could you help me please ? Marc --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/227

3 5

git:master:e34cc9e4: pdb: decrease the WARN log message level to NOTICE
by Stefan Mititelu 02 Jul '15

02 Jul '15

Module: kamailio Branch: master Commit: e34cc9e49867644b2280265a546f6d901720986c URL: https://github.com/kamailio/kamailio/commit/e34cc9e49867644b2280265a546f6d9… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-07-02T16:07:32+03:00 pdb: decrease the WARN log message level to NOTICE Decrease the log level for the pdb WARN messages to NOTICE. --- Modified: modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e34cc9e49867644b2280265a546f6d9… Patch: https://github.com/kamailio/kamailio/commit/e34cc9e49867644b2280265a546f6d9… --- diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 78b5958..6feb309 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -269,7 +269,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct } td=(tnow.tv_usec-tstart.tv_usec+(tnow.tv_sec-tstart.tv_sec)*1000000) / 1000; if (td > timeout) { - LM_WARN("exceeded timeout while flushing recv buffer.\n"); + LM_NOTICE("exceeded timeout while flushing recv buffer.\n"); return -1; } } @@ -329,10 +329,10 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct if (td > timeout) { timeoutlogs++; if (timeoutlogs<0) { - LM_WARN("exceeded timeout while waiting for response.\n"); + LM_NOTICE("exceeded timeout while waiting for response.\n"); } else if (timeoutlogs>1000) { - LM_WARN("exceeded timeout %d times while waiting for response.\n", timeoutlogs); + LM_NOTICE("exceeded timeout %d times while waiting for response.\n", timeoutlogs); timeoutlogs=0; } return -1; @@ -360,15 +360,15 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct } break; case PDB_CODE_NOT_NUMBER: - LM_WARN("Number %s has letters in it\n", number.s); + LM_NOTICE("Number %s has letters in it\n", number.s); carrierid = 0; goto found; case PDB_CODE_NOT_FOUND: - LM_WARN("Number %s pdb_id not found\n", number.s); + LM_NOTICE("Number %s pdb_id not found\n", number.s); carrierid = 0; goto found; default: - LM_WARN("Invalid code %d received\n", msg.hdr.code); + LM_NOTICE("Invalid code %d received\n", msg.hdr.code); carrierid = 0; goto found; } @@ -391,7 +391,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct found: if (timeoutlogs>0) { - LM_WARN("exceeded timeout while waiting for response (buffered %d lines).\n", timeoutlogs); + LM_NOTICE("exceeded timeout while waiting for response (buffered %d lines).\n", timeoutlogs); timeoutlogs=-10; } if (gettimeofday(&tnow, NULL) == 0) {

1 0

git:master:bac97071: cdp: Evaluate the supported_vendor_id-AVP during CER/CEA
by Carsten Bock 02 Jul '15

02 Jul '15

Module: kamailio Branch: master Commit: bac9707163082e7e0ca60c2c02eb1102df8d227b URL: https://github.com/kamailio/kamailio/commit/bac9707163082e7e0ca60c2c02eb110… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-07-02T12:22:35+02:00 cdp: Evaluate the supported_vendor_id-AVP during CER/CEA --- Modified: modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/bac9707163082e7e0ca60c2c02eb110… Patch: https://github.com/kamailio/kamailio/commit/bac9707163082e7e0ca60c2c02eb110… --- diff --git a/modules/cdp/peerstatemachine.c b/modules/cdp/peerstatemachine.c index 375443b..f7ec548 100644 --- a/modules/cdp/peerstatemachine.c +++ b/modules/cdp/peerstatemachine.c @@ -722,11 +722,25 @@ void save_peer_applications(peer *p,AAAMessage *msg) switch (avp->code){ case AVP_Auth_Application_Id: id = get_4bytes(avp->data.s); - add_peer_application(p,id,0,DP_AUTHORIZATION); + add_peer_application(p,id,0,DP_AUTHORIZATION); + avp_vendor = AAAFindMatchingAVP(msg,0,AVP_Supported_Vendor_Id,0,0); + while (avp_vendor) { + vendor = get_4bytes(avp_vendor->data.s); + LM_DBG("Found Supported Vendor for Application %i: %i\n", DP_AUTHORIZATION, vendor); + add_peer_application(p,id,vendor,DP_AUTHORIZATION); + avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); + } break; case AVP_Acct_Application_Id: id = get_4bytes(avp->data.s); add_peer_application(p,id,0,DP_ACCOUNTING); + avp_vendor = AAAFindMatchingAVP(msg,0,AVP_Supported_Vendor_Id,0,0); + while (avp_vendor) { + vendor = get_4bytes(avp_vendor->data.s); + LM_DBG("Found Supported Vendor for Application %i: %i\n", DP_ACCOUNTING, vendor); + add_peer_application(p,id,vendor,DP_ACCOUNTING); + avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); + } break; case AVP_Vendor_Specific_Application_Id: group = AAAUngroupAVPS(avp->data);

1 0

git:master:64ccb0f9: kazoo : first approach to multiple consumers
by Luis Azedo 01 Jul '15

01 Jul '15

Module: kamailio Branch: master Commit: 64ccb0f92781a82d183444d6c69def3df49898cc URL: https://github.com/kamailio/kamailio/commit/64ccb0f92781a82d183444d6c69def3… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-07-01T21:38:01+01:00 kazoo : first approach to multiple consumers --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/64ccb0f92781a82d183444d6c69def3… Patch: https://github.com/kamailio/kamailio/commit/64ccb0f92781a82d183444d6c69def3…

1 0

configuring mohqueue
by Alexandru Raileanu 01 Jul '15

01 Jul '15

Hi, I'm trying to configure the mohqueue in order to use a Music on Hold. (in case Invite with recvonly). I've added the module as specified in the documentation http://kamailio.org/docs/modules/4.3.x/modules/mohqueue.html So after generation the tables, and fixing some init config issues, kamailio starts but I still don't understand ho I specify file has to play when a call is in HOLD mode. I'm using a /etc/kamailio/moh/g711.8 my config file: *modparam("rtpproxy", "rtpproxy_sock", "unix:/var/run/rtpproxy/rtpproxy.sock")modparam ("mohqueue", "db_url", DBURL)modparam ("mohqueue", "db_qtable", "mohqueues")modparam ("mohqueue", "db_ctable", "mohqcalls")modparam ("mohqueue", "mohdir", "/etc/kamailio/moh")* Any idea would be very useful! :D Thanks Alex

2 1

git:master:542a8f8e: kazoo : fix memory leak
by Luis Azedo 01 Jul '15

01 Jul '15

Module: kamailio Branch: master Commit: 542a8f8e6d6f8242ec1dea51ea9aa4a37403dcc8 URL: https://github.com/kamailio/kamailio/commit/542a8f8e6d6f8242ec1dea51ea9aa4a… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-07-01T16:29:17+01:00 kazoo : fix memory leak --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/542a8f8e6d6f8242ec1dea51ea9aa4a… Patch: https://github.com/kamailio/kamailio/commit/542a8f8e6d6f8242ec1dea51ea9aa4a… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 06e1599..34741a6 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -2081,6 +2081,7 @@ void kz_amqp_cmd_timeout_cb(int fd, short event, void *arg) close(cmd->timerfd); event_del(cmd->timer_ev); pkg_free(cmd->timer_ev); + pkg_free(cmd->message_id); pkg_free(cmd); }

1 0

git:master:67db972a: kazoo : fix, send timeout callback to consumer process
by Luis Azedo 01 Jul '15

01 Jul '15

Module: kamailio Branch: master Commit: 67db972a129a8f34ea7406618593df4eaf846a1b URL: https://github.com/kamailio/kamailio/commit/67db972a129a8f34ea7406618593df4… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-07-01T15:59:57+01:00 kazoo : fix, send timeout callback to consumer process --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/67db972a129a8f34ea7406618593df4… Patch: https://github.com/kamailio/kamailio/commit/67db972a129a8f34ea7406618593df4… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 96227c0..06e1599 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -2034,7 +2034,32 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) int n = route_get(&main_rt, cmd->err_route); struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); - kz_amqp_free_pipe_cmd(cmd); +} + +int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd) +{ + cmd->return_code = -1; + kz_amqp_consumer_delivery_ptr ptr = (kz_amqp_consumer_delivery_ptr) shm_malloc(sizeof(kz_amqp_consumer_delivery)); + if(ptr == NULL) { + LM_ERR("NO MORE SHARED MEMORY!"); + return 0; + } + memset(ptr, 0, sizeof(kz_amqp_consumer_delivery)); + ptr->cmd = cmd; + + consumer++; + if(consumer >= dbk_consumer_processes) { + consumer = 0; + } + + if (write(kz_worker_pipes[consumer], &ptr, sizeof(ptr)) != sizeof(ptr)) { + LM_ERR("failed to send payload to consumer %d : %s\nPayload %s\n", consumer, strerror(errno), cmd->payload); + kz_amqp_free_consumer_delivery(ptr); + return 0; + } + + return 1; + } void kz_amqp_cmd_timeout_cb(int fd, short event, void *arg) @@ -2047,7 +2072,7 @@ void kz_amqp_cmd_timeout_cb(int fd, short event, void *arg) , retrieved_cmd ->message_id->len, retrieved_cmd ->message_id->s ); if(retrieved_cmd->type == KZ_AMQP_CMD_ASYNC_CALL) { - kz_amqp_cb_error(retrieved_cmd); + kz_send_worker_error_event(retrieved_cmd); } else { retrieved_cmd->return_code = -1; lock_release(&retrieved_cmd->lock); @@ -2577,6 +2602,9 @@ void kz_amqp_send_worker_event(int _kz_server_id, amqp_envelope_t* envelope, kz_ } if(idx < dbk_channels) { cmd = kz_cmd_retrieve(message_id); + if(cmd) + cmd->return_code = AMQP_RESPONSE_NORMAL; + /* if(cmd != NULL) { cmd->return_code = 0; @@ -2791,8 +2819,13 @@ void kz_amqp_consumer_worker_cb(int fd, short event, void *arg) LM_DBG("consumer %d received payload %s\n", my_pid(), cmd->payload); if(cmd->cmd) { - kz_amqp_set_last_result(cmd->payload); - kz_amqp_cb_ok(cmd->cmd); + if(cmd->cmd->return_code == AMQP_RESPONSE_NORMAL) { + kz_amqp_set_last_result(cmd->payload); + kz_amqp_cb_ok(cmd->cmd); + } else { + kz_amqp_reset_last_result(); + kz_amqp_cb_error(cmd->cmd); + } } else { kz_amqp_consumer_event(cmd->payload, cmd->event_key, cmd->event_subkey); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015