Modify

Opened 4 years ago

Closed 3 years ago

#14108 closed defect (fixed)

Possible typo in netfilter.mk

Reported by: hnyman <hannu.nyman@…> Owned by: developers
Priority: normal Milestone: Chaos Calmer 15.05
Component: base system Version: Trunk
Keywords: netfilter Cc: hannu.nyman@…

Description

I noticed the recent typo fix for netfilter.mk by r37821 and I quickly browsed through netfilter.mk and I noticed one item that might be a similar typo/copy-paste error.

The change was done by r30897:

-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_tos)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_TOS)))
-
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_TTL, ipt_ttl)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_TTL, ipt_TTL)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, xt_tos)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, xt_TOS)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_ttl)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_TTL)))

Should the third inserted line (second last line) be MATCH instead of TARGET?

I am no netfilter expert, but based on the contents that the patch removed, I suspect that the third inserted line should be CONFIG_NETFILTER_XT_MATCH_HL, ipt_ttl))), so that there would be a MATCH/TARGET pair for ttl/TTL.

Currently it is line 116:
https://dev.openwrt.org/browser/trunk/include/netfilter.mk?annotate=blame#L116

The same is naturally also in AA12.09, line 114 there:
https://dev.openwrt.org/browser/branches/attitude_adjustment/include/netfilter.mk?annotate=blame#L114

Attachments (0)

Change History (2)

comment:1 Changed 3 years ago by hnyman

Fixed in trunk by r42611

comment:2 Changed 3 years ago by jow

  • Resolution set to fixed
  • Status changed from new to closed

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.