sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

by Jan Janak

Hello, If we want to make the sip-router core usable in both projects, we would also need to merge both tls implementations. In SER we moved the the TLS implementation into tls module. In Kamailio it appears that the tls implementation is in tls subdirectory in the core and then there is tlsops module which contains pseudovariables used to retrieve information from TLS certificates. Unless somebody has a better idea, I would propose that we merge the tls implementation from kamailio core into ser tls module. In addition to that we could merge the implementation of tls related pseudovariables from tlsops into the tls module and then put the tls module into the sip-router repository. What do you think? I volunteer to do this if nobody objects. Jan.

14 years, 8 months

sip-router: modules & repositories

by Andrei Pelinescu-Onciul

Hi, We've reached the point where we should start adding modules. Me and Jan would like to start moving ser modules to sip-router. ser modules are particularly easy because we can move changes from ser cvs semi-automatically (only a git pull required), so we don't need to stop development on cvs. Soon we will have to add kamailio modules too, but for kamailio it would be more painful, both because of the bigger number of changes required and because it's difficult to update from svn (so it would be better if all developers would move to git or use patches). We must decide if we use separate repositories or a branch in sip-router and we should also start thinking about the version number of the first ser and first kamailio based on sip-router. Repositories: 1. we use branches inside sip-router: master - like now, only core, tm and common modules ser_30 - master merged with ser_modules, next version of ser will come out of it kamailio_30 - same like above Disadvantages: - one big repo - people must be careful _not_ to merge ser_30 or kamailio_30 into master (that would bring all the modules into master which is not what we want) - if someone working on the ser_30 branch (for example) finds a problem in the core and wants to fix it, it has to do it on the master branch. - if the above requirement cannot be avoided and someone does a specific core change in ser_30 or k_30 (e.g. name in makefile), it should always do it in a separate commit (no commits touching both core/tm and some project specific module, instead separate commits for the common part so that they might be cherry-picked) 2. we use 3 repositories: sip-router - like now, only the common part: core, tm and common modules ser-ng - sip-router + ser modules kamailio-ng - sip-router + k modules Advantages: - 3 smaller repos - more difficult to make mistakes and merge kamailio or ser into sip-router/master Disadvantages: - 3 smaller repos :-) - same as for (1) In general whatever we can do with branches in the same repo we can with branches in different repos, so a complete kamailio-ser merge would not be affected if we use separate repos. Version numbers: I think it would be a good idea to come up with a versioning scheme that would reflect the common part used for future ser and kamailio releases. Maybe 3.x (3 being > then both current ser and kamailio version), or mabye v.v.X , where v.v is the sip-router version (common part) and X is the project version (ser or kamailio). What's important is to (very) quickly decide on the repository layout (because this will slow us down) and on the names for the branches or for the different repos. Once this is decided we want to quickly make a test ser version based on sip-router and start testing it. If everything looks ok we want to start using it on iptel.org. Andrei

15 years

SDP parser

by Ovidiu Sas

Hello all, The SDP parser from the kamailio core needs to be imported into the sip-router core. It is located under parser/sdp directory. Th qos module has a dependency on the SDP parser. Regards, Ovidiu Sas

15 years, 1 month

git:master: Merge branch 'ser_core_cvs'

by Jan Janak

Module: sip-router Branch: master Commit: 7a0489e835789292fbe133b2000bc4091db87e5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a0489e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Feb 27 23:27:37 2009 +0100 Merge branch 'ser_core_cvs' * ser_core_cvs: sctp: direct blacklist support Support for MESSAGE and OPTIONS method types are added to the parser. log/dbg: level is not limited anymore config: tcp_async alias for tcp_buf_write tcp: async write timeout fixes tcp: blacklist at tcp level if possible blst: another blacklist dest. function version cfg_size macro renamed to cfg_sizeof to avoid a conflict with one of the Conflicts: cfg.y The first conflict in BREAK definition, the file coming from cvs contained RETURN_R_F, while the file coming from git contained BREAK_R_F, I resolved it with BREAK_R_F. The second conflict was in the definition in LOG_TOK which was resolved with the latest version from cvs. ---

15 years, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009