sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:4.3:b40d2ecd: kazoo: KZ_URL_MAX_SIZE set to 100

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: b40d2ecd35200559f9a1a5408d1cf441cf49cf17 URL: https://github.com/kamailio/kamailio/commit/b40d2ecd35200559f9a1a5408d1cf44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-14T14:53:20+01:00 kazoo: KZ_URL_MAX_SIZE set to 100 - previous version was too low (50) - reported by Niklas Larsson, GH #529 - master and 4.4 has it already increased --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b40d2ecd35200559f9a1a5408d1cf44… Patch: https://github.com/kamailio/kamailio/commit/b40d2ecd35200559f9a1a5408d1cf44… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index f7572b6..70c0fae 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -393,7 +393,7 @@ void kz_amqp_destroy() { } -#define KZ_URL_MAX_SIZE 50 +#define KZ_URL_MAX_SIZE 100 static char* KZ_URL_ROOT = "/"; int kz_amqp_add_connection(modparam_t type, void* val)

8 years, 9 months

git:master:1c22f395: pipelimit: set array result tipe for rpc commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c22f395df81dab09288ff945e97b0040894daaf URL: https://github.com/kamailio/kamailio/commit/1c22f395df81dab09288ff945e97b00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-17T22:47:02+01:00 pipelimit: set array result tipe for rpc commands - rpc stats and get pipes can return more than one item --- Modified: modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/1c22f395df81dab09288ff945e97b00… Patch: https://github.com/kamailio/kamailio/commit/1c22f395df81dab09288ff945e97b00… --- diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index 5ed5c13..2a15fbb 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -912,8 +912,8 @@ void rpc_pl_push_load(rpc_t *rpc, void *c) { } static rpc_export_t rpc_methods[] = { - {"pl.stats", rpc_pl_stats, rpc_pl_stats_doc, 0}, - {"pl.get_pipes", rpc_pl_get_pipes, rpc_pl_get_pipes_doc, 0}, + {"pl.stats", rpc_pl_stats, rpc_pl_stats_doc, RET_ARRAY}, + {"pl.get_pipes", rpc_pl_get_pipes, rpc_pl_get_pipes_doc, RET_ARRAY}, {"pl.set_pipe", rpc_pl_set_pipe, rpc_pl_set_pipe_doc, 0}, {"pl.get_pid", rpc_pl_get_pid, rpc_pl_get_pid_doc, 0}, {"pl.set_pid", rpc_pl_set_pid, rpc_pl_set_pid_doc, 0},

8 years, 9 months

git:master:99caa6c5: modules/ims_registrar_scscf: more efficient traversal of contacts

by jaybeepee

Module: kamailio Branch: master Commit: 99caa6c583c68f61aded4988e8a1603e78015a0a URL: https://github.com/kamailio/kamailio/commit/99caa6c583c68f61aded4988e8a1603… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-17T09:53:39+02:00 modules/ims_registrar_scscf: more efficient traversal of contacts --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/99caa6c583c68f61aded4988e8a1603… Patch: https://github.com/kamailio/kamailio/commit/99caa6c583c68f61aded4988e8a1603… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index d677272..41fe9f6 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -694,8 +694,12 @@ int get_number_of_valid_contacts(impurecord_t* impu) { int ret = 0; get_act_time(); for (i = 0; i < impu->num_contacts; i++) { - if (VALID_CONTACT(impu->newcontacts[i], act_time)) { - ret++; + if (impu->newcontacts[i]) { + if VALID_CONTACT(impu->newcontacts[i], act_time) + ret++; + } else { + //if we hit a null ref then we are at the end of the list. + return ret; } }

8 years, 9 months

git:master:82c42dd9: modules/ims_registrar_scscf: protection around sending notifications - prevent races

by jaybeepee

Module: kamailio Branch: master Commit: 82c42dd91c5f715a17fca767ade700afde29c7a5 URL: https://github.com/kamailio/kamailio/commit/82c42dd91c5f715a17fca767ade700a… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-17T09:51:42+02:00 modules/ims_registrar_scscf: protection around sending notifications - prevent races --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/82c42dd91c5f715a17fca767ade700a… Patch: https://github.com/kamailio/kamailio/commit/82c42dd91c5f715a17fca767ade700a… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index a33dbcf..d677272 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -859,11 +859,14 @@ int update_contacts(struct sip_msg* msg, udomain_t* _d, LM_DBG("ref count after sub is now %d\n", subscription->ref_count); ul.unlock_subscription(subscription); + ul.lock_udomain(_d, public_identity); //finally we update the explicit IMPU record with the new data if (ul.update_impurecord(_d, public_identity, 0, reg_state, -1 /*do not change send sar on delete */, 0 /*this is explicit so barring must be 0*/, 0, s, ccf1, ccf2, ecf1, ecf2, &impu_rec) != 0) { LM_ERR("Unable to update explicit impurecord for <%.*s>\n", public_identity->len, public_identity->s); } + notify_subscribers(impu_rec); + ul.unlock_udomain(_d, public_identity); break; case AVP_IMS_SAR_USER_DEREGISTRATION: /*TODO: if its not a star lets find all the contact records and remove them*/

8 years, 9 months

git:master:9fbf7a73: modules/ims_usrloc_scscf: removed protoype debugging code

by jaybeepee

Module: kamailio Branch: master Commit: 9fbf7a737b3d538fa190e7057c34ff737a4d4d68 URL: https://github.com/kamailio/kamailio/commit/9fbf7a737b3d538fa190e7057c34ff7… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-17T09:50:40+02:00 modules/ims_usrloc_scscf: removed protoype debugging code --- Modified: modules/ims_usrloc_scscf/contact_dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/9fbf7a737b3d538fa190e7057c34ff7… Patch: https://github.com/kamailio/kamailio/commit/9fbf7a737b3d538fa190e7057c34ff7… --- diff --git a/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/modules/ims_usrloc_scscf/contact_dlg_handlers.c index 82d61a6..0492ffb 100644 --- a/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -177,8 +177,4 @@ static void contact_dlg_handler(struct dlg_cell* dlg, int cb_types, struct dlg_c i_terminated_count++; break; } - if (i_confirmed_count > 100 && !(i_confirmed_count % 100)) - { - LM_ERR("Curent confirmed count %d terminated count %d \n",i_confirmed_count, i_terminated_count); - } }

8 years, 9 months

git:master:876648a1: http_client Adding support for HTTP proxy on a connection and default level

by Olle E. Johansson

Module: kamailio Branch: master Commit: 876648a15a76a43db7e2d743b5914198ee30b0fc URL: https://github.com/kamailio/kamailio/commit/876648a15a76a43db7e2d743b591419… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-16T15:01:08+01:00 http_client Adding support for HTTP proxy on a connection and default level Addresses issue #541 Documentation coming in separate commit --- Modified: modules/http_client/curlcon.c Modified: modules/http_client/functions.c Modified: modules/http_client/http_client.c Modified: modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/876648a15a76a43db7e2d743b591419… Patch: https://github.com/kamailio/kamailio/commit/876648a15a76a43db7e2d743b591419…

8 years, 9 months

Compiler warnings on linux

by Ovidiu Sas

tps_msg.c: In function "tps_pack_request": tps_msg.c:384:5: warning: implicit declaration of function "strnstr" [-Wimplicit-function-declaration] if(strnstr(ptsd->bs_contact.s, ";r2=on", ^ strnstr is not available on linux. A local implementation exists in tm/t_msgbuilder.c: _strnstr Another one in sdpops/sdpops_mod.c: strnistr Probably there should be one single implementation in core available for all modules. -ovidiu -- VoIP Embedded, Inc. http://www.voipembedded.com

8 years, 9 months

git:master:331ab29e: ims_registrar_pcscf: remove duplicate implementation and use _strnistr() from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 331ab29e77e178067a23291bd20638201ba9b393 URL: https://github.com/kamailio/kamailio/commit/331ab29e77e178067a23291bd206382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-15T12:40:47+01:00 ims_registrar_pcscf: remove duplicate implementation and use _strnistr() from core --- Modified: modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/331ab29e77e178067a23291bd206382… Patch: https://github.com/kamailio/kamailio/commit/331ab29e77e178067a23291bd206382… --- diff --git a/modules/ims_registrar_pcscf/save.c b/modules/ims_registrar_pcscf/save.c index 1f8fba4..5a98d36 100644 --- a/modules/ims_registrar_pcscf/save.c +++ b/modules/ims_registrar_pcscf/save.c @@ -97,26 +97,6 @@ static inline int calc_contact_expires(contact_t *c,int expires_hdr, int local_t return local_time_now + r; } -static inline char* strnistr(const char *s, const char *find, size_t slen) -{ - char c, sc; - size_t len; - - if ((c = *find++) != '\0') { - len = strlen(find); - do { - do { - if ((sc = *s++) == '\0' || slen-- < 1) - return (NULL); - } while (sc != c); - if (len > slen) - return (NULL); - } while (strncasecmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} - /** * Updates the registrar with the new values @@ -170,7 +150,7 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma ci.num_service_routes = service_route_cnt; ci.reg_state = PCONTACT_REGISTERED|PCONTACT_REG_PENDING|PCONTACT_REG_PENDING_AAR; //we don't want to add contacts that did not come through us (pcscf) - if (c->uri.len > 6 && (strnistr(c->uri.s, "alias=", c->uri.len))) { + if (c->uri.len > 6 && (_strnistr(c->uri.s, "alias=", c->uri.len))) { LM_DBG("contact has an alias - we can use that as the received.... - TODO\n"); } ci.received_host.len = 0;

8 years, 9 months

git:master:e69c3284: sdpops: reuse _strnstr() from core instead of own implementation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e69c3284231917f5c63871842b6ce6ab37b419eb URL: https://github.com/kamailio/kamailio/commit/e69c3284231917f5c63871842b6ce6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-15T12:40:47+01:00 sdpops: reuse _strnstr() from core instead of own implementation --- Modified: modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e69c3284231917f5c63871842b6ce6a… Patch: https://github.com/kamailio/kamailio/commit/e69c3284231917f5c63871842b6ce6a… --- diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 9cbd8d6..c3e188f 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -1529,31 +1529,6 @@ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) return -1; } -/* - * Find the first case insensitive occurrence of find in s, where the - * search is limited to the first slen characters of s. - * Based on FreeBSD strnstr. - */ -char* strnistr(const char *s, const char *find, size_t slen) -{ - char c, sc; - size_t len; - - if ((c = *find++) != '\0') { - len = strlen(find); - do { - do { - if ((sc = *s++) == '\0' || slen-- < 1) - return (NULL); - } while (sc != c); - if (len > slen) - return (NULL); - } while (strncasecmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} - /** * */ @@ -1576,7 +1551,7 @@ static int w_sdp_content_sloppy(sip_msg_t* msg, char* foo, char *bar) if ((mime & 0x00ff) == SUBTYPE_SDP) return 1; else return -1; case TYPE_MULTIPART: if ((mime & 0x00ff) == SUBTYPE_MIXED) { - if (strnistr(body.s, "application/sdp", body.len) == NULL) { + if (_strnistr(body.s, "application/sdp", body.len) == NULL) { return -1; } else { return 1;

8 years, 9 months

git:master:4910ddf9: tm: _strnstr() moved to core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4910ddf9eebb8fa5106300b9e684ecb67fb2d225 URL: https://github.com/kamailio/kamailio/commit/4910ddf9eebb8fa5106300b9e684ecb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-15T12:40:47+01:00 tm: _strnstr() moved to core --- Modified: modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/4910ddf9eebb8fa5106300b9e684ecb… Patch: https://github.com/kamailio/kamailio/commit/4910ddf9eebb8fa5106300b9e684ecb… --- diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index ded1b47..09bb6dc 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1456,29 +1456,6 @@ static inline char* print_callid(char* w, dlg_t* dialog, struct cell* t) return w; } -/* -* Find the first occurrence of find in s, where the search is limited to the -* first slen characters of s. -*/ -static -char * _strnstr(const char* s, const char* find, size_t slen) { - char c, sc; - size_t len; - - if ((c = *find++) != '\0') { - len = strlen(find); - do { - do { - if (slen-- < 1 || (sc = *s++) == '\0') - return (NULL); - } while (sc != c); - if (len > slen) - return (NULL); - } while (strncmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} /* * Create a request

8 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016