can-gw: make routing to the incoming CAN interface configurable
Subsystems (2)
Oliver Hartkopp
maintainerPATCH 2/4 can-gw: make routing to the incoming CAN interface configurable
From f811108301b262334810f90e6f732c142b302414 Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <[email protected]>
Date: Thu, 17 Jan 2013 07:10:50 +0100
Subject: [PATCH 2/4] can-gw: make routing to the incoming CAN interface configurable
Introduce new configuration flag CGW_FLAGS_CAN_IIF_TX_OK to configure if a CAN sk_buff that has been routed with can-gw is allowed to be send back to the originating CAN interface.
Signed-off-by Oliver Hartkopp <[email protected]>
--- include/uapi/linux/can/gw.h | 1 + net/can/gw.c | 8 ++++++++ 2 files changed, 9 insertions(+)
include/uapi/linux/can/gw.h +1 -0
@@ -51,6 +51,7 @@ enum {#define CGW_FLAGS_CAN_ECHO 0x01#define CGW_FLAGS_CAN_SRC_TSTAMP 0x02 +#define CGW_FLAGS_CAN_IIF_TX_OK 0x04#define CGW_MOD_FUNCS 4/* AND OR XOR SET */
net/can/gw.c +8 -0
@@ -52,6 +52,7 @@#include <linux/skbuff.h> #include <linux/can.h> #include <linux/can/core.h> +#include <linux/can/skb.h> #include <linux/can/gw.h> #include <net/rtnetlink.h> #include <net/net_namespace.h>
@@ -347,6 +348,13 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data)return ; } +/* is sending the skb back to the incoming interface not allowed? */ +if (!(gwj->flags &CGW_FLAGS_CAN_IIF_TX_OK ) && +skb_headroom (skb) ==sizeof (struct can_skb_priv ) && + (((struct can_skb_priv *)(skb->head))->ifindex == + gwj->dst.dev->ifindex)) +return ; +/* * clone the given skb, which has not been done in can_rcv() *
Signature · 1 line
1.7.10.4