All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/2] New netfilter target to trigger LED devices
@ 2008-11-09 13:26 Adam Nielsen
  2008-11-09 13:36 ` Jan Engelhardt
  2008-11-09 17:10 ` Alexey Dobriyan
  0 siblings, 2 replies; 7+ messages in thread
From: Adam Nielsen @ 2008-11-09 13:26 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Richard Purdie

Kernel module providing implementation of LED netfilter target.  Each
instance of the target appears as a led-trigger device, which can be
associated with one or more LEDs in /sys/class/leds/

Signed-off-by: Adam Nielsen <a.nielsen@shikadi.net>

---

This patch was created against 2.6.28-rc3.  It contains a single new
file (which should apply without problems) plus the associated kernel
config options.

There are a few const-ness issues in the code - I've had to modify
some data that should be const, but it does "belong" to me and
should not be used by anything else.  But of course if you have any
suggestions to get around this I'd like to hear them :-)

Cheers,
Adam.


diff -urN linux-2.6.28-rc3-orig/drivers/leds/Kconfig linux-2.6.28-rc3/drivers/leds/Kconfig
--- linux-2.6.28-rc3-orig/drivers/leds/Kconfig	2008-11-09 22:02:17.912599258 +1000
+++ linux-2.6.28-rc3/drivers/leds/Kconfig	2008-11-09 22:47:32.889599211 +1000
@@ -217,4 +217,7 @@
  	  This allows LEDs to be initialised in the ON state.
  	  If unsure, say Y.

+comment "iptables trigger is under Netfilter config (LED target)"
+	depends on LEDS_TRIGGERS
+
  endif # NEW_LEDS
diff -urN linux-2.6.28-rc3-orig/net/netfilter/Kconfig linux-2.6.28-rc3/net/netfilter/Kconfig
--- linux-2.6.28-rc3-orig/net/netfilter/Kconfig	2008-11-09 22:02:24.010636621 +1000
+++ linux-2.6.28-rc3/net/netfilter/Kconfig	2008-11-09 22:37:02.070599392 +1000
@@ -357,6 +357,32 @@

  	  To compile it as a module, choose M here.  If unsure, say N.

+config NETFILTER_XT_TARGET_LED
+	tristate '"LED" target support'
+	depends on LEDS_CLASS
+	depends on NETFILTER_ADVANCED
+	help
+	  This option adds a `LED' target, which allows you to blink LEDs in
+	  response to particular packets passing through your machine.
+
+	  This can be used to turn a spare LED into a network activity LED,
+	  which only flashes in response to FTP transfers, for example.  Or
+	  you could have a LED which lights up for a minute or two every time
+	  somebody connects to your machine via SSH.
+
+	  You will need support for the "led" class to make this work.
+
+	  To create a LED trigger for incoming SSH traffic:
+	    iptables -A INPUT -p tcp --dport 22 -j LED --led-trigger-id ssh --led-delay 1000
+
+	  Then attach the new trigger to an LED on your system:
+	    echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
+
+	  For more information on the LEDs available on your system, see
+	  Documentation/leds-class.txt
+
+	  To compile it as a module, choose M here.  If unsure, say N.
+
  config NETFILTER_XT_TARGET_MARK
  	tristate '"MARK" target support'
  	default m if NETFILTER_ADVANCED=n
diff -urN linux-2.6.28-rc3-orig/net/netfilter/Makefile linux-2.6.28-rc3/net/netfilter/Makefile
--- linux-2.6.28-rc3-orig/net/netfilter/Makefile	2008-11-09 22:02:24.010636621 +1000
+++ linux-2.6.28-rc3/net/netfilter/Makefile	2008-11-09 22:38:22.580607716 +1000
@@ -45,6 +45,7 @@
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
diff -urN linux-2.6.28-rc3-orig/net/netfilter/xt_LED.c linux-2.6.28-rc3/net/netfilter/xt_LED.c
--- linux-2.6.28-rc3-orig/net/netfilter/xt_LED.c	1970-01-01 10:00:00.000000000 +1000
+++ linux-2.6.28-rc3/net/netfilter/xt_LED.c	2008-11-09 23:21:43.044599382 +1000
@@ -0,0 +1,214 @@
+/*
+ * xt_LED.c - netfilter target to make LEDs blink upon packet matches
+ *
+ * Copyright (C) 2008 Adam Nielsen <a.nielsen@shikadi.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ *
+ *
+ * This allows you to blink LEDs on your system in response to incoming
+ * network packets.
+ *
+ * Create a LED trigger for incoming SSH traffic:
+ *   iptables -A INPUT -p tcp --dport 22 -j LED --led-trigger-id ssh
+ *
+ * Then attach the new trigger to a LED on your system:
+ *   echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
+ *
+ * See /usr/src/linux/Documentation/leds-class.txt for LED details.
+ *
+ */
+
+/*
+ * Known issues:
+ *
+ *  - It's possible to add multiple led triggers with the same name (as
+ *    set with --led-trigger-id)
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/leds.h>
+#include <linux/mutex.h>
+
+#define DRVNAME	"xt_LED"
+#define DRVMSG	DRVNAME ": "
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Adam Nielsen <a.nielsen@shikadi.net>");
+MODULE_DESCRIPTION("Xtables: trigger LED devices on packet match");
+
+struct xt_led_info {
+	char id[26];  /* Unique ID for this trigger in the LED class */
+	int delay;    /* Delay until LED is switched off again after trigger */
+
+	void *internal_data;  /* pointer to xt_led_info_internal */
+};
+
+/* This is declared in here (the kernel module) only, to avoid having these
+   dependencies in userspace code */
+struct xt_led_info_internal {
+	struct led_trigger netfilter_led_trigger;
+	struct timer_list timer;
+	struct mutex led_changing_state;
+};
+
+static unsigned int
+led_tg(struct sk_buff *skb, const struct xt_target_param *par)
+{
+	const struct xt_led_info *ledinfo = par->targinfo;
+	/*noconst*/struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
+
+	/* Make sure the timer callback doesn't go switching the LED off while
+	   we're figuring out what to do */
+	if (ledinfo->delay > 0) {
+		mutex_lock(&ledinternal->led_changing_state);
+
+		/* If the LED is currently on, it could be some time before it
+		   switches off again.  Another matching packet has arrived
+		   though, so uncommenting the code below will briefly turn the
+		   LED off to signal the new packet.  It will be switched on
+		   again below, then stay on for the full timeout again.  The
+		   code is currently commented out, because it can make the LED
+		   flicker when lots of packets arrive, which defeats the
+		   purpose of having the delay... */
+		/*
+		if (timer_pending(&ledinternal->timer))
+			led_trigger_event(&ledinternal->netfilter_led_trigger,
+			                  LED_OFF);
+		*/
+	}
+
+	led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL);
+
+	/* If there's a positive delay, start/update the timer */
+	if (ledinfo->delay > 0) {
+		mod_timer(&ledinternal->timer,
+			jiffies + msecs_to_jiffies(ledinfo->delay));
+		/* If there's a *huge* delay right here (enough for the timer
+		   to expire), it could cause the LED to remain stuck on until
+		   the next packet, but it's probably not worth worrying
+		   about... */
+		mutex_unlock(&ledinternal->led_changing_state);
+
+	/* Otherwise if there was no delay given, blink as fast as possible */
+	} else if (ledinfo->delay == 0) {
+		led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
+	}
+
+	/* else the delay is negative, which means switch on and stay on */
+
+	return XT_CONTINUE;
+}
+
+static void led_timeout_callback(unsigned long data)
+{
+	struct xt_led_info *ledinfo = (struct xt_led_info *)data;
+	struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
+
+	/* If the timer has expired while we're changing the state, then don't
+	   interfere.  We also don't want to twiddle with anything after the
+	   mutex is unlocked, because by then a new timeout will have been
+	   set. */
+	if (mutex_is_locked(&ledinternal->led_changing_state)) return;
+
+	led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
+	return;
+}
+
+static bool led_tg_check(const struct xt_tgchk_param *par)
+{
+	/*noconst*/ struct xt_led_info *ledinfo = par->targinfo;
+	struct xt_led_info_internal *ledinternal;
+
+	if (ledinfo->id[0] == 0) {
+		printk(DRVMSG "No 'id' parameter given.\n");
+		return false;
+	}
+
+	if (!(ledinternal = kzalloc(sizeof(struct xt_led_info_internal), GFP_KERNEL))) {
+		printk(DRVMSG "Out of memory\n");
+		return false;
+	}
+
+	ledinternal->netfilter_led_trigger.name = ledinfo->id;
+	mutex_init(&ledinternal->led_changing_state);
+
+	printk(DRVMSG "Registering led trigger \"%s\".\n", ledinfo->id);
+	if (led_trigger_register(&ledinternal->netfilter_led_trigger)) {
+		printk(KERN_CRIT DRVMSG "led_trigger_register() failed\n");
+		goto exit_alloc;
+	}
+
+	/* See if we need to set up a timer */
+	if (ledinfo->delay > 0) {
+		setup_timer(&ledinternal->timer, led_timeout_callback,
+			(unsigned long) ledinfo);
+	}
+
+	ledinfo->internal_data = ledinternal;
+
+	return true;
+
+exit_alloc:
+	kfree(ledinternal);
+
+	return false;
+}
+
+static void led_tg_destroy(const struct xt_tgdtor_param *par)
+{
+	const struct xt_led_info *ledinfo = par->targinfo;
+	/*noconst*/struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
+
+	printk(DRVMSG "Unregistering led trigger \"%s\".\n",
+		ledinternal->netfilter_led_trigger.name);
+
+	if (ledinfo->delay > 0)
+		del_timer_sync(&ledinternal->timer);
+
+	led_trigger_unregister(&ledinternal->netfilter_led_trigger);
+	kfree(ledinternal);
+	return;
+}
+
+static struct xt_target led_tg_reg __read_mostly = {
+	.name = "LED",
+	.revision = 0,
+	.family = NFPROTO_UNSPEC,
+	.target = led_tg,
+	.targetsize = sizeof(struct xt_led_info),
+	.checkentry = led_tg_check,
+	.destroy = led_tg_destroy,
+	.me = THIS_MODULE,
+};
+
+static int __init led_tg_init(void)
+{
+	printk(KERN_NOTICE DRVMSG "Registering LED netfilter target\n");
+	return xt_register_target(&led_tg_reg);
+}
+
+static void __exit led_tg_exit(void)
+{
+	printk(KERN_NOTICE DRVMSG "Unregistering LED netfilter target\n");
+	xt_unregister_target(&led_tg_reg);
+	return;
+}
+
+module_init(led_tg_init);
+module_exit(led_tg_exit);


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 13:26 [PATCH 2/2] New netfilter target to trigger LED devices Adam Nielsen
@ 2008-11-09 13:36 ` Jan Engelhardt
  2008-11-09 13:42   ` Adam Nielsen
  2008-11-09 17:10 ` Alexey Dobriyan
  1 sibling, 1 reply; 7+ messages in thread
From: Jan Engelhardt @ 2008-11-09 13:36 UTC (permalink / raw)
  To: Adam Nielsen; +Cc: netfilter-devel, Richard Purdie


On Sunday 2008-11-09 14:26, Adam Nielsen wrote:

> Kernel module providing implementation of LED netfilter target.  Each
> instance of the target appears as a led-trigger device, which can be
> associated with one or more LEDs in /sys/class/leds/

Heh I thought I've seen everything, but this was yet unseen :)

> +	  To compile it as a module, choose M here.  If unsure, say N.

I think this historical line is now redundant, especially when
every single option has it.

> +#define DRVNAME	"xt_LED"

Drop DRVNAME, you can use the predefined KBUILD_MODNAME.

> +#define DRVMSG	DRVNAME ": "
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Adam Nielsen <a.nielsen@shikadi.net>");
> +MODULE_DESCRIPTION("Xtables: trigger LED devices on packet match");
> +
> +struct xt_led_info {
> +	char id[26];  /* Unique ID for this trigger in the LED class */
> +	int delay;    /* Delay until LED is switched off again after trigger */

Please, no variadic-size types as per
http://jengelh.medozas.de/Netfilter_Modules.pdf .

> +/* If the LED is currently on, it could be some time before it
> +   switches off again.  Another matching packet has arrived
> +   though, so uncommenting the code below will briefly turn the
> +   LED off to signal the new packet.  It will be switched on
> +   again below, then stay on for the full timeout again.  The
> +   code is currently commented out, because it can make the LED
> +   flicker when lots of packets arrive, which defeats the
> +   purpose of having the delay... */

Well that could be a feature in itself. After all, network
switches flicker a lot too :)

> +static void led_timeout_callback(unsigned long data)
> +{
> +	struct xt_led_info *ledinfo = (struct xt_led_info *)data;
> +	struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
> +
> +	/* If the timer has expired while we're changing the state, then don't
> +	   interfere.  We also don't want to twiddle with anything after the
> +	   mutex is unlocked, because by then a new timeout will have been
> +	   set. */
> +	if (mutex_is_locked(&ledinternal->led_changing_state)) return;
\n
> +	led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
> +	return;
> +}
> +
> +static bool led_tg_check(const struct xt_tgchk_param *par)
> +{
> +	/*noconst*/ struct xt_led_info *ledinfo = par->targinfo;
> +	struct xt_led_info_internal *ledinternal;
> +
> +	if (ledinfo->id[0] == 0) {
'\0'
> +		printk(DRVMSG "No 'id' parameter given.\n");

printks are missing a KERN_ level.

> +		return false;
> +	}
> +
> +	/* See if we need to set up a timer */
> +	if (ledinfo->delay > 0) {
> +		setup_timer(&ledinternal->timer, led_timeout_callback,
> +			(unsigned long) ledinfo);
> +	}

-{}

> +static void led_tg_destroy(const struct xt_tgdtor_param *par)
> +{
> +	const struct xt_led_info *ledinfo = par->targinfo;
> +	/*noconst*/struct xt_led_info_internal *ledinternal =
> ledinfo->internal_data;
> +
> +	printk(DRVMSG "Unregistering led trigger \"%s\".\n",
> +		ledinternal->netfilter_led_trigger.name);
> +
> +	if (ledinfo->delay > 0)
> +		del_timer_sync(&ledinternal->timer);
> +
> +	led_trigger_unregister(&ledinternal->netfilter_led_trigger);
> +	kfree(ledinternal);
> +	return;
> +}

-return

> +static struct xt_target led_tg_reg __read_mostly = {
> +	.name = "LED",
> +	.revision = 0,
> +	.family = NFPROTO_UNSPEC,
> +	.target = led_tg,
> +	.targetsize = sizeof(struct xt_led_info),

XT_ALIGN(sizeof(..)).

> +	.checkentry = led_tg_check,
> +	.destroy = led_tg_destroy,
> +	.me = THIS_MODULE,
> +};
> +
> +static int __init led_tg_init(void)
> +{
> +	printk(KERN_NOTICE DRVMSG "Registering LED netfilter target\n");
> +	return xt_register_target(&led_tg_reg);
> +}
> +
> +static void __exit led_tg_exit(void)
> +{
> +	printk(KERN_NOTICE DRVMSG "Unregistering LED netfilter target\n");
> +	xt_unregister_target(&led_tg_reg);
> +	return;
> +}
> +
> +module_init(led_tg_init);
> +module_exit(led_tg_exit);

Looks good :)
Though I wonder when I will ever have a desktop PC with LEDs
driven by the led subsystem...

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 13:36 ` Jan Engelhardt
@ 2008-11-09 13:42   ` Adam Nielsen
  0 siblings, 0 replies; 7+ messages in thread
From: Adam Nielsen @ 2008-11-09 13:42 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel, Richard Purdie

> Looks good :)

Thanks for the quick feedback!  I'll fix up those issues and
resubmit after a good night's sleep :-)

> Though I wonder when I will ever have a desktop PC with LEDs
> driven by the led subsystem...

Actually what prompted this was a USB driver I'm working on
which implements a LED device, and I wanted something more
interesting to test it with :-)  Now I'm wondering how hard
it would be to tie the input subsystem in with it - I don't
use my scroll lock LED for anything at the moment...

Cheers,
Adam.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 13:26 [PATCH 2/2] New netfilter target to trigger LED devices Adam Nielsen
  2008-11-09 13:36 ` Jan Engelhardt
@ 2008-11-09 17:10 ` Alexey Dobriyan
  2008-11-09 17:40   ` Jan Engelhardt
  1 sibling, 1 reply; 7+ messages in thread
From: Alexey Dobriyan @ 2008-11-09 17:10 UTC (permalink / raw)
  To: Adam Nielsen; +Cc: netfilter-devel, Richard Purdie

On Sun, Nov 09, 2008 at 11:26:08PM +1000, Adam Nielsen wrote:
> +	/*noconst*/struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
	  ^^^^^^^
What is this?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 17:10 ` Alexey Dobriyan
@ 2008-11-09 17:40   ` Jan Engelhardt
  2008-11-09 17:58     ` Alexey Dobriyan
  0 siblings, 1 reply; 7+ messages in thread
From: Jan Engelhardt @ 2008-11-09 17:40 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: Adam Nielsen, netfilter-devel, Richard Purdie


On Sunday 2008-11-09 18:10, Alexey Dobriyan wrote:

>On Sun, Nov 09, 2008 at 11:26:08PM +1000, Adam Nielsen wrote:
>> +	/*noconst*/struct xt_led_info_internal *ledinternal =
>>                        ledinfo->internal_data;
>	  ^^^^^^^
>What is this?

A C89-style comment?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 17:40   ` Jan Engelhardt
@ 2008-11-09 17:58     ` Alexey Dobriyan
  2008-11-09 21:44       ` Adam Nielsen
  0 siblings, 1 reply; 7+ messages in thread
From: Alexey Dobriyan @ 2008-11-09 17:58 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: Adam Nielsen, netfilter-devel, Richard Purdie

On Sun, Nov 09, 2008 at 06:40:39PM +0100, Jan Engelhardt wrote:
> 
> On Sunday 2008-11-09 18:10, Alexey Dobriyan wrote:
> 
> >On Sun, Nov 09, 2008 at 11:26:08PM +1000, Adam Nielsen wrote:
> >> +	/*noconst*/struct xt_led_info_internal *ledinternal =
> >>                        ledinfo->internal_data;
> >	  ^^^^^^^
> >What is this?
> 
> A C89-style comment?

I'm talking about noconst. Utterly pointless.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] New netfilter target to trigger LED devices
  2008-11-09 17:58     ` Alexey Dobriyan
@ 2008-11-09 21:44       ` Adam Nielsen
  0 siblings, 0 replies; 7+ messages in thread
From: Adam Nielsen @ 2008-11-09 21:44 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: Jan Engelhardt, netfilter-devel, Richard Purdie

>>>> +	/*noconst*/struct xt_led_info_internal *ledinternal =
>>>>                        ledinfo->internal_data;
>>> 	  ^^^^^^^
>>> What is this?
>> A C89-style comment?
> 
> I'm talking about noconst. Utterly pointless.

It's to highlight the parts of my code where I'm taking a
const pointer, and then modifying the data pointed to.  I'm
not sure whether this is allowed, so I thought I'd play
it safe and flag that part of the code for comment.

If you think it's fine as is then I'd be happy to remove
the comment, unless it might be helpful to explain to
others that what I'm doing is intentional.

Cheers,
Adam.


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-11-09 21:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-09 13:26 [PATCH 2/2] New netfilter target to trigger LED devices Adam Nielsen
2008-11-09 13:36 ` Jan Engelhardt
2008-11-09 13:42   ` Adam Nielsen
2008-11-09 17:10 ` Alexey Dobriyan
2008-11-09 17:40   ` Jan Engelhardt
2008-11-09 17:58     ` Alexey Dobriyan
2008-11-09 21:44       ` Adam Nielsen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.