conntrackd: build: always add ports to sync message
Pablo Neira Ayuso
maintainerPATCH 1/1 conntrackd: build: always add ports to sync message
Ports are used to uniquely identify the flow, this information must be included inconditionally to sync message.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/build.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
src/build.c +9 -6
@@ -133,11 +133,12 @@ static enum nf_conntrack_attr nat_type[] =/* ICMP, UDP and TCP are always loaded with nf_conntrack_ipv4 */ static void build_l4proto_tcp (const struct nf_conntrack *ct,struct nethdr *n) { +ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , +sizeof (struct nfct_attr_grp_port )); +if (!nfct_attr_is_set (ct,ATTR_TCP_STATE ))return ; -ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , -sizeof (struct nfct_attr_grp_port ));ct_build_u8 (ct,ATTR_TCP_STATE , n,NTA_TCP_STATE );if (CONFIG (sync).tcp_window_tracking) {ct_build_u8 (ct,ATTR_TCP_WSCALE_ORIG , n,NTA_TCP_WSCALE_ORIG );
@@ -147,12 +148,13 @@ static void build_l4proto_tcp(const struct nf_conntrack *ct, struct nethdr *n)static void build_l4proto_sctp (const struct nf_conntrack *ct,struct nethdr *n) { +ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , +sizeof (struct nfct_attr_grp_port )); +/* SCTP is optional, make sure nf_conntrack_sctp is loaded */ if (!nfct_attr_is_set (ct,ATTR_SCTP_STATE ))return ; -ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , -sizeof (struct nfct_attr_grp_port ));ct_build_u8 (ct,ATTR_SCTP_STATE , n,NTA_SCTP_STATE );ct_build_u32 (ct,ATTR_SCTP_VTAG_ORIG , n,NTA_SCTP_VTAG_ORIG );ct_build_u32 (ct,ATTR_SCTP_VTAG_REPL , n,NTA_SCTP_VTAG_REPL );
@@ -160,12 +162,13 @@ static void build_l4proto_sctp(const struct nf_conntrack *ct, struct nethdr *n)static void build_l4proto_dccp (const struct nf_conntrack *ct,struct nethdr *n) { +ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , +sizeof (struct nfct_attr_grp_port )); +/* DCCP is optional, make sure nf_conntrack_dccp is loaded */ if (!nfct_attr_is_set (ct,ATTR_DCCP_STATE ))return ; -ct_build_group (ct,ATTR_GRP_ORIG_PORT , n,NTA_PORT , -sizeof (struct nfct_attr_grp_port ));ct_build_u8 (ct,ATTR_DCCP_STATE , n,NTA_DCCP_STATE );ct_build_u8 (ct,ATTR_DCCP_ROLE , n,NTA_DCCP_ROLE ); }
Signature · 1 line
2.30.2