sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:master:dbdaf6d1: log_custom: module that can replace logging to syslog with logging to a remote address via UDP
by Daniel-Constantin Mierla 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: dbdaf6d1f965c54f6b197abf5b38c600c8400e5e URL: https://github.com/kamailio/kamailio/commit/dbdaf6d1f965c54f6b197abf5b38c60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-21T09:51:54+02:00 log_custom: module that can replace logging to syslog with logging to a remote address via UDP - reference of how to implement a custom logging mechanism --- Added: modules/log_custom/Makefile Added: modules/log_custom/README Added: modules/log_custom/doc/Makefile Added: modules/log_custom/doc/log_custom.xml Added: modules/log_custom/doc/log_custom_admin.xml Added: modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dbdaf6d1f965c54f6b197abf5b38c60… Patch: https://github.com/kamailio/kamailio/commit/dbdaf6d1f965c54f6b197abf5b38c60…

1 0

git:master:027495fb: corex: detect ipv6 for send*() functions
by Daniel-Constantin Mierla 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: 027495fb6ac7c8f50ff9945c209bc9f7ac98d991 URL: https://github.com/kamailio/kamailio/commit/027495fb6ac7c8f50ff9945c209bc9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-21T09:51:54+02:00 corex: detect ipv6 for send*() functions --- Modified: modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/027495fb6ac7c8f50ff9945c209bc9f… Patch: https://github.com/kamailio/kamailio/commit/027495fb6ac7c8f50ff9945c209bc9f… --- diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index dcbe550..21593f5 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -254,13 +254,15 @@ int corex_send(sip_msg_t *msg, gparam_t *pu, enum sip_protos proto) ret=E_BUG; goto error; } - } - else - { + } else { u = &next_hop; u->port_no = 5060; u->host = dest; - p = memchr(dest.s, ':', dest.len); + p = dest.s; + /* detect ipv6 */ + p = memchr(p, ']', dest.len); + if (p) p++; + p = memchr(p, ':', dest.len); if (p) { u->host.len = p - dest.s;

1 0

git:master:88b06d1f: core: added parameters log_engine_type and log_engine_data
by Daniel-Constantin Mierla 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: 88b06d1f6a1d8101504f4d644a406cbe6675dd73 URL: https://github.com/kamailio/kamailio/commit/88b06d1f6a1d8101504f4d644a406cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-21T09:51:54+02:00 core: added parameters log_engine_type and log_engine_data - can be used to specify what logging engine to be used and its initialization data - see readme of log_custom module for a same of usage --- Modified: cfg.lex Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/88b06d1f6a1d8101504f4d644a406cb… Patch: https://github.com/kamailio/kamailio/commit/88b06d1f6a1d8101504f4d644a406cb… --- diff --git a/cfg.lex b/cfg.lex index dc7ddcb..5aeadf0 100644 --- a/cfg.lex +++ b/cfg.lex @@ -290,6 +290,8 @@ LOGFACILITY log_facility LOGNAME log_name LOGCOLOR log_color LOGPREFIX log_prefix +LOGENGINETYPE log_engine_type +LOGENGINEDATA log_engine_data LISTEN listen ADVERTISE advertise|ADVERTISE ALIAS alias @@ -671,6 +673,8 @@ IMPORTFILE "import_file" <INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } <INITIAL>{LOGCOLOR} { yylval.strval=yytext; return LOGCOLOR; } <INITIAL>{LOGPREFIX} { yylval.strval=yytext; return LOGPREFIX; } +<INITIAL>{LOGENGINETYPE} { yylval.strval=yytext; return LOGENGINETYPE; } +<INITIAL>{LOGENGINEDATA} { yylval.strval=yytext; return LOGENGINEDATA; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } diff --git a/cfg.y b/cfg.y index 0b62aec..aa9b0ca 100644 --- a/cfg.y +++ b/cfg.y @@ -320,6 +320,8 @@ extern char *default_routename; %token LOGNAME %token LOGCOLOR %token LOGPREFIX +%token LOGENGINETYPE +%token LOGENGINEDATA %token LISTEN %token ADVERTISE %token ALIAS @@ -775,6 +777,10 @@ assign_stm: | LOGCOLOR EQUAL error { yyerror("boolean value expected"); } | LOGPREFIX EQUAL STRING { log_prefix_fmt=$3; } | LOGPREFIX EQUAL error { yyerror("string value expected"); } + | LOGENGINETYPE EQUAL STRING { _km_log_engine_type=$3; } + | LOGENGINETYPE EQUAL error { yyerror("string value expected"); } + | LOGENGINEDATA EQUAL STRING { _km_log_engine_data=$3; } + | LOGENGINEDATA EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; }

1 0

git:master:d20cc8be: core: added framework to allow replacing logging to syslog
by Daniel-Constantin Mierla 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: d20cc8bea38b6070a865ba04286f487034ba53b2 URL: https://github.com/kamailio/kamailio/commit/d20cc8bea38b6070a865ba04286f487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-21T09:51:54+02:00 core: added framework to allow replacing logging to syslog - this enables a module to replace all logging to syslog with another logging mechanism - it is not enabled when log_stderror=yes or the system is detected as __SUNPRO_C --- Modified: dprint.c Modified: dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/d20cc8bea38b6070a865ba04286f487… Patch: https://github.com/kamailio/kamailio/commit/d20cc8bea38b6070a865ba04286f487… --- diff --git a/dprint.c b/dprint.c index ebb5059..a2a2961 100644 --- a/dprint.c +++ b/dprint.c @@ -36,6 +36,19 @@ #include <stdio.h> #include <strings.h> +char *_km_log_engine_type = NULL; +char *_km_log_engine_data = NULL; + +km_log_f _km_log_func = &syslog; + +/** + * + */ +void km_log_func_set(km_log_f f) +{ + _km_log_func = f; +} + #ifndef NO_SIG_DEBUG /* signal protection: !=0 when LOG/DBG/... are printing */ volatile int dprint_crit = 0; diff --git a/dprint.h b/dprint.h index 40fc62a..35d5a0d 100644 --- a/dprint.h +++ b/dprint.h @@ -123,6 +123,13 @@ extern int log_stderr; extern int log_color; extern char *log_prefix_fmt; extern str *log_prefix_val; +extern char *_km_log_engine_type; +extern char *_km_log_engine_data; + +typedef void (*km_log_f)(int, const char *, ...); +extern km_log_f _km_log_func; + +void km_log_func_set(km_log_f f); /** @brief maps log levels to their string name and corresponding syslog level */ @@ -303,7 +310,7 @@ void log_prefix_init(void); if (unlikely(log_color)) dprint_color_reset(); \ } else { \ if(unlikely(log_prefix_val)) { \ - syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\ (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \ @@ -312,7 +319,7 @@ void log_prefix_init(void); (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ (prefix) , ## args); \ } else { \ - syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\ (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \

1 0

git:master:b6ddd2e1: curl Add example of using pvars
by Olle E. Johansson 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: b6ddd2e1348c45a662c9ee0cbc76ae0c3d2d407e URL: https://github.com/kamailio/kamailio/commit/b6ddd2e1348c45a662c9ee0cbc76ae0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-21T07:25:11+02:00 curl Add example of using pvars --- Modified: modules/curl/curl.c --- Diff: https://github.com/kamailio/kamailio/commit/b6ddd2e1348c45a662c9ee0cbc76ae0… Patch: https://github.com/kamailio/kamailio/commit/b6ddd2e1348c45a662c9ee0cbc76ae0… --- diff --git a/modules/curl/curl.c b/modules/curl/curl.c index be2a5b0..ae9f464 100644 --- a/modules/curl/curl.c +++ b/modules/curl/curl.c @@ -41,6 +41,7 @@ * curl_connect(connection, url, content-type, data, $avp) * * $var(res) = curl_connect("anders", "/postlåda", "application/json", "{ ok, {200, ok}}", "$avp(gurka)"); + * $var(res) = curl_connect("anders", "/postlåda", "application/json", "$var(tomat)", "$avp(gurka)"); * */

1 0

git:master:c100654e: curl Add documentation for new parameter "maxdatasize"
by Olle E. Johansson 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: c100654e5cbd1dfefef6101389c41bf62b8a1394 URL: https://github.com/kamailio/kamailio/commit/c100654e5cbd1dfefef6101389c41bf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-21T07:24:13+02:00 curl Add documentation for new parameter "maxdatasize" --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c100654e5cbd1dfefef6101389c41bf… Patch: https://github.com/kamailio/kamailio/commit/c100654e5cbd1dfefef6101389c41bf…

1 0

git:master:1703dda2: curl Add parameter for max download size
by Olle E. Johansson 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: 1703dda2b3d7c54d8ead2b1152ac87f36f6384fa URL: https://github.com/kamailio/kamailio/commit/1703dda2b3d7c54d8ead2b1152ac87f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-20T21:54:47+02:00 curl Add parameter for max download size --- Modified: modules/curl/curl.c Modified: modules/curl/curl.h Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/1703dda2b3d7c54d8ead2b1152ac87f… Patch: https://github.com/kamailio/kamailio/commit/1703dda2b3d7c54d8ead2b1152ac87f… --- diff --git a/modules/curl/curl.c b/modules/curl/curl.c index a2c2d74..be2a5b0 100644 --- a/modules/curl/curl.c +++ b/modules/curl/curl.c @@ -78,6 +78,7 @@ char *default_http_proxy = NULL; /*!< Default HTTP proxy to use */ unsigned int default_http_proxy_port = 0; /*!< Default HTTP proxy port to use */ unsigned int default_http_follow_redirect = 0; /*!< Follow HTTP redirects CURLOPT_FOLLOWLOCATION */ char *default_useragent = CURL_USER_AGENT; /*!< Default CURL useragent. Default "Kamailio Curl " */ +unsigned int default_maxdatasize = 0; /*!< Default download size. 0=disabled */ static curl_version_info_data *curl_info; @@ -133,16 +134,17 @@ static cmd_export_t cmds[] = { /* Exported parameters */ static param_export_t params[] = { - {"connection_timeout", INT_PARAM, &default_connection_timeout}, + {"connection_timeout", PARAM_INT, &default_connection_timeout}, {"curlcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, {"tlscacert", PARAM_STRING, &default_tls_cacert }, {"tlsclientcert", PARAM_STRING, &default_tls_clientcert }, {"tlsclientkey", PARAM_STRING, &default_tls_clientkey }, - {"tlsverifyserver", INT_PARAM, &default_tls_verifyserver }, - {"httpproxyport", INT_PARAM, &default_http_proxy_port }, + {"tlsverifyserver", PARAM_INT, &default_tls_verifyserver }, + {"httpproxyport", PARAM_INT, &default_http_proxy_port }, {"httpproxy", PARAM_STRING, &default_http_proxy}, - {"httpredirect", INT_PARAM, &default_http_follow_redirect }, + {"httpredirect", PARAM_INT, &default_http_follow_redirect }, {"useragent", PARAM_STRING, &default_useragent }, + {"maxdatasize", PARAM_INT, &default_maxdatasize }, {0, 0, 0} }; diff --git a/modules/curl/curl.h b/modules/curl/curl.h index afa296a..b83438c 100644 --- a/modules/curl/curl.h +++ b/modules/curl/curl.h @@ -44,6 +44,7 @@ extern char *default_http_proxy; /*!< Default HTTP proxy to use */ extern unsigned int default_http_proxy_port; /*!< Default HTTP proxy port to use */ extern unsigned int default_http_follow_redirect; /*!< Follow HTTP redirects CURLOPT_FOLLOWLOCATION */ extern char *default_useragent; /*!< Default CURL useragent. Default "Kamailio Curl " */ +extern unsigned int default_maxdatasize; /*!< Default Maximum download size */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */ @@ -74,6 +75,7 @@ typedef struct _curl_con int http_follow_redirect; /*!< TRUE if we should follow HTTP 302 redirects */ unsigned int port; /*!< The port to connect to */ int timeout; /*!< Timeout for this connection */ + long maxdatasize; /*!< Maximum data download on GET or POST */ http_res_stream_t *stream; /*!< Curl stream */ struct _curl_con *next; /*!< next connection */ char redirecturl[512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 2baf80f..31034fe 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -247,6 +247,7 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ char urlbuf[512]; unsigned int len = 0; str postdata; + long maxdatasize = default_maxdatasize; memset(usernamebuf,0,sizeof(usernamebuf)); memset(passwordbuf,0,sizeof(passwordbuf)); @@ -289,7 +290,7 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ /* TODO: Concatenate URL in connection with URL given in function */ return curL_query_url(_m, urlbuf, _result, usernamebuf, passwordbuf, (contenttype ? contenttype : "text/plain"), _post, - conn->timeout, conn->http_follow_redirect, 0, 0 ); + conn->timeout, conn->http_follow_redirect, 0, (unsigned int) maxdatasize ); }

1 0

git:master:e8bb6312: curl Preparing for a max size of data transfer. Download full file for curl_connect, not for http_query
by Olle E. Johansson 21 Oct '15

21 Oct '15

Module: kamailio Branch: master Commit: e8bb6312c500232cad9e1fa6413c5911fd2ece0d URL: https://github.com/kamailio/kamailio/commit/e8bb6312c500232cad9e1fa6413c591… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-20T21:47:58+02:00 curl Preparing for a max size of data transfer. Download full file for curl_connect, not for http_query --- Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/e8bb6312c500232cad9e1fa6413c591… Patch: https://github.com/kamailio/kamailio/commit/e8bb6312c500232cad9e1fa6413c591…

1 0

[kamailio] Proposed: Consolidate example kamailio.cfg files (#209)
by tuxd00d 20 Oct '15

20 Oct '15

- There are relatively few differences between the example configuration files. - The time needed to maintain three separate files doesn't match the benefit. - The power of the #!define and #!ifdef system negates the need for separate examples. - It is simple enough to remove #!ifdef sections if one wishes to slim down the file size. - I'll do a consolidation if no valid argument against it is raised. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/209

3 6

git:master:a3265965: curl Update documentation
by Olle E. Johansson 20 Oct '15

20 Oct '15

Module: kamailio Branch: master Commit: a3265965625fa4f2a2c9825e0ed03c834f35fffc URL: https://github.com/kamailio/kamailio/commit/a3265965625fa4f2a2c9825e0ed03c8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-20T21:06:12+02:00 curl Update documentation --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a3265965625fa4f2a2c9825e0ed03c8… Patch: https://github.com/kamailio/kamailio/commit/a3265965625fa4f2a2c9825e0ed03c8…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015