Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6afa00a authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: gw: indicate and count deleted frames due to misconfiguration 



Add a statistic counter to detect deleted frames due to misconfiguration with
a new read-only CGW_DELETED netlink attribute for the CAN gateway.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent be286baf

include/uapi/linux/can/gw.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ enum { 
	CGW_SRC_IF,	/* ifindex of source network interface */

	CGW_SRC_IF,	/* ifindex of source network interface */

	CGW_DST_IF,	/* ifindex of destination network interface */

	CGW_DST_IF,	/* ifindex of destination network interface */

	CGW_FILTER,	/* specify struct can_filter on source CAN device */

	CGW_FILTER,	/* specify struct can_filter on source CAN device */

	CGW_DELETED,	/* number of deleted CAN frames (see max_hops param) */

	__CGW_MAX

	__CGW_MAX

};

};

net/can/gw.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ struct cgw_job { 
	struct rcu_head rcu;

	struct rcu_head rcu;

	u32 handled_frames;

	u32 handled_frames;

	u32 dropped_frames;

	u32 dropped_frames;

	u32 deleted_frames;

	struct cf_mod mod;

	struct cf_mod mod;

	union {

	union {

		/* CAN frame data source */

		/* CAN frame data source */
@@ -367,8 +368,11 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data) 




	BUG_ON(skb->ip_summed != CHECKSUM_UNNECESSARY);

	BUG_ON(skb->ip_summed != CHECKSUM_UNNECESSARY);





	if (cgw_hops(skb) >= max_hops)

	if (cgw_hops(skb) >= max_hops) {

		/* indicate deleted frames due to misconfiguration */

		gwj->deleted_frames++;

		return;

		return;

	}





	if (!(gwj->dst.dev->flags & IFF_UP)) {

	if (!(gwj->dst.dev->flags & IFF_UP)) {

		gwj->dropped_frames++;

		gwj->dropped_frames++;
@@ -500,6 +504,11 @@ static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj, int type, 
			goto cancel;

			goto cancel;

	}

	}





	if (gwj->deleted_frames) {

		if (nla_put_u32(skb, CGW_DELETED, gwj->deleted_frames) < 0)

			goto cancel;

	}



	/* check non default settings of attributes */

	/* check non default settings of attributes */





	if (gwj->mod.modtype.and) {

	if (gwj->mod.modtype.and) {
@@ -799,6 +808,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh, 




	gwj->handled_frames = 0;

	gwj->handled_frames = 0;

	gwj->dropped_frames = 0;

	gwj->dropped_frames = 0;

	gwj->deleted_frames = 0;

	gwj->flags = r->flags;

	gwj->flags = r->flags;

	gwj->gwtype = r->gwtype;

	gwj->gwtype = r->gwtype;