diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2011-05-13 01:12:05 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-05-13 02:00:01 +0200 |
| commit | fe9922cb4f1fb75072970dd09605fdc056b96195 (patch) | |
| tree | e422f11d4458683a62b9f116abda3be0359519c9 /extensions | |
| parent | 10dbcd0bfb5a62a71a706d11134f83b0539f4dd3 (diff) | |
libxt_conntrack: fix assignment to wrong member
Of course the range end ought to be set, not doing the start value
twice.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/libxt_conntrack.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 6d16ccf5..0262b019 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -480,32 +480,28 @@ static void conntrack_mt_parse(struct xt_option_call *cb, uint8_t rev) break; case O_CTORIGSRCPORT: info->origsrc_port = cb->val.port_range[0]; - info->origsrc_port = (cb->nvals == 2) ? cb->val.port_range[1] : - cb->val.port_range[0]; + info->origsrc_port_high = cb->val.port_range[cb->nvals >= 2]; info->match_flags |= XT_CONNTRACK_ORIGSRC_PORT; if (cb->invert) info->invert_flags |= XT_CONNTRACK_ORIGSRC_PORT; break; case O_CTORIGDSTPORT: info->origdst_port = cb->val.port_range[0]; - info->origdst_port = (cb->nvals == 2) ? cb->val.port_range[1] : - cb->val.port_range[0]; + info->origdst_port_high = cb->val.port_range[cb->nvals >= 2]; info->match_flags |= XT_CONNTRACK_ORIGDST_PORT; if (cb->invert) info->invert_flags |= XT_CONNTRACK_ORIGDST_PORT; break; case O_CTREPLSRCPORT: info->replsrc_port = cb->val.port_range[0]; - info->replsrc_port = (cb->nvals == 2) ? cb->val.port_range[1] : - cb->val.port_range[0]; + info->replsrc_port_high = cb->val.port_range[cb->nvals >= 2]; info->match_flags |= XT_CONNTRACK_REPLSRC_PORT; if (cb->invert) info->invert_flags |= XT_CONNTRACK_REPLSRC_PORT; break; case O_CTREPLDSTPORT: info->repldst_port = cb->val.port_range[0]; - info->repldst_port = (cb->nvals == 2) ? cb->val.port_range[1] : - cb->val.port_range[0]; + info->repldst_port_high = cb->val.port_range[cb->nvals >= 2]; info->match_flags |= XT_CONNTRACK_REPLDST_PORT; if (cb->invert) info->invert_flags |= XT_CONNTRACK_REPLDST_PORT; |