--- net/ipv4/ipvs/ip_vs_conn.c Wed Feb 21 20:27:09 2001 +++ ../ipvs-0.2.4/ipvs/ip_vs_conn.c Fri Jan 26 11:19:22 2001 @@ -422,48 +422,48 @@ static struct vs_tcp_states_t vs_tcp_states [] = { /* INPUT */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSR, sES, sES, sSR, sSR, sSR, sSR, sSR, sSR, sSR, sSR/*, sSR*/ }}, -/*fin*/ {{sCL, sCW, sSS, sTW, sTW, sTW, sTW, sCL, sCW, sLA, sLI/*, sTW*/ }}, -/*ack*/ {{sCL, sES, sSS, sES, sES, sFW, sTW, sCL, sCW, sCL, sLI/*, sES*/ }}, -/*rst*/ {{sCL, sCL, sCL, sSR, sSR, sCL, sCL, sCL, sCL, sLA, sLI/*, sSR*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSR, sES, sES, sSR, sSR, sSR, sSR, sSR, sSR, sSR, sSR }}, +/*fin*/ {{sCL, sCW, sSS, sTW, sTW, sTW, sCL, sCW, sLA, sLI, sTW }}, +/*ack*/ {{sCL, sES, sSS, sES, sFW, sTW, sCL, sCW, sCL, sLI, sES }}, +/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sLA, sLI, sSR }}, /* OUTPUT */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSS, sES, sSS, sSR, sSR, sSS, sSS, sSS, sSS, sSS, sLI/*, sSR*/ }}, -/*fin*/ {{sTW, sFW, sSS, sTW, sTW, sFW, sTW, sCL, sTW, sLA, sLI/*, sTW*/ }}, -/*ack*/ {{sES, sES, sSS, sES, sES, sFW, sTW, sCL, sCW, sLA, sES/*, sES*/ }}, -/*rst*/ {{sCL, sCL, sSS, sCL, sCL, sCL, sTW, sCL, sCL, sCL, sCL/*, sCL*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSS, sES, sSS, sSR, sSS, sSS, sSS, sSS, sSS, sLI, sSR }}, +/*fin*/ {{sTW, sFW, sSS, sTW, sFW, sTW, sCL, sTW, sLA, sLI, sTW }}, +/*ack*/ {{sES, sES, sSS, sES, sFW, sTW, sCL, sCW, sLA, sES, sES }}, +/*rst*/ {{sCL, sCL, sSS, sCL, sCL, sTW, sCL, sCL, sCL, sCL, sCL }}, /* INPUT-ONLY */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSR, sES, sES, sSR, sSR, sSR, sSR, sSR, sSR, sSR, sSR/*, sSR*/ }}, -/*fin*/ {{sCL, sFW, sSS, sTW, sTW, sFW, sTW, sCL, sCW, sLA, sLI/*, sTW*/ }}, -/*ack*/ {{sCL, sES, sSS, sES, sES, sFW, sTW, sCL, sCW, sCL, sLI/*, sES*/ }}, -/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sCL, sLA, sLI/*, sCL*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSR, sES, sES, sSR, sSR, sSR, sSR, sSR, sSR, sSR, sSR }}, +/*fin*/ {{sCL, sFW, sSS, sTW, sFW, sTW, sCL, sCW, sLA, sLI, sTW }}, +/*ack*/ {{sCL, sES, sSS, sES, sFW, sTW, sCL, sCW, sCL, sLI, sES }}, +/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sLA, sLI, sCL }}, }; static struct vs_tcp_states_t vs_tcp_states_dos [] = { /* INPUT */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSR, sES, sES, sSR, sSA, sSR, sSR, sSR, sSR, sSR, sSR/*, sSA*/ }}, -/*fin*/ {{sCL, sCW, sSS, sTW, sSA, sTW, sTW, sCL, sCW, sLA, sLI/*, sSA*/ }}, -/*ack*/ {{sCL, sES, sSS, sSR, sFW, sSA, sTW, sCL, sCW, sCL, sLI/*, sSA*/ }}, -/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sCL, sLA, sLI/*, sCL*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSR, sES, sES, sSR, sSR, sSR, sSR, sSR, sSR, sSR, sSA }}, +/*fin*/ {{sCL, sCW, sSS, sTW, sTW, sTW, sCL, sCW, sLA, sLI, sSA }}, +/*ack*/ {{sCL, sES, sSS, sSR, sFW, sTW, sCL, sCW, sCL, sLI, sSA }}, +/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sLA, sLI, sCL }}, /* OUTPUT */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSS, sES, sSS, sSA, sSA, sSS, sSS, sSS, sSS, sSS, sLI/*, sSA*/ }}, -/*fin*/ {{sTW, sFW, sSS, sTW, sTW, sFW, sTW, sCL, sTW, sLA, sLI/*, sTW*/ }}, -/*ack*/ {{sES, sES, sSS, sES, sES, sFW, sTW, sCL, sCW, sLA, sES/*, sES*/ }}, -/*rst*/ {{sCL, sCL, sSS, sCL, sCL, sCL, sTW, sCL, sCL, sCL, sCL/*, sCL*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSS, sES, sSS, sSA, sSS, sSS, sSS, sSS, sSS, sLI, sSA }}, +/*fin*/ {{sTW, sFW, sSS, sTW, sFW, sTW, sCL, sTW, sLA, sLI, sTW }}, +/*ack*/ {{sES, sES, sSS, sES, sFW, sTW, sCL, sCW, sLA, sES, sES }}, +/*rst*/ {{sCL, sCL, sSS, sCL, sCL, sTW, sCL, sCL, sCL, sCL, sCL }}, /* INPUT-ONLY */ -/* sNO, sES, sSS, sSR, sSA, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ -/*syn*/ {{sSA, sES, sES, sSR, sSA, sSA, sSA, sSA, sSA, sSA, sSA/*, sSA*/ }}, -/*fin*/ {{sCL, sFW, sSS, sTW, sTW, sFW, sTW, sCL, sCW, sLA, sLI/*, sTW*/ }}, -/*ack*/ {{sCL, sES, sSS, sES, sES, sFW, sTW, sCL, sCW, sCL, sLI/*, sES*/ }}, -/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sCL, sLA, sLI/*, sCL*/ }}, +/* sNO, sES, sSS, sSR, sFW, sTW, sCL, sCW, sLA, sLI, sSA */ +/*syn*/ {{sSA, sES, sES, sSR, sSA, sSA, sSA, sSA, sSA, sSA, sSA }}, +/*fin*/ {{sCL, sFW, sSS, sTW, sFW, sTW, sCL, sCW, sLA, sLI, sTW }}, +/*ack*/ {{sCL, sES, sSS, sES, sFW, sTW, sCL, sCW, sCL, sLI, sES }}, +/*rst*/ {{sCL, sCL, sCL, sSR, sCL, sCL, sCL, sCL, sLA, sLI, sCL }}, }; static struct vs_tcp_states_t *ip_vs_state_table = vs_tcp_states; --- net/ipv4/ipvs/ip_vs_ftp.c Wed Feb 21 17:09:39 2001 +++ ../ipvs-0.2.4/ipvs/ip_vs_ftp.c Wed Jan 10 08:42:53 2001 @@ -40,7 +40,7 @@ #define SERVER_STRING "227 Entering Passive Mode (" -#define CLIENT_STRING "PORT_DISABLED " +#define CLIENT_STRING "PORT " /* @@ -147,7 +147,6 @@ __u32 from; __u16 port; struct ip_vs_conn *n_cp; - struct ip_vs_dest *cdst; char buf[24]; /* xxx.xxx.xxx.xxx,ppp,ppp\000 */ unsigned buf_len; int diff; @@ -187,10 +184,7 @@ if (!n_cp) return 0; - cdst = cp->dest; - atomic_inc(&cdst->inactconns); ip_vs_control_add(n_cp, cp); - ip_vs_bind_dest(n_cp,cdst); } /*