commit 2ae0a40a473ca4328d8b4baaff9eadfd8e56a220 Author: Patrick McHardy Date: Mon Oct 25 17:29:45 2010 +0200 src/nf-queue: revert nonsensical change The only part of commit d378220c (src/nf-queue.c: cleanup and improve performance of test program for NF_QUEUE) that actually makes sense is the increase in receive buffer size. Issuing verdicts for IDs not delivered to userspace is a wasted effort since the kernel drops packets itself when netlink message delivery fails. This would actually have been noticed by a return value of -ENOENT if the result of nfnl_queue_msg_send_verdict() would have been checked. Signed-off-by: Patrick McHardy diff --git a/src/nf-queue.c b/src/nf-queue.c index 3fb3c11..2bcd7ec 100644 --- a/src/nf-queue.c +++ b/src/nf-queue.c @@ -41,31 +40,7 @@ static void obj_input(struct nl_object *obj, void *arg) .dp_fd = stdout, .dp_dump_msgtype = 1, }; - uint32_t packet_id = nfnl_queue_msg_get_packetid(msg); - static uint32_t next_packet_id = 0; - struct nfnl_queue_msg *lost_msg = NULL; - uint8_t family; - uint16_t group; - - if (packet_id > next_packet_id) { - printf("Warning: %d Out of order packets. Queue or socket overload \n", packet_id - next_packet_id); - group = nfnl_queue_msg_get_group(msg); - family = nfnl_queue_msg_get_family(msg); - lost_msg = nfnl_queue_msg_alloc(); - - do { - nfnl_queue_msg_set_group(lost_msg, group); - nfnl_queue_msg_set_family(lost_msg, family); - nfnl_queue_msg_set_packetid(lost_msg, next_packet_id); - nfnl_queue_msg_set_verdict(lost_msg, NF_ACCEPT); - nfnl_queue_msg_send_verdict(nf_sock, lost_msg); - next_packet_id++; - } while (packet_id > next_packet_id); - - nfnl_queue_msg_put(lost_msg); - } - next_packet_id = packet_id + 1; nfnl_queue_msg_set_verdict(msg, NF_ACCEPT); nl_object_dump(obj, &dp); nfnl_queue_msg_send_verdict(nf_sock, msg);