History

Merge branch 'master' of git://1984.lsi.us.es/nf-next

Pablo Neira Ayuso says: ==================== * Remove limitation in the maximum number of supported sets in ipset. Now ipset automagically increments the number of slots in the array of sets by 64 new spare slots, from Jozsef Kadlecsik. * Partially remove the generic queue infrastructure now that ip_queue is gone. Its only client is nfnetlink_queue now, from Florian Westphal. * Add missing attribute policy checkings in ctnetlink, from Florian Westphal. * Automagically kill conntrack entries that use the wrong output interface for the masquerading case in case of routing changes, from Jozsef Kadlecsik. * Two patches two improve ct object traceability. Now ct objects are always placed in any of the existing lists. This allows us to dump the content of unconfirmed and dying conntracks via ctnetlink as a way to provide more instrumentation in case you suspect leaks, from myself. ====================

David S. Miller committed 13 years ago

Commit e8ad1a82 parents 099f7aa a0ecb8513 files · +332 −259Browse files

Showing the changes to include/uapi/linux (1 of 13 files). Show all

Unified · Split

include/uapi/linux/netfilter/nfnetlink_conntrack.h+2−0
@@ -9,6 +9,8 @@ enum cntl_msg_types { · 8 unmodified lines
99 IPCTNL_MSG_CT_GET_CTRZERO,
1010 IPCTNL_MSG_CT_GET_STATS_CPU,
1111 IPCTNL_MSG_CT_GET_STATS,
12+ IPCTNL_MSG_CT_GET_DYING,
13+ IPCTNL_MSG_CT_GET_UNCONFIRMED,
1214
1315 IPCTNL_MSG_MAX
1416 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t