sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: modules/rtpengine: rtpengine does not use ser_memmem

by Juha Heinanen

Module: sip-router Branch: master Commit: 7126d8aa7a5fa5fd0a5cafdf17c359dab01df5ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7126d8a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 9 20:50:13 2014 +0300 modules/rtpengine: rtpengine does not use ser_memmem --- modules/rtpengine/rtpengine_funcs.c | 32 -------------------------------- modules/rtpengine/rtpengine_funcs.h | 1 - 2 files changed, 0 insertions(+), 33 deletions(-) diff --git a/modules/rtpengine/rtpengine_funcs.c b/modules/rtpengine/rtpengine_funcs.c index c6a2c14..bb3d164 100644 --- a/modules/rtpengine/rtpengine_funcs.c +++ b/modules/rtpengine/rtpengine_funcs.c @@ -276,38 +276,6 @@ done: } /* - * ser_memmem() returns the location of the first occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. Obtained from NetBSD. - */ -void * -ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = sp + len1 - len2; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp <= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp++; - } - - return NULL; -} - -/* * Some helper functions taken verbatim from tm module. */ diff --git a/modules/rtpengine/rtpengine_funcs.h b/modules/rtpengine/rtpengine_funcs.h index fc223b3..4ad3210 100644 --- a/modules/rtpengine/rtpengine_funcs.h +++ b/modules/rtpengine/rtpengine_funcs.h @@ -30,7 +30,6 @@ int extract_body(struct sip_msg * , str *); int check_content_type(struct sip_msg * ); -void *ser_memmem(const void *, const void *, size_t, size_t); int get_callid(struct sip_msg *, str *); int get_to_tag(struct sip_msg *, str *); int get_from_tag(struct sip_msg *, str *);

10 years, 7 months

git:master: modules/nathelper: use ser_memmem from core

by Juha Heinanen

Module: sip-router Branch: master Commit: 2d4d54b4f4593dee767db240a3eafce5489d628f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d4d54b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 9 20:45:12 2014 +0300 modules/nathelper: use ser_memmem from core --- modules/nathelper/nhelpr_funcs.c | 31 ------------------------------- modules/nathelper/nhelpr_funcs.h | 1 - 2 files changed, 0 insertions(+), 32 deletions(-) diff --git a/modules/nathelper/nhelpr_funcs.c b/modules/nathelper/nhelpr_funcs.c index bfc3828..0efef68 100644 --- a/modules/nathelper/nhelpr_funcs.c +++ b/modules/nathelper/nhelpr_funcs.c @@ -282,37 +282,6 @@ done: return 1; } -/* - * ser_memmem() returns the location of the first occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. Obtained from NetBSD. - */ -void * -ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = sp + len1 - len2; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp <= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp++; - } - - return NULL; -} /* * Some helper functions taken verbatim from tm module. diff --git a/modules/nathelper/nhelpr_funcs.h b/modules/nathelper/nhelpr_funcs.h index 6778668..1c6b1ea 100644 --- a/modules/nathelper/nhelpr_funcs.h +++ b/modules/nathelper/nhelpr_funcs.h @@ -30,7 +30,6 @@ int extract_body(struct sip_msg * , str *); int check_content_type(struct sip_msg * ); -void *ser_memmem(const void *, const void *, size_t, size_t); int get_contact_uri(struct sip_msg *, struct sip_uri *, contact_t **); #endif

10 years, 7 months

git:master: modules/sdpops: use ser_memmem from core

by Juha Heinanen

Module: sip-router Branch: master Commit: 5c25ba35f37d2a9774caec7215261687c2ad17a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c25ba3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 9 20:35:58 2014 +0300 modules/sdpops: use ser_memmem from core --- modules/sdpops/sdpops_mod.c | 34 +--------------------------------- 1 files changed, 1 insertions(+), 33 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 33ca1de..16ce98d 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -35,6 +35,7 @@ #include "../../parser/sdp/sdp_helpr_funcs.h" #include "../../trim.h" #include "../../data_lump.h" +#include "../../ut.h" #include "api.h" #include "sdpops_data.h" @@ -903,39 +904,6 @@ static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar) } -/* - * ser_memmem() returns the location of the first occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. Obtained from NetBSD. - */ -void * -ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = sp + len1 - len2; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp <= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp++; - } - - return NULL; -} - - /** * @brief check 'media' matches the value of any 'm=media port value ...' lines * @return -1 - error; 0 - not found; 1 - found

10 years, 7 months

git:master: core, parser: moved ser_mem[r]mem() functions from parser to ut .c

by Juha Heinanen

Module: sip-router Branch: master Commit: 5ab74a287014087dbf6f95f96eeea55deb174f35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ab74a2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 9 20:30:23 2014 +0300 core, parser: moved ser_mem[r]mem() functions from parser to ut.c --- parser/sdp/sdp_helpr_funcs.c | 62 ------------------------------------------ ut.c | 62 ++++++++++++++++++++++++++++++++++++++++++ ut.h | 15 ++++++++++ 3 files changed, 77 insertions(+), 62 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index a9eb315..64868c1 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -67,68 +67,6 @@ static struct { (_x==_t[0]||_x==_t[7]||_x==_t[1]||_x==_t[2]||_x==_t[3]||_x==_t[4]\ ||_x==_t[5]||_x==_t[6]) -/* - * ser_memmem() returns the location of the first occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. Obtained from NetBSD. - */ -static void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = sp + len1 - len2; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp <= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp++; - } - - return NULL; -} - -/* - * ser_memrmem() returns the location of the last occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. - */ -static void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1 + len1 - len2; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = (char *) b1; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp >= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp--; - } - - return NULL; -} - int get_mixed_part_delimiter(str* body, str *mp_delimiter) { static unsigned int boun[16] = { diff --git a/ut.c b/ut.c index 7dd7373..7079c70 100644 --- a/ut.c +++ b/ut.c @@ -297,3 +297,65 @@ char *str_search(str *text, str *needle) return NULL; } + +/* + * ser_memmem() returns the location of the first occurrence of data + * pattern b2 of size len2 in memory block b1 of size len1 or + * NULL if none is found. Obtained from NetBSD. + */ +void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) +{ + /* Initialize search pointer */ + char *sp = (char *) b1; + + /* Initialize pattern pointer */ + char *pp = (char *) b2; + + /* Initialize end of search address space pointer */ + char *eos = sp + len1 - len2; + + /* Sanity check */ + if(!(b1 && b2 && len1 && len2)) + return NULL; + + while (sp <= eos) { + if (*sp == *pp) + if (memcmp(sp, pp, len2) == 0) + return sp; + + sp++; + } + + return NULL; +} + +/* + * ser_memrmem() returns the location of the last occurrence of data + * pattern b2 of size len2 in memory block b1 of size len1 or + * NULL if none is found. + */ +void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) +{ + /* Initialize search pointer */ + char *sp = (char *) b1 + len1 - len2; + + /* Initialize pattern pointer */ + char *pp = (char *) b2; + + /* Initialize end of search address space pointer */ + char *eos = (char *) b1; + + /* Sanity check */ + if(!(b1 && b2 && len1 && len2)) + return NULL; + + while (sp >= eos) { + if (*sp == *pp) + if (memcmp(sp, pp, len2) == 0) + return sp; + + sp--; + } + + return NULL; +} diff --git a/ut.h b/ut.h index 8f04736..aa7f33c 100644 --- a/ut.h +++ b/ut.h @@ -902,4 +902,19 @@ char* get_abs_pathname(str* base, str* file); * search for needle in text */ char *str_search(str *text, str *needle); + +/* + * ser_memmem() returns the location of the first occurrence of data + * pattern b2 of size len2 in memory block b1 of size len1 or + * NULL if none is found. Obtained from NetBSD. + */ +void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2); + +/* + * ser_memrmem() returns the location of the last occurrence of data + * pattern b2 of size len2 in memory block b1 of size len1 or + * NULL if none is found. + */ +void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2); + #endif

10 years, 7 months

git:4.1: uac: safety check to be sure the reg hash table is initialized

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 35d83b91a8654a2218bf1ba900d7486fad189851 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35d83b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 9 18:49:32 2014 +0200 uac: safety check to be sure the reg hash table is initialized - reported by Alex Villacís Lasso (cherry picked from commit b1900f66cc4acd254f1e6750538f31a3653fcd7f) --- modules/uac/uac_reg.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 537ba82..8ab204f 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -236,6 +236,12 @@ int reg_ht_add_byuuid(reg_uac_t *reg) unsigned int slot; reg_item_t *ri = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return -1; + } + ri = (reg_item_t*)shm_malloc(sizeof(reg_item_t)); if(ri==NULL) { @@ -259,6 +265,12 @@ int reg_ht_add_byuser(reg_uac_t *reg) unsigned int slot; reg_item_t *ri = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return -1; + } + ri = (reg_item_t*)shm_malloc(sizeof(reg_item_t)); if(ri==NULL) { @@ -346,6 +358,12 @@ reg_uac_t *reg_ht_get_byuuid(str *uuid) unsigned int slot; reg_item_t *it = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return NULL; + } + hash = reg_compute_hash(uuid); slot = reg_get_entry(hash, _reg_htable->htsize); it = _reg_htable->entries[slot].byuuid; @@ -370,6 +388,12 @@ reg_uac_t *reg_ht_get_byuser(str *user, str *domain) unsigned int slot; reg_item_t *it = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return NULL; + } + hash = reg_compute_hash(user); slot = reg_get_entry(hash, _reg_htable->htsize); it = _reg_htable->entries[slot].byuser; @@ -740,6 +764,9 @@ void uac_reg_timer(unsigned int ticks) reg_item_t *it = NULL; time_t tn; + if(_reg_htable==NULL) + return; + tn = time(NULL); for(i=0; i<_reg_htable->htsize; i++) {

10 years, 7 months

git:master: uac: safety check to be sure the reg hash table is initialized

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b1900f66cc4acd254f1e6750538f31a3653fcd7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1900f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 9 18:49:32 2014 +0200 uac: safety check to be sure the reg hash table is initialized - reported by Alex Villacís Lasso --- modules/uac/uac_reg.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 537ba82..8ab204f 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -236,6 +236,12 @@ int reg_ht_add_byuuid(reg_uac_t *reg) unsigned int slot; reg_item_t *ri = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return -1; + } + ri = (reg_item_t*)shm_malloc(sizeof(reg_item_t)); if(ri==NULL) { @@ -259,6 +265,12 @@ int reg_ht_add_byuser(reg_uac_t *reg) unsigned int slot; reg_item_t *ri = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return -1; + } + ri = (reg_item_t*)shm_malloc(sizeof(reg_item_t)); if(ri==NULL) { @@ -346,6 +358,12 @@ reg_uac_t *reg_ht_get_byuuid(str *uuid) unsigned int slot; reg_item_t *it = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return NULL; + } + hash = reg_compute_hash(uuid); slot = reg_get_entry(hash, _reg_htable->htsize); it = _reg_htable->entries[slot].byuuid; @@ -370,6 +388,12 @@ reg_uac_t *reg_ht_get_byuser(str *user, str *domain) unsigned int slot; reg_item_t *it = NULL; + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return NULL; + } + hash = reg_compute_hash(user); slot = reg_get_entry(hash, _reg_htable->htsize); it = _reg_htable->entries[slot].byuser; @@ -740,6 +764,9 @@ void uac_reg_timer(unsigned int ticks) reg_item_t *it = NULL; time_t tn; + if(_reg_htable==NULL) + return; + tn = time(NULL); for(i=0; i<_reg_htable->htsize; i++) {

10 years, 7 months

_GNU_SOURCE

by Juha Heinanen

daniel, thanks for your reply. i started a new thread on _GNU_SOURCE. tcp_main.c includes io_wait.h, which in turn defines _GNU_SOURCE: #define _GNU_SOURCE /* for POLLRDHUP on linux */ _GNU_SOURCE is also included by tls module, which can be considered to be part of "core": #define _GNU_SOURCE 1 /* Needed for strndup */ is it possible to get rid of these two _GNU_SOURCE dependencies? if not, then _GNU_SOURCE version of memmem can be freely used in all modules and we can get rid of ser_memmem. --- juha

10 years, 7 months

rfc: evapi architecture and message format

by Daniel-Constantin Mierla

Hello, (cross-posting because the results are impacting users) recently I added a new module named evapi: - http://www.kamailio.org/docs/modules/devel/modules/evapi.html The purpose is to able to send custom messages to applications that connect to kamailio via tcp on a special port (different than sip port) as well as receive messages and react on them. One of the first use case we look at is integration with cgrates for real time billing. For example: - send notification when a new call comes in and cgrates will return allow/reject - send notification when the call starts so cgrates can start billing - send notification when the call ends so cgrates will close bllling The module is now in quite good shape, sending and receiving messages. Sending is done from config file, in the future some modules might do it from inside. Received message is passed to config file via an event_route and variables. Now, the point of this discussion is to debate following points: 1) should there be a specific format used for this messages? The examples in the README use json. The module can encapsulate them in netstring format when sending over tcp to be easy to parse and read the message at once. This is optional, the message can be sent as it is 2) now messages are sent to all connected applications, should be there some subscription mechanism per event? If yes, then there has to be a way to specify the event, so point 1) might need a specific format 3) handle response - should be there a defined api that will say allow, reject, drop? I was thinking that the return could be some script for an embedded interpreter (e.g., Lua) that can be executed from config file. Or, alternative, manually scripted in the event route, so each user defines its own api 3) other suggestions for what should be discussed? Looking forward to opinions regarding these matters. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 7 months

git:master: evapi: netstring format option applies for sent messages

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9bf9a7448848580aa883dbdfb26125e27d5ac32d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bf9a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 9 10:42:15 2014 +0200 evapi: netstring format option applies for sent messages --- modules/evapi/evapi_dispatch.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 7b42320..60c5bfa 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -524,9 +524,16 @@ int evapi_relay(str *evdata) return -1; } sbuf->s = (char*)sbuf + sizeof(str); - sbuf->len = snprintf(sbuf->s, sbsize+32, - EVAPI_RELAY_FORMAT, - sbsize, evdata->len, evdata->s); + if(_evapi_netstring_format) { + /* netstring encapsulation */ + sbuf->len = snprintf(sbuf->s, sbsize+32, + EVAPI_RELAY_FORMAT, + sbsize, evdata->len, evdata->s); + } else { + sbuf->len = snprintf(sbuf->s, sbsize+32, + "%.*s", + evdata->len, evdata->s); + } if(sbuf->len<=0 || sbuf->len>sbsize+32) { shm_free(sbuf); LM_ERR("cannot serialize event\n");

10 years, 7 months

[tracker] Task opened: Setting only dlg_set_property("ka-dst") doesn't work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bill Radis (radisb) Attached to Project - sip-router Summary - Setting only dlg_set_property("ka-dst") doesn't work Task Type - Bug Report Category - dialog Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - In dlg_hash.c, line 135: if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_SRC))) return 0; should be if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_DST))) return 0; It causes the keep-alives to work only if only "ka-src" attr is set or both "ka-src" and "ka-dst" are set, but not when only "ka-dst" is set. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=416 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014