* (c) 2011 Volkswagen Group Research
* Authors: Michal Sojka <sojkam1@fel.cvut.cz>
* Pavel Pisa <pisa@cmp.felk.cvut.cz>
- * Rostislav Lisovy <lisovy@kormus.cz>
+ * Rostislav Lisovy <lisovy@gmail.cz>
* Funded by: Volkswagen Group Research
*
* Some function descriptions are heavily inspired by article "Linux Network
#include <linux/rcupdate.h>
#include <linux/can.h>
-#ifndef CAN_SFF_ID_BITS
- #define CAN_SFF_ID_BITS 11
- #define CAN_EFF_ID_BITS 29
-#endif
-
#define SFF_BITMAP 1 /* Use bitmap for storing rules
for SFF frames? */
#define TCA_CANFLTR_MAX (__TCA_CANFLTR_MAX - 1)
static const struct nla_policy canfltr_policy[TCA_CANFLTR_MAX + 1] = {
- [TCA_CANFLTR_CLASSID] = { .type = NLA_U32 },
- /* FIXME Be aware of possible problems with 64bit kernel and
- 32bit userspace etc. */
- [TCA_CANFLTR_RULES] = { /*.len = (sizeof(struct can_filter))*/ } /* FIXME */
+ [TCA_CANFLTR_CLASSID] = { .type = NLA_U32 }, /* Be aware of possible
+ problems with 64bit kernel and
+ 32bit userspace etc. */
+ [TCA_CANFLTR_RULES] = { .type = NLA_NESTED }
};
struct canfltr_rules {
ID (11 bit) there is one record in this
bitfield */
#endif
- int inv_match_en; /* Inverted match flag */
int rules_count;
int eff_rules_count;
int sff_rules_count;
#endif
}
-/*
- * Extracts Can ID out of the sk_buff structure.
+/**
+ * canfltr_get_id() - Extracts Can ID out of the sk_buff structure.
*/
static canid_t canfltr_get_id(struct sk_buff *skb)
{
return cf->can_id;
}
-/*
- * Performs the classification. Iterates over all instances of filter,
- * checking for CAN ID match.
+/**
+ * canfltr_classify() - Performs the classification.
*
* @skb: Socket buffer
* @tp:
* @res: Is used for setting Class ID as a result of classification
*
+ * Iterates over all instances of filter, checking for CAN ID match.
+ *
* Returns value relevant for policing. Used return values:
* TC_POLICE_OK if succesfully classified (without regard to policing rules)
* TC_POLICE_UNSPEC if no matching rule was found
*/
-static int canfltr_classify(struct sk_buff *skb, struct tcf_proto *tp,
+static int canfltr_classify(struct sk_buff *skb, const struct tcf_proto *tp,
struct tcf_result *res)
{
struct canfltr_head *head = (struct canfltr_head *)tp->root;
can_id &= CAN_EFF_MASK;
for (i = 0; i < r->eff_rules_count; i++) {
- /* XXX: Why aren't these & performed "off-line"? */
- if ((r->rules_raw[i].can_id & r->rules_raw[i].can_mask & CAN_EFF_MASK) ==
- (can_id & r->rules_raw[i].can_mask & CAN_EFF_MASK)) {
+ if (!(((r->rules_raw[i].can_id ^ can_id) &
+ r->rules_raw[i].can_mask) & CAN_EFF_MASK)) {
match = true;
break;
}
#ifdef SFF_BITMAP
match = test_bit(can_id, r->match_sff);
#else
- for (i = r->eff_rules_count; i < r->eff_rules_count + r->sff_rules_count; i++) {
- if ((r->rules_raw[i].can_id & r->rules_raw[i].can_mask & CAN_SFF_MASK) == /* XXX: dtto */
- (can_id & r->rules_raw[i].can_mask & CAN_SFF_MASK)) {
+ for (i = r->eff_rules_count;
+ i < r->eff_rules_count + r->sff_rules_count; i++) {
+ if (!(((r->rules_raw[i].can_id ^ can_id) &
+ r->rules_raw[i].can_mask) & CAN_SFF_MASK)) {
match = true;
break;
}
return TC_POLICE_UNSPEC;
}
-/*
- * Looks up a filter element by its handle and returns the internal
- * filter ID (i.e. pointer)
+/**
+ * canfltr_get() - Looks up a filter element by its handle and returns the
+ * internal filter ID (i.e. pointer)
*/
static unsigned long canfltr_get(struct tcf_proto *tp, u32 handle)
{
return 0UL;
}
-/*
- * Is invoked when a filter element previously referenced
+/**
+ * canfltr_put() - Is invoked when a filter element previously referenced
* with get() is no longer used
*/
static void canfltr_put(struct tcf_proto *tp, unsigned long f)
int i;
rules_tmp = kzalloc(sizeof(*rules_tmp), GFP_KERNEL);
- if (rules_tmp == NULL)
- return -ENOBUFS; /* XXX: Why not -ENOMEM? */
+ if (!rules_tmp)
+ return -ENOBUFS;
err = -EINVAL;
if (tb[TCA_CANFLTR_CLASSID] == NULL)
return err;
}
-/*
- * Called for changing properties of an existing filter or after addition
- * of a new filter to a class (by calling bind_tcf which binds an instance
- * of a filter to the class).
+/**
+ * canfltr_change() - Called for changing properties of an existing filter or
+ * after addition of a new filter to a class (by calling bind_tcf which binds
+ * an instance of a filter to the class).
*
* @tp: Structure representing instance of a filter.
* Part of a linked list of all filters.
kfree(f);
}
-/*
- * Remove whole filter.
+/**
+ * canfltr_destroy() - Remove whole filter.
*/
static void canfltr_destroy(struct tcf_proto *tp)
{
kfree(head);
}
-/*
- * Delete one instance of a filter.
+/**
+ * canfltr_delete() - Delete one instance of a filter.
*/
static int canfltr_delete(struct tcf_proto *tp, unsigned long arg)
{
}
-/*
- * Initialize filter
+/**
+ * canfltr_init() - Initialize filter
*/
static int canfltr_init(struct tcf_proto *tp)
{
struct canfltr_head *head;
+ if ((tp->protocol != htons(ETH_P_ALL)) && (tp->protocol != htons(ETH_P_CAN)))
+ return -1;
+
+ /* Work only on CAN frames */
+ if (tp->protocol == htons(ETH_P_ALL))
+ tp->protocol = htons(ETH_P_CAN);
+
head = kzalloc(sizeof(*head), GFP_KERNEL);
if (head == NULL)
return -ENOBUFS;
INIT_LIST_HEAD(&head->flist);
tp->root = head;
- tp->protocol = htons(ETH_P_CAN); /* Work only on AF_CAN packets - not tested! */
return 0;
}
-/*
- * Iterates over all elements of a filter and invokes a callback function
- * for each of them. This is used to obtain diagnostic data
+/**
+ * canfltr_walk() - Iterates over all elements of a filter and invokes a
+ * callback function for each of them. This is used to obtain diagnostic data.
*/
static void canfltr_walk(struct tcf_proto *tp, struct tcf_walker *arg)
{
}
}
-/*
- * Returns diagnostic data for a filter or one of its elements.
+/**
+ * canfltr_dump() - Returns diagnostic data for a filter or one of its elements.
*/
static int canfltr_dump(struct tcf_proto *tp, unsigned long fh,
struct sk_buff *skb, struct tcmsg *t)
module_init(init_canfltr);
module_exit(exit_canfltr);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR(""); /* FIXME */
+MODULE_AUTHOR("Rostislav Lisovy <lisovy@gmail.cz>");
MODULE_DESCRIPTION("Controller Area Network classifier");
projects / lisovros / linux_canprio.git / blobdiff