sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

[kamailio/kamailio] http_client: Fixed bug, so user-agent header now is added to HTTP request (#674)

by Jurijs Ivolga

This commit add minor fix, so user-agent header now is added for HTTP requests. I'm not a C programmer, but this fix makes it work. I highly recommend to review this fix. :) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/674 -- Commit Summary -- * http_client: Fixed user-agent -- File Changes -- M modules/http_client/functions.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/674.patch https://github.com/kamailio/kamailio/pull/674.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/674

8 years, 4 months

git:master:875fd4cc: http_client: http_query reuse the default user agent setting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 875fd4cc96d9aab15ab307e8f991a876b8ed31be URL: https://github.com/kamailio/kamailio/commit/875fd4cc96d9aab15ab307e8f991a87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-04T15:20:21+02:00 http_client: http_query reuse the default user agent setting - based on GH #674, by Jurijs Ivolga - useful for simplified upgrade of the configs using utils version of the http query to the http_client module --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/875fd4cc96d9aab15ab307e8f991a87… Patch: https://github.com/kamailio/kamailio/commit/875fd4cc96d9aab15ab307e8f991a87… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 258508d..3b6e808 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -54,6 +54,7 @@ typedef struct { char *ciphersuites; char *http_proxy; char *failovercon; + char *useragent; unsigned int authmethod; unsigned int http_proxy_port; unsigned int tlsversion; @@ -68,11 +69,11 @@ typedef struct { } curl_query_t; -/* +/* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. * - * This function may be called multiple times for larger responses, + * This function may be called multiple times for larger responses, * so it reallocs + concatenates the buffer as needed. */ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) @@ -228,6 +229,8 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); + if(params->useragent) + res |= curl_easy_setopt(curl, CURLOPT_USERAGENT, params->useragent); if (res != CURLE_OK) { /* PANIC */ @@ -587,6 +590,9 @@ int http_query(struct sip_msg* _m, char* _url, str* _dst, char* _post) query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = 1; query_params.maxdatasize = 0; + if(default_useragent.s!=NULL && default_useragent.len>0) { + query_params.useragent = default_useragent.s; + } if(default_http_proxy.s!=NULL && default_http_proxy.len>0) { query_params.http_proxy = default_http_proxy.s; if(default_http_proxy_port>0) {

8 years, 4 months

git:master:4949ebb7: rr: refactored the check route params to detect properly if same message is used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4949ebb7258aff41b2fd3a075bdc1a1af4684b5c URL: https://github.com/kamailio/kamailio/commit/4949ebb7258aff41b2fd3a075bdc1a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-04T15:12:34+02:00 rr: refactored the check route params to detect properly if same message is used - cached pointers may get invalid depending on the type of route block - reported by GH #663 --- Modified: modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/4949ebb7258aff41b2fd3a075bdc1a1… Patch: https://github.com/kamailio/kamailio/commit/4949ebb7258aff41b2fd3a075bdc1a1…

8 years, 4 months

git:master:0374befe: modules: readme files regenerated - cdp ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 0374befe491522e0bcdf005477f1d26b20d6b8fe URL: https://github.com/kamailio/kamailio/commit/0374befe491522e0bcdf005477f1d26… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-04T14:31:17+02:00 modules: readme files regenerated - cdp ... --- Modified: modules/cdp/README --- Diff: https://github.com/kamailio/kamailio/commit/0374befe491522e0bcdf005477f1d26… Patch: https://github.com/kamailio/kamailio/commit/0374befe491522e0bcdf005477f1d26… --- diff --git a/modules/cdp/README b/modules/cdp/README index 1eec91d..964afea 100644 --- a/modules/cdp/README +++ b/modules/cdp/README @@ -33,6 +33,7 @@ Richard Good 4.1. config_file (string) 4.2. latency_threshold (int) 4.3. workerq_length_threshold_percentage (int) + 4.4. debug_heavy (int) 5. RPC Commands @@ -123,7 +124,8 @@ Richard Good 1.1. Set config_file parameter 1.2. Set latency_threshold parameter 1.3. Set workerq_length_threshold_percentage parameter - 1.4. DiameterPeer.xml example + 1.4. Set debug_heavy parameter + 1.5. DiameterPeer.xml example Chapter 1. Admin Guide @@ -141,6 +143,7 @@ Chapter 1. Admin Guide 4.1. config_file (string) 4.2. latency_threshold (int) 4.3. workerq_length_threshold_percentage (int) + 4.4. debug_heavy (int) 5. RPC Commands @@ -207,6 +210,7 @@ Chapter 1. Admin Guide 4.1. config_file (string) 4.2. latency_threshold (int) 4.3. workerq_length_threshold_percentage (int) + 4.4. debug_heavy (int) 4.1. config_file (string) @@ -244,6 +248,19 @@ modparam("cdp", "latency_threshold", 1000) modparam("cdp", "workerq_length_threshold_percentage", 25) ... +4.4. debug_heavy (int) + + Flag to enable a more verbose log, which tells you more details about + peers. This is disabled by default because it brings to a log too much + verbose in DBG mode Can be enabled upon needs + + Default value is “0”. + + Example 1.4. Set debug_heavy parameter +... +modparam("cdp", "debug_heavy", 1) +... + 5. RPC Commands 5.1. cdp.disable_peer @@ -269,7 +286,7 @@ modparam("cdp", "workerq_length_threshold_percentage", 25) This is an example CDP configuration file. The location of this file is configured as a CDP parameter (config_file) - See section 4.1 Above - Example 1.4. DiameterPeer.xml example + Example 1.5. DiameterPeer.xml example <?xml version="1.0" encoding="UTF-8"?> <!--

8 years, 4 months

[kamailio/kamailio] Refactor cdp log (#692)

by Federico Favaro

This is a complete refactor of cdp log. In particular: - It removes escape chars for colors in log: they are most of the times not interpreted so they are messing up the logs - It refactors some log level, moving to ERROR from WARN some errors during peer connections - In DEBUG level, cdp is too much verbose and also syslogs complains about rate-limiting. Instead of removing some logs (which is quite unfair), let's introduce a new modparam (debug_heavy) in order to activate some logs which gives some side informations about peers status. This modparam is not active by default but this can be enabled easily re-introducing previous debug logs You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/692 -- Commit Summary -- * cdp: Review log level on peer_connect() function * cdp: Remove escape chars for colors in log * cdp: Review of logging of cdp -- File Changes -- M modules/cdp/globals.h (10) M modules/cdp/mod.c (2) M modules/cdp/peermanager.c (27) M modules/cdp/peermanager.h (2) M modules/cdp/peerstatemachine.c (2) M modules/cdp/receiver.c (34) M modules/cdp/receiver.h (2) M modules/cdp/session.c (74) M modules/cdp/session.h (2) M modules/cdp/tcp_accept.c (2) M modules/cdp/tcp_accept.h (2) M modules/cdp/transaction.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/692.patch https://github.com/kamailio/kamailio/pull/692.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/692

8 years, 4 months

git:master:f00553e3: Merge pull request #692 from athonet-open/refactor_cdp_log

by GitHub

Module: kamailio Branch: master Commit: f00553e31da12bfacbf582c201f5a4f8addd587f URL: https://github.com/kamailio/kamailio/commit/f00553e31da12bfacbf582c201f5a4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-04T14:24:48+02:00 Merge pull request #692 from athonet-open/refactor_cdp_log Refactor cdp log --- Modified: modules/cdp/doc/cdp_admin.xml Modified: modules/cdp/globals.h Modified: modules/cdp/mod.c Modified: modules/cdp/peermanager.c Modified: modules/cdp/peermanager.h Modified: modules/cdp/peerstatemachine.c Modified: modules/cdp/receiver.c Modified: modules/cdp/receiver.h Modified: modules/cdp/session.c Modified: modules/cdp/session.h Modified: modules/cdp/tcp_accept.c Modified: modules/cdp/tcp_accept.h Modified: modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/f00553e31da12bfacbf582c201f5a4f… Patch: https://github.com/kamailio/kamailio/commit/f00553e31da12bfacbf582c201f5a4f…

8 years, 4 months

git:master:c78d111c: cdp: Update doc of module with "debug_heavy" param

by Federico Favaro

Module: kamailio Branch: master Commit: c78d111c974c7d51a463e5fccd71fe0116ed7e64 URL: https://github.com/kamailio/kamailio/commit/c78d111c974c7d51a463e5fccd71fe0… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-07-04T12:37:19+02:00 cdp: Update doc of module with "debug_heavy" param --- Modified: modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c78d111c974c7d51a463e5fccd71fe0… Patch: https://github.com/kamailio/kamailio/commit/c78d111c974c7d51a463e5fccd71fe0… --- diff --git a/modules/cdp/doc/cdp_admin.xml b/modules/cdp/doc/cdp_admin.xml index 234e270..d21bbb9 100644 --- a/modules/cdp/doc/cdp_admin.xml +++ b/modules/cdp/doc/cdp_admin.xml @@ -144,6 +144,25 @@ modparam("cdp", "workerq_length_threshold_percentage", 25) </programlisting> </example> </section> + <section> + <title>debug_heavy (int)</title> + + <para>Flag to enable a more verbose log, which tells you + more details about peers. This is disabled by default + because it brings to a log too much verbose in DBG mode + Can be enabled upon needs</para> + + <para><emphasis> Default value is <quote>0</quote>. </emphasis></para> + + <example> + <title>Set <varname>debug_heavy</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "debug_heavy", 1) +... + </programlisting> + </example> + </section> </section> <section>

8 years, 4 months

git:master:cc68bea2: cdp: Review of logging of cdp

by Federico Favaro

Module: kamailio Branch: master Commit: cc68bea26eee85b9918716f9fc2bae23a1732b48 URL: https://github.com/kamailio/kamailio/commit/cc68bea26eee85b9918716f9fc2bae2… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <fedefava86(a)gmail.com> Date: 2016-07-01T21:40:05+02:00 cdp: Review of logging of cdp cdp log at DEBUG level is too verbose leading to an un-readable log and rate-limiting. Instead of removing them completely let's introduce a modparam to enable the "heavy" debug. By default it is not activated. --- Modified: modules/cdp/mod.c Modified: modules/cdp/peermanager.c Modified: modules/cdp/peermanager.h Modified: modules/cdp/receiver.c Modified: modules/cdp/receiver.h Modified: modules/cdp/session.c Modified: modules/cdp/session.h Modified: modules/cdp/tcp_accept.c Modified: modules/cdp/tcp_accept.h Modified: modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/cc68bea26eee85b9918716f9fc2bae2… Patch: https://github.com/kamailio/kamailio/commit/cc68bea26eee85b9918716f9fc2bae2…

8 years, 4 months

git:master:01b16ce7: cdp: Remove escape chars for colors in log

by Federico Favaro

Module: kamailio Branch: master Commit: 01b16ce70bf6a36200e0df7bb8519303d7933a3a URL: https://github.com/kamailio/kamailio/commit/01b16ce70bf6a36200e0df7bb851930… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-07-01T17:23:53+02:00 cdp: Remove escape chars for colors in log Usually they are not interpreted on log and they are messing up the log itsefl --- Modified: modules/cdp/globals.h Modified: modules/cdp/peermanager.c Modified: modules/cdp/peerstatemachine.c Modified: modules/cdp/receiver.c Modified: modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/01b16ce70bf6a36200e0df7bb851930… Patch: https://github.com/kamailio/kamailio/commit/01b16ce70bf6a36200e0df7bb851930…

8 years, 4 months

git:master:1b1a7816: cdp: Review log level on peer_connect() function

by Federico Favaro

Module: kamailio Branch: master Commit: 1b1a7816a86788daf9c9dc2bc8f61bbd4aab8b3d URL: https://github.com/kamailio/kamailio/commit/1b1a7816a86788daf9c9dc2bc8f61bb… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-07-01T17:05:11+02:00 cdp: Review log level on peer_connect() function In order to log as ERROR if something wrong occurs --- Modified: modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/1b1a7816a86788daf9c9dc2bc8f61bb… Patch: https://github.com/kamailio/kamailio/commit/1b1a7816a86788daf9c9dc2bc8f61bb… --- diff --git a/modules/cdp/receiver.c b/modules/cdp/receiver.c index fa6af0b..ee406f5 100644 --- a/modules/cdp/receiver.c +++ b/modules/cdp/receiver.c @@ -857,7 +857,7 @@ int peer_connect(peer *p) { if (getnameinfo(ainfo->ai_addr,ainfo->ai_addrlen, host,256,serv,256,NI_NUMERICHOST|NI_NUMERICSERV)==0){ - LM_WARN("peer_connect(): Trying to connect to %s port %s\n", + LM_INFO("peer_connect(): Trying to connect to %s port %s\n", host,serv); } @@ -876,11 +876,11 @@ int peer_connect(peer *p) error = getaddrinfo(p->src_addr.s, NULL, &hints, &sainfo); if (error!=0){ - LM_WARN("peer_connect(): error getting client socket on %.*s:%s\n", + LM_ERR("peer_connect(): error getting client socket on %.*s:%s\n", p->src_addr.len,p->src_addr.s,gai_strerror(error)); } else { if (bind(sock, sainfo->ai_addr, sainfo->ai_addrlen )) { - LM_WARN("peer_connect(): error opening client socket on %.*s:%s\n", + LM_ERR("peer_connect(): error opening client socket on %.*s:%s\n", p->src_addr.len,p->src_addr.s,strerror(errno)); } } @@ -905,18 +905,18 @@ int peer_connect(peer *p) int valopt; getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)(&valopt), &lon); if (valopt) { - LM_WARN("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); + LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); close(sock); continue; } }else{ - LM_WARN("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); + LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); continue; } } }else{ - LM_WARN("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); + LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); continue; }

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016