sr-dev

sr-dev@lists.kamailio.org

17 participants
44126 discussions

git:master: config: tcp_async alias for tcp_buf_write

by Jan Janak

Module: sip-router Branch: master Commit: 69515cab5eefb3b272617fc46565d58e8b392619 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69515ca… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:13:59 2009 +0000 config: tcp_async alias for tcp_buf_write - tcp_buf_write was not the best choosen name, so tcp_async was added as an alias for it --- NEWS | 3 ++- cfg.lex | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 6318d2a..f3cbfb3 100644 --- a/NEWS +++ b/NEWS @@ -273,9 +273,10 @@ new config variables: will be cached inside the process calling tcp_send (performance increase for sending over tcp at the cost of slightly slower connection closing and extra FDs kept open) - tcp_buf_write = yes | no (default no) - if enabled all the tcp writes that + tcp_async = yes | no (default no) - if enabled all the tcp writes that would block / wait for connect to finish, will be queued and attempted latter (see also tcp_conn_wq_max and tcp_wq_max). + tcp_buf_write = synonim for tcp_async tcp_conn_wq_max = bytes (default 32 K) - maximum bytes queued for write allowed per connection. Attempting to queue more bytes would result in an error and in the connection being closed (too slow). If diff --git a/cfg.lex b/cfg.lex index 0c4ac17..e36a625 100644 --- a/cfg.lex +++ b/cfg.lex @@ -301,7 +301,7 @@ TCP_MAX_CONNECTIONS "tcp_max_connections" TCP_SOURCE_IPV4 "tcp_source_ipv4" TCP_SOURCE_IPV6 "tcp_source_ipv6" TCP_OPT_FD_CACHE "tcp_fd_cache" -TCP_OPT_BUF_WRITE "tcp_buf_write" +TCP_OPT_BUF_WRITE "tcp_buf_write"|"tcp_async" TCP_OPT_CONN_WQ_MAX "tcp_conn_wq_max" TCP_OPT_WQ_MAX "tcp_wq_max" TCP_OPT_DEFER_ACCEPT "tcp_defer_accept"

15 years, 9 months

git:master: tcp: blacklist at tcp level if possible

by Jan Janak

Module: sip-router Branch: master Commit: 38429f23ff8a73c16c1b02812fa4a27cf28c0cb1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38429f2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:13:22 2009 +0000 tcp: blacklist at tcp level if possible - automatically blacklist destinations if connecting to them fails (BLST_ERR_CONNECT) or send fails (BLST_ERR_SEND), either due to a protocol error (RST, protocol level timeout a.s.o), or because of a ser level send/connect timeout. Note: in this cases the sip_msg parameter of the blacklist will be null (since in general the message triggering the error is not known), so if you register a blacklist callback you should make sure it works with null sip_msgs too. - if a connection is in a connect pending state (S_CONN_CONNECT) and something is read on it, move it into established state (S_CONN_OK). This can happen only in tcp async mode. - fix transition directly to S_CONN_OK from S_CONN_PENDING (should go through S_CONN_CONNECT first) --- tcp_main.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- tcp_read.c | 27 ++++++++++++- 2 files changed, 139 insertions(+), 8 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=384…

15 years, 9 months

git:master: tcp: async write timeout fixes

by Jan Janak

Module: sip-router Branch: master Commit: dda6ba602c251def193f3b9f7a7534b78a7f6556 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dda6ba6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:13:44 2009 +0000 tcp: async write timeout fixes - fixed a wrong write timeout test on connection-read-release (TICKS_LE instead of TICKS_GE) - fixed initial write timeout after connection creation (the timeout was ended up set to tcp_con_lifetime instead of tcp_wq_timeout) --- tcp_main.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 82be36c..d9dd7f8 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2661,7 +2661,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) #ifdef TCP_BUF_WRITE if (unlikely(tcp_options.tcp_buf_write && _wbufq_non_empty(tcpconn) )){ - if (unlikely(TICKS_LE(t, tcpconn->wbuf_q.wr_timeout))){ + if (unlikely(TICKS_GE(t, tcpconn->wbuf_q.wr_timeout))){ DBG("handle_tcp_child: wr. timeout on CONN_RELEASE for %p " "refcnt= %d\n", tcpconn, atomic_get(&tcpconn->refcnt)); @@ -2772,6 +2772,9 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) int fd; int flags; ticks_t t; +#ifdef TCP_BUF_WRITE + ticks_t nxt_timeout; +#endif /* TCP_BUF_WRITE */ ret=-1; if (unlikely(p->unix_sock<=0)){ @@ -2993,11 +2996,7 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) /* update the timeout*/ t=get_ticks_raw(); tcpconn->timeout=t+tcp_con_lifetime; - /* activate the timer (already properly init. in tcpconn_new()) - * no need for reinit */ - local_timer_add(&tcp_main_ltimer, &tcpconn->timer, - tcp_con_lifetime, t); - tcpconn->flags|=F_CONN_MAIN_TIMER|F_CONN_READ_W|F_CONN_WANTS_RD; + nxt_timeout=tcp_con_lifetime; if (unlikely(cmd==CONN_NEW_COMPLETE)){ tcpconn->state=S_CONN_OK; /* check if needs to be watched for write */ @@ -3005,8 +3004,18 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) /* if queue non empty watch it for write */ flags=(_wbufq_empty(tcpconn)-1)&POLLOUT; lock_release(&tcpconn->write_lock); - tcpconn->flags|=(!(flags&POLLOUT)-1)& - (F_CONN_WRITE_W|F_CONN_WANTS_WR); + if (flags){ + if (TICKS_LT(tcpconn->wbuf_q.wr_timeout, tcpconn->timeout) + && TICKS_LT(t, tcpconn->wbuf_q.wr_timeout)) + nxt_timeout=tcpconn->wbuf_q.wr_timeout-t; + tcpconn->flags|=F_CONN_WRITE_W|F_CONN_WANTS_WR; + } + /* activate the timer (already properly init. in + tcpconn_new()) no need for reinit */ + local_timer_add(&tcp_main_ltimer, &tcpconn->timer, nxt_timeout, + t); + tcpconn->flags|=F_CONN_MAIN_TIMER|F_CONN_READ_W| + F_CONN_WANTS_RD; }else{ /* CONN_NEW_PENDING_WRITE */ /* we don't know if we successfully sent anything, but @@ -3015,7 +3024,16 @@ inline static int handle_ser_child(struct process_table* p, int fd_i) tcpconn->state=S_CONN_CONNECT; /* no need to check, we have something queued for write */ flags=POLLOUT; - tcpconn->flags|=(F_CONN_WRITE_W|F_CONN_WANTS_WR); + if (TICKS_LT(tcpconn->wbuf_q.wr_timeout, tcpconn->timeout) + && TICKS_LT(t, tcpconn->wbuf_q.wr_timeout)) + nxt_timeout=tcpconn->wbuf_q.wr_timeout-t; + /* activate the timer (already properly init. in + tcpconn_new()) no need for reinit */ + local_timer_add(&tcp_main_ltimer, &tcpconn->timer, nxt_timeout, + t); + tcpconn->flags|=F_CONN_MAIN_TIMER|F_CONN_READ_W| + F_CONN_WANTS_RD | + F_CONN_WRITE_W|F_CONN_WANTS_WR; } flags|=POLLIN; if (unlikely(

15 years, 9 months

git:master: blst: another blacklist dest. function version

by Jan Janak

Module: sip-router Branch: master Commit: 6d91574de7f9133328e3f58d94b58bbdaacf1583 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d91574… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:09:22 2009 +0000 blst: another blacklist dest. function version - added dst_blacklist_su(), which is a variant of dst_blacklist_add() (different way of passing the blacklist target) --- dst_blacklist.c | 35 +++++++++++++++++++++++++++++++++++ dst_blacklist.h | 15 ++++++++++++++- 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dst_blacklist.c b/dst_blacklist.c index bb6e35e..7ebd1e6 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -34,6 +34,7 @@ * 2007-07-30 added dst_blacklist_del() and dst_blacklist_add_to() (andrei) * 2007-07-30 dst blacklist measurements added (Gergo) * 2008-02-11 dns_blacklist_init cfg parameter is introduced (Miklos) + * 2009-02-26 added dst_blacklist_su* variant (andrei) */ @@ -785,6 +786,14 @@ inline static int dst_is_blacklisted_ip(unsigned char proto, +/** add dst to the blacklist, specifying the timeout. + * @param err_flags - reason (bitmap) + * @param si - destination (protocol, ip and port) + * @param msg - sip message that triggered the blacklisting (can be 0 if + * not known) + * @param timeout - timeout in ticks + * @return 0 on success, -1 on error + */ int dst_blacklist_add_to(unsigned char err_flags, struct dest_info* si, struct sip_msg* msg, ticks_t timeout) { @@ -802,6 +811,32 @@ int dst_blacklist_add_to(unsigned char err_flags, struct dest_info* si, +/** add dst to the blacklist, specifying the timeout. + * (like @function dst_blacklist_add_to)= above, but uses + * (proto, sockaddr_union) instead of struct dest_info) + */ +int dst_blacklist_su_to(unsigned char err_flags, unsigned char proto, + union sockaddr_union* dst, + struct sip_msg* msg, ticks_t timeout) +{ + struct ip_addr ip; +#ifdef DST_BLACKLIST_HOOKS + struct dest_info si; + + init_dest_info(&si); + si.to=*dst; + si.proto=proto; + if (unlikely (blacklist_run_hooks(&blst_add_cb, &si, &err_flags, msg) == + DST_BLACKLIST_DENY)) + return 0; +#endif + su2ip_addr(&ip, dst); + return dst_blacklist_add_ip(err_flags, proto, &ip, + su_getport(dst), timeout); +} + + + int dst_is_blacklisted(struct dest_info* si, struct sip_msg* msg) { int ires; diff --git a/dst_blacklist.h b/dst_blacklist.h index e2ca0b4..b7c3ea1 100644 --- a/dst_blacklist.h +++ b/dst_blacklist.h @@ -88,12 +88,25 @@ void destroy_dst_blacklist(); /* like dst_blacklist_add, but the timeout can be also set */ int dst_blacklist_add_to(unsigned char err_flags, struct dest_info* si, struct sip_msg* msg, ticks_t timeout); +/* like above, but using a differnt way of passing the target */ +int dst_blacklist_su_to(unsigned char err_flags, unsigned char proto, + union sockaddr_union* dst, + struct sip_msg* msg, ticks_t timeout); -/* adds a dst to the blacklist with default timeout */ +/** adds a dst to the blacklist with default timeout. + * @see dst_blacklist_add_to for more details. + */ #define dst_blacklist_add(err_flags, si, msg) \ dst_blacklist_add_to((err_flags), (si), (msg), \ S_TO_TICKS(cfg_get(core, core_cfg, blst_timeout))) +/** adds a dst to the blacklist with default timeout. + * @see dst_blacklist_su_to for more details. + */ +#define dst_blacklist_su(err_flags, proto, dst, msg) \ + dst_blacklist_su_to((err_flags), (proto), (dst), (msg), \ + S_TO_TICKS(cfg_get(core, core_cfg, blst_timeout))) + int dst_is_blacklisted(struct dest_info* si, struct sip_msg* msg); /* delete an entry from the blacklist */ int dst_blacklist_del(struct dest_info* si, struct sip_msg* msg);

15 years, 9 months

git:master: Support for MESSAGE and OPTIONS method types are added to the parser.

by Jan Janak

Module: sip-router Branch: master Commit: 19af811d791bfe71fb91ae4532678c056e5ea1d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19af811… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Feb 27 09:01:42 2009 +0000 Support for MESSAGE and OPTIONS method types are added to the parser. --- parser/msg_parser.h | 3 ++- parser/parse_fline.c | 2 ++ parser/parse_fline.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 43434a9..ffa3e19 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -79,7 +79,8 @@ /* number methods as power of two to allow bitmap matching */ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_ACK=4, METHOD_BYE=8, METHOD_INFO=16, METHOD_REGISTER=32, METHOD_SUBSCRIBE=64, - METHOD_NOTIFY=128, METHOD_OTHER=256 }; + METHOD_NOTIFY=128, METHOD_MESSAGE=256, METHOD_OPTIONS=512, + METHOD_OTHER=1024 }; #define FL_FORCE_RPORT 1 /* force rport */ #define FL_FORCE_ACTIVE 2 /* force active SDP */ diff --git a/parser/parse_fline.c b/parser/parse_fline.c index fedfd3f..e234835 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -123,6 +123,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) else IFISMETHOD( REGISTER, 'R') else IFISMETHOD( SUBSCRIBE, 'S') else IFISMETHOD( NOTIFY, 'N') + else IFISMETHOD( MESSAGE, 'M') + else IFISMETHOD( OPTIONS, 'O') /* if you want to add another method XXX, include METHOD_XXX in H-file (this is the value which you will take later in processing and define XXX_LEN as length of method name; diff --git a/parser/parse_fline.h b/parser/parse_fline.h index 48a1eef..f8b3e06 100644 --- a/parser/parse_fline.h +++ b/parser/parse_fline.h @@ -58,6 +58,8 @@ #define REGISTER_LEN 8 #define SUBSCRIBE_LEN 9 #define NOTIFY_LEN 6 +#define MESSAGE_LEN 7 +#define OPTIONS_LEN 7 struct msg_start { int type; /* Type of the Message - Request/Response */

15 years, 9 months

git:master: sctp: direct blacklist support

by Jan Janak

Module: sip-router Branch: master Commit: 047b1dfb8958f4ba29fd77ed44e7cb17fdd106b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=047b1df… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 27 21:15:27 2009 +0000 sctp: direct blacklist support - blacklist support at the sctp level. If sctp_send_retries are used, the blacklist will work only for send (using SCTP_SEND_FAILED notifications). If sctp_send_retries is not used (default), there are 2 possible blacklist reasons: SEND or CONNECT (assoc. failed to be opened). --- sctp_server.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index 7ac8444..9b8688f 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -22,6 +22,7 @@ * History: * -------- * 2008-08-07 initial version (andrei) + * 2009-02-27 blacklist support (andrei) */ #ifdef USE_SCTP @@ -49,6 +50,9 @@ #include "mem/mem.h" #include "ip_addr.h" #include "cfg/cfg_struct.h" +#ifdef USE_DST_BLACKLIST +#include "dst_blacklist.h" +#endif /* USE_DST_BLACKLIST */ @@ -643,6 +647,16 @@ static int sctp_handle_send_failed(struct socket_info* si, ret=sctp_msg_send_raw(&dst, data, data_len, &sinfo); } +#ifdef USE_DST_BLACKLIST + else if (cfg_get(core, core_cfg, use_dst_blacklist) && + sctp_options.sctp_send_retries) { + /* blacklist only if send_retries is on, if off we blacklist + from SCTP_ASSOC_CHANGE: SCTP_COMM_LOST/SCTP_CANT_STR_ASSOC + which is better (because we can tell connect errors from send + errors and we blacklist a failed dst only once) */ + dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0); + } +#endif /* USE_DST_BLACKLIST */ return (ret>0)?0:ret; } @@ -665,7 +679,7 @@ static int sctp_handle_notification(struct socket_info* si, text " too short (%d bytes instead of %d bytes)\n", \ su2a((from_su), sizeof(*(from_su))), \ (bind_addr)->name.len, (bind_addr)->name.s, \ - (bind_addr)->port_no, (length), (val)); \ + (bind_addr)->port_no, (int)(length), (int)(val)); \ goto error; \ } @@ -735,6 +749,21 @@ static int sctp_handle_notification(struct socket_info* si, snp->sn_assoc_change.sac_outbound_streams, snp->sn_assoc_change.sac_inbound_streams ); +#ifdef USE_DST_BLACKLIST + /* blacklist only if send_retries is turned off (if on we don't + know here if we did retry or we are at the first error) */ + if (cfg_get(core, core_cfg, use_dst_blacklist) && + (sctp_options.sctp_send_retries==0)){ + switch(snp->sn_assoc_change.sac_state) { + case SCTP_CANT_STR_ASSOC: + dst_blacklist_su(BLST_ERR_CONNECT, PROTO_SCTP, su, 0); + break; + case SCTP_COMM_LOST: + dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0); + break; + } + } +#endif /* USE_DST_BLACKLIST */ break; #ifdef SCTP_ADAPTION_INDICATION case SCTP_ADAPTION_INDICATION:

15 years, 9 months

git:master: log/dbg: level is not limited anymore

by Jan Janak

Module: sip-router Branch: master Commit: 43181b6bc1c50b8456c4c4b5bceda5a99ef0c417 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43181b6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 26 23:14:12 2009 +0000 log/dbg: level is not limited anymore The recent changes to LOG() added a new limitation: the log level was restricted to one of the L_ macros. Using another level (e.g. L_DBG+1) would trigger an assert(). Now any level is allowed. If the level is not among the defined range (L_ALERT - L_DBG), the prefix will be skipped (e.g. "DBG") and the syslog level will be set to either the L_ALERT or the L_DBG one. This fixes problems with log() from the script, or when using a very high debug level and something like memdbg=7. --- cfg.y | 3 +- dprint.h | 76 ++++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/cfg.y b/cfg.y index 8408e1d..8d56371 100644 --- a/cfg.y +++ b/cfg.y @@ -2207,7 +2207,8 @@ cmd: | RETURN NUMBER {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)RETURN_R_F);} | RETURN RETCODE {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)RETURN_R_F);} | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)RETURN_R_F); } - | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)4, STRING_ST, $3); } + | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, + (void*)(L_DBG+1), STRING_ST, $3); } | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); } | LOG_TOK error { $$=0; yyerror("missing '(' or ')' ?"); } | LOG_TOK LPAREN error RPAREN { $$=0; yyerror("bad log argument"); } diff --git a/dprint.h b/dprint.h index 6a9806d..6b66427 100644 --- a/dprint.h +++ b/dprint.h @@ -32,6 +32,7 @@ #include <syslog.h> #include <stdio.h> /* stderr, fprintf() */ +#include "compiler_opt.h" #include "cfg_core.h" @@ -144,19 +145,36 @@ int log_facility_fixup(void *handle, str *name, void **val); # ifdef __SUNPRO_C # define LOG_(level, prefix, fmt, ...) \ do { \ - if (cfg_get(core, core_cfg, debug) >= (level) && \ - DPRINT_NON_CRIT) { \ + if (unlikely(cfg_get(core, core_cfg, debug) >= (level) && \ + DPRINT_NON_CRIT)) { \ DPRINT_CRIT_ENTER; \ - assert(((level) >= L_ALERT) && ((level) <= L_DBG)); \ - if (log_stderr) { \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), LOG_LEVEL2NAME(level),\ - (prefix), __VA_ARGS__); \ + if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ + if (unlikely(log_stderr)) { \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + LOG_LEVEL2NAME(level), (prefix), \ + __VA_ARGS__); \ + } else { \ + syslog(LOG2SYSLOG_LEVEL(level) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + (prefix), __VA_ARGS__); \ + } \ } else { \ - syslog(LOG2SYSLOG_LEVEL(level) | \ - cfg_get(core, core_cfg, log_facility), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ - (prefix), __VA_ARGS__); \ + if (log_stderr) { \ + fprintf(stderr, "%2d(%d) %s" fmt, \ + process_no, my_pid(), \ + (prefix), __VA_ARGS__); \ + } else { \ + if ((level)<L_ALERT) \ + syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), __VA_ARGS__); \ + else \ + syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), __VA_ARGS__); \ + } \ } \ DPRINT_CRIT_EXIT; \ } \ @@ -164,22 +182,38 @@ int log_facility_fixup(void *handle, str *name, void **val); # define LOG(level, fmt, ...) LOG_((level), LOC_INFO, fmt, __VA_ARGS__) -# else +# else /* ! __SUNPRO_C */ # define LOG_(level, prefix, fmt, args...) \ do { \ if (cfg_get(core, core_cfg, debug) >= (level) && \ DPRINT_NON_CRIT) { \ DPRINT_CRIT_ENTER; \ - assert(((level) >= L_ALERT) && ((level) <= L_DBG)); \ - if (log_stderr) { \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), LOG_LEVEL2NAME(level),\ - (prefix), ## args); \ - } else { \ - syslog(LOG2SYSLOG_LEVEL(level) |\ + if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ + if (unlikely(log_stderr)) { \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + LOG_LEVEL2NAME(level),(prefix), ## args);\ + } else { \ + syslog(LOG2SYSLOG_LEVEL(level) |\ cfg_get(core, core_cfg, log_facility), \ - "%s: %s" fmt, LOG_LEVEL2NAME(level),\ - (prefix), ## args); \ + "%s: %s" fmt, LOG_LEVEL2NAME(level),\ + (prefix), ## args); \ + } \ + } else { \ + if (log_stderr) { \ + fprintf(stderr, "%2d(%d) %s" fmt, \ + process_no, my_pid(), \ + (prefix), ## args); \ + } else { \ + if ((level)<L_ALERT) \ + syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), ## args); \ + else \ + syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ + cfg_get(core, core_cfg, log_facility),\ + "%s" fmt, (prefix), ## args); \ + } \ } \ DPRINT_CRIT_EXIT; \ } \

15 years, 9 months

Annotated git configuration file

by Jan Janak

Hello, There is a new page in the wiki which contains my version of the configuration file for git: http://sip-router.org/wiki/git/gitconfig Some of the options were not so easy to figure out, so I decided to share the config file to make your git learning curve less steep than mine was (and is :-). The file is well commented. Save the configuration file in ~/.gitconfig and set your name and email address to your real name and real email address. After that you get your copy of the sip-router repository using: mkdir my_repo cd my_repo git init git fetch sr You have pulled the whole history when the last command finished. "sr" is a shorthand for the sip-router git repository. As the next step you can check out the master branch, this is where the most recent source code is (it is an equivalent of the trunk in svn or HEAD in cvs): git co -b master sr/master "co" is an alias for checkout, this alias is defined in the configuration file. So now you have your very own copy of the sip-router repository, but that's not all, you can also pull the whole kamailio repository into it: g fetch km "km" is a shorthand for the git mirror of the kamailio svn repository. This command will produce a lot of output (don't be scared) and after it finishes you will have the full history of both projects--sip-router and kamailio--in your local git repository. You can, for example, check out kamailio svn trunk using: git co -b kam_trunk km/trunk And now you have the sources from kamailio trunk in your working directory. You can, of course do the same for SER from CVS, to get the latest sources of ser: git fetch cvs "cvs" is a shorthand for the git import of the ser cvs repository. Now you can switch to cvs trunk using: git co -b cvs_trunk cvs/cvs-head And now you have the latest ser sources in your working directory. And the last repository you can fetch from is the opensips git import: git fetch os git co -b opensips_trunk os/trunk And you have the latest sources from opensips trunk. To display all branches from all repositories run: git branch -a The most important branches are: sr/master - Latest version of sip-router core cvs/cvs-head - Latest version of ser from cvs km/trunk - Kamailio svn trunk km/1.4 - Kamailio branch with release 1.4 os/trunk - Opensips svn trunk Jan.

15 years, 9 months

git:master: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router

by Jan Janak

Module: sip-router Branch: master Commit: 90bb3224cc75db8dbaab3c2c21c54dddad544b79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90bb322… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 23 22:58:35 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router * 'master' of ssh://janakj@git.sip-router.org/sip-router: tcp: fix compilation problem on solaris (FIONREAD) core: fix bad level name in new LOG() t_check_status() checks also the blind UACs if t_pick_branch() Documenting t_lookup_cancel() script function. Removing set_t() from t_lookup_cancel() function, and introducing updated udp_mtu handling code - fixes SER-433 documenting t_is_expired() function t_is_expired() script function is introduced. * logging API updated (see doc/logging-api.txt for details) - AS support disabled by default. When building the route set of ACKs for local UACs, only the reply is now In case the AVP is a regexp, an allocation is required to build an AVP Currently, SER matches E2E ACKs only if there is an equality between From HF The calculate_routeset_length() produces an invalid result in the case 'memapp' and 'append_mem_block' are now both only used in source "Route :" prefix (and separator) is used some more time across the script: udp_mtu fallback script config & commands core: forward: tcp fallback for big udp packets ---

15 years, 9 months

git:master: Rename cfg_size to cfg_sizeof

by Jan Janak

Module: sip-router Branch: master Commit: a5ecca6386388a8bf465c1c0cc623db18b120936 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5ecca6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 26 12:52:17 2009 +0100 Rename cfg_size to cfg_sizeof One of kamailio modules uses libconfuse library which happens to contain a function with the same name, and this causes a conflict. We can rename cfg_size to cfg_sizeof to solve the problem. Signed-off-by: Jan Janak <jan(a)iptel.org> Acked-by: Miklos Tirpak <miklos(a)iptel.org> --- cfg/cfg.h | 2 +- doc/cfg.txt | 2 +- main.c | 2 +- modules/tm/tm.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/cfg.h b/cfg/cfg.h index 21be1aa..f2bd85b 100644 --- a/cfg/cfg.h +++ b/cfg/cfg.h @@ -77,7 +77,7 @@ typedef struct _cfg_def { int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, void **handler); -#define cfg_size(gname) \ +#define cfg_sizeof(gname) \ sizeof(struct cfg_group_##gname) #define cfg_get(gname, handle, var) \ diff --git a/doc/cfg.txt b/doc/cfg.txt index 730f1bf..ddfbec6 100644 --- a/doc/cfg.txt +++ b/doc/cfg.txt @@ -147,7 +147,7 @@ Each row consists of the following items: static int mod_init(void) { - if (cfg_declare("foo", cfg_def, &default_cfg, cfg_size(foo), + if (cfg_declare("foo", cfg_def, &default_cfg, cfg_sizeof(foo), &cfg_handle) ) { /* error */ diff --git a/main.c b/main.c index 453f578..b3f567f 100644 --- a/main.c +++ b/main.c @@ -1998,7 +1998,7 @@ try_again: goto error; } /* declare the core cfg before the module configs */ - if (cfg_declare("core", core_cfg_def, &default_core_cfg, cfg_size(core), + if (cfg_declare("core", core_cfg_def, &default_core_cfg, cfg_sizeof(core), &core_cfg) ) { LOG(L_CRIT, "could not declare the core configuration\n"); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index ef8c9af..9a4fea1 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -707,7 +707,7 @@ static int mod_init(void) #endif /* declare the configuration */ - if (cfg_declare("tm", tm_cfg_def, &default_tm_cfg, cfg_size(tm), + if (cfg_declare("tm", tm_cfg_def, &default_tm_cfg, cfg_sizeof(tm), &tm_cfg)) { LOG(L_ERR, "ERROR: mod_init: failed to declare the configuration\n"); return -1;

15 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev