sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

[tracker] Task closed: To tag parsing bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#465 - To tag parsing bug User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied to master. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=465 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

git:master: Makefile.defs: version set to 4.2.0-pre0

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 23a35c0598696a7a4e97c95466b321ade05bf823 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23a35c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 11 12:10:44 2014 +0200 Makefile.defs: version set to 4.2.0-pre0 - pre-release phase - testing period, no new features till branching 4.2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4ee2430..f98b168 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev9 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

10 years, 2 months

git:master: msg_parser: fix To parameter with null value parsing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 14183ffa5e1bab1659d1df87a77057d50c376029 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14183ff… Author: Alekzander Spiridonov <sipidronov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 4 07:09:02 2014 -0700 msg_parser: fix To parameter with null value parsing --- msg_translator.c | 2 +- parser/parse_addr_spec.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 788cff8..677d44e 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2406,7 +2406,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if (to_tag.len ) + if ( to_tag.len || to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; diff --git a/parser/parse_addr_spec.c b/parser/parse_addr_spec.c index c6635d3..f0388a2 100644 --- a/parser/parse_addr_spec.c +++ b/parser/parse_addr_spec.c @@ -546,7 +546,12 @@ endofheader: break; case S_PARA_VALUE: /* parameter with null value, e.g. foo= */ - param->value.s=tmp; + if ( status==F_CRLF ) + param->value.s=tmp-2; + else if ( status==F_CR || status==F_LF ) + param->value.s=tmp-1; + else + param->value.s=tmp; param->value.len=0; add_param(param, to_b, newparam); saved_status=E_PARA_VALUE;

10 years, 2 months

[tracker] Task closed: tm doesn't relay changed 'To' header in CANCEL before dialog is established

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#325 - tm doesn't relay changed 'To' header in CANCEL before dialog is established User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: This is implemented in latest stable versions. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=325 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

[tracker] Task closed: Improving logging (show at least the transaction branch)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#57 - Improving logging (show at least the transaction branch) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=57 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

[tracker] Comment added: Improving logging (show at least the transaction branch)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#57 - Improving logging (show at least the transaction branch) User who did this - Daniel-Constantin Mierla (miconda) ---------- This should be now possible via log_prefix core parameter/ ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=57#comment1615 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

[tracker] Task closed: error message does not include cfg file line number

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#58 - error message does not include cfg file line number User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=58 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

[tracker] Comment added: error message does not include cfg file line number

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#58 - error message does not include cfg file line number User who did this - Daniel-Constantin Mierla (miconda) ---------- This should be possible now with log_prefix and cfg line variable. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=58#comment1614 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 2 months

git:master: ims_auth: Fix crash, if the third parameter was ommited on ims_www_challenge.

by Carsten Bock

Module: sip-router Branch: master Commit: 81fbf1504548c0978f4e8f056df594f57d681e88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81fbf15… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Sep 11 11:17:43 2014 +0200 ims_auth: Fix crash, if the third parameter was ommited on ims_www_challenge. --- modules/ims_auth/authims_mod.c | 4 ++-- modules/ims_auth/authorize.c | 5 ++++- modules/ims_auth/authorize.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/ims_auth/authims_mod.c b/modules/ims_auth/authims_mod.c index 8d8afd1..dcdd421 100644 --- a/modules/ims_auth/authims_mod.c +++ b/modules/ims_auth/authims_mod.c @@ -112,8 +112,8 @@ int ignore_failed_auth = 0; */ static cmd_export_t cmds[] = { {"ims_www_authenticate", (cmd_function) www_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, - {"ims_www_challenge", (cmd_function) www_challenge, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, - {"ims_www_challenge", (cmd_function) www_challenge, 3, challenge_fixup_async, 0, REQUEST_ROUTE}, + {"ims_www_challenge", (cmd_function) www_challenge2, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, + {"ims_www_challenge", (cmd_function) www_challenge3, 3, challenge_fixup_async, 0, REQUEST_ROUTE}, {"ims_www_resync_auth", (cmd_function) www_resync_auth, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, {"ims_proxy_authenticate", (cmd_function) proxy_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, {"ims_proxy_challenge", (cmd_function) proxy_challenge, 2, auth_fixup_async, 0, REQUEST_ROUTE}, diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index bb93ffa..bebb4fc 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -476,8 +476,11 @@ int challenge(struct sip_msg* msg, char* str1, char* alg, int is_proxy_auth, cha } return CSCF_RETURN_BREAK; } +int www_challenge2(struct sip_msg* msg, char* _route, char* str1, char* str2) { + return challenge(msg, str1, 0, 0, _route); +} -int www_challenge(struct sip_msg* msg, char* _route, char* str1, char* str2) { +int www_challenge3(struct sip_msg* msg, char* _route, char* str1, char* str2) { return challenge(msg, str1, str2, 0, _route); } diff --git a/modules/ims_auth/authorize.h b/modules/ims_auth/authorize.h index 54942bb..41360b7 100644 --- a/modules/ims_auth/authorize.h +++ b/modules/ims_auth/authorize.h @@ -139,7 +139,8 @@ int proxy_challenge(struct sip_msg* msg, char* route, char* _realm, char* str2); * Authorize using WWW-Authorization header field */ int www_authenticate(struct sip_msg* _msg, char* _realm, char* _table); -int www_challenge(struct sip_msg* msg, char* route, char* _realm, char* str2); +int www_challenge2(struct sip_msg* msg, char* route, char* _realm, char* str2); +int www_challenge3(struct sip_msg* msg, char* route, char* _realm, char* str2); int www_resync_auth(struct sip_msg* msg, char* _route, char* str1, char* str2);

10 years, 2 months

git:master: core: new parameter - log_prefix

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 35e94c97dfb2f6519c87e566b5158e5b9b9f39ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35e94c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 11 00:16:53 2014 +0200 core: new parameter - log_prefix - can be used to set what prefix to be printed for each log message while processing a SIP message - can contain variables - example: log_prefix="[$mt $hdr(CSeq) $ci]" --- action.h | 2 + cfg.lex | 2 + cfg.y | 3 ++ dprint.c | 41 ++++++++++++++++++++++++++++++++++++ dprint.h | 68 +++++++++++++++++++++++++++++++----------------------------- main.c | 7 ++++++ receive.c | 7 ++++++ 7 files changed, 97 insertions(+), 33 deletions(-) diff --git a/action.h b/action.h index 77f1948..f8a30f6 100644 --- a/action.h +++ b/action.h @@ -81,4 +81,6 @@ int run_actions_safe(struct run_act_ctx* c, struct action* a, #define run_actions_safe(c, a, m) run_actions(c, a, m) #endif /* USE_LONGJMP */ +void log_prefix_set(sip_msg_t *msg); + #endif diff --git a/cfg.lex b/cfg.lex index 874e85f..10766b2 100644 --- a/cfg.lex +++ b/cfg.lex @@ -346,6 +346,7 @@ LOGSTDERROR log_stderror LOGFACILITY log_facility LOGNAME log_name LOGCOLOR log_color +LOGPREFIX log_prefix LISTEN listen ADVERTISE advertise|ADVERTISE ALIAS alias @@ -709,6 +710,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } <INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } <INITIAL>{LOGCOLOR} { yylval.strval=yytext; return LOGCOLOR; } +<INITIAL>{LOGPREFIX} { yylval.strval=yytext; return LOGPREFIX; } <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 18849b8..1e52289 100644 --- a/cfg.y +++ b/cfg.y @@ -395,6 +395,7 @@ extern char *default_routename; %token LOGFACILITY %token LOGNAME %token LOGCOLOR +%token LOGPREFIX %token LISTEN %token ADVERTISE %token ALIAS @@ -843,6 +844,8 @@ assign_stm: | LOGNAME EQUAL error { yyerror("string value expected"); } | LOGCOLOR EQUAL NUMBER { log_color=$3; } | LOGCOLOR EQUAL error { yyerror("boolean value expected"); } + | LOGPREFIX EQUAL STRING { log_prefix_fmt=$3; } + | LOGPREFIX 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; } diff --git a/dprint.c b/dprint.c index f65facb..4906001 100644 --- a/dprint.c +++ b/dprint.c @@ -38,6 +38,7 @@ #include "globals.h" #include "dprint.h" +#include "pvar.h" #include <stdarg.h> #include <stdio.h> @@ -368,3 +369,43 @@ void dprint_color_update(int level, char f, char b) if(f && f!='0') _log_level_colors[level - L_MIN].f = f; if(b && b!='0') _log_level_colors[level - L_MIN].b = b; } + + +/* log_prefix functionality */ +str *log_prefix_val = NULL; +static pv_elem_t *log_prefix_pvs = NULL; + +#define LOG_PREFIX_SIZE 128 +static char log_prefix_buf[LOG_PREFIX_SIZE]; +static str log_prefix_str; + +void log_prefix_init(void) +{ + str s; + if(log_prefix_fmt==NULL) + return; + s.s = log_prefix_fmt; s.len = strlen(s.s); + + if(pv_parse_format(&s, &log_prefix_pvs)<0) + { + LM_ERR("wrong format[%s]\n", s.s); + return; + } +} + +void log_prefix_set(sip_msg_t *msg) +{ + if(log_prefix_pvs == NULL) + return; + if(msg==NULL) { + log_prefix_val = NULL; + return; + } + log_prefix_str.s = log_prefix_buf; + log_prefix_str.len = LOG_PREFIX_SIZE; + if(pv_printf(msg, log_prefix_pvs, log_prefix_str.s, &log_prefix_str.len)<0) + return; + if(log_prefix_str.len<=0) + return; + log_prefix_val = &log_prefix_str; +} diff --git a/dprint.h b/dprint.h index 2d414c3..3c57d9c 100644 --- a/dprint.h +++ b/dprint.h @@ -118,6 +118,8 @@ extern int my_pid(void); extern int log_stderr; extern int log_color; +extern char *log_prefix_fmt; +extern str *log_prefix_val; /** @brief maps log levels to their string name and corresponding syslog level */ @@ -151,6 +153,8 @@ void dprint_color_update(int level, char f, char b); void dprint_init_colors(void); void dprint_term_color(char f, char b, str *obuf); +void log_prefix_init(void); + /** @brief * General logging macros * @@ -271,44 +275,42 @@ void dprint_term_color(char f, char b, str *obuf); do { \ if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT) { \ + int __llevel; \ + __llevel = ((level)<L_ALERT)?L_ALERT:(((level)>L_DBG)?L_DBG:level); \ DPRINT_CRIT_ENTER; \ - if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ - if (unlikely(log_stderr)) { \ - if (unlikely(log_color)) dprint_color(level); \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), \ - (lname)?(lname):LOG_LEVEL2NAME(level), \ - (prefix) , ## args);\ - if (unlikely(log_color)) dprint_color_reset(); \ + 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, \ + process_no, my_pid(), \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + (prefix) , ## args);\ } else { \ - syslog(LOG2SYSLOG_LEVEL(level) |\ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)), \ - "%s: %s" fmt,\ - (lname)?(lname):LOG_LEVEL2NAME(level),\ - (prefix) , ## args); \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + (prefix) , ## args);\ } \ + if (unlikely(log_color)) dprint_color_reset(); \ } else { \ - if (log_stderr) { \ - if (unlikely(log_color)) dprint_color(level); \ - fprintf(stderr, "%2d(%d) %s" fmt, \ - process_no, my_pid(), \ - (prefix) , ## args); \ - if (unlikely(log_color)) dprint_color_reset(); \ + if(unlikely(log_prefix_val)) { \ + syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ + "%.*s%s: %s" fmt,\ + log_prefix_val->len, log_prefix_val->s, \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + (prefix) , ## args); \ } else { \ - if ((level)<L_ALERT) \ - syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix) , ## args); \ - else \ - syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix) , ## args); \ + syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ + "%s: %s" fmt,\ + (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + (prefix) , ## args); \ } \ } \ DPRINT_CRIT_EXIT; \ diff --git a/main.c b/main.c index bed6ccc..be75335 100644 --- a/main.c +++ b/main.c @@ -380,6 +380,7 @@ int log_stderr = 0; int log_color = 0; /* set custom app name for syslog printing */ char *log_name = 0; +char *log_prefix_fmt = 0; pid_t creator_pid = (pid_t) -1; int config_check = 0; /* check if reply first via host==us */ @@ -1352,6 +1353,9 @@ int main_loop(void) */ cfg_main_set_local(); + /* init log prefix format */ + log_prefix_init(); + /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes @@ -1565,6 +1569,9 @@ int main_loop(void) */ cfg_main_set_local(); + /* init log prefix format */ + log_prefix_init(); + /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes diff --git a/receive.c b/receive.c index 62ad047..83f72c0 100644 --- a/receive.c +++ b/receive.c @@ -153,6 +153,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } DBG("After parse_msg...\n"); + /* set log prefix */ + log_prefix_set(msg); /* ... clear branches from previous message */ clear_branches(); @@ -301,7 +303,10 @@ end: #ifdef STATS if (skipped) STATS_RX_DROPS; #endif + /* reset log prefix */ + log_prefix_set(NULL); return 0; + #ifndef NO_ONREPLY_ROUTE_ERROR error_rpl: /* execute post reply-script callbacks */ @@ -327,6 +332,8 @@ error02: pkg_free(msg); error00: STATS_RX_DROPS; + /* reset log prefix */ + log_prefix_set(NULL); return -1; }

10 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014