Skip to contentSkip to conversation

Remove useless event-bit-is-set checkings on updates

PATCH Applied Pablo Neira Ayuso 2 participants 2 messages Jul 25, 2006 – Aug 8, 2006

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 8/8 Remove useless event-bit-is-set checkings on updates

IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Signed-off-by Pablo Neira Ayuso <[email protected]>
Signature · 1 line
The dawn of the fourth age of Linux firewalling is coming; a time of great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[CTNETLINK] Remove useless event-bit-is-set checkings on updates

IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Signed-off-by Pablo Neira Ayuso <[email protected]>
net/netfilter/nf_conntrack_netlink.c +1 -5
Index: net-2.6/net/netfilter/nf_conntrack_netlink.c
===================================================================
@@ -340,11 +340,7 @@ static int ctnetlink_conntrack_event(str
 			  IPCT_STATUS |
 			  IPCT_PROTOINFO;
 		group = NFNLGRP_CONNTRACK_NEW;
-	} else  if (events & (IPCT_STATUS |
-		      IPCT_PROTOINFO |
-		      IPCT_HELPER |
-		      IPCT_HELPINFO |
-		      IPCT_NATINFO)) {
+	} else  if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {
 		type = IPCTNL_MSG_CT_NEW;
 		events |= IPCT_REFRESH |
 			  IPCT_STATUS |
net/ipv4/netfilter/ip_conntrack_netlink.c +1 -5
Index: net-2.6/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
@@ -330,11 +330,7 @@ static int ctnetlink_conntrack_event(str
 			  IPCT_STATUS |
 			  IPCT_PROTOINFO;
 		group = NFNLGRP_CONNTRACK_NEW;
-	} else if (events & (IPCT_STATUS |
-		      IPCT_PROTOINFO |
-		      IPCT_HELPER |
-		      IPCT_HELPINFO |
-		      IPCT_NATINFO)) {
+	} else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {
 		type = IPCTNL_MSG_CT_NEW;
 		events |= IPCT_REFRESH |
 			  IPCT_STATUS |
Applied
#1 lore raw
Quoted 1 line · Pablo Neira Ayuso

IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Applied, thanks.