pkttype match (new) + scorefile,

libiptc C++ compatibility + scorefile

diff --git a/extensions/.pkttype-test b/extensions/.pkttype-test
new file mode 100755 (executable)
index 0000000..ea1a075
--- /dev/null
+++ b/extensions/.pkttype-test
@@ -0,0 +1,2 @@
+#! /bin/sh
+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_pkttype.h ] && echo pkttype

diff --git a/extensions/libipt_pkttype.c b/extensions/libipt_pkttype.c
new file mode 100644 (file)
index 0000000..f05a231
--- /dev/null
+++ b/extensions/libipt_pkttype.c
@@ -0,0 +1,174 @@
+/* 
+ * Shared library add-on to iptables to match 
+ * packets by their type (BROADCAST, UNICAST, MULTICAST). 
+ *
+ * Michal Ludvig <michal@logix.cz>
+ */
+#include <stdio.h>
+#include <netdb.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#if defined(__GLIBC__) && __GLIBC__ == 2
+#include <net/ethernet.h>
+#else
+#include <linux/if_ether.h>
+#endif
+#include <iptables.h>
+#include <linux/if_packet.h>
+#include <linux/netfilter_ipv4/ipt_pkttype.h>
+
+#define        PKTTYPE_VERSION "0.1"
+
+struct pkttypes {
+       const char *name;
+       unsigned char pkttype;
+       unsigned char printhelp;
+       const char *help;
+};
+
+static const struct pkttypes supported_types[] = {
+       {"host", PACKET_HOST, 1, "to us"},
+       {"broadcast", PACKET_BROADCAST, 1, "to all"},
+       {"multicast", PACKET_MULTICAST, 1, "to group"},
+/*
+       {"otherhost", PACKET_OTHERHOST, 1, "to someone else"},
+       {"outgoing", PACKET_OUTGOING, 1, "outgoing of any type"},
+*/
+       /* aliases */
+       {"bcast", PACKET_BROADCAST, 0, NULL},
+       {"mcast", PACKET_MULTICAST, 0, NULL},
+       {"for-us", PACKET_HOST, 0, NULL}
+};
+
+static void print_types()
+{
+       unsigned int    i;
+       
+       printf("Valid packet types:\n");
+       for (i = 0; i < sizeof(supported_types)/sizeof(struct pkttypes); i++)
+       {
+               if(supported_types[i].printhelp == 1)
+                       printf("\t%-14s\t\t%s\n", supported_types[i].name, supported_types[i].help);
+       }
+       printf("\n");
+}
+
+/* Function which prints out usage message. */
+static void help(void)
+{
+       printf(
+"pkt_type v%s options:\n"
+"  --pkt-type [!] packettype\tmatch packet type\n"
+"\n", PKTTYPE_VERSION);
+       print_types();
+}
+
+static struct option opts[] = {
+       {"pkt-type", 1, 0, '1'},
+       {0}
+};
+
+static void init(struct ipt_entry_match *m, unsigned int *nfcache)
+{
+       *nfcache |= NFC_UNKNOWN;
+}
+
+static void parse_pkttype(const char *pkttype, struct ipt_pkttype_info *info)
+{
+       unsigned int    i;
+       
+       for (i = 0; i < sizeof(supported_types)/sizeof(struct pkttypes); i++)
+       {
+               if(strcasecmp(pkttype, supported_types[i].name)==0)
+               {
+                       info->pkttype=supported_types[i].pkttype;
+                       return;
+               }
+       }
+       
+       exit_error(PARAMETER_PROBLEM, "Bad packet type '%s'", pkttype);
+}
+
+static int parse(int c, char **argv, int invert, unsigned int *flags,
+      const struct ipt_entry *entry,
+      unsigned int *nfcache,
+      struct ipt_entry_match **match)
+{
+       struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)(*match)->data;
+       
+       switch(c)
+       {
+               case '1':
+                       if(check_inverse(optarg, &invert))
+                               optind++;
+                       parse_pkttype(argv[optind-1], info);
+                       if(invert)
+                               info->invert=1;
+                       *flags=1;
+                       break;
+
+               default: 
+                       return 0;
+       }
+
+       return 1;
+}
+
+static void final_check(unsigned int flags)
+{
+       if (!flags)
+               exit_error(PARAMETER_PROBLEM, "You must specify `--pkt-type'");
+}
+
+static void print_pkttype(struct ipt_pkttype_info *info)
+{
+       unsigned int    i;
+       
+       for (i = 0; i < sizeof(supported_types)/sizeof(struct pkttypes); i++)
+       {
+               if(supported_types[i].pkttype==info->pkttype)
+               {
+                       printf("%s ", supported_types[i].name);
+                       return;
+               }
+       }
+
+       printf("%d ", info->pkttype);   /* in case we didn't find an entry in named-packtes */
+}
+
+static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric)
+{
+       struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
+       
+       printf("PKTTYPE %s= ", info->invert?"!":"");
+       print_pkttype(info);
+}
+
+static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+{
+       struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
+       
+       printf("--pkt-type %s", info->invert?"! ":"");
+       print_pkttype(info);
+}
+
+struct iptables_match pkttype = {
+    NULL,
+    "pkttype",
+    NETFILTER_VERSION,
+    IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
+    IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
+    &help,
+    &init,
+    &parse, 
+    &final_check, 
+    &print,
+    &save, 
+    opts
+};
+
+void _init(void)
+{
+       register_match(&pkttype);
+}

diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h
index 6bb37323ddbec861e359c2bc0b3823510a35250e..82745f93ae567aeda1ed0db2089cbd6691253304 100644 (file)
--- a/include/libiptc/libiptc.h
+++ b/include/libiptc/libiptc.h
@@ -5,6 +5,10 @@
 #include <libiptc/ipt_kernel_headers.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef IPT_MIN_ALIGN
 /* ipt_entry has pointers and u_int64_t's in it, so if you align to
    it, you'll also align to any crazy matches and targets someone
@@ -150,4 +154,10 @@ int iptc_get_raw_socket();
 
 /* Translates errno numbers into more human-readable form than strerror. */
 const char *iptc_strerror(int err);
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _LIBIPTC_H */