Commit 61e7c420 authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: replace the SCTP state machine 



Convert the SCTP state table, so that it is more readable.
Change the states to be according to the diagram in RFC 2960
and add more states suitable for middle box. Still, such
change in states adds incompatibility if systems in sync
setup include this change and others do not include it.

With this change we also have proper transitions in INPUT-ONLY
mode (DR/TUN) where we see packets only from client. Now
we should not switch to 10-second CLOSED state at a time
when we should stay in ESTABLISHED state.

The short names for states are because we have 16-char space
in ipvsadm and 11-char limit for the connection list format.
It is a sequence of the TCP implementation where the longest
state name is ESTABLISHED.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent c6c96c18

include/net/ip_vs.h

+11 −10
Original line number Diff line number Diff line
@@ -380,17 +380,18 @@ enum { 
 */

enum ip_vs_sctp_states {

	IP_VS_SCTP_S_NONE,

	IP_VS_SCTP_S_INIT_CLI,

	IP_VS_SCTP_S_INIT_SER,

	IP_VS_SCTP_S_INIT_ACK_CLI,

	IP_VS_SCTP_S_INIT_ACK_SER,

	IP_VS_SCTP_S_ECHO_CLI,

	IP_VS_SCTP_S_ECHO_SER,

	IP_VS_SCTP_S_INIT1,

	IP_VS_SCTP_S_INIT,

	IP_VS_SCTP_S_COOKIE_SENT,

	IP_VS_SCTP_S_COOKIE_REPLIED,

	IP_VS_SCTP_S_COOKIE_WAIT,

	IP_VS_SCTP_S_COOKIE,

	IP_VS_SCTP_S_COOKIE_ECHOED,

	IP_VS_SCTP_S_ESTABLISHED,

	IP_VS_SCTP_S_SHUT_CLI,

	IP_VS_SCTP_S_SHUT_SER,

	IP_VS_SCTP_S_SHUT_ACK_CLI,

	IP_VS_SCTP_S_SHUT_ACK_SER,

	IP_VS_SCTP_S_SHUTDOWN_SENT,

	IP_VS_SCTP_S_SHUTDOWN_RECEIVED,

	IP_VS_SCTP_S_SHUTDOWN_ACK_SENT,

	IP_VS_SCTP_S_REJECTED,

	IP_VS_SCTP_S_CLOSED,

	IP_VS_SCTP_S_LAST

};

net/netfilter/ipvs/ip_vs_proto_sctp.c

+153 −701

File changed.

Preview size limit exceeded, changes collapsed.

net/netfilter/ipvs/ip_vs_sync.c

+4 −3
Original line number Diff line number Diff line
@@ -461,9 +461,10 @@ static int ip_vs_sync_conn_needed(struct netns_ipvs *ipvs, 
	} else if (unlikely(cp->protocol == IPPROTO_SCTP)) {

		if (!((1 << cp->state) &

		      ((1 << IP_VS_SCTP_S_ESTABLISHED) |

		       (1 << IP_VS_SCTP_S_CLOSED) |

		       (1 << IP_VS_SCTP_S_SHUT_ACK_CLI) |

		       (1 << IP_VS_SCTP_S_SHUT_ACK_SER))))

		       (1 << IP_VS_SCTP_S_SHUTDOWN_SENT) |

		       (1 << IP_VS_SCTP_S_SHUTDOWN_RECEIVED) |

		       (1 << IP_VS_SCTP_S_SHUTDOWN_ACK_SENT) |

		       (1 << IP_VS_SCTP_S_CLOSED))))

			return 0;

		force = cp->state != cp->old_state;

		if (force && cp->state != IP_VS_SCTP_S_ESTABLISHED)

CRA Git | Maintained and supported by SUSTech CRA and CCSE