sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:868bf247: mem/tlsf: return a valid pointer for malloc(0)

by Camille Oudot

Module: kamailio Branch: master Commit: 868bf2474c9d22e659875a2ac49553c4908553b2 URL: https://github.com/kamailio/kamailio/commit/868bf2474c9d22e659875a2ac49553c… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-01-29T15:46:59+01:00 mem/tlsf: return a valid pointer for malloc(0) for consistency with FM and QM allocators --- Modified: mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/868bf2474c9d22e659875a2ac49553c… Patch: https://github.com/kamailio/kamailio/commit/868bf2474c9d22e659875a2ac49553c… --- diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index c5b2b64..534b2e2 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -960,7 +960,7 @@ void* tlsf_malloc(tlsf_t tlsf, size_t size) #endif { control_t* control = tlsf_cast(control_t*, tlsf); - const size_t adjust = adjust_request_size(size, ALIGN_SIZE); + const size_t adjust = adjust_request_size(size?size:4, ALIGN_SIZE); block_header_t* block = block_locate_free(control, adjust); #ifdef DBG_TLSF_MALLOC void *ptr;

8 years, 3 months

http_query/Curl Async Module

by Waite, Hugh

I look forward to discussing this at FOSDEM (which is only tomorrow!). I’ve started a wiki page http://www.kamailio.org/wiki/devel/libcurl_integration which might help keep all the discussion in one place. Please update with your comments if you have something to add to the curl/async_http debate. Hugh From: sr-dev [mailto:sr-dev-bounces@lists.sip-router.org] On Behalf Of Olle E. Johansson Sent: 27 January 2016 14:48 To: Kamailio (SER) - Development Mailing List Subject: Re: [sr-dev] http_query/Curl Async Module : custom http headers feature request On 27 Jan 2016, at 15:07, Waite, Hugh <hugh.waite(a)xura.com<mailto:hugh.waite@xura.com>> wrote: I should add, I had it in the pipeline for the current (non-async) curl module. Frederico’s response is probably more what you wanted! We should possibly have an online or Fosdem meeting to discuss this mess with two non-compatible modules. I see many cases where I want to use both in the same Kamailio. We really need to figure this out before release, especially from a product marketing view :-) /O Hugh From: sr-dev [mailto:sr-dev-bounces@lists.sip-router.org] On Behalf Of Waite, Hugh Sent: 27 January 2016 13:58 To: Kamailio (SER) - Development Mailing List Subject: Re: [sr-dev] http_query/Curl Async Module : custom http headers feature request It’s in the pipeline already! It is needed in the API if the xcap_client module needs to be ported. Hugh From: sr-dev [mailto:sr-dev-bounces@lists.sip-router.org] On Behalf Of Olle E. Johansson Sent: 27 January 2016 13:56 To: Kamailio (SER) - Development Mailing List Subject: Re: [sr-dev] http_query/Curl Async Module : custom http headers feature request On 27 Jan 2016, at 14:53, Tim Chubb <tim.chubb(a)voicesimplified.com<mailto:tim.chubb@voicesimplified.com>> wrote: Hi Would it be possible to have a means of specifying additional request headers, i.e. things like the Authorization header, so that you would be able to make use of services which use a token based AAA system such as OAuth. From the cli its trivial to invoke curl with additional headers i.e. if I was to query such a service it would simply be something like this: curl --header "Authorization: Bearer <token>" https://<uri<http://cp.mcafee.com/d/FZsS82gs73hJ5xZAQsTphjsdTdFEITjphhjudEEEKnusovd79Jd5…>> Ideally having an optional parameter on http_request/curl_http_request where you could provide a delimited string of additional headers, as without that sort of functionality the usefulness of http requests is pretty limited against modern web services. If this is already possible could someone guide me to the documentation which documents this ability? I don’t think that exists today, but it is a very good idea and clearly possible in Curl. We just need the code for it :-) Best regards, /Olle ________________________________ This e-mail message may contain confidential, commercial or privileged information that constitutes proprietary information of Xura, Inc. or its subsidiaries. If you are not the intended recipient of this message, you are hereby notified that any review, use or distribution of this information is absolutely prohibited and we request that you delete all copies and contact us by e-mailing tosecurity(a)xura.com<mailto:security@xura.com>. Thank You. ________________________________ This e-mail message may contain confidential, commercial or privileged information that constitutes proprietary information of Xura, Inc. or its subsidiaries. If you are not the intended recipient of this message, you are hereby notified that any review, use or distribution of this information is absolutely prohibited and we request that you delete all copies and contact us by e-mailing to security(a)xura.com<mailto:security@xura.com>. Thank You. _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org<mailto:sr-dev@lists.sip-router.org> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev<http://cp.mcafee.com/d/2DRPoQ82gsrhovpd7dTbCzBwTsSCyPtdB55dUSyyyVtVNxYQsCQQ…> ________________________________ This e-mail message may contain confidential, commercial or privileged information that constitutes proprietary information of Xura, Inc. or its subsidiaries. If you are not the intended recipient of this message, you are hereby notified that any review, use or distribution of this information is absolutely prohibited and we request that you delete all copies and contact us by e-mailing to security(a)xura.com. Thank You.

8 years, 3 months

[kamailio] modules/statsd improvements (#488)

by Mikko Lehto

I wanted to add IPv6 sending socket and found some other adjustments while doing that You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/488 -- Commit Summary -- * modules/statsd: fixes documented module parameter type * modules/statsd: enables IPv6 by using result from getaddrinfo() * modules/statsd: combine sock structure and error tracking variable * modules/statsd: fixes incorrect socket() return value check and log message -- File Changes -- M modules/statsd/README (8) M modules/statsd/doc/statsd_admin.xml (2) M modules/statsd/lib_statsd.c (34) M modules/statsd/lib_statsd.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/488.patch https://github.com/kamailio/kamailio/pull/488.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/488

8 years, 3 months

git:master:676a2d0a: Merge pull request #488 from mslehto/statsd6

by Eloy Coto

Module: kamailio Branch: master Commit: 676a2d0a8aaa8daeaf07947d6b63905cb19d0656 URL: https://github.com/kamailio/kamailio/commit/676a2d0a8aaa8daeaf07947d6b63905… Author: Eloy Coto <eloy.coto(a)gmail.com> Committer: Eloy Coto <eloy.coto(a)gmail.com> Date: 2016-01-29T09:04:09Z Merge pull request #488 from mslehto/statsd6 modules/statsd improvements --- Modified: modules/statsd/README Modified: modules/statsd/doc/statsd_admin.xml Modified: modules/statsd/lib_statsd.c Modified: modules/statsd/lib_statsd.h --- Diff: https://github.com/kamailio/kamailio/commit/676a2d0a8aaa8daeaf07947d6b63905… Patch: https://github.com/kamailio/kamailio/commit/676a2d0a8aaa8daeaf07947d6b63905…

8 years, 3 months

git:master:06a9516a: modules/statsd: fixes incorrect socket() return value check and log message

by Mikko Lehto

Module: kamailio Branch: master Commit: 06a9516af72c87b9aa6e709f72eb6472951f398b URL: https://github.com/kamailio/kamailio/commit/06a9516af72c87b9aa6e709f72eb647… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-26T00:38:20+02:00 modules/statsd: fixes incorrect socket() return value check and log message --- Modified: modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/06a9516af72c87b9aa6e709f72eb647… Patch: https://github.com/kamailio/kamailio/commit/06a9516af72c87b9aa6e709f72eb647… --- diff --git a/modules/statsd/lib_statsd.c b/modules/statsd/lib_statsd.c index 76744f0..878b452 100644 --- a/modules/statsd/lib_statsd.c +++ b/modules/statsd/lib_statsd.c @@ -38,8 +38,8 @@ bool statsd_connect(void){ } statsd_connection.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); - if (statsd_connection.sock == 0 ){ - LM_ERR("Statsd: could not initiate a connect to statsd\n"); + if (statsd_connection.sock < 0 ){ + LM_ERR("Statsd: could not create a socket for statsd connection\n"); return false; }

8 years, 3 months

git:master:8ead5ae6: modules/statsd: combine sock structure and error tracking variable

by Mikko Lehto

Module: kamailio Branch: master Commit: 8ead5ae6f4cd0b64226a838fcc03c9beca219d98 URL: https://github.com/kamailio/kamailio/commit/8ead5ae6f4cd0b64226a838fcc03c9b… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-26T00:36:01+02:00 modules/statsd: combine sock structure and error tracking variable --- Modified: modules/statsd/lib_statsd.c Modified: modules/statsd/lib_statsd.h --- Diff: https://github.com/kamailio/kamailio/commit/8ead5ae6f4cd0b64226a838fcc03c9b… Patch: https://github.com/kamailio/kamailio/commit/8ead5ae6f4cd0b64226a838fcc03c9b… --- diff --git a/modules/statsd/lib_statsd.c b/modules/statsd/lib_statsd.c index dedb41b..76744f0 100644 --- a/modules/statsd/lib_statsd.c +++ b/modules/statsd/lib_statsd.c @@ -11,47 +11,40 @@ #include "../../sr_module.h" #include "lib_statsd.h" -static StatsdSocket statsd_socket = { - "/var/run/statsd/statsd.sock", - -1, - 500, // timeout 500ms if no answer - 0, - "" -}; - static StatsConnection statsd_connection = { "127.0.0.1", - "8125" + "8125", + -1 }; bool statsd_connect(void){ struct addrinfo *serverAddr; - int rc, error; + int rc; - if (statsd_socket.sock > 0){ + if (statsd_connection.sock > 0){ return true; } - error = getaddrinfo( + rc = getaddrinfo( statsd_connection.ip, statsd_connection.port, NULL, &serverAddr); - if (error != 0) + if (rc != 0) { LM_ERR( "Statsd: could not initiate server information (%s)\n", - gai_strerror(error)); + gai_strerror(rc)); return false; } - statsd_socket.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); - if (statsd_socket.sock == 0 ){ + statsd_connection.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); + if (statsd_connection.sock == 0 ){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); return false; } rc = connect( - statsd_socket.sock, serverAddr->ai_addr, serverAddr->ai_addrlen); + statsd_connection.sock, serverAddr->ai_addr, serverAddr->ai_addrlen); freeaddrinfo(serverAddr); if (rc < 0){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); @@ -67,7 +60,7 @@ bool send_command(char *command){ return false; } - send_result = send(statsd_socket.sock, command, strlen(command), 0); + send_result = send(statsd_connection.sock, command, strlen(command), 0); if ( send_result < 0){ LM_ERR("could not send the correct info to statsd (%i| %s)\n", send_result, strerror(errno)); @@ -129,6 +122,6 @@ bool statsd_init(char *ip, char *port){ } bool statsd_destroy(void){ - statsd_socket.sock = 0; + statsd_connection.sock = 0; return true; } diff --git a/modules/statsd/lib_statsd.h b/modules/statsd/lib_statsd.h index d3064c2..a80482c 100644 --- a/modules/statsd/lib_statsd.h +++ b/modules/statsd/lib_statsd.h @@ -5,16 +5,9 @@ typedef struct StatsConnection{ char *ip; char *port; + int sock; } StatsConnection; -typedef struct StatsdSocket { - char *name; // name - int sock; // socket - int timeout; // how many miliseconds to wait for an answer - time_t last_failure; // time of the last failure - char data[BUFFER_SIZE]; // buffer for the answer data -} StatsdSocket; - bool statsd_connect(void); bool send_command(char *command); bool statsd_set(char *key, char *value);

8 years, 3 months

git:master:c2ffa5b9: modules/statsd: fixes documented module parameter type

by Mikko Lehto

Module: kamailio Branch: master Commit: c2ffa5b95f768f14ea3b1e30eed621c97ca1a025 URL: https://github.com/kamailio/kamailio/commit/c2ffa5b95f768f14ea3b1e30eed621c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-26T00:28:19+02:00 modules/statsd: fixes documented module parameter type --- Modified: modules/statsd/README Modified: modules/statsd/doc/statsd_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2ffa5b95f768f14ea3b1e30eed621c… Patch: https://github.com/kamailio/kamailio/commit/c2ffa5b95f768f14ea3b1e30eed621c… --- diff --git a/modules/statsd/README b/modules/statsd/README index 4d33f55..06dd698 100644 --- a/modules/statsd/README +++ b/modules/statsd/README @@ -21,7 +21,7 @@ Eloy Coto Pereiro 2. Parameters 2.1. ip(string) - 2.2. port(int) + 2.2. port(string) 3. Functions @@ -51,7 +51,7 @@ Chapter 1. Admin Guide 2. Parameters 2.1. ip(string) - 2.2. port(int) + 2.2. port(string) 3. Functions @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 2. Parameters 2.1. ip(string) - 2.2. port(int) + 2.2. port(string) 2.1. ip(string) @@ -86,7 +86,7 @@ Chapter 1. Admin Guide modparam("statsd", "ip", "127.0.0.1") ... -2.2. port(int) +2.2. port(string) Statsd server ip diff --git a/modules/statsd/doc/statsd_admin.xml b/modules/statsd/doc/statsd_admin.xml index 4e299d2..80d9f92 100644 --- a/modules/statsd/doc/statsd_admin.xml +++ b/modules/statsd/doc/statsd_admin.xml @@ -45,7 +45,7 @@ modparam("statsd", "ip", "127.0.0.1") </section> <section id="statsd.p.serverPort"> - <title><varname>port</varname>(int)</title> + <title><varname>port</varname>(string)</title> <para> Statsd server ip </para>

8 years, 3 months

git:master:20cd36c6: modules/statsd: enables IPv6 by using result from getaddrinfo()

by Mikko Lehto

Module: kamailio Branch: master Commit: 20cd36c671972d9ebb180884b70e1fd91a92a1cc URL: https://github.com/kamailio/kamailio/commit/20cd36c671972d9ebb180884b70e1fd… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-26T00:28:43+02:00 modules/statsd: enables IPv6 by using result from getaddrinfo() --- Modified: modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/20cd36c671972d9ebb180884b70e1fd… Patch: https://github.com/kamailio/kamailio/commit/20cd36c671972d9ebb180884b70e1fd… --- diff --git a/modules/statsd/lib_statsd.c b/modules/statsd/lib_statsd.c index 6492ef2..dedb41b 100644 --- a/modules/statsd/lib_statsd.c +++ b/modules/statsd/lib_statsd.c @@ -44,7 +44,7 @@ bool statsd_connect(void){ return false; } - statsd_socket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + statsd_socket.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); if (statsd_socket.sock == 0 ){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); return false; @@ -52,6 +52,7 @@ bool statsd_connect(void){ rc = connect( statsd_socket.sock, serverAddr->ai_addr, serverAddr->ai_addrlen); + freeaddrinfo(serverAddr); if (rc < 0){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); return false;

8 years, 3 months

git:master:93b5d2e5: usrloc: option to clean up database on write back/through modes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 93b5d2e5098938e49831125622ee6a5a8ba002c4 URL: https://github.com/kamailio/kamailio/commit/93b5d2e5098938e49831125622ee6a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T16:50:29+01:00 usrloc: option to clean up database on write back/through modes - enabled by db_timer_clean parameter - deletes expired records from database using secondary timer - can be helpful if there was an error on db client after the db operation was done on server, as reported by GH #30 --- Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/udomain.c Modified: modules/usrloc/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/93b5d2e5098938e49831125622ee6a5… Patch: https://github.com/kamailio/kamailio/commit/93b5d2e5098938e49831125622ee6a5… --- diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c index 1081aad..65ea97b 100644 --- a/modules/usrloc/dlist.c +++ b/modules/usrloc/dlist.c @@ -764,6 +764,22 @@ int synchronize_all_udomains(int istart, int istep) return res; } +/*! + * \brief Run timer handler to clean all domains in db + * \return 0 if all timer return 0, != 0 otherwise + */ +int ul_db_clean_udomains(void) +{ + int res = 0; + dlist_t* ptr; + + get_act_time(); /* Get and save actual time */ + + for( ptr=root ; ptr ; ptr=ptr->next) + res |= db_timer_udomain(ptr->d); + + return res; +} /*! * \brief Find a particular domain, small wrapper around find_dlist diff --git a/modules/usrloc/dlist.h b/modules/usrloc/dlist.h index a210996..e293325 100644 --- a/modules/usrloc/dlist.h +++ b/modules/usrloc/dlist.h @@ -146,4 +146,6 @@ int find_domain(str* _d, udomain_t** _p); */ void ul_set_max_partition(unsigned int m); +int ul_db_clean_udomains(void); + #endif diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 3ef2803..d57f212 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -881,7 +881,8 @@ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) /*! - * \brief Timer function to cleanup expired contacts, DB_ONLY db_mode + * \brief Timer function to cleanup expired contacts, db_mode: DB_ONLY + * and for WRITE_BACK, WRITE_THROUGH on config param * \param _d cleaned domain * \return 0 on success, -1 on failure */ diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 1b41f26..fa72e2b 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -95,6 +95,7 @@ static int mod_init(void); /*!< Module initialization f static void destroy(void); /*!< Module destroy function */ static void ul_core_timer(unsigned int ticks, void* param); /*!< Core timer handler */ static void ul_local_timer(unsigned int ticks, void* param); /*!< Local timer handler */ +static void ul_db_clean_timer(unsigned int ticks, void* param); /*!< DB clean timer handler */ static int child_init(int rank); /*!< Per-child init function */ static int mi_child_init(void); @@ -166,6 +167,7 @@ int skip_remote_socket = 0; /*!< By default do not skip remote socket */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; int ul_db_insert_null = 0; +int ul_db_timer_clean = 0; /* flags */ unsigned int nat_bflag = (unsigned int)-1; @@ -233,6 +235,7 @@ static param_export_t params[] = { {"db_raw_fetch_type", PARAM_INT, &ul_db_raw_fetch_type}, {"db_insert_null", PARAM_INT, &ul_db_insert_null}, {"server_id_filter", PARAM_INT, &ul_db_srvid}, + {"db_timer_clean", PARAM_INT, &ul_db_timer_clean}, {0, 0, 0} }; @@ -361,6 +364,11 @@ static int mod_init(void) return -1; } } + if(db_mode==WRITE_THROUGH || db_mode==WRITE_BACK) { + if(ul_db_timer_clean!=0) { + sr_wtimer_add(ul_db_clean_timer, 0, timer_interval); + } + } if (nat_bflag==(unsigned int)-1) { nat_bflag = 0; @@ -519,6 +527,14 @@ static void ul_local_timer(unsigned int ticks, void* param) } /*! \brief + * DB dlean timer handler + */ +static void ul_db_clean_timer(unsigned int ticks, void* param) +{ + ul_db_clean_udomains(); +} + +/*! \brief * preload module parameter handler */ static int ul_preload_param(modparam_t type, void* val)

8 years, 3 months

http_query/Curl Async Module : custom http headers feature request

by Tim Chubb

Hi Would it be possible to have a means of specifying additional request headers, i.e. things like the Authorization header, so that you would be able to make use of services which use a token based AAA system such as OAuth. >From the cli its trivial to invoke curl with additional headers i.e. if I was to query such a service it would simply be something like this: curl --header "Authorization: Bearer <token>" https://<uri<https://%3curi>> Ideally having an optional parameter on http_request/curl_http_request where you could provide a delimited string of additional headers, as without that sort of functionality the usefulness of http requests is pretty limited against modern web services. If this is already possible could someone guide me to the documentation which documents this ability? Thanks Tim.

8 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016