summaryrefslogtreecommitdiffstats
path: root/src/owner.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2025-01-30 18:47:13 +0100
committerFlorian Westphal <fw@strlen.de>2025-02-07 11:44:20 +0100
commit4f046ae450cbe2567022575c11dd65a9d9ea272d (patch)
tree9cd9ec0a542b32af97b937fd2fd5d084e409d05e /src/owner.c
parent44c803015a1e0bca54fb7b92fdc154d162f9dbfd (diff)
src: add and use payload_expr_trim_force
Previous commit fixed erroneous handling of raw expressions when RHS sets a zero value. Input: @ih,58,6 set 0 @ih,86,6 set 0 @ih,170,22 set 0 Output:@ih,48,16 set @ih,48,16 & 0xffc0 @ih,80,16 set \ @ih,80,16 & 0xfc0f @ih,160,32 set @ih,160,32 & 0xffc00000 After this patch, this will instead display: @ih,58,6 set 0x0 @ih,86,6 set 0x0 @ih,170,22 set 0x0 payload_expr_trim_force() only works when the payload has no known protocol (template) attached, i.e. will be printed as raw payload syntax. It performs sanity checks on @mask and then adjusts the payload expression length and offset according to the mask. Also add this check in __binop_postprocess() so we can also discard masks when matching, e.g. '@ih,7,5 2' becomes '@ih,7,5 0x2', not '@ih,0,16 & 0xffc0 == 0x20'. binop_postprocess now returns if it performed an action or not; if this returns true then arguments might have been freed so callers must no longer refer to any of the expressions attached to the binop. Next patch adds test cases for this. Signed-off-by: Florian Westphal <fw@strlen.de> Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/owner.c')
0 files changed, 0 insertions, 0 deletions