sr-dev June 2014

sr-dev@lists.kamailio.org

21 participants
153 discussions

[tracker] Comment added: CRASH: segmentation fault after INVITE
by sip-router 10 Jun '14

10 Jun '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#439 - CRASH: segmentation fault after INVITE User who did this - Olle Johansson (oej) ---------- Interestingly enough, using t_release after t_relay failure fixes the problem. t_relay returns a strange error code: -478. According to the docs from 1.5 tm module (which still documents t_relay error codes) it should be -4 for unresolvable address... ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=439#comment1525 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.

1 0

RPC processes out of memory
by Juha Heinanen 10 Jun '14

10 Jun '14

i noticed these kind of errors in syslog when running master version from around may 22: Jun 10 13:03:03 box /usr/sbin/sip-proxy[32740]: ERROR: <core> [db_id.c:244]: new_db_id(): no private memory left Jun 10 13:03:03 box /usr/sbin/sip-proxy[32740]: ERROR: <core> [db.c:311]: db_do_init2(): cannot parse URL 'mysql://foo:bar@127.0.0.1/sip_proxy_usage' Jun 10 13:03:03 box /usr/sbin/sip-proxy[32740]: ERROR: db_mysql [km_dbase.c:141]: db_mysql_async_exec_task(): failed to open connection for [mysql://foo:bar@127.0.0.1/sip_proxy_usage] ps shows that two RPC processes have run out of memory: 32733 RPC 11534336 0 32740 RPC 11534336 0 32741 RPC 9939320 1595016 in the config, i run on timer two routes that execute sql_query_async insert and delete queries, which do not have "result" param. looks like some memory does not get freed. any ideas? have i missed an already committed fix? -- juha

2 2

git:master: ims_registrar_pcscf: Bugfix: Update Received Info, when updating contact (it may have changed)
by Carsten Bock 10 Jun '14

10 Jun '14

Module: sip-router Branch: master Commit: 67de76fce11b3c7ac80955590a441d7be6563368 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67de76f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Jun 10 12:22:03 2014 +0200 ims_registrar_pcscf: Bugfix: Update Received Info, when updating contact (it may have changed) --- modules/ims_registrar_pcscf/save.c | 46 ++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/ims_registrar_pcscf/save.c b/modules/ims_registrar_pcscf/save.c index 2843278..4a625a7 100644 --- a/modules/ims_registrar_pcscf/save.c +++ b/modules/ims_registrar_pcscf/save.c @@ -156,6 +156,29 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma ci.received_port = 0; ci.received_proto = 0; + // Received Info: First try AVP, otherwise simply take the source of the request: + memset(&val, 0, sizeof(int_str)); + if (rcv_avp_name.n!=0 && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) && val.s.len > 0) { + if (val.s.len>RECEIVED_MAX_SIZE) { + LM_ERR("received too long\n"); + goto error; + } + if (parse_uri(val.s.s, val.s.len, &parsed_received) < 0) { + LM_DBG("Error parsing Received URI <%.*s>\n", val.s.len, val.s.s); + continue; + } + ci.received_host = parsed_received.host; + ci.received_port = parsed_received.port_no; + ci.received_proto = parsed_received.proto; + } else { + ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, sizeof(srcip)); + ci.received_host.s = srcip; + ci.received_port = req->rcv.src_port; + ci.received_proto = req->rcv.proto; + } + // Set to default, if not set: + if (ci.received_port == 0) ci.received_port = 5060; + ul.lock_udomain(_d, &c->uri); if (ul.get_pcontact(_d, &c->uri, &pcontact) != 0) { //need to insert new contact if ((expires-local_time_now)<=0) { //remove contact - de-register @@ -165,29 +188,6 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma LM_DBG("Adding pcontact: <%.*s>, expires: %d which is in %d seconds\n", c->uri.len, c->uri.s, expires, expires-local_time_now); - // Received Info: First try AVP, otherwise simply take the source of the request: - memset(&val, 0, sizeof(int_str)); - if (rcv_avp_name.n!=0 && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) && val.s.len > 0) { - if (val.s.len>RECEIVED_MAX_SIZE) { - LM_ERR("received too long\n"); - goto error; - } - if (parse_uri(val.s.s, val.s.len, &parsed_received) < 0) { - LM_DBG("Error parsing Received URI <%.*s>\n", val.s.len, val.s.s); - continue; - } - ci.received_host = parsed_received.host; - ci.received_port = parsed_received.port_no; - ci.received_proto = parsed_received.proto; - } else { - ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, sizeof(srcip)); - ci.received_host.s = srcip; - ci.received_port = req->rcv.src_port; - ci.received_proto = req->rcv.proto; - } - // Set to default, if not set: - if (ci.received_port == 0) ci.received_port = 5060; - if (ul.insert_pcontact(_d, &c->uri, &ci, &pcontact) != 0) { LM_ERR("Failed inserting new pcontact\n"); } else {

1 0

git:master: acc: log cdrs for expired dialogs
by Lucian Balaceanu 10 Jun '14

10 Jun '14

Module: sip-router Branch: master Commit: 57177cf1cf63b64cd1eedb817dd056f0be51a38e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57177cf… Author: Sven Knoblich, Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Tue Jun 10 11:47:27 2014 +0300 acc: log cdrs for expired dialogs - added the cdr_expired_dlg_enable module parameter to toggle on/off the cdr writing feature (default is off=0) If enabled, only the dlg_vars in the cdr_extra will get printed on dialog expiry; the other parameters' values in the cdr extra will be left empty --- modules/acc/acc_cdr.c | 67 +++++++++++++++++++++++++++++++--------- modules/acc/acc_extra.c | 48 ++++++++++++++++++++++++++++- modules/acc/acc_extra.h | 4 ++ modules/acc/acc_mod.c | 8 +++++ modules/acc/acc_mod.h | 1 + modules/acc/doc/acc_admin.xml | 29 +++++++++++++++++- 6 files changed, 139 insertions(+), 18 deletions(-) diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index a9f8eb9..e5bd356 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -161,11 +161,23 @@ static int db_write_cdr( struct dlg_cell* dialog, } /* get extra values */ - m += extra2strar( cdr_extra, - message, - cdr_value_array + m, - cdr_int_array + m, - cdr_type_array + m); + if (message) + { + m += extra2strar( cdr_extra, + message, + cdr_value_array + m, + cdr_int_array + m, + cdr_type_array + m); + } else if (cdr_expired_dlg_enable){ + LM_WARN( "fallback to dlg_only search because of message doesn't exist.\n"); + m += extra2strar_dlg_only( cdr_extra, + dialog, + cdr_value_array + m, + cdr_int_array + m, + cdr_type_array +m, + &dlgb); + } + for( ; i<m; i++) { db_cdr_keys[i] = &cdr_attrs[i]; VAL_TYPE(db_cdr_vals+i)=DB1_STR; @@ -221,11 +233,23 @@ static int log_write_cdr( struct dlg_cell* dialog, cdr_type_array); /* get extra values */ - message_index += extra2strar( cdr_extra, - message, - cdr_value_array + message_index, - cdr_int_array + message_index, - cdr_type_array + message_index); + if (message) + { + message_index += extra2strar( cdr_extra, + message, + cdr_value_array + message_index, + cdr_int_array + message_index, + cdr_type_array + message_index); + } else if (cdr_expired_dlg_enable){ + LM_WARN( "fallback to dlg_only search because of message does not exist.\n"); + message_index += extra2strar_dlg_only( cdr_extra, + dialog, + cdr_value_array + message_index, + cdr_int_array + message_index, + cdr_type_array + message_index, + &dlgb); + } + for( counter = 0, message_position = cdr_message; counter < message_index ; @@ -280,11 +304,18 @@ static int write_cdr( struct dlg_cell* dialog, struct sip_msg* message) { int ret = 0; - if( !dialog || !message) - { - LM_ERR( "dialog or message is empty!"); - return -1; - } + + if( !dialog) + { + LM_ERR( "dialog is empty!"); + return -1; + } + /* message can be null when logging expired dialogs */ + if ( !cdr_expired_dlg_enable && !message ){ + LM_ERR( "message is empty!"); + return -1; + } + ret = log_write_cdr(dialog, message); #ifdef SQL_ACC ret |= db_write_cdr(dialog, message); @@ -605,6 +636,12 @@ static void cdr_on_expired( struct dlg_cell* dialog, } LM_DBG("dialog '%p' expired!\n", dialog); + + if( cdr_expired_dlg_enable && (write_cdr( dialog, 0) != 0)) + { + LM_ERR( "failed to write cdr!\n"); + return; + } } /* callback for the cleanup of a dialog. */ diff --git a/modules/acc/acc_extra.c b/modules/acc/acc_extra.c index a9b3ad6..47ed676 100644 --- a/modules/acc/acc_extra.c +++ b/modules/acc/acc_extra.c @@ -244,8 +244,6 @@ int extra2int( struct acc_extra *extra, int *attrs ) return i; } - - int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, int *int_arr, char *type_arr) { @@ -299,6 +297,52 @@ done: return n; } +int extra2strar_dlg_only(struct acc_extra *extra, struct dlg_cell* dlg, str *val_arr, + int *int_arr, char *type_arr, const struct dlg_binds* p_dlgb) +{ + //string value; + str* value = 0; + int n=0; + + if( !dlg || !val_arr || !int_arr || !type_arr || !p_dlgb) + { + LM_ERR( "invalid input parameter!\n"); + return 0; + } + + while (extra) { + + /* check for overflow */ + if (n==MAX_ACC_EXTRA) { + LM_WARN("array to short -> ommiting extras for accounting\n"); + goto done; + } + + val_arr[n].s = 0; + val_arr[n].len = 0; + type_arr[n] = TYPE_NULL; + + str key = extra->spec.pvp.pvn.u.isname.name.s; + if ( key.len == 0 || !key.s) + { + n++; extra = extra->next; continue; + } + /* get the value */ + value = p_dlgb->get_dlg_var( dlg, &key); + + if (value) + { + val_arr[n].s = value->s; + val_arr[n].len = value->len; + type_arr[n] = TYPE_STR; + } + + n++; + extra = extra->next; + } +done: + return n; +} int legs2strar( struct acc_extra *legs, struct sip_msg *rq, str *val_arr, int *int_arr, char *type_arr, int start) diff --git a/modules/acc/acc_extra.h b/modules/acc/acc_extra.h index 63048bb..a1aa64d 100644 --- a/modules/acc/acc_extra.h +++ b/modules/acc/acc_extra.h @@ -46,6 +46,7 @@ #include "../../str.h" #include "../../pvar.h" #include "../../parser/msg_parser.h" +#include "../dialog/dlg_load.h" void init_acc_extra(void); @@ -58,6 +59,9 @@ void destroy_extras( struct acc_extra *extra); int extra2strar( struct acc_extra *extra, struct sip_msg *rq, str *val_arr, int *int_arr, char *type_arr); +int extra2strar_dlg_only(struct acc_extra *extra, struct dlg_cell* dlg, + str *val_arr, int *int_arr, char *type_arr, const struct dlg_binds* p_dlgb); + int legs2strar( struct acc_extra *legs, struct sip_msg *rq, str *val_arr, int *int_arr, char *type_arr, int start); diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index 6544f35..3a97ce9 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -143,6 +143,7 @@ struct acc_extra *log_extra = 0; /*!< Log extra attributes */ int cdr_enable = 0; int cdr_log_enable = 1; int cdr_start_on_confirmed = 0; +int cdr_expired_dlg_enable = 0; static char* cdr_facility_str = 0; static char* cdr_log_extra_str = 0; @@ -275,6 +276,7 @@ static param_export_t params[] = { {"cdr_start_id", STR_PARAM, &cdr_start_str.s }, {"cdr_end_id", STR_PARAM, &cdr_end_str.s }, {"cdr_duration_id", STR_PARAM, &cdr_duration_str.s }, + {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable }, #ifdef RAD_ACC {"radius_config", STR_PARAM, &radius_config }, {"radius_flag", INT_PARAM, &radius_flag }, @@ -573,6 +575,12 @@ static int mod_init( void ) return -1; } + if( cdr_expired_dlg_enable < 0 || cdr_expired_dlg_enable > 1) + { + LM_ERR("cdr_expired_dlg_enable is out of range\n"); + return -1; + } + if( cdr_enable) { if( !cdr_start_str.s || !cdr_end_str.s || !cdr_duration_str.s) diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h index 2f5f815..327dd15 100644 --- a/modules/acc/acc_mod.h +++ b/modules/acc/acc_mod.h @@ -60,6 +60,7 @@ extern int log_missed_flag; extern int cdr_enable; extern int cdr_start_on_confirmed; extern int cdr_log_facility; +extern int cdr_expired_dlg_enable; #ifdef RAD_ACC extern int radius_flag; diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 887f953..b9914bc 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -90,7 +90,9 @@ find out about it. In general, a better practice is to account from an end-device (such as PSTN gateway), which best knows about call status (including media status and PSTN status in case of the - gateway). + gateway). However, CDR-base logging has the option to log existing + information from expired dialogs (the dlg_vars in cdr_extra) + Please see cdr_expired_dlg_enable parameter - <xref linkend="acc.p.cdr_expired_dlg_enable"/>. </para> </listitem> </itemizedlist> @@ -354,6 +356,13 @@ if (uri=~"sip:+40") /* calls to Romania */ { to persist the CDRs into a database you will have to set up an exterior process (i.e., a script living outside of &kamailio;) and implement the storage task yourself. </para> + + <para> + Sometimes, dialogs expire because the UA has a problem and a final message is never + transmitted. You can toggle on/off the generation of CDR-based logging in such cases + with only the dlg_vars showing by using the cdr_expired_dlg_enable parameter + - <xref linkend="acc.p.cdr_expired_dlg_enable"/>. Default behavior is not logging. + </para> </section> <section id="cdr-extra-id"> <title>CDR Extra</title> @@ -1222,6 +1231,24 @@ modparam("acc", "cdr_enable", 1) </programlisting> </example> </section> + <section id="acc.p.cdr_expired_dlg_enable"> + <title><varname>cdr_expired_dlg_enable</varname> (integer)</title> + <para> + Should CDR-based logging be enabled in case of expired dialogs? + </para> + <para> + 0 - off (default). + 1 - on. + </para> + <example> + <title>cdr_expired_dlg_enable example</title> + <programlisting format="linespecific"> +... +modparam("acc", "cdr_expired_dlg_enable", 1) +... +</programlisting> + </example> + </section> <section id="acc.p.cdr_start_on_confirmed"> <title><varname>cdr_start_on_confirmed</varname> (integer)</title> <para>

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Lucian Balaceanu 10 Jun '14

10 Jun '14

Module: sip-router Branch: master Commit: ad5f82c598e564e3d937fffa401ad04e1966b9f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad5f82c… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Tue Jun 10 12:31:19 2014 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

[tracker] Comment added: CRASH: segmentation fault if there is no dispatcher available
by sip-router 10 Jun '14

10 Jun '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#440 - CRASH: segmentation fault if there is no dispatcher available User who did this - Daniel-Constantin Mierla (miconda) ---------- Should not crash and should be fixed. Just that I was investigating in the wrong direction based on your description. Can you get the log messages with debug=3 in this case? I expect to be a lot of them as the PUBLISH is looping. Also, what is the value for the retransmission timeout you set in the config file? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=440#comment1524 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.

1 0

[tracker] Task closed: route name in action struct
by sip-router 10 Jun '14

10 Jun '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#441 - route name in action struct User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=441 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.

1 0

git:master: debugger: show routename in cfgtrace output
by Victor Seva 10 Jun '14

10 Jun '14

Module: sip-router Branch: master Commit: bed067f3fb8423f0d138903f8d58941d19b81360 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bed067f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jun 7 09:19:38 2014 +0200 debugger: show routename in cfgtrace output --- modules/debugger/debugger_api.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index c611fa1..e3b53db 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -287,6 +287,32 @@ int dbg_msgid_filter(struct sip_msg *msg, unsigned int flags, void *bar) } } +char* get_current_route_type_name() +{ + switch(route_type){ + case REQUEST_ROUTE: + return "request_route"; + case FAILURE_ROUTE: + return "failure_route"; + case TM_ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: + case ONREPLY_ROUTE: + return "onreply_route"; + case BRANCH_ROUTE: + return "branch_route"; + case ONSEND_ROUTE: + return "onsend_route"; + case ERROR_ROUTE: + return "error_route"; + case LOCAL_ROUTE: + return "local_route"; + case BRANCH_FAILURE_ROUTE: + return "branch_failure_route"; + default: + return "unknown_route"; + } +} + /** * callback executed for each cfg action */ @@ -329,8 +355,10 @@ int dbg_cfg_trace(void *data) { LOG__(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, - " c=[%s] l=%d a=%d n=%.*s\n", - ZSW(a->cfile), a->cline, a->type, an->len, ZSW(an->s) + "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", + get_current_route_type_name(), ZSW(a->rname), + ZSW(a->cfile), a->cline, + a->type, an->len, ZSW(an->s) ); } }

1 0

git:master: core: add route name to action struct
by Victor Seva 10 Jun '14

10 Jun '14

Module: sip-router Branch: master Commit: c44685cbcefb8f6ecfa6f11369699906db832c39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c44685c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jun 7 09:19:03 2014 +0200 core: add route name to action struct --- cfg.lex | 29 +++++++++++++++++++++-------- cfg.y | 9 +++++++-- route_struct.h | 2 ++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/cfg.lex b/cfg.lex index 7435bb2..4c5c686 100644 --- a/cfg.lex +++ b/cfg.lex @@ -135,6 +135,9 @@ int startcolumn=1; int startline=1; char *finame = 0; + char *routename = 0; + char *default_routename = 0; + static int ign_lines=0; static int ign_columns=0; char* yy_number_str=0; /* str correspondent for the current NUMBER token */ @@ -155,6 +158,7 @@ int startcolumn; int startline; char *finame; + char *routename; } include_stack[MAX_INCLUDE_DEPTH]; static int include_stack_ptr = 0; @@ -596,16 +600,24 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); yylval.strval=yytext; +<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; + yylval.strval=yytext; return ROUTE; } +<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; + yylval.strval=yytext; return ROUTE_REQUEST; } +<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; + yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); yylval.strval=yytext; +<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; + yylval.strval=yytext; return ROUTE_REPLY; } +<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; + yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); yylval.strval=yytext; return ROUTE_EVENT; } +<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; + yylval.strval=yytext; return ROUTE_BRANCH; } +<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; + yylval.strval=yytext; return ROUTE_SEND; } +<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; + yylval.strval=yytext; return ROUTE_EVENT; } <INITIAL>{EXEC} { count(); yylval.strval=yytext; return EXEC; } <INITIAL>{SET_HOST} { count(); yylval.strval=yytext; return SET_HOST; } <INITIAL>{SET_HOSTPORT} { count(); yylval.strval=yytext; return SET_HOSTPORT; } @@ -1593,6 +1605,7 @@ static int sr_push_yy_state(char *fin, int mode) include_stack[include_stack_ptr].startline = startline; include_stack[include_stack_ptr].startcolumn = startcolumn; include_stack[include_stack_ptr].finame = finame; + include_stack[include_stack_ptr].routename = routename; include_stack_ptr++; line=1; diff --git a/cfg.y b/cfg.y index 5d140d1..70508f8 100644 --- a/cfg.y +++ b/cfg.y @@ -256,12 +256,15 @@ extern int column; extern int startcolumn; extern int startline; extern char *finame; +extern char *routename; +extern char *default_routename; #define set_cfg_pos(x) \ do{\ if(x) {\ (x)->cline = line;\ (x)->cfile = (finame!=0)?finame:((cfg_file!=0)?cfg_file:"default");\ + (x)->rname = (routename!=0)?routename:((default_routename!=0)?default_routename:"DEFAULT");\ }\ }while(0) @@ -1743,9 +1746,10 @@ route_name: NUMBER { memcpy($$, tmp, i_tmp); $$[i_tmp]=0; } + routename = tmp; } - | ID { $$=$1; } - | STRING { $$=$1; } + | ID { routename = $1; $$=$1; } + | STRING { routename = $1; $$=$1; } ; @@ -3372,6 +3376,7 @@ static void get_cpos(struct cfg_pos* pos) if(finame==0) finame = (cfg_file!=0)?cfg_file:"default"; pos->fname=finame; + pos->rname=(routename!=0)?routename:default_routename; } diff --git a/route_struct.h b/route_struct.h index e56f4c0..3264a0e 100644 --- a/route_struct.h +++ b/route_struct.h @@ -156,6 +156,7 @@ struct cfg_pos{ unsigned short s_col; unsigned short e_col; char *fname; + char *rname; }; @@ -202,6 +203,7 @@ typedef struct { struct action{ int cline; char *cfile; + char *rname; enum action_type type; /* forward, drop, log, send ...*/ int count; struct action* next;

1 0

[tracker] Comment added: route name in action struct
by sip-router 10 Jun '14

10 Jun '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#441 - route name in action struct User who did this - Daniel-Constantin Mierla (miconda) ---------- Just use "unknown_route" instead of "unknown_type_route" (suggestive enough and shorter). Then it can be committed. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=441#comment1523 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.

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2014