sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

by Daniel-Constantin Mierla

Hello, during the last developers meeting in Dusseldorf we had some discussions about simplifying the building process and internal dependencies/libraries. The src/lib/srutils contains now mainly the uuid and json functions, which are used by very common modules such as registrar/usrloc, tm, dialog, jsonrpcs, dmq*, ... There is a part related to the time recurrence matching, used by drouting, tmrec, but the code is not that significant in size, so I am planning to relocate the lib code to the core and get rid of dependencies to internal libsrutils to many modules. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 9-11, 2020, Berlin - www.asipto.com Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

4 years, 11 months

git:master:b63c3aa7: core: dprint - support for long engine data via cli --log-engine param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b63c3aa7c221cc7f68b1e649287d4fed32c1b0e4 URL: https://github.com/kamailio/kamailio/commit/b63c3aa7c221cc7f68b1e649287d4fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-21T13:26:11+01:00 core: dprint - support for long engine data via cli --log-engine param - format: --log-engine=name:data - log engine data for 'json' can be: - M - strip the last '\n' from logmessage value - N - do not add '\n' after the json document --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/b63c3aa7c221cc7f68b1e649287d4fe… Patch: https://github.com/kamailio/kamailio/commit/b63c3aa7c221cc7f68b1e649287d4fe… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index bd4783fff6..42695e39d9 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -484,7 +484,11 @@ void log_prefix_set(sip_msg_t *msg) ksr_slog_f _ksr_slog_func = NULL; -static void ksr_slog_json_str_escape(str *s_in, str *s_out) +static int _ksr_slog_json_flags = 0; +#define KSR_SLOGJSON_FL_STRIPMSGNL (1<<0) +#define KSR_SLOGJSON_FL_NOLOGNL (1<<1) + +static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) { char *p1, *p2; int len = 0; @@ -494,6 +498,7 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out) s_out->len = 0; if (!s_in || !s_in->s) { s_out->s = strdup(""); + *emode = 1; return; } for(i = 0; i < s_in->len; i++) { @@ -505,11 +510,18 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out) len++; } } + if(len == s_in->len) { + s_out->s = s_in->s; + s_out->len = s_in->len; + *emode = 0; + return; + } s_out->s = (char*)malloc(len + 2); if (!s_out->s) { return; } + *emode = 1; p2 = s_out->s; p1 = s_in->s; @@ -553,11 +565,11 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out) } #define KSR_SLOG_SYSLOG_JSON_FMT "{ \"level\": \"%s\", \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }\n" + " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }%s" #define KSR_SLOG_STDERR_JSON_FMT "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }\n" + " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }%s" void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) { @@ -567,6 +579,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) int n; str s_in = STR_NULL; str s_out = STR_NULL; + int emode = 0; va_start(arglist, format); n = vsnprintf(obuf + s_in.len, KSR_SLOG_MAX_SIZE - s_in.len, format, arglist); @@ -578,7 +591,13 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) va_end(arglist); s_in.s = obuf; - ksr_slog_json_str_escape(&s_in, &s_out); + if (_ksr_slog_json_flags & KSR_SLOGJSON_FL_STRIPMSGNL) { + if(s_in.s[s_in.len - 1] == '\n') { + s_in.len--; + } + } + + ksr_slog_json_str_escape(&s_in, &s_out, &emode); if(s_out.s == NULL) { goto error; } @@ -588,16 +607,20 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) KSR_SLOG_STDERR_JSON_FMT, process_no, my_pid(), kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, - s_out.len, s_out.s); + s_out.len, s_out.s, + (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL)?"":"\n"); if (unlikely(log_color)) dprint_color_reset(); } else { _km_log_func(kld->v_facility, KSR_SLOG_SYSLOG_JSON_FMT, kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, - s_out.len, s_out.s); + s_out.len, s_out.s, + (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL)?"":"\n"); + } + if(emode && s_out.s) { + free(s_out.s); } - free(s_out.s); return; error: return; @@ -605,8 +628,36 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) void ksr_slog_init(char *ename) { - if(ename && (strlen(ename)==4) && (strcasecmp(ename, "json")==0)) { + char *p; + int elen = 0; + + if (!ename) { + return; + } + + p = strchr(ename, ':'); + if(p) { + elen = p - ename; + } else { + elen = strlen(ename); + } + + if ((elen==4) && (strncasecmp(ename, "json", 4)==0)) { _km_log_engine_type = "json"; _ksr_slog_func = &ksr_slog_json; + if(p) { + _km_log_engine_data = p + 1; + while (*p) { + switch (*p) { + case 'M': + _ksr_slog_json_flags |= KSR_SLOGJSON_FL_STRIPMSGNL; + break; + case 'N': + _ksr_slog_json_flags |= KSR_SLOGJSON_FL_NOLOGNL; + break; + } + p++; + } + } } }

4 years, 11 months

git:master:37b4a35a: core: dprint - implemented json structured logging

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 37b4a35ab2b1f156ff3fd4dab7ce7aab22a5e398 URL: https://github.com/kamailio/kamailio/commit/37b4a35ab2b1f156ff3fd4dab7ce7aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T20:28:47+01:00 core: dprint - implemented json structured logging - start with --log-engine=json --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/37b4a35ab2b1f156ff3fd4dab7ce7aa… Patch: https://github.com/kamailio/kamailio/commit/37b4a35ab2b1f156ff3fd4dab7ce7aa… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 8d2053e0ae..bd4783fff6 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -27,15 +27,15 @@ */ +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <strings.h> #include "globals.h" #include "dprint.h" #include "pvar.h" -#include <stdarg.h> -#include <stdio.h> -#include <strings.h> - char *_km_log_engine_type = NULL; char *_km_log_engine_data = NULL; @@ -484,34 +484,129 @@ void log_prefix_set(sip_msg_t *msg) ksr_slog_f _ksr_slog_func = NULL; +static void ksr_slog_json_str_escape(str *s_in, str *s_out) +{ + char *p1, *p2; + int len = 0; + char token; + int i; + + s_out->len = 0; + if (!s_in || !s_in->s) { + s_out->s = strdup(""); + return; + } + for(i = 0; i < s_in->len; i++) { + if (strchr("\"\\\b\f\n\r\t", s_in->s[i])) { + len += 2; + } else if (s_in->s[i] < 32) { + len += 5; + } else { + len++; + } + } + + s_out->s = (char*)malloc(len + 2); + if (!s_out->s) { + return; + } + + p2 = s_out->s; + p1 = s_in->s; + while (p1 < s_in->s + s_in->len) { + if ((unsigned char) *p1 > 31 && *p1 != '\"' && *p1 != '\\') + *p2++ = *p1++; + else { + *p2++ = '\\'; + switch (token = *p1++) { + case '\\': + *p2++ = '\\'; + break; + case '\"': + *p2++ = '\"'; + break; + case '\b': + *p2++ = 'b'; + break; + case '\f': + *p2++ = 'f'; + break; + case '\n': + *p2++ = 'n'; + break; + case '\r': + *p2++ = 'r'; + break; + case '\t': + *p2++ = 't'; + break; + default: + snprintf(p2, 6, "u%04x", token); + p2 += 5; + break; /* escape and print */ + } + } + } + *p2++ = 0; + s_out->len = len; + return; +} + +#define KSR_SLOG_SYSLOG_JSON_FMT "{ \"level\": \"%s\", \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }\n" + +#define KSR_SLOG_STDERR_JSON_FMT "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"logprefix\": \"%.*s\", \"message\": \"%.*s\" }\n" + void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) { va_list arglist; #define KSR_SLOG_MAX_SIZE 32*1024 char obuf[KSR_SLOG_MAX_SIZE]; int n; + str s_in = STR_NULL; + str s_out = STR_NULL; - n = 0; va_start(arglist, format); - n += vsnprintf(obuf + n, KSR_SLOG_MAX_SIZE - n, format, arglist); + n = vsnprintf(obuf + s_in.len, KSR_SLOG_MAX_SIZE - s_in.len, format, arglist); + if(n<0 || n>=KSR_SLOG_MAX_SIZE - s_in.len) { + va_end(arglist); + goto error; + } + s_in.len += n; va_end(arglist); + s_in.s = obuf; + ksr_slog_json_str_escape(&s_in, &s_out); + if(s_out.s == NULL) { + goto error; + } if (unlikely(log_stderr)) { if (unlikely(log_color)) dprint_color(kld->v_level); fprintf(stderr, - "{ \"level\": \"%s\", \"module\": \"%s\", \"file\": \"%s\", \"line\": %d, \"function\": \"%s\", \"message\": \"%.*s\" }\n", - kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, n, obuf); + KSR_SLOG_STDERR_JSON_FMT, process_no, my_pid(), + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, + s_out.len, s_out.s); if (unlikely(log_color)) dprint_color_reset(); } else { _km_log_func(kld->v_facility, - "{ \"level\": \"%s\", \"module\": \"%s\", \"file\": \"%s\", \"line\": %d, \"function\": \"%s\", \"message\": \"%.*s\" }\n", - kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, n, obuf); + KSR_SLOG_SYSLOG_JSON_FMT, + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, + s_out.len, s_out.s); } + free(s_out.s); + return; +error: + return; } void ksr_slog_init(char *ename) { if(ename && (strlen(ename)==4) && (strcasecmp(ename, "json")==0)) { + _km_log_engine_type = "json"; _ksr_slog_func = &ksr_slog_json; } }

4 years, 11 months

git:5.2:c3493767: pkg/kamailio: removed not maintaned Oracle packaging files [skip ci]

by Sergey Safarov

Module: kamailio Branch: 5.2 Commit: c3493767ba479c7e8b39730af76402abea0a4953 URL: https://github.com/kamailio/kamailio/commit/c3493767ba479c7e8b39730af76402a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-20T20:54:40+03:00 pkg/kamailio: removed not maintaned Oracle packaging files [skip ci] To package for Oracle dist need use OBS folder (cherry picked from commit fcd45145d9c534e2230707ce64b044d927efca14) --- Removed: pkg/kamailio/oracle/el6/kamailio.default Removed: pkg/kamailio/oracle/el6/kamailio.init Removed: pkg/kamailio/oracle/el6/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.service Removed: pkg/kamailio/oracle/el7/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.sysconfig Removed: pkg/kamailio/oracle/kamailio.logrotate Removed: pkg/kamailio/oracle/kamailio.rsyslog --- Diff: https://github.com/kamailio/kamailio/commit/c3493767ba479c7e8b39730af76402a… Patch: https://github.com/kamailio/kamailio/commit/c3493767ba479c7e8b39730af76402a…

4 years, 11 months

git:5.3:3a21cd3a: pkg/kamailio: removed not maintaned Oracle packaging files [skip ci]

by Sergey Safarov

Module: kamailio Branch: 5.3 Commit: 3a21cd3a7010108e88164154b3f682e72dfa65ac URL: https://github.com/kamailio/kamailio/commit/3a21cd3a7010108e88164154b3f682e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-20T20:46:29+03:00 pkg/kamailio: removed not maintaned Oracle packaging files [skip ci] To package for Oracle dist need use OBS folder (cherry picked from commit fcd45145d9c534e2230707ce64b044d927efca14) --- Removed: pkg/kamailio/oracle/el6/kamailio.default Removed: pkg/kamailio/oracle/el6/kamailio.init Removed: pkg/kamailio/oracle/el6/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.service Removed: pkg/kamailio/oracle/el7/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.sysconfig Removed: pkg/kamailio/oracle/kamailio.logrotate Removed: pkg/kamailio/oracle/kamailio.rsyslog --- Diff: https://github.com/kamailio/kamailio/commit/3a21cd3a7010108e88164154b3f682e… Patch: https://github.com/kamailio/kamailio/commit/3a21cd3a7010108e88164154b3f682e…

4 years, 11 months

git:master:fcd45145: pkg/kamailio: removed not maintaned Oracle packaging files [skip ci]

by Sergey Safarov

Module: kamailio Branch: master Commit: fcd45145d9c534e2230707ce64b044d927efca14 URL: https://github.com/kamailio/kamailio/commit/fcd45145d9c534e2230707ce64b044d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-20T20:39:52+03:00 pkg/kamailio: removed not maintaned Oracle packaging files [skip ci] To package for Oracle dist need use OBS folder --- Removed: pkg/kamailio/oracle/el6/kamailio.default Removed: pkg/kamailio/oracle/el6/kamailio.init Removed: pkg/kamailio/oracle/el6/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.service Removed: pkg/kamailio/oracle/el7/kamailio.spec Removed: pkg/kamailio/oracle/el7/kamailio.sysconfig Removed: pkg/kamailio/oracle/kamailio.logrotate Removed: pkg/kamailio/oracle/kamailio.rsyslog --- Diff: https://github.com/kamailio/kamailio/commit/fcd45145d9c534e2230707ce64b044d… Patch: https://github.com/kamailio/kamailio/commit/fcd45145d9c534e2230707ce64b044d…

4 years, 11 months

[kamailio/kamailio] pkg: fixed SystemD service install path (#2197)

by Oded Arbel

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description - `systemd/system/service` is not a real directory. Services should be in `systemd/system` to be loaded by SystemD. - Also, fixed typo in `%files`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2197 -- Commit Summary -- * `systemd/system/service` is not a real directory -- File Changes -- M pkg/kamailio/oracle/el7/kamailio.spec (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2197.patch https://github.com/kamailio/kamailio/pull/2197.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/2197

4 years, 11 months

git:master:36723bba: core: main - new command line parameter --log-engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36723bbace54f98637ca0f20bbb42b8461716d61 URL: https://github.com/kamailio/kamailio/commit/36723bbace54f98637ca0f20bbb42b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T15:11:21+01:00 core: main - new command line parameter --log-engine - allow setting the log engine from command line --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/36723bbace54f98637ca0f20bbb42b8… Patch: https://github.com/kamailio/kamailio/commit/36723bbace54f98637ca0f20bbb42b8… --- diff --git a/src/main.c b/src/main.c index 1c62c6d130..8926308ca5 100644 --- a/src/main.c +++ b/src/main.c @@ -195,6 +195,7 @@ Options:\n\ -l \"sctp:(eth0)\", -l \"(eth0, eth1, 127.0.0.1):5065\".\n\ The default behaviour is to listen on all the interfaces.\n\ --loadmodule=name load the module specified by name\n\ + --log-engine=log engine name and data\n\ -L path Modules search path (default: " MODS_DIR ")\n\ -m nr Size of shared memory allocated in Megabytes\n\ --modparam=modname:paramname:type:value set the module parameter\n\ @@ -1929,6 +1930,7 @@ int main(int argc, char** argv) {"server-id", required_argument, 0, KARGOPTVAL + 4}, {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, {"modparam", required_argument, 0, KARGOPTVAL + 6}, + {"log-engine", required_argument, 0, KARGOPTVAL + 7}, {0, 0, 0, 0 } }; @@ -1987,6 +1989,10 @@ int main(int argc, char** argv) case 'X': sr_memmng_pkg = optarg; break; + case KARGOPTVAL+7: + ksr_slog_init(optarg); + break; + default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { printf("version: %s\n", full_version); @@ -2146,6 +2152,7 @@ int main(int argc, char** argv) case 'Y': case KARGOPTVAL+5: case KARGOPTVAL+6: + case KARGOPTVAL+7: break; /* long options */

4 years, 11 months

git:master:452635c7: core: dprint - support for structured logging

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 452635c799460e4a0919e413d3916ed2a7d245c4 URL: https://github.com/kamailio/kamailio/commit/452635c799460e4a0919e413d3916ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T15:10:10+01:00 core: dprint - support for structured logging - enable formatting the logging output with different functions --- Modified: src/core/dprint.c Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/452635c799460e4a0919e413d3916ed… Patch: https://github.com/kamailio/kamailio/commit/452635c799460e4a0919e413d3916ed…

4 years, 11 months

git:master:85fcffa0: core: dprint - simplified log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 85fcffa021819dcf25d2bf792155edbe0d3d2710 URL: https://github.com/kamailio/kamailio/commit/85fcffa021819dcf25d2bf792155edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-20T09:38:23+01:00 core: dprint - simplified log macros - removed compile flag for no function name (activated for over 10 years) - log prefix printed with inline conditions --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/85fcffa021819dcf25d2bf792155edb… Patch: https://github.com/kamailio/kamailio/commit/85fcffa021819dcf25d2bf792155edb…

4 years, 11 months

← Newer
1
...
27
28
29
30
31
32
33
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020