sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

personal summary of what still needs to be done

by jh＠tutpro.com

this is a summary of what i still need in order to be able to use sip router in production. they are not new issues. all of them have been mentioned on the mailing list before: - async t_uac_dlg support and allowing asycn mi commands by mi_rpc module. i have seen various commits related to thius by andrei, but if i have understood correctly, at least mi_rpc part is not done yet. - any test "if (something)" must succeed if something evaluates to non-zero int or non-empty string. - this warning needs to go away: Sep 2 21:00:18 localhost sip-router: WARNING: tm [tm.c:502]: WARNING: on_sl_reply("stateless_reply"): empty/non existing route when onreply_route [stateless_reply] exist. - tm needs to have param 1.3.18. disable_6xx_block (integer) please correct me if some of the items have already done and i can remove them from the list. if these issues are not taken care of, it is likely that i'm not using sip-router in next version of my sip proxy. -- juha

15 years, 3 months

syntax error in switch statement

by jh＠tutpro.com

i'm getting syntax error on last line of this kind of switch statement: if (defined($fd.foo)) { switch ($fd.foo) { case "fi": route(TEST); return($retcode); why is that? in k, that kind of construct used to work. -- juha 0(26885) : <core> [cfg.y:3208]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 2971, column 19: syntax error 0(26885) : <core> [cfg.y:3208]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 2971, column 19: ==, !=, <,>, >= or <= expected

15 years, 3 months

git:master: perl(k): makefile vars use '_' instead of '-'

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 700002804c7438c6b7f35572d4b5854bdb203389 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7000028… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 22 15:37:52 2009 +0200 perl(k): makefile vars use '_' instead of '-' --- modules_k/perl/Makefile | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules_k/perl/Makefile b/modules_k/perl/Makefile index de68dc4..28f5154 100644 --- a/modules_k/perl/Makefile +++ b/modules_k/perl/Makefile @@ -54,21 +54,21 @@ doc/perl_pod.sgml: openserxs.xs install_module_custom: echo "installing Perl OpenSER packages ..." - mkdir -p $(modules-prefix)/$(lib-dir)/perl - $(INSTALL_CFG) lib/perl/*.pm $(modules-prefix)/$(lib-dir)/perl - mkdir -p $(modules-prefix)/$(lib-dir)/perl/OpenSER + mkdir -p $(modules_prefix)/$(lib_dir)/perl + $(INSTALL_CFG) lib/perl/*.pm $(modules_prefix)/$(lib_dir)/perl + mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER $(INSTALL_CFG) lib/perl/OpenSER/*.pm \ - $(modules-prefix)/$(lib-dir)/perl/OpenSER - mkdir -p $(modules-prefix)/$(lib-dir)/perl/OpenSER/LDAPUtils + $(modules_prefix)/$(lib_dir)/perl/OpenSER + mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/LDAPUtils $(INSTALL_CFG) lib/perl/OpenSER/LDAPUtils/*.pm \ - $(modules-prefix)/$(lib-dir)/perl/OpenSER/LDAPUtils - mkdir -p $(modules-prefix)/$(lib-dir)/perl/OpenSER/Utils + $(modules_prefix)/$(lib_dir)/perl/OpenSER/LDAPUtils + mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/Utils $(INSTALL_CFG) lib/perl/OpenSER/Utils/*.pm \ - $(modules-prefix)/$(lib-dir)/perl/OpenSER/Utils - mkdir -p $(modules-prefix)/$(lib-dir)/perl/OpenSER/VDB + $(modules_prefix)/$(lib_dir)/perl/OpenSER/Utils + mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB $(INSTALL_CFG) lib/perl/OpenSER/VDB/*.pm \ - $(modules-prefix)/$(lib-dir)/perl/OpenSER/VDB - mkdir -p $(modules-prefix)/$(lib-dir)/perl/OpenSER/VDB/Adapter + $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB + mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB/Adapter $(INSTALL_CFG) lib/perl/OpenSER/VDB/Adapter/*.pm \ - $(modules-prefix)/$(lib-dir)/perl/OpenSER/VDB/Adapter + $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB/Adapter

15 years, 3 months

git:master: tm: support for disabling 6xx special handling

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 77e7d5164dde66d3ec5dd7b86c3cbd586e9e25d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77e7d51… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 22 13:07:14 2009 +0200 tm: support for disabling 6xx special handling Added disable_6xx_block (same name as in kamailio), which when set will cause the 6xx to be treated like a normal reply (breaking the rfc). Default is off. It can be set also at runtime, e.g.: sercmd cfg.set_now_int tm disable_6xx_block 1 --- modules/tm/config.c | 6 +++++- modules/tm/config.h | 1 + modules/tm/t_reply.c | 3 ++- modules/tm/tm.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/tm/config.c b/modules/tm/config.c index 0dd258e..0e3101e 100644 --- a/modules/tm/config.c +++ b/modules/tm/config.c @@ -90,7 +90,9 @@ struct cfg_group_tm default_tm_cfg = { * for every method except BYE by default */ 1, /* cancel_b_method used for e2e and 6xx cancels*/ 1, /* reparse_on_dns_failover */ - INV_FR_TIME_OUT_NEXT + INV_FR_TIME_OUT_NEXT, /* fr_inv_timeout_next -> for serial forking subseq. + branches */ + 0 /* disable_6xx, by default off */ }; void *tm_cfg = &default_tm_cfg; @@ -182,5 +184,7 @@ cfg_def_t tm_cfg_def[] = { "branch instead of from the received request"}, {"fr_inv_timer_next", CFG_VAR_INT, 0, 0, timer_fixup, 0, "The value of fr_inv_timer for subsequent branches during serial forking"}, + {"disable_6xx_block", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, 6xx is treated like a normal reply (breaks rfc)"}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/tm/config.h b/modules/tm/config.h index 0904479..aabfa96 100644 --- a/modules/tm/config.h +++ b/modules/tm/config.h @@ -134,6 +134,7 @@ struct cfg_group_tm { unsigned int cancel_b_flags; int reparse_on_dns_failover; unsigned int fr_inv_timeout_next; + int disable_6xx; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index fa99650..6458d2e 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1086,7 +1086,8 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, if (picked_branch==-2) { /* branches open yet */ *should_store=1; *should_relay=-1; - if (new_code>=600 && new_code<=699){ + if (new_code>=600 && new_code<=699 && + !cfg_get(tm, tm_cfg, disable_6xx)){ if (!(Trans->flags & T_6xx)){ /* cancel only the first time we get a 6xx */ prepare_to_cancel(Trans, cancel_bitmap, 0); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e62185c..64d32fd 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -463,6 +463,7 @@ static param_export_t params[]={ {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, {"fr_inv_timer_next", PARAM_INT, &default_tm_cfg.fr_inv_timeout_next }, {"contacts_avp", PARAM_STRING, &contacts_avp_param }, + {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, {0,0,0} };

15 years, 3 months

git:master: kamctl: Makefile to install the tool

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 10f862b37d9ffa8776f80dd9f2e952c8d9a00913 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10f862b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 22 12:47:19 2009 +0200 kamctl: Makefile to install the tool --- tools/kamctl/Makefile | 230 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 230 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=10f…

15 years, 3 months

git:andrei/send_flags: core: new close after send and reuse only script functions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/send_flags Commit: 58cbf7f7e13fa383a76d9f67d38a686ae5e8babe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58cbf7f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 15 17:47:33 2009 +0200 core: new close after send and reuse only script functions Added new script functions for setting send options for the current message or its replies: - set_forward_no_connect() - the message will be forwarded only if there is already an open connection to the destination. - set_reply_no_connect() - like above but for replies to the current message. - set_forward_close() - hint that after forwarding the current message the connection should be closed. - set reply_close() - like above but for replies. --- action.c | 17 +++++++++++++++++ cfg.lex | 12 ++++++++++++ cfg.y | 28 ++++++++++++++++++++++++++++ route_struct.h | 6 +++++- 4 files changed, 62 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 352dd90..13a9817 100644 --- a/action.c +++ b/action.c @@ -50,6 +50,7 @@ * 2008-12-03 use lvalues/rvalues for assignments (andrei) * 2008-12-17 added UDP_MTU_TRY_PROTO_T (andrei) * 2009-05-04 switched IF_T to rval_expr (andrei) + * 2009-09-15 added SET_{FWD,RPL}_NO_CONNECT, SET_{FWD,RPL}_CLOSE (andrei) */ @@ -1214,6 +1215,22 @@ match_cleanup: else ret=v; break; + case SET_FWD_NO_CONNECT_T: + msg->fwd_send_flags|= SND_F_FORCE_CON_REUSE; + ret=1; /* continue processing */ + break; + case SET_RPL_NO_CONNECT_T: + msg->rpl_send_flags|= SND_F_FORCE_CON_REUSE; + ret=1; /* continue processing */ + break; + case SET_FWD_CLOSE_T: + msg->fwd_send_flags|= SND_F_CON_CLOSE; + ret=1; /* continue processing */ + break; + case SET_RPL_CLOSE_T: + msg->rpl_send_flags|= SND_F_CON_CLOSE; + ret=1; /* continue processing */ + break; /* default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); diff --git a/cfg.lex b/cfg.lex index 9723877..bedf79c 100644 --- a/cfg.lex +++ b/cfg.lex @@ -215,6 +215,10 @@ ELSE "else" SET_ADV_ADDRESS "set_advertised_address" SET_ADV_PORT "set_advertised_port" FORCE_SEND_SOCKET "force_send_socket" +SET_FWD_NO_CONNECT "set_forward_no_connect" +SET_RPL_NO_CONNECT "set_reply_no_connect" +SET_FWD_CLOSE "set_forward_close" +SET_RPL_CLOSE "set_reply_close" SWITCH "switch" CASE "case" DEFAULT "default" @@ -572,6 +576,14 @@ EAT_ABLE [\ \t\b\r] return SET_ADV_PORT; } <INITIAL>{FORCE_SEND_SOCKET} { count(); yylval.strval=yytext; return FORCE_SEND_SOCKET; } +<INITIAL>{SET_FWD_NO_CONNECT} { count(); yylval.strval=yytext; + return SET_FWD_NO_CONNECT; } +<INITIAL>{SET_RPL_NO_CONNECT} { count(); yylval.strval=yytext; + return SET_RPL_NO_CONNECT; } +<INITIAL>{SET_FWD_CLOSE} { count(); yylval.strval=yytext; + return SET_FWD_CLOSE; } +<INITIAL>{SET_RPL_CLOSE} { count(); yylval.strval=yytext; + return SET_RPL_CLOSE; } <INITIAL>{SWITCH} { count(); yylval.strval=yytext; return SWITCH; } <INITIAL>{CASE} { count(); yylval.strval=yytext; return CASE; } <INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } diff --git a/cfg.y b/cfg.y index 3344b03..af5335c 100644 --- a/cfg.y +++ b/cfg.y @@ -319,6 +319,10 @@ extern char *finame; %token SET_ADV_ADDRESS %token SET_ADV_PORT %token FORCE_SEND_SOCKET +%token SET_FWD_NO_CONNECT +%token SET_RPL_NO_CONNECT +%token SET_FWD_CLOSE +%token SET_RPL_CLOSE %token SWITCH %token CASE %token DEFAULT @@ -2990,6 +2994,30 @@ cmd: $$=0; yyerror("bad argument, [proto:]host[:port] expected"); } | FORCE_SEND_SOCKET error {$$=0; yyerror("missing '(' or ')' ?"); } + | SET_FWD_NO_CONNECT LPAREN RPAREN { + $$=mk_action(SET_FWD_NO_CONNECT_T, 0); set_cfg_pos($$); + } + | SET_FWD_NO_CONNECT { + $$=mk_action(SET_FWD_NO_CONNECT_T, 0); set_cfg_pos($$); + } + | SET_RPL_NO_CONNECT LPAREN RPAREN { + $$=mk_action(SET_RPL_NO_CONNECT_T, 0); set_cfg_pos($$); + } + | SET_RPL_NO_CONNECT { + $$=mk_action(SET_RPL_NO_CONNECT_T, 0); set_cfg_pos($$); + } + | SET_FWD_CLOSE LPAREN RPAREN { + $$=mk_action(SET_FWD_CLOSE_T, 0); set_cfg_pos($$); + } + | SET_FWD_CLOSE { + $$=mk_action(SET_FWD_CLOSE_T, 0); set_cfg_pos($$); + } + | SET_RPL_CLOSE LPAREN RPAREN { + $$=mk_action(SET_RPL_CLOSE_T, 0); set_cfg_pos($$); + } + | SET_RPL_CLOSE { + $$=mk_action(SET_RPL_CLOSE_T, 0); set_cfg_pos($$); + } | ID {mod_func_action = mk_action(MODULE_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0); } LPAREN func_params RPAREN { mod_func_action->val[0].u.data = diff --git a/route_struct.h b/route_struct.h index 4dc84e9..4894bd5 100644 --- a/route_struct.h +++ b/route_struct.h @@ -106,7 +106,11 @@ enum action_type{ FORCE_SEND_SOCKET_T, ASSIGN_T, ADD_T, - UDP_MTU_TRY_PROTO_T + UDP_MTU_TRY_PROTO_T, + SET_FWD_NO_CONNECT_T, + SET_RPL_NO_CONNECT_T, + SET_FWD_CLOSE_T, + SET_RPL_CLOSE_T }; /* parameter types for actions or types for expression right operands (WARNING right operands only, not working for left operands) */

15 years, 3 months

git:master: kamctl: moved files in own directory

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 04a0e7f4c8ea05641029060c92313f1c4b3ca7bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04a0e7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 22 11:27:49 2009 +0200 kamctl: moved files in own directory - tools/* => tools/kamctl1/* - avoid the mixture of kamctl and pike_top tools --- tools/{ => kamctl1}/db_berkeley/kamailio/acc | 0 .../db_berkeley/kamailio/active_watchers | 0 tools/{ => kamctl1}/db_berkeley/kamailio/address | 0 tools/{ => kamctl1}/db_berkeley/kamailio/aliases | 0 .../db_berkeley/kamailio/carrier_name | 0 .../db_berkeley/kamailio/carrierfailureroute | 0 .../db_berkeley/kamailio/carrierroute | 0 tools/{ => kamctl1}/db_berkeley/kamailio/cpl | 0 tools/{ => kamctl1}/db_berkeley/kamailio/dbaliases | 0 tools/{ => kamctl1}/db_berkeley/kamailio/dialog | 0 tools/{ => kamctl1}/db_berkeley/kamailio/dialplan | 0 .../{ => kamctl1}/db_berkeley/kamailio/dispatcher | 0 tools/{ => kamctl1}/db_berkeley/kamailio/domain | 0 .../{ => kamctl1}/db_berkeley/kamailio/domain_name | 0 .../db_berkeley/kamailio/domainpolicy | 0 .../db_berkeley/kamailio/globalblacklist | 0 tools/{ => kamctl1}/db_berkeley/kamailio/grp | 0 tools/{ => kamctl1}/db_berkeley/kamailio/gw | 0 tools/{ => kamctl1}/db_berkeley/kamailio/htable | 0 .../{ => kamctl1}/db_berkeley/kamailio/imc_members | 0 tools/{ => kamctl1}/db_berkeley/kamailio/imc_rooms | 0 tools/{ => kamctl1}/db_berkeley/kamailio/lcr | 0 tools/{ => kamctl1}/db_berkeley/kamailio/location | 0 .../db_berkeley/kamailio/missed_calls | 0 tools/{ => kamctl1}/db_berkeley/kamailio/pdt | 0 .../{ => kamctl1}/db_berkeley/kamailio/presentity | 0 tools/{ => kamctl1}/db_berkeley/kamailio/pua | 0 tools/{ => kamctl1}/db_berkeley/kamailio/purplemap | 0 tools/{ => kamctl1}/db_berkeley/kamailio/re_grp | 0 .../db_berkeley/kamailio/rls_presentity | 0 .../db_berkeley/kamailio/rls_watchers | 0 tools/{ => kamctl1}/db_berkeley/kamailio/silo | 0 tools/{ => kamctl1}/db_berkeley/kamailio/sip_trace | 0 .../{ => kamctl1}/db_berkeley/kamailio/speed_dial | 0 .../{ => kamctl1}/db_berkeley/kamailio/subscriber | 0 tools/{ => kamctl1}/db_berkeley/kamailio/trusted | 0 tools/{ => kamctl1}/db_berkeley/kamailio/uri | 0 .../db_berkeley/kamailio/userblacklist | 0 .../db_berkeley/kamailio/usr_preferences | 0 tools/{ => kamctl1}/db_berkeley/kamailio/version | 0 tools/{ => kamctl1}/db_berkeley/kamailio/watchers | 0 tools/{ => kamctl1}/db_berkeley/kamailio/xcap | 0 tools/{ => kamctl1}/dbtext/kamailio/acc | 0 .../{ => kamctl1}/dbtext/kamailio/active_watchers | 0 tools/{ => kamctl1}/dbtext/kamailio/address | 0 tools/{ => kamctl1}/dbtext/kamailio/aliases | 0 tools/{ => kamctl1}/dbtext/kamailio/carrier_name | 0 .../dbtext/kamailio/carrierfailureroute | 0 tools/{ => kamctl1}/dbtext/kamailio/carrierroute | 0 tools/{ => kamctl1}/dbtext/kamailio/cpl | 0 tools/{ => kamctl1}/dbtext/kamailio/dbaliases | 0 tools/{ => kamctl1}/dbtext/kamailio/dialog | 0 tools/{ => kamctl1}/dbtext/kamailio/dialplan | 0 tools/{ => kamctl1}/dbtext/kamailio/dispatcher | 0 tools/{ => kamctl1}/dbtext/kamailio/domain | 0 tools/{ => kamctl1}/dbtext/kamailio/domain_name | 0 tools/{ => kamctl1}/dbtext/kamailio/domainpolicy | 0 .../{ => kamctl1}/dbtext/kamailio/globalblacklist | 0 tools/{ => kamctl1}/dbtext/kamailio/grp | 0 tools/{ => kamctl1}/dbtext/kamailio/gw | 0 tools/{ => kamctl1}/dbtext/kamailio/htable | 0 tools/{ => kamctl1}/dbtext/kamailio/imc_members | 0 tools/{ => kamctl1}/dbtext/kamailio/imc_rooms | 0 tools/{ => kamctl1}/dbtext/kamailio/lcr | 0 tools/{ => kamctl1}/dbtext/kamailio/location | 0 tools/{ => kamctl1}/dbtext/kamailio/missed_calls | 0 tools/{ => kamctl1}/dbtext/kamailio/pdt | 0 tools/{ => kamctl1}/dbtext/kamailio/presentity | 0 tools/{ => kamctl1}/dbtext/kamailio/pua | 0 tools/{ => kamctl1}/dbtext/kamailio/purplemap | 0 tools/{ => kamctl1}/dbtext/kamailio/re_grp | 0 tools/{ => kamctl1}/dbtext/kamailio/rls_presentity | 0 tools/{ => kamctl1}/dbtext/kamailio/rls_watchers | 0 tools/{ => kamctl1}/dbtext/kamailio/silo | 0 tools/{ => kamctl1}/dbtext/kamailio/sip_trace | 0 tools/{ => kamctl1}/dbtext/kamailio/speed_dial | 0 tools/{ => kamctl1}/dbtext/kamailio/subscriber | 0 tools/{ => kamctl1}/dbtext/kamailio/trusted | 0 tools/{ => kamctl1}/dbtext/kamailio/uri | 0 tools/{ => kamctl1}/dbtext/kamailio/userblacklist | 0 .../{ => kamctl1}/dbtext/kamailio/usr_preferences | 0 tools/{ => kamctl1}/dbtext/kamailio/version | 0 tools/{ => kamctl1}/dbtext/kamailio/watchers | 0 tools/{ => kamctl1}/dbtext/kamailio/xcap | 0 tools/{ => kamctl1}/dbtextdb/__init__.py | 0 tools/{ => kamctl1}/dbtextdb/dbtextdb.py | 0 tools/{ => kamctl1}/dbtextdb/dbtextdb_test.py | 0 .../dbtextdb/tests/bad_table_auto_dupe | 0 tools/{ => kamctl1}/dbtextdb/tests/bad_table_int | 0 .../dbtextdb/tests/bad_table_long_row | 0 tools/{ => kamctl1}/dbtextdb/tests/bad_table_null | 0 .../dbtextdb/tests/bad_table_short_row | 0 .../dbtextdb/tests/bad_table_wrong_type | 0 tools/{ => kamctl1}/dbtextdb/tests/subscriber | 0 tools/{ => kamctl1}/dbtextdb/tests/test | 0 tools/{ => kamctl1}/dbtextdb/tests/unsorted_table | 0 tools/{ => kamctl1}/dbtextdb/tests/unsorted_table2 | 0 tools/{ => kamctl1}/kamctl | 0 tools/{ => kamctl1}/kamctl.8 | 0 tools/{ => kamctl1}/kamctl.base | 0 tools/{ => kamctl1}/kamctl.ctlbase | 0 tools/{ => kamctl1}/kamctl.db_berkeley | 0 tools/{ => kamctl1}/kamctl.dbtext | 0 tools/{ => kamctl1}/kamctl.fifo | 0 tools/{ => kamctl1}/kamctl.mysql | 0 tools/{ => kamctl1}/kamctl.oracle | 0 tools/{ => kamctl1}/kamctl.pgsql | 0 tools/{ => kamctl1}/kamctl.sqlbase | 0 tools/{ => kamctl1}/kamctl.unixsock | 0 tools/{ => kamctl1}/kamctlrc | 0 tools/{ => kamctl1}/kamdbctl | 0 tools/{ => kamctl1}/kamdbctl.8 | 0 tools/{ => kamctl1}/kamdbctl.base | 0 tools/{ => kamctl1}/kamdbctl.db_berkeley | 0 tools/{ => kamctl1}/kamdbctl.dbtext | 0 tools/{ => kamctl1}/kamdbctl.mysql | 0 tools/{ => kamctl1}/kamdbctl.oracle | 0 tools/{ => kamctl1}/kamdbctl.pgsql | 0 tools/{ => kamctl1}/kamdbfunc.oracle | 0 tools/{ => kamctl1}/mysql/acc-create.sql | 0 tools/{ => kamctl1}/mysql/alias_db-create.sql | 0 tools/{ => kamctl1}/mysql/auth_db-create.sql | 0 tools/{ => kamctl1}/mysql/avpops-create.sql | 0 tools/{ => kamctl1}/mysql/carrierroute-create.sql | 0 tools/{ => kamctl1}/mysql/cpl-create.sql | 0 tools/{ => kamctl1}/mysql/dialog-create.sql | 0 tools/{ => kamctl1}/mysql/dialplan-create.sql | 0 tools/{ => kamctl1}/mysql/dispatcher-create.sql | 0 tools/{ => kamctl1}/mysql/domain-create.sql | 0 tools/{ => kamctl1}/mysql/domainpolicy-create.sql | 0 tools/{ => kamctl1}/mysql/group-create.sql | 0 tools/{ => kamctl1}/mysql/htable-create.sql | 0 tools/{ => kamctl1}/mysql/imc-create.sql | 0 tools/{ => kamctl1}/mysql/lcr-create.sql | 0 tools/{ => kamctl1}/mysql/msilo-create.sql | 0 tools/{ => kamctl1}/mysql/pdt-create.sql | 0 tools/{ => kamctl1}/mysql/permissions-create.sql | 0 tools/{ => kamctl1}/mysql/presence-create.sql | 0 tools/{ => kamctl1}/mysql/purple-create.sql | 0 tools/{ => kamctl1}/mysql/registrar-create.sql | 0 tools/{ => kamctl1}/mysql/rls-create.sql | 0 tools/{ => kamctl1}/mysql/siptrace-create.sql | 0 tools/{ => kamctl1}/mysql/speeddial-create.sql | 0 tools/{ => kamctl1}/mysql/standard-create.sql | 0 tools/{ => kamctl1}/mysql/uri_db-create.sql | 0 tools/{ => kamctl1}/mysql/userblacklist-create.sql | 0 tools/{ => kamctl1}/mysql/usrloc-create.sql | 0 tools/{ => kamctl1}/oracle/README.TYPES | 0 tools/{ => kamctl1}/oracle/acc-create.sql | 0 tools/{ => kamctl1}/oracle/admin/README | 0 .../{ => kamctl1}/oracle/admin/_create_as_sys.tmpl | 0 tools/{ => kamctl1}/oracle/admin/_drop_as_sys.tmpl | 0 tools/{ => kamctl1}/oracle/alias_db-create.sql | 0 tools/{ => kamctl1}/oracle/auth_db-create.sql | 0 tools/{ => kamctl1}/oracle/avpops-create.sql | 0 tools/{ => kamctl1}/oracle/carrierroute-create.sql | 0 tools/{ => kamctl1}/oracle/cpl-create.sql | 0 tools/{ => kamctl1}/oracle/dialog-create.sql | 0 tools/{ => kamctl1}/oracle/dialplan-create.sql | 0 tools/{ => kamctl1}/oracle/dispatcher-create.sql | 0 tools/{ => kamctl1}/oracle/domain-create.sql | 0 tools/{ => kamctl1}/oracle/domainpolicy-create.sql | 0 tools/{ => kamctl1}/oracle/group-create.sql | 0 tools/{ => kamctl1}/oracle/htable-create.sql | 0 tools/{ => kamctl1}/oracle/imc-create.sql | 0 tools/{ => kamctl1}/oracle/inc/_create_compat.sql | 0 tools/{ => kamctl1}/oracle/inc/_createsch.tmpl | 0 tools/{ => kamctl1}/oracle/inc/_dropsch.tmpl | 0 tools/{ => kamctl1}/oracle/inc/_grantfunc.tmpl | 0 tools/{ => kamctl1}/oracle/inc/_grantroot.tmpl | 0 tools/{ => kamctl1}/oracle/lcr-create.sql | 0 tools/{ => kamctl1}/oracle/msilo-create.sql | 0 tools/{ => kamctl1}/oracle/pdt-create.sql | 0 tools/{ => kamctl1}/oracle/permissions-create.sql | 0 tools/{ => kamctl1}/oracle/presence-create.sql | 0 tools/{ => kamctl1}/oracle/purple-create.sql | 0 tools/{ => kamctl1}/oracle/registrar-create.sql | 0 tools/{ => kamctl1}/oracle/rls-create.sql | 0 tools/{ => kamctl1}/oracle/siptrace-create.sql | 0 tools/{ => kamctl1}/oracle/speeddial-create.sql | 0 tools/{ => kamctl1}/oracle/standard-create.sql | 0 tools/{ => kamctl1}/oracle/uri_db-create.sql | 0 .../{ => kamctl1}/oracle/userblacklist-create.sql | 0 tools/{ => kamctl1}/oracle/usrloc-create.sql | 0 tools/{ => kamctl1}/postgres/acc-create.sql | 0 tools/{ => kamctl1}/postgres/alias_db-create.sql | 0 tools/{ => kamctl1}/postgres/auth_db-create.sql | 0 tools/{ => kamctl1}/postgres/avpops-create.sql | 0 .../{ => kamctl1}/postgres/carrierroute-create.sql | 0 tools/{ => kamctl1}/postgres/cpl-create.sql | 0 tools/{ => kamctl1}/postgres/dialog-create.sql | 0 tools/{ => kamctl1}/postgres/dialplan-create.sql | 0 tools/{ => kamctl1}/postgres/dispatcher-create.sql | 0 tools/{ => kamctl1}/postgres/domain-create.sql | 0 .../{ => kamctl1}/postgres/domainpolicy-create.sql | 0 tools/{ => kamctl1}/postgres/group-create.sql | 0 tools/{ => kamctl1}/postgres/htable-create.sql | 0 tools/{ => kamctl1}/postgres/imc-create.sql | 0 tools/{ => kamctl1}/postgres/lcr-create.sql | 0 tools/{ => kamctl1}/postgres/msilo-create.sql | 0 tools/{ => kamctl1}/postgres/pdt-create.sql | 0 .../{ => kamctl1}/postgres/permissions-create.sql | 0 tools/{ => kamctl1}/postgres/presence-create.sql | 0 tools/{ => kamctl1}/postgres/purple-create.sql | 0 tools/{ => kamctl1}/postgres/registrar-create.sql | 0 tools/{ => kamctl1}/postgres/rls-create.sql | 0 tools/{ => kamctl1}/postgres/siptrace-create.sql | 0 tools/{ => kamctl1}/postgres/speeddial-create.sql | 0 tools/{ => kamctl1}/postgres/standard-create.sql | 0 tools/{ => kamctl1}/postgres/uri_db-create.sql | 0 .../postgres/userblacklist-create.sql | 0 tools/{ => kamctl1}/postgres/usrloc-create.sql | 0 212 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=04a…

15 years, 3 months

git:master: kamctl: files moved in tools/kamctl/

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f6f895e95d3274c5f872f81a83dbbc71fe7623fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6f895e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 22 11:29:22 2009 +0200 kamctl: files moved in tools/kamctl/ - second stange of moving files in own directory - renamed tmp dir: tools/kamctl1 => tools/kamctl --- tools/{kamctl1 => kamctl}/db_berkeley/kamailio/acc | 0 .../db_berkeley/kamailio/active_watchers | 0 .../db_berkeley/kamailio/address | 0 .../db_berkeley/kamailio/aliases | 0 .../db_berkeley/kamailio/carrier_name | 0 .../db_berkeley/kamailio/carrierfailureroute | 0 .../db_berkeley/kamailio/carrierroute | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/cpl | 0 .../db_berkeley/kamailio/dbaliases | 0 .../db_berkeley/kamailio/dialog | 0 .../db_berkeley/kamailio/dialplan | 0 .../db_berkeley/kamailio/dispatcher | 0 .../db_berkeley/kamailio/domain | 0 .../db_berkeley/kamailio/domain_name | 0 .../db_berkeley/kamailio/domainpolicy | 0 .../db_berkeley/kamailio/globalblacklist | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/grp | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/gw | 0 .../db_berkeley/kamailio/htable | 0 .../db_berkeley/kamailio/imc_members | 0 .../db_berkeley/kamailio/imc_rooms | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/lcr | 0 .../db_berkeley/kamailio/location | 0 .../db_berkeley/kamailio/missed_calls | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/pdt | 0 .../db_berkeley/kamailio/presentity | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/pua | 0 .../db_berkeley/kamailio/purplemap | 0 .../db_berkeley/kamailio/re_grp | 0 .../db_berkeley/kamailio/rls_presentity | 0 .../db_berkeley/kamailio/rls_watchers | 0 .../{kamctl1 => kamctl}/db_berkeley/kamailio/silo | 0 .../db_berkeley/kamailio/sip_trace | 0 .../db_berkeley/kamailio/speed_dial | 0 .../db_berkeley/kamailio/subscriber | 0 .../db_berkeley/kamailio/trusted | 0 tools/{kamctl1 => kamctl}/db_berkeley/kamailio/uri | 0 .../db_berkeley/kamailio/userblacklist | 0 .../db_berkeley/kamailio/usr_preferences | 0 .../db_berkeley/kamailio/version | 0 .../db_berkeley/kamailio/watchers | 0 .../{kamctl1 => kamctl}/db_berkeley/kamailio/xcap | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/acc | 0 .../dbtext/kamailio/active_watchers | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/address | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/aliases | 0 .../dbtext/kamailio/carrier_name | 0 .../dbtext/kamailio/carrierfailureroute | 0 .../dbtext/kamailio/carrierroute | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/cpl | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/dbaliases | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/dialog | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/dialplan | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/dispatcher | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/domain | 0 .../dbtext/kamailio/domain_name | 0 .../dbtext/kamailio/domainpolicy | 0 .../dbtext/kamailio/globalblacklist | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/grp | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/gw | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/htable | 0 .../dbtext/kamailio/imc_members | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/imc_rooms | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/lcr | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/location | 0 .../dbtext/kamailio/missed_calls | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/pdt | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/presentity | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/pua | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/purplemap | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/re_grp | 0 .../dbtext/kamailio/rls_presentity | 0 .../dbtext/kamailio/rls_watchers | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/silo | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/sip_trace | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/speed_dial | 0 .../{kamctl1 => kamctl}/dbtext/kamailio/subscriber | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/trusted | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/uri | 0 .../dbtext/kamailio/userblacklist | 0 .../dbtext/kamailio/usr_preferences | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/version | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/watchers | 0 tools/{kamctl1 => kamctl}/dbtext/kamailio/xcap | 0 tools/{kamctl1 => kamctl}/dbtextdb/__init__.py | 0 tools/{kamctl1 => kamctl}/dbtextdb/dbtextdb.py | 0 .../{kamctl1 => kamctl}/dbtextdb/dbtextdb_test.py | 0 .../dbtextdb/tests/bad_table_auto_dupe | 0 .../dbtextdb/tests/bad_table_int | 0 .../dbtextdb/tests/bad_table_long_row | 0 .../dbtextdb/tests/bad_table_null | 0 .../dbtextdb/tests/bad_table_short_row | 0 .../dbtextdb/tests/bad_table_wrong_type | 0 .../{kamctl1 => kamctl}/dbtextdb/tests/subscriber | 0 tools/{kamctl1 => kamctl}/dbtextdb/tests/test | 0 .../dbtextdb/tests/unsorted_table | 0 .../dbtextdb/tests/unsorted_table2 | 0 tools/{kamctl1 => kamctl}/kamctl | 0 tools/{kamctl1 => kamctl}/kamctl.8 | 0 tools/{kamctl1 => kamctl}/kamctl.base | 0 tools/{kamctl1 => kamctl}/kamctl.ctlbase | 0 tools/{kamctl1 => kamctl}/kamctl.db_berkeley | 0 tools/{kamctl1 => kamctl}/kamctl.dbtext | 0 tools/{kamctl1 => kamctl}/kamctl.fifo | 0 tools/{kamctl1 => kamctl}/kamctl.mysql | 0 tools/{kamctl1 => kamctl}/kamctl.oracle | 0 tools/{kamctl1 => kamctl}/kamctl.pgsql | 0 tools/{kamctl1 => kamctl}/kamctl.sqlbase | 0 tools/{kamctl1 => kamctl}/kamctl.unixsock | 0 tools/{kamctl1 => kamctl}/kamctlrc | 0 tools/{kamctl1 => kamctl}/kamdbctl | 0 tools/{kamctl1 => kamctl}/kamdbctl.8 | 0 tools/{kamctl1 => kamctl}/kamdbctl.base | 0 tools/{kamctl1 => kamctl}/kamdbctl.db_berkeley | 0 tools/{kamctl1 => kamctl}/kamdbctl.dbtext | 0 tools/{kamctl1 => kamctl}/kamdbctl.mysql | 0 tools/{kamctl1 => kamctl}/kamdbctl.oracle | 0 tools/{kamctl1 => kamctl}/kamdbctl.pgsql | 0 tools/{kamctl1 => kamctl}/kamdbfunc.oracle | 0 tools/{kamctl1 => kamctl}/mysql/acc-create.sql | 0 .../{kamctl1 => kamctl}/mysql/alias_db-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/auth_db-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/avpops-create.sql | 0 .../mysql/carrierroute-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/cpl-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/dialog-create.sql | 0 .../{kamctl1 => kamctl}/mysql/dialplan-create.sql | 0 .../mysql/dispatcher-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/domain-create.sql | 0 .../mysql/domainpolicy-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/group-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/htable-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/imc-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/lcr-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/msilo-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/pdt-create.sql | 0 .../mysql/permissions-create.sql | 0 .../{kamctl1 => kamctl}/mysql/presence-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/purple-create.sql | 0 .../{kamctl1 => kamctl}/mysql/registrar-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/rls-create.sql | 0 .../{kamctl1 => kamctl}/mysql/siptrace-create.sql | 0 .../{kamctl1 => kamctl}/mysql/speeddial-create.sql | 0 .../{kamctl1 => kamctl}/mysql/standard-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/uri_db-create.sql | 0 .../mysql/userblacklist-create.sql | 0 tools/{kamctl1 => kamctl}/mysql/usrloc-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/README.TYPES | 0 tools/{kamctl1 => kamctl}/oracle/acc-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/admin/README | 0 .../oracle/admin/_create_as_sys.tmpl | 0 .../oracle/admin/_drop_as_sys.tmpl | 0 .../{kamctl1 => kamctl}/oracle/alias_db-create.sql | 0 .../{kamctl1 => kamctl}/oracle/auth_db-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/avpops-create.sql | 0 .../oracle/carrierroute-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/cpl-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/dialog-create.sql | 0 .../{kamctl1 => kamctl}/oracle/dialplan-create.sql | 0 .../oracle/dispatcher-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/domain-create.sql | 0 .../oracle/domainpolicy-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/group-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/htable-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/imc-create.sql | 0 .../oracle/inc/_create_compat.sql | 0 .../{kamctl1 => kamctl}/oracle/inc/_createsch.tmpl | 0 tools/{kamctl1 => kamctl}/oracle/inc/_dropsch.tmpl | 0 .../{kamctl1 => kamctl}/oracle/inc/_grantfunc.tmpl | 0 .../{kamctl1 => kamctl}/oracle/inc/_grantroot.tmpl | 0 tools/{kamctl1 => kamctl}/oracle/lcr-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/msilo-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/pdt-create.sql | 0 .../oracle/permissions-create.sql | 0 .../{kamctl1 => kamctl}/oracle/presence-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/purple-create.sql | 0 .../oracle/registrar-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/rls-create.sql | 0 .../{kamctl1 => kamctl}/oracle/siptrace-create.sql | 0 .../oracle/speeddial-create.sql | 0 .../{kamctl1 => kamctl}/oracle/standard-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/uri_db-create.sql | 0 .../oracle/userblacklist-create.sql | 0 tools/{kamctl1 => kamctl}/oracle/usrloc-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/acc-create.sql | 0 .../postgres/alias_db-create.sql | 0 .../postgres/auth_db-create.sql | 0 .../{kamctl1 => kamctl}/postgres/avpops-create.sql | 0 .../postgres/carrierroute-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/cpl-create.sql | 0 .../{kamctl1 => kamctl}/postgres/dialog-create.sql | 0 .../postgres/dialplan-create.sql | 0 .../postgres/dispatcher-create.sql | 0 .../{kamctl1 => kamctl}/postgres/domain-create.sql | 0 .../postgres/domainpolicy-create.sql | 0 .../{kamctl1 => kamctl}/postgres/group-create.sql | 0 .../{kamctl1 => kamctl}/postgres/htable-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/imc-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/lcr-create.sql | 0 .../{kamctl1 => kamctl}/postgres/msilo-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/pdt-create.sql | 0 .../postgres/permissions-create.sql | 0 .../postgres/presence-create.sql | 0 .../{kamctl1 => kamctl}/postgres/purple-create.sql | 0 .../postgres/registrar-create.sql | 0 tools/{kamctl1 => kamctl}/postgres/rls-create.sql | 0 .../postgres/siptrace-create.sql | 0 .../postgres/speeddial-create.sql | 0 .../postgres/standard-create.sql | 0 .../{kamctl1 => kamctl}/postgres/uri_db-create.sql | 0 .../postgres/userblacklist-create.sql | 0 .../{kamctl1 => kamctl}/postgres/usrloc-create.sql | 0 212 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f6f…

15 years, 3 months

[tracker] Task closed: TLS modul problem

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#14 - TLS modul problem User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed Additional comments about closing: Hopefully fixed, see git#68e944. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=14 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.

15 years, 4 months

git:master: tcp: tls fix_read_con hook return changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c390fed30a67655a8d45c7210b06d82bde9f3820 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c390fed… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Sep 21 18:41:26 2009 +0200 tcp: tls fix_read_con hook return changes tls_fix_read_con doesn't change the tcp connection state any longer, relying instead on different return codes. --- tcp_read.c | 6 +++--- tls_hooks.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 7d45d53..b79e2e2 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -651,11 +651,11 @@ int tcp_read_req(struct tcp_connection* con, int* bytes_read, int* read_flags) req=&con->req; #ifdef USE_TLS if (con->type==PROTO_TLS){ - if (tls_fix_read_conn(con)!=0){ + ret=tls_fix_read_conn(con); + if (unlikely(ret<0)){ resp=CONN_ERROR; goto end_req; - } - if (unlikely(con->state!=S_CONN_OK && con->state!=S_CONN_ACCEPT)) + }else if (unlikely(ret==0)) goto end_req; /* not enough data */ } #endif diff --git a/tls_hooks.h b/tls_hooks.h index 5b17ca6..462ad3d 100644 --- a/tls_hooks.h +++ b/tls_hooks.h @@ -51,7 +51,11 @@ struct tls_hooks{ /* checks if a tls connection is fully established before a read, and if * not it runs tls_accept() or tls_connect() as needed * (tls_accept and tls_connect are deferred to the "reader" process for - * performance reasons) */ + * performance reasons) + * returns 1 if the read can continue, 0 if the connection is not yet + * ready for the read and fix_read_con() should be attempted at a latter + * time and <0 on error. + */ int (*fix_read_con)(struct tcp_connection* c); /* per listening socket init, called on ser startup (after modules,

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