[netfilter-cvslog] r3978 - trunk/iptables/extensions

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2005-06-11 19:06:23 +0200 (Sat, 11 Jun 2005)
New Revision: 3978

Modified:
   trunk/iptables/extensions/libipt_osf.c
Log:
[3/3] OSF: lib_ipt.c changes to support connector notifications (Evgeniy Polyakov <johnpol at 2ka.mipt.ru>)


Modified: trunk/iptables/extensions/libipt_osf.c
===================================================================
--- trunk/iptables/extensions/libipt_osf.c	2005-06-11 17:05:04 UTC (rev 3977)
+++ trunk/iptables/extensions/libipt_osf.c	2005-06-11 17:06:23 UTC (rev 3978)
@@ -35,14 +35,15 @@
 
 static void help(void)
 {
-	printf("OS fingerprint match v%s options:\n"
+	printf("OS fingerprint match options:\n"
 		"--genre [!] string	Match a OS genre by passive fingerprinting.\n"
 		"--smart		Use some smart extensions to determine OS (do not use TTL).\n"
 		"--log level		Log all(or only first) determined genres even if "
 					"they do not match desired one. "
 					"Level may be 0(all) or 1(only first entry).\n"
 		"--netlink		Log through netlink(NETLINK_NFLOG).\n",
-		IPTABLES_VERSION);
+		"--connector		Log through kernel connector [in 2.6.12-mm+].\n"
+		);
 }
 
 
@@ -51,6 +52,7 @@
 	{ .name = "smart",	.has_arg = 0, .flag = 0, .val = '2' },
 	{ .name = "log",	.has_arg = 1, .flag = 0, .val = '3' },
 	{ .name = "netlink",	.has_arg = 0, .flag = 0, .val = '4' },
+	{ .name = "connector",	.has_arg = 0, .flag = 0, .val = '5' },
 	{ .name = 0 }
 };
 
@@ -97,10 +99,16 @@
 			break;
 		case '4': /* --netlink */
 			if (*flags & IPT_OSF_NETLINK)
-				exit_error(PARAMETER_PROBLEM, "Can't specify multiple smart parameter");
+				exit_error(PARAMETER_PROBLEM, "Can't specify multiple netlink parameter");
 			*flags |= IPT_OSF_NETLINK;
 			info->flags |= IPT_OSF_NETLINK;
 			break;
+		case '5': /* --connector */
+			if (*flags & IPT_OSF_CONNECTOR)
+				exit_error(PARAMETER_PROBLEM, "Can't specify multiple connector parameter");
+			*flags |= IPT_OSF_CONNECTOR;
+			info->flags |= IPT_OSF_CONNECTOR;
+			break;
 		default:
 			return 0;
 	}