sr-dev

sr-dev@lists.kamailio.org

15 participants
44213 discussions

by Daniel-Constantin Mierla

Hello, is there a list with available selects in ser? I only found short introduction at: http://www.iptel.org/introduction_to_selects_and_attribute_value_pairs_avpa… Thanks, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years, 4 months

new PV class: $sel(name)

by Daniel-Constantin Mierla

Hello, there is a new PV class that provides access to SER select variables. A list with available selects can be found at: http://sip-router.org/wiki/cookbooks/selects/devel Therefore, all Kamailio modules relying on PV framework can get access to select values without any change. See example of usage from config at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#selects Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years, 4 months

async (delayed reply) support for t_uac_dlg in first release?

by jh＠tutpro.com

andrei you wrote in july regarding async (delayed reply) support for t_uac_dlg: Ok, I'll add async support (in fact delayed reply support since it's not true async), at least to xmlrpc (turns out that it's quite easy since xmlrpc reuses sr tcp). For ctl/binrpc it would be easy for datagram sockets (udp or unix datagram socket) and more difficult (but possible) for stream sockets (tcp or unix stream). However it might take a while until there will be a workable version. any idea, if this will be available in first release of sip-router? if yes, i could plan to start using sip-router. if not, i need to plan for something else. -- juha

15 years, 4 months

git:master: pv: new pv class $sel(name)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6dac6b618015314811b94127490e906d535f44fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dac6b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 16:12:35 2009 +0300 pv: new pv class $sel(name) - access select (ser cfg variables) values via PV framework - read-only PV - examples: $sel(@ruri), $sel((a)via[2].host) --- modules_k/pv/pv.c | 4 +++ modules_k/pv/pv_select.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_select.h | 36 ++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index f990a55..b284bbd 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -35,6 +35,7 @@ #include "pv_shv.h" #include "pv_time.h" #include "pv_trans.h" +#include "pv_select.h" MODULE_VERSION @@ -64,6 +65,9 @@ static pv_export_t mod_pvs[] = { { {"stat", sizeof("stat")-1}, /* statistics */ PVT_OTHER, pv_get_stat, 0, pv_parse_stat_name, 0, 0, 0 }, + { {"sel", sizeof("sel")-1}, /* select */ + PVT_OTHER, pv_get_select, 0, + pv_parse_select_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, diff --git a/modules_k/pv/pv_select.c b/modules_k/pv/pv_select.c new file mode 100644 index 0000000..8634052 --- /dev/null +++ b/modules_k/pv/pv_select.c @@ -0,0 +1,67 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Implementation for Select Pseudo-variables + */ + +#include "../../select.h" +#include "pv_select.h" + +int pv_parse_select_name(pv_spec_p sp, str *in) +{ + select_t *sel = 0; + char c; + char *p; + if (in == NULL || in->s == NULL || sp == NULL) + return -1; + + c = in->s[in->len]; + in->s[in->len] = '\0'; + p = in->s; + if(parse_select(&p, &sel)<0) + { + LM_ERR("invalid select name [%.*s]\n", + in->len, in->s); + in->s[in->len] = c; + return -1; + } + in->s[in->len] = c; + sp->pvp.pvn.u.dname = (void*)sel; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; +} + + +int pv_get_select(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + str s = {0, 0}; + select_t *sel = 0; + + sel = (select_t*)param->pvn.u.dname; + + if(sel==0 || run_select(&s, sel, msg)<0 || s.s==0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &s); +} + diff --git a/modules_k/pv/pv_select.h b/modules_k/pv/pv_select.h new file mode 100644 index 0000000..84c872f --- /dev/null +++ b/modules_k/pv/pv_select.h @@ -0,0 +1,36 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Headers for Stats Pseudo-variables + */ + +#ifndef _PV_SELECT_H_ +#define _PV_SELECT_H_ + +#include "../../pvar.h" + +int pv_parse_select_name(pv_spec_p sp, str *in); +int pv_get_select(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +#endif

15 years, 4 months

git:master: core: server signature value can be set via param

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c745469fb8af0101b26de8bee82c4314dfcafab9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c745469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 11:49:14 2009 +0300 core: server signature value can be set via param - server and user agent signature were only defines so far - two new parameters server_header and user_agent_header allow to define them via cfg parameters - default values are the same so far --- cfg.lex | 4 ++++ cfg.y | 10 ++++++++++ globals.h | 2 ++ main.c | 2 ++ msg_translator.c | 6 +++--- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 32aed32..e15c71b 100644 --- a/cfg.lex +++ b/cfg.lex @@ -329,6 +329,8 @@ MEMLOG "memlog"|"mem_log" MEMDBG "memdbg"|"mem_dbg" SIP_WARNING sip_warning SERVER_SIGNATURE server_signature +SERVER_HEADER server_header +USER_AGENT_HEADER user_agent_header REPLY_TO_VIA reply_to_via USER "user"|"uid" GROUP "group"|"gid" @@ -765,6 +767,8 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{SCTP_MAX_BURST} { count(); yylval.strval=yytext; return SCTP_MAX_BURST; } <INITIAL>{SERVER_SIGNATURE} { count(); yylval.strval=yytext; return SERVER_SIGNATURE; } +<INITIAL>{SERVER_HEADER} { count(); yylval.strval=yytext; return SERVER_HEADER; } +<INITIAL>{USER_AGENT_HEADER} { count(); yylval.strval=yytext; return USER_AGENT_HEADER; } <INITIAL>{REPLY_TO_VIA} { count(); yylval.strval=yytext; return REPLY_TO_VIA; } <INITIAL>{ADVERTISED_ADDRESS} { count(); yylval.strval=yytext; return ADVERTISED_ADDRESS; } diff --git a/cfg.y b/cfg.y index e9e8d8a..8a240c6 100644 --- a/cfg.y +++ b/cfg.y @@ -390,6 +390,8 @@ static int case_check_default(struct case_stms* stms); %token MEMDBG %token SIP_WARNING %token SERVER_SIGNATURE +%token SERVER_HEADER +%token USER_AGENT_HEADER %token REPLY_TO_VIA %token LOADMODULE %token LOADPATH @@ -1362,6 +1364,14 @@ assign_stm: | SCTP_MAX_BURST EQUAL error { yyerror("number expected"); } | SERVER_SIGNATURE EQUAL NUMBER { server_signature=$3; } | SERVER_SIGNATURE EQUAL error { yyerror("boolean value expected"); } + | SERVER_HEADER EQUAL STRING { server_hdr.s=$3; + server_hdr.len=strlen(server_hdr.s); + } + | SERVER_HEADER EQUAL error { yyerror("string value expected"); } + | USER_AGENT_HEADER EQUAL STRING { user_agent_hdr.s=$3; + user_agent_hdr.len=strlen(user_agent_hdr.s); + } + | USER_AGENT_HEADER EQUAL error { yyerror("string value expected"); } | REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; } | REPLY_TO_VIA EQUAL error { yyerror("boolean value expected"); } | LISTEN EQUAL id_lst { diff --git a/globals.h b/globals.h index f7ef9f8..add1f40 100644 --- a/globals.h +++ b/globals.h @@ -108,6 +108,8 @@ extern int syn_branch; extern int child_rank; extern int sip_warning; extern int server_signature; +extern str server_hdr; +extern str user_agent_hdr; extern char* user; extern char* group; extern char* sock_user; diff --git a/main.c b/main.c index 9a771f8..c975057 100644 --- a/main.c +++ b/main.c @@ -345,6 +345,8 @@ int sip_warning = 1; be default yes, good for trouble-shooting */ int server_signature=1; +str server_hdr = {SERVER_HDR, SERVER_HDR_LEN}; +str user_agent_hdr = {USER_AGENT, USER_AGENT_LEN}; /* should ser try to locate outbound interface on multihomed * host? by default not -- too expensive */ diff --git a/msg_translator.c b/msg_translator.c index 2f14505..b6273b0 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1953,7 +1953,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, } /* server header */ if (server_signature) - len += SERVER_HDR_LEN + CRLF_LEN; + len += server_hdr.len + CRLF_LEN; /* warning hdr */ if (sip_warning) { warning_buf = warning_builder(msg,&warning_len); @@ -2092,8 +2092,8 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, } /* server header */ if (server_signature) { - memcpy( p, SERVER_HDR , SERVER_HDR_LEN ); - p+=SERVER_HDR_LEN; + memcpy( p, server_hdr.s, server_hdr.len ); + p+=server_hdr.len; memcpy( p, CRLF, CRLF_LEN ); p+=CRLF_LEN; }

15 years, 4 months

git:master: core: support to add rport parameter to local via hdr

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c37c22b4af29fed88c5655a5405876ffc640e5b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c37c22b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 12:57:01 2009 +0300 core: support to add rport parameter to local via hdr - new cfg function - add_local_rport() - to add rport parameter to local via header (rfc3581) --- action.c | 4 ++++ cfg.lex | 3 +++ cfg.y | 3 +++ msg_translator.c | 25 +++++++++++++++++++++---- parser/msg_parser.h | 1 + route_struct.h | 1 + 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 848ec59..8e21ee6 100644 --- a/action.c +++ b/action.c @@ -1129,6 +1129,10 @@ match_cleanup: msg->msg_flags|=FL_FORCE_RPORT; ret=1; /* continue processing */ break; + case ADD_LOCAL_RPORT_T: + msg->msg_flags|=FL_ADD_LOCAL_RPORT; + ret=1; /* continue processing */ + break; case UDP_MTU_TRY_PROTO_T: msg->msg_flags|= (unsigned int)a->val[0].u.number & FL_MTU_FB_MASK; ret=1; /* continue processing */ diff --git a/cfg.lex b/cfg.lex index e15c71b..ebe2b6d 100644 --- a/cfg.lex +++ b/cfg.lex @@ -166,6 +166,7 @@ ROUTE_SEND onsend_route ROUTE_EVENT event_route EXEC exec FORCE_RPORT "force_rport"|"add_rport" +ADD_LOCAL_RPORT "add_local_rport" FORCE_TCP_ALIAS "force_tcp_alias"|"add_tcp_alias" UDP_MTU "udp_mtu" UDP_MTU_TRY_PROTO "udp_mtu_try_proto" @@ -534,6 +535,8 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{SET_USERPHONE} { count(); yylval.strval=yytext; return SET_USERPHONE; } <INITIAL>{FORCE_RPORT} { count(); yylval.strval=yytext; return FORCE_RPORT; } +<INITIAL>{ADD_LOCAL_RPORT} { count(); yylval.strval=yytext; + return ADD_LOCAL_RPORT; } <INITIAL>{FORCE_TCP_ALIAS} { count(); yylval.strval=yytext; return FORCE_TCP_ALIAS; } <INITIAL>{UDP_MTU} { count(); yylval.strval=yytext; return UDP_MTU; } diff --git a/cfg.y b/cfg.y index 8a240c6..6950d88 100644 --- a/cfg.y +++ b/cfg.y @@ -295,6 +295,7 @@ static int case_check_default(struct case_stms* stms); %token SET_URI %token REVERT_URI %token FORCE_RPORT +%token ADD_LOCAL_RPORT %token FORCE_TCP_ALIAS %token UDP_MTU %token UDP_MTU_TRY_PROTO @@ -2886,6 +2887,8 @@ cmd: | REVERT_URI { $$=mk_action(REVERT_URI_T, 0); } | FORCE_RPORT LPAREN RPAREN { $$=mk_action(FORCE_RPORT_T, 0); } | FORCE_RPORT {$$=mk_action(FORCE_RPORT_T, 0); } + | ADD_LOCAL_RPORT LPAREN RPAREN { $$=mk_action(ADD_LOCAL_RPORT_T, 0); } + | ADD_LOCAL_RPORT {$$=mk_action(ADD_LOCAL_RPORT_T, 0); } | FORCE_TCP_ALIAS LPAREN NUMBER RPAREN { #ifdef USE_TCP $$=mk_action(FORCE_TCP_ALIAS_T, 1, NUMBER_ST, (void*)$3); diff --git a/msg_translator.c b/msg_translator.c index b6273b0..e486579 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2382,14 +2382,31 @@ char* create_via_hf( unsigned int *len, } #endif /* USE_TCP || USE_SCTP */ + /* test and add rport parameter to local via - rfc3581 */ + if(msg->msg_flags&FL_ADD_LOCAL_RPORT) { + /* params so far + ';rport' + '\0' */ + via = (char*)pkg_malloc(extra_params.len+RPORT_LEN); + if(via==0) { + LM_ERR("building local rport via param failed\n"); + if (extra_params.s) pkg_free(extra_params.s); + return 0; + } + if(extra_params.len!=0) { + memcpy(via, extra_params.s, extra_params.len); + pkg_free(extra_params.s); + } + memcpy(via + extra_params.len, RPORT, RPORT_LEN-1); + extra_params.s = via; + extra_params.len += RPORT_LEN-1; + extra_params.s[extra_params.len]='\0'; + } + set_hostport(&hp, msg); via = via_builder( len, send_info, branch, extra_params.len?&extra_params:0, &hp); -#if defined USE_TCP || defined USE_SCTP - /* we do not need id_buf any more, the id is already in the new via header */ - if (id_buf) pkg_free(id_buf); -#endif + /* we do not need extra_params any more, already in the new via header */ + if (extra_params.s) pkg_free(extra_params.s); return via; } diff --git a/parser/msg_parser.h b/parser/msg_parser.h index a811b61..1ce00bb 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -109,6 +109,7 @@ enum request_method { #define FL_MTU_TCP_FB (1 << 8) #define FL_MTU_TLS_FB (1 << 9) #define FL_MTU_SCTP_FB (1 << 10) +#define FL_ADD_LOCAL_RPORT (1 << 11) /* add 'rport' to local via hdr */ /* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc * module (flag FL_REQ_UPSTREAM)! */ diff --git a/route_struct.h b/route_struct.h index 090388c..9274340 100644 --- a/route_struct.h +++ b/route_struct.h @@ -97,6 +97,7 @@ enum action_type{ FORWARD_SCTP_T, SEND_TCP_T, FORCE_RPORT_T, + ADD_LOCAL_RPORT_T, SET_ADV_ADDR_T, SET_ADV_PORT_T, FORCE_TCP_ALIAS_T,

15 years, 4 months

git:master: tm: use server signature from config var

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d3be842237ba670d671b8af0f59a39dda7503545 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3be842… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 11:48:35 2009 +0300 tm: use server signature from config var --- modules/tm/t_msgbuilder.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index fe0eed4..a76c3db 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -154,7 +154,7 @@ char *build_local(struct cell *Trans,unsigned int branch, /* User Agent */ if (server_signature) { - *len += USER_AGENT_LEN + CRLF_LEN; + *len += user_agent_hdr.len + CRLF_LEN; } /* Content Length, EoM */ *len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN + CRLF_LEN; @@ -194,7 +194,8 @@ char *build_local(struct cell *Trans,unsigned int branch, /* User Agent header */ if (server_signature) { - append_str(p,USER_AGENT CRLF, USER_AGENT_LEN+CRLF_LEN ); + append_str(p, user_agent_hdr.s, user_agent_hdr.len ); + append_str(p, CRLF, CRLF_LEN ); } /* Content Length, EoM */ append_str(p, CONTENT_LENGTH "0" CRLF CRLF , @@ -1026,7 +1027,7 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, *len += calc_routeset_len(list, cont); /* User Agent */ - if (server_signature) *len += USER_AGENT_LEN + CRLF_LEN; + if (server_signature) *len += user_agent_hdr.len + CRLF_LEN; /* extra headers */ if (hdrs) *len += hdrs->len; @@ -1077,7 +1078,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, /* User Agent header */ if (server_signature) { - append_str(p, USER_AGENT CRLF, USER_AGENT_LEN + CRLF_LEN); + append_str(p, user_agent_hdr.s, user_agent_hdr.len); + append_str(p, CRLF, CRLF_LEN); } /* extra headers */ @@ -1342,7 +1344,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra *len += calculate_routeset_length(dialog); /* Route set */ *len += CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN; /* Content- Length */ - *len += (server_signature ? (USER_AGENT_LEN + CRLF_LEN) : 0); /* Signature */ + *len += (server_signature ? (user_agent_hdr.len + CRLF_LEN) : 0); /* Signature */ *len += (headers ? headers->len : 0); /* Additional headers */ *len += (body ? body->len : 0); /* Message body */ *len += CRLF_LEN; /* End of Header */ @@ -1369,7 +1371,10 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra memapp(w, CRLF, CRLF_LEN); /* Server signature */ - if (server_signature) memapp(w, USER_AGENT CRLF, USER_AGENT_LEN + CRLF_LEN); + if (server_signature) { + memapp(w, user_agent_hdr.s, user_agent_hdr.len); + memapp(w, CRLF, CRLF_LEN); + } if (headers) memapp(w, headers->s, headers->len); memapp(w, CRLF, CRLF_LEN); if (body) memapp(w, body->s, body->len);

15 years, 4 months

git:master: core: added log_name config parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 95bf86454e277a7a0ef1c41c2995806f65eda17b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95bf864… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 10:41:02 2009 +0300 core: added log_name config parameter - log_name allows to set app name to be used when printing to syslog - useful to filter log messages when running many instance on same server --- cfg.lex | 2 ++ cfg.y | 3 +++ dprint.h | 1 + main.c | 4 +++- 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index a99968d..32aed32 100644 --- a/cfg.lex +++ b/cfg.lex @@ -281,6 +281,7 @@ DEBUG debug FORK fork LOGSTDERROR log_stderror LOGFACILITY log_facility +LOGNAME log_name LISTEN listen ALIAS alias SR_AUTO_ALIASES auto_aliases @@ -577,6 +578,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{FORK} { count(); yylval.strval=yytext; return FORK; } <INITIAL>{LOGSTDERROR} { yylval.strval=yytext; return LOGSTDERROR; } <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } +<INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } <INITIAL>{SR_AUTO_ALIASES} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index b51a272..e9e8d8a 100644 --- a/cfg.y +++ b/cfg.y @@ -345,6 +345,7 @@ static int case_check_default(struct case_stms* stms); %token FORK %token LOGSTDERROR %token LOGFACILITY +%token LOGNAME %token LISTEN %token ALIAS %token SR_AUTO_ALIASES @@ -758,6 +759,8 @@ assign_stm: default_core_cfg.log_facility=i_tmp; } | LOGFACILITY EQUAL error { yyerror("ID expected"); } + | LOGNAME EQUAL STRING { log_name=$3; } + | LOGNAME 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.h b/dprint.h index 54d47fa..8f9d743 100644 --- a/dprint.h +++ b/dprint.h @@ -109,6 +109,7 @@ struct log_level_info { #define is_printable(level) (cfg_get(core, core_cfg, debug)>=(level)) extern struct log_level_info log_level_info[]; +extern char *log_name; #ifndef NO_SIG_DEBUG /* protection against "simultaneous" printing from signal handlers */ diff --git a/main.c b/main.c index 23455e7..9a771f8 100644 --- a/main.c +++ b/main.c @@ -321,6 +321,8 @@ int sig_flag = 0; /* last signal received */ int dont_fork = 0; int dont_daemonize = 0; int log_stderr = 0; +/* set custom app name for syslog printing */ +char *log_name = 0; pid_t creator_pid = (pid_t) -1; int config_check = 0; /* check if reply first via host==us */ @@ -2059,7 +2061,7 @@ try_again: #endif /* USE_SCTP */ /* init_daemon? */ if (!dont_fork){ - if ( daemonize(argv[0]) <0 ) goto error; + if ( daemonize((log_name==0)?argv[0]:log_name) <0 ) goto error; } if (install_sigs() != 0){ fprintf(stderr, "ERROR: could not install the signal handlers\n");

15 years, 4 months

git:master: cr: documentation extension related to the prime route behaviour (port r5898)

by Henning Westerholt

Module: sip-router Branch: master Commit: 5ec9f271fad97a4abbf151e55eaf509c3d9f5722 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ec9f27… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 19 16:40:04 2009 +0200 cr: documentation extension related to the prime route behaviour (port r5898) --- modules/carrierroute/README | 12 ++++++++++-- modules/carrierroute/doc/carrierroute_admin.xml | 12 +++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index eba27e5..7192926 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -511,8 +511,16 @@ rewrite_user, hash_source, descavp) the destination or the number of channels. This function is only usable with rewrite_user and prefix_matching containing a valid string. This string needs to be numerical if the - match_mode parameter is set to 10. It uses the prime hash - algorithm to calculate the hash values. + match_mode parameter is set to 10. + + It uses the prime hash algorithm to calculate the hash values. + This means that the fuction behaves different then the normal + routing function. If you don't know what this prime + functionality is, you should just use the cr_route function. + The prime routing algorithm not use the configured + probabilities in order to route requests, it just uses a fixed + hash distribution. If one of the hash targets is not available, + and no backup rule is configured, the function will return -1. Meaning of the parameters is as follows: * carrier - The routing tree to be used. Additional to a diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index d6b927f..7814d83 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -507,7 +507,17 @@ cr_tree_rewrite_uri(tree, domain) number of channels. This function is only usable with rewrite_user and prefix_matching containing a valid string. This string needs to be numerical if the match_mode - parameter is set to 10. It uses the prime hash algorithm to calculate the hash values. + parameter is set to 10. + </para> + <para> + It uses the prime hash algorithm to calculate the hash values. This + means that the fuction behaves different then the normal routing + function. If you don't know what this prime functionality is, + you should just use the <emphasis>cr_route</emphasis> function. The + prime routing algorithm not use the configured probabilities in + order to route requests, it just uses a fixed hash distribution. If + one of the hash targets is not available, and no backup rule is + configured, the function will return -1. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

15 years, 4 months

git:master: lib kmi: fix double allocation length calculation in mi_add_attr function

by Henning Westerholt

Module: sip-router Branch: master Commit: c742ca80bcdfdd844a0dd03138b1c67c6995be57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c742ca8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 19 16:51:44 2009 +0200 lib kmi: fix double allocation length calculation in mi_add_attr function - patch from marius zbihlei, marius dot zbihlei at 1and1 dot ro, port from r5882 --- lib/kmi/attr.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/lib/kmi/attr.c b/lib/kmi/attr.c index 4a1b81b..1610cde 100644 --- a/lib/kmi/attr.c +++ b/lib/kmi/attr.c @@ -101,14 +101,6 @@ struct mi_attr *add_mi_attr(struct mi_node *node, int flags, new->value.s = value; } } - if(flags & MI_DUP_NAME){ - name_pos = size_mem; - size_mem += name_len * sizeof(char); - } - if(flags & MI_DUP_VALUE){ - value_pos = size_mem; - size_mem += value_len * sizeof(char); - } if(!(node->attributes)){ new->next = NULL;

15 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev