Skip to content

Commit

Permalink
[NETFILTER]: nfnetlink_log: fix some constants
Browse files Browse the repository at this point in the history
Fix timeout (one second is 1 * HZ) and convert max packet copy length
to #defined constant.

Signed-off-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michal Miroslaw authored and David S. Miller committed Oct 10, 2007
1 parent aace57e commit 6b6ec99
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions net/netfilter/nfnetlink_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@
#endif

#define NFULNL_NLBUFSIZ_DEFAULT NLMSG_GOODSIZE
#define NFULNL_TIMEOUT_DEFAULT 100 /* every second */
#define NFULNL_TIMEOUT_DEFAULT HZ /* every second */
#define NFULNL_QTHRESH_DEFAULT 100 /* 100 packets */
#define NFULNL_COPY_RANGE_MAX 0xFFFF /* max packet size is limited by 16-bit struct nfattr nfa_len field */

#define PRINTR(x, args...) do { if (net_ratelimit()) \
printk(x, ## args); } while (0);
Expand Down Expand Up @@ -171,7 +172,7 @@ instance_create(u_int16_t group_num, int pid)
inst->flushtimeout = NFULNL_TIMEOUT_DEFAULT;
inst->nlbufsiz = NFULNL_NLBUFSIZ_DEFAULT;
inst->copy_mode = NFULNL_COPY_PACKET;
inst->copy_range = 0xffff;
inst->copy_range = NFULNL_COPY_RANGE_MAX;

hlist_add_head(&inst->hlist,
&instance_table[instance_hashfn(group_num)]);
Expand Down Expand Up @@ -235,11 +236,8 @@ nfulnl_set_mode(struct nfulnl_instance *inst, u_int8_t mode,

case NFULNL_COPY_PACKET:
inst->copy_mode = mode;
/* we're using struct nlattr which has 16bit nfa_len */
if (range > 0xffff)
inst->copy_range = 0xffff;
else
inst->copy_range = range;
inst->copy_range = min_t(unsigned int,
range, NFULNL_COPY_RANGE_MAX);
break;

default:
Expand Down

0 comments on commit 6b6ec99

Please sign in to comment.