Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ddec746 authored by Harald Welte's avatar Harald Welte Committed by David S. Miller
Browse files

[NETFILTER] ip_conntrack: Update event cache when status changes 



The GRE, SCTP and TCP protocol helpers did not call
ip_conntrack_event_cache() when updating ct->status.  This patch adds
the respective calls.

Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8689c07e

net/ipv4/netfilter/ip_conntrack_proto_gre.c

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static int gre_packet(struct ip_conntrack *ct, 
				   ct->proto.gre.stream_timeout);

		/* Also, more likely to be important, and not a probe. */

		set_bit(IPS_ASSURED_BIT, &ct->status);

		ip_conntrack_event_cache(IPCT_STATUS, skb);

	} else

		ip_ct_refresh_acct(ct, conntrackinfo, skb,

				   ct->proto.gre.timeout);

net/ipv4/netfilter/ip_conntrack_proto_sctp.c

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ static int sctp_packet(struct ip_conntrack *conntrack, 
		&& newconntrack == SCTP_CONNTRACK_ESTABLISHED) {

		DEBUGP("Setting assured bit\n");

		set_bit(IPS_ASSURED_BIT, &conntrack->status);

		ip_conntrack_event_cache(IPCT_STATUS, skb);

	}



	return NF_ACCEPT;

net/ipv4/netfilter/ip_conntrack_proto_tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -1015,6 +1015,7 @@ static int tcp_packet(struct ip_conntrack *conntrack, 
		   after SYN_RECV or a valid answer for a picked up 

		   connection. */

		set_bit(IPS_ASSURED_BIT, &conntrack->status);

		ip_conntrack_event_cache(IPCT_STATUS, skb);

	}

	ip_ct_refresh_acct(conntrack, ctinfo, skb, timeout);