sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:master:4d9f342f: core: more detailed error message when no config option to route requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4d9f342f8a7050d9c5f7754622ddb918edb16a99 URL: https://github.com/kamailio/kamailio/commit/4d9f342f8a7050d9c5f7754622ddb91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-14T10:47:27+02:00 core: more detailed error message when no config option to route requests --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/4d9f342f8a7050d9c5f7754622ddb91… Patch: https://github.com/kamailio/kamailio/commit/4d9f342f8a7050d9c5f7754622ddb91… --- diff --git a/src/core/receive.c b/src/core/receive.c index 2b8b2c7f56..9a385e4b85 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -306,7 +306,8 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) if(unlikely(main_rt.rlist[DEFAULT_RT] == NULL)) { keng = sr_kemi_eng_get(); if(keng == NULL) { - LM_ERR("no config routing engine registered\n"); + LM_ERR("no request_route {...} and no other config routing" + " engine registered\n"); goto error_req; } if(unlikely(cidlockset)) {

6 years, 4 months

git:master:a295bff3: modules: readme files regenerated - app_lua ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a295bff374def68acbd2cf5a4b81003820c49778 URL: https://github.com/kamailio/kamailio/commit/a295bff374def68acbd2cf5a4b81003… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-14T10:46:33+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/a295bff374def68acbd2cf5a4b81003… Patch: https://github.com/kamailio/kamailio/commit/a295bff374def68acbd2cf5a4b81003… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index 3b423924f7..4e908f10f5 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -253,10 +253,10 @@ if(!lua_run("sr_append_fu_to_reply")) { xdbg("SCRIPT: failed to execute lua function!\n"); } ... -lua_run("lua_funcx0"); -lua_run("lua_funcx1", "$rU"); -lua_run("lua_funcx2", "$rU", "2"); -lua_run("lua_funcx3", "$rU", "2", "$si"); +lua_run("lua_func0"); +lua_run("lua_func1", "$rU"); +lua_run("lua_func2", "$rU", "2"); +lua_run("lua_func3", "$rU", "2", "$si"); ... 4.4. lua_runstring(script)

6 years, 4 months

git:master:788d84e8: topos: declare variable at the beginning of the block

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 788d84e8e7112555fc373a15e63f63d7ac157807 URL: https://github.com/kamailio/kamailio/commit/788d84e8e7112555fc373a15e63f63d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-14T10:42:44+02:00 topos: declare variable at the beginning of the block --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/788d84e8e7112555fc373a15e63f63d… Patch: https://github.com/kamailio/kamailio/commit/788d84e8e7112555fc373a15e63f63d… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 8d9a888356..69d5c7c2b5 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -210,6 +210,7 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) str sv; sip_uri_t puri; int i; + int contact_len; if(dir==TPS_DIR_DOWNSTREAM) { sv = td->bs_contact; @@ -226,7 +227,7 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) return -1; } - int contact_len = sv.len; + contact_len = sv.len; if (_tps_contact_host.len) contact_len = sv.len - puri.host.len + _tps_contact_host.len;

6 years, 4 months

git:master:7788aa4b: app_lua: docs - more examples for lua_run()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7788aa4b396b27fe86bd535a0ded024531c5e75a URL: https://github.com/kamailio/kamailio/commit/7788aa4b396b27fe86bd535a0ded024… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-14T10:42:44+02:00 app_lua: docs - more examples for lua_run() --- Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7788aa4b396b27fe86bd535a0ded024… Patch: https://github.com/kamailio/kamailio/commit/7788aa4b396b27fe86bd535a0ded024… --- diff --git a/src/modules/app_lua/doc/app_lua_admin.xml b/src/modules/app_lua/doc/app_lua_admin.xml index 74ea68e460..ab8601bcc0 100644 --- a/src/modules/app_lua/doc/app_lua_admin.xml +++ b/src/modules/app_lua/doc/app_lua_admin.xml @@ -351,10 +351,10 @@ if(!lua_run("sr_append_fu_to_reply")) { xdbg("SCRIPT: failed to execute lua function!\n"); } ... -lua_run("lua_funcx0"); -lua_run("lua_funcx1", "$rU"); -lua_run("lua_funcx2", "$rU", "2"); -lua_run("lua_funcx3", "$rU", "2", "$si"); +lua_run("lua_func0"); +lua_run("lua_func1", "$rU"); +lua_run("lua_func2", "$rU", "2"); +lua_run("lua_func3", "$rU", "2", "$si"); ... </programlisting> </example>

6 years, 4 months

git:master:901d2c8c: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 901d2c8c34c1585531808d3ebcbd6788fa40ae8c URL: https://github.com/kamailio/kamailio/commit/901d2c8c34c1585531808d3ebcbd678… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-14T10:02:13+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/901d2c8c34c1585531808d3ebcbd678… Patch: https://github.com/kamailio/kamailio/commit/901d2c8c34c1585531808d3ebcbd678… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index de5363ea56..e745e4b9cf 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -34,6 +34,7 @@ Daniel-Constantin Mierla 3.7. clean_interval (int) 3.8. event_callback (str) 3.9. event_mode (int) + 3.10. contact_host (str) 4. Event Routes @@ -51,8 +52,9 @@ Daniel-Constantin Mierla 1.7. Set clean_interval parameter 1.8. Set event_callback parameter 1.9. Set event_mode parameter - 1.10. Usage of event_route[topos:msg-outgoing] - 1.11. Usage of event_route[topos:msg-sending] + 1.10. Set contact_host parameter + 1.11. Usage of event_route[topos:msg-outgoing] + 1.12. Usage of event_route[topos:msg-sending] Chapter 1. Admin Guide @@ -75,6 +77,7 @@ Chapter 1. Admin Guide 3.7. clean_interval (int) 3.8. event_callback (str) 3.9. event_mode (int) + 3.10. contact_host (str) 4. Event Routes @@ -126,6 +129,7 @@ Chapter 1. Admin Guide 3.7. clean_interval (int) 3.8. event_callback (str) 3.9. event_mode (int) + 3.10. contact_host (str) 3.1. storage (str) @@ -247,6 +251,21 @@ end modparam("topos", "event_mode", 2) ... +3.10. contact_host (str) + + You may need to control the host part of the Contact header added by + topos. For example when using TLS with TOPOS the remote UAS must be + able to open a new TLS socket to the contact header. In this case, the + contact header must contain a domain name with a trusted CA signed + certitificate. + + Default value is taken from the Record-Route URI. + + Example 1.10. Set contact_host parameter +... +modparam("topos", "contact_host", "proxy.domain.com") +... + 4. Event Routes 4.1. event_route[topos:msg-outgoing] @@ -264,7 +283,7 @@ modparam("topos", "event_mode", 2) reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.10. Usage of event_route[topos:msg-outgoing] + Example 1.11. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -283,7 +302,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.11. Usage of event_route[topos:msg-sending] + Example 1.12. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") {

6 years, 4 months

git:master:e04b8fc2: Merge pull request #1596 from jchavanton/topos_contact_host

by GitHub

Module: kamailio Branch: master Commit: e04b8fc2a18d76991bc0e48a07b4a0c925597255 URL: https://github.com/kamailio/kamailio/commit/e04b8fc2a18d76991bc0e48a07b4a0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-14T09:58:48+02:00 Merge pull request #1596 from jchavanton/topos_contact_host topos: adding param contact_hostname --- Modified: src/modules/topos/doc/topos_admin.xml Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e04b8fc2a18d76991bc0e48a07b4a0c… Patch: https://github.com/kamailio/kamailio/commit/e04b8fc2a18d76991bc0e48a07b4a0c… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4c87d371c6..281706b79b 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -275,6 +275,31 @@ end ... modparam("topos", "event_mode", 2) ... +</programlisting> + </example> + </section> + <section id="topos.p.contact_host"> + <title><varname>contact_host</varname> (str)</title> + <para> + You may need to control the host part of the Contact header added + by topos. + + For example when using TLS with TOPOS the remote UAS must be able to open + a new TLS socket to the contact header. + In this case, the contact header must contain a domain name with a trusted CA + signed certitificate. + </para> + <para> + <emphasis> + Default value is taken from the Record-Route URI. + </emphasis> + </para> + <example> + <title>Set <varname>contact_host</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "contact_host", "proxy.domain.com") +... </programlisting> </example> </section> diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 1bd9eb6571..43711f2fe9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -93,6 +93,7 @@ static str _tps_eventrt_callback = STR_NULL; static str _tps_eventrt_outgoing_name = str_init("topos:msg-outgoing"); static int _tps_eventrt_sending = -1; static str _tps_eventrt_sending_name = str_init("topos:msg-sending"); +str _tps_contact_host = str_init(""); sanity_api_t scb; @@ -129,6 +130,7 @@ static param_export_t params[]={ {"clean_interval", PARAM_INT, &_tps_clean_interval}, {"event_callback", PARAM_STR, &_tps_eventrt_callback}, {"event_mode", PARAM_STR, &_tps_eventrt_mode}, + {"contact_host", PARAM_STR, &_tps_contact_host}, {0,0,0} }; diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 08bf15ec8a..8d9a888356 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -53,6 +53,8 @@ extern sruid_t _tps_sruid; extern db1_con_t* _tps_db_handle; extern db_func_t _tpsdbf; +extern str _tps_contact_host; + #define TPS_STORAGE_LOCK_SIZE 1<<9 static gen_lock_set_t *_tps_storage_lock_set = NULL; @@ -219,14 +221,20 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) return 0; } - if(td->cp + 8 + (2*uuid->len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { - LM_ERR("insufficient data buffer\n"); - return -1; - } if (parse_uri(sv.s, sv.len, &puri) < 0) { LM_ERR("failed to parse the uri\n"); return -1; } + + int contact_len = sv.len; + if (_tps_contact_host.len) + contact_len = sv.len - puri.host.len + _tps_contact_host.len; + + if(td->cp + 8 + (2*uuid->len) + contact_len >= td->cbuf + TPS_DATA_SIZE) { + LM_ERR("insufficient data buffer\n"); + return -1; + } + if(dir==TPS_DIR_DOWNSTREAM) { td->b_uuid.s = td->cp; *td->cp = 'b'; @@ -263,8 +271,15 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) td->cp += uuid->len; *td->cp = '@'; td->cp++; - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + + if (_tps_contact_host.len) { // using configured hostname in the contact header + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } + if(puri.port.len>0) { *td->cp = ':'; td->cp++;

6 years, 4 months

[kamailio/kamailio] topos: adding param contact_hostname (#1596)

by Julien Chavanton

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  When using TLS with TOPOS the remote UAS could open a new TLS socket to the contact header. The contact header must contain a domain name with a signed certitificate. Adding the parameter to TOPOS module to control the host part of the contact headers ``` modparam("topos", "contact_hostname", "proxy.domain.com") ``` Default behavior is left unchanged I will update documentation it his modification is confirmed to be valuable. Else I would be curious to know how this should be handled differently. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1596 -- Commit Summary -- * topos: adding param contact_hostname -- File Changes -- M src/modules/topos/topos_mod.c (2) M src/modules/topos/tps_storage.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1596.patch https://github.com/kamailio/kamailio/pull/1596.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/1596

6 years, 4 months

git:master:8454dac6: topos: adding param contact_host

by Julien Chavanton

Module: kamailio Branch: master Commit: 8454dac69187516921a20686c9d9085a5db6728b URL: https://github.com/kamailio/kamailio/commit/8454dac69187516921a20686c9d9085… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-07-18T11:16:29-07:00 topos: adding param contact_host --- Modified: src/modules/topos/doc/topos_admin.xml Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/8454dac69187516921a20686c9d9085… Patch: https://github.com/kamailio/kamailio/commit/8454dac69187516921a20686c9d9085… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 8a423fdc84..3d6e5ac5d7 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -275,6 +275,31 @@ end ... modparam("topos", "event_mode", 2) ... +</programlisting> + </example> + </section> + <section id="topos.p.contact_host"> + <title><varname>contact_host</varname> (str)</title> + <para> + You may need to control the host part of the Contact header added + by topos. + + For example when using TLS with TOPOS the remote UAS must be able to open + a new TLS socket to the contact header. + In this case, the contact header must contain a domain name with a trusted CA + signed certitificate. + </para> + <para> + <emphasis> + Default value is taken from the Record-Route URI. + </emphasis> + </para> + <example> + <title>Set <varname>contact_host</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "contact_host", "proxy.domain.com") +... </programlisting> </example> </section> diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 1bd9eb6571..43711f2fe9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -93,6 +93,7 @@ static str _tps_eventrt_callback = STR_NULL; static str _tps_eventrt_outgoing_name = str_init("topos:msg-outgoing"); static int _tps_eventrt_sending = -1; static str _tps_eventrt_sending_name = str_init("topos:msg-sending"); +str _tps_contact_host = str_init(""); sanity_api_t scb; @@ -129,6 +130,7 @@ static param_export_t params[]={ {"clean_interval", PARAM_INT, &_tps_clean_interval}, {"event_callback", PARAM_STR, &_tps_eventrt_callback}, {"event_mode", PARAM_STR, &_tps_eventrt_mode}, + {"contact_host", PARAM_STR, &_tps_contact_host}, {0,0,0} }; diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 08bf15ec8a..8d9a888356 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -53,6 +53,8 @@ extern sruid_t _tps_sruid; extern db1_con_t* _tps_db_handle; extern db_func_t _tpsdbf; +extern str _tps_contact_host; + #define TPS_STORAGE_LOCK_SIZE 1<<9 static gen_lock_set_t *_tps_storage_lock_set = NULL; @@ -219,14 +221,20 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) return 0; } - if(td->cp + 8 + (2*uuid->len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { - LM_ERR("insufficient data buffer\n"); - return -1; - } if (parse_uri(sv.s, sv.len, &puri) < 0) { LM_ERR("failed to parse the uri\n"); return -1; } + + int contact_len = sv.len; + if (_tps_contact_host.len) + contact_len = sv.len - puri.host.len + _tps_contact_host.len; + + if(td->cp + 8 + (2*uuid->len) + contact_len >= td->cbuf + TPS_DATA_SIZE) { + LM_ERR("insufficient data buffer\n"); + return -1; + } + if(dir==TPS_DIR_DOWNSTREAM) { td->b_uuid.s = td->cp; *td->cp = 'b'; @@ -263,8 +271,15 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) td->cp += uuid->len; *td->cp = '@'; td->cp++; - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + + if (_tps_contact_host.len) { // using configured hostname in the contact header + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } + if(puri.port.len>0) { *td->cp = ':'; td->cp++;

6 years, 4 months

[kamailio/kamailio] core: print log_prefix after loglevel for more intuitive parsing (#1610)

by Armen Babikyan

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1610 -- Commit Summary -- * core: print log_prefix after loglevel for more intuitive parsing -- File Changes -- M src/core/dprint.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1610.patch https://github.com/kamailio/kamailio/pull/1610.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/1610

6 years, 4 months

git:master:b3b9b37a: Merge pull request #1610 from armenb/armenb/loglevel_then_log_prefix

by GitHub

Module: kamailio Branch: master Commit: b3b9b37a8feae5361f527478670d6ca403efac96 URL: https://github.com/kamailio/kamailio/commit/b3b9b37a8feae5361f527478670d6ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-14T09:56:30+02:00 Merge pull request #1610 from armenb/armenb/loglevel_then_log_prefix core: print log_prefix after loglevel for more intuitive parsing --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/b3b9b37a8feae5361f527478670d6ca… Patch: https://github.com/kamailio/kamailio/commit/b3b9b37a8feae5361f527478670d6ca… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 67a4ac3d7e..8a7a283875 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -221,10 +221,10 @@ void log_prefix_init(void); if (unlikely(log_stderr)) { \ if (unlikely(log_color)) dprint_color(__llevel); \ if(unlikely(log_prefix_val)) { \ - fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ - log_prefix_val->len, log_prefix_val->s, \ + fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ process_no, my_pid(), \ (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , __VA_ARGS__);\ } else { \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ @@ -239,9 +239,9 @@ void log_prefix_init(void); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \ - "%.*s%s: %s" fmt,\ - log_prefix_val->len, log_prefix_val->s, \ + "%s: %.*s%s" fmt,\ (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , __VA_ARGS__); \ } else { \ _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\ @@ -299,10 +299,10 @@ void log_prefix_init(void); if (unlikely(log_stderr)) { \ if (unlikely(log_color)) dprint_color(__llevel); \ if(unlikely(log_prefix_val)) { \ - fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ - log_prefix_val->len, log_prefix_val->s, \ + fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ process_no, my_pid(), \ (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , ## args);\ } else { \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ @@ -317,9 +317,9 @@ void log_prefix_init(void); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \ - "%.*s%s: %s" fmt,\ - log_prefix_val->len, log_prefix_val->s, \ + "%s: %.*s%s" fmt,\ (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , ## args); \ } else { \ _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\

6 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018