Merge branch 'fwup_type_net'

src/plugins/fwup/fwup.txt

@@ -49,13 +49,15 @@ The sets may have different types. The types are specified by
 single-character code in the protocol.
 
 [options="header"]
-|===================================================================================
-|Code |Kernel type  |Family |Description           |Note
-|`i`  |hash:ip      |IPv4   |Single IPv4 address   |
-|`I`  |hash:ip      |IPv6   |Single IPv6 address   |
-|`b`  |hash:ip,port |IPv4   |IPv4 address and port |Both tcp and udp ports are added
-|`B`  |hash:ip,port |IPv6   |IPv6 address and port |Both tcp and udp ports are added
-|===================================================================================
+|====================================================================================
+|Code |Kernel type  |Family |Description            |Note
+|`i`  |hash:ip      |IPv4   |Single IPv4 address    |
+|`I`  |hash:ip      |IPv6   |Single IPv6 address    |
+|`b`  |hash:ip,port |IPv4   |IPv4 address and port  |Both tcp and udp ports are added
+|`B`  |hash:ip,port |IPv6   |IPv6 address and port  |Both tcp and udp ports are added
+|`n`  |hash:net     |IPv4   |IPv4 address in net-set|Used for IPs, not nets
+|`N`  |hash:net     |IPv6   |IPv6 address in net-set|Used for IPs, not nets
+|====================================================================================
 
 Note that in case it says that both tcp and udp ports are added, there
 are two items generated in the kernel for each one address sent from

src/plugins/fwup/type.c

@@ -76,6 +76,16 @@ const struct set_type set_types[256] = {
 		.family = "inet6",
 		.addr2str = inet62str
 	},
+	['n'] = {
+		.desc = "hash:net",
+		.family = "inet",
+		.addr2str = inet2str
+	},
+	['N'] = {
+		.desc = "hash:net",
+		.family = "inet6",
+		.addr2str = inet62str
+	},
 	['b'] = {
 		.desc = "hash:ip,port",
 		.family = "inet",