This patch modifies output key of ULOG by providing a parsing of
source and destination mac address instead of having a simply
sending raw.mac through the stack.
The introduction of the config key "hwaddrlen" was necessary to be able
to know the length of an hardware address which is used to compute the
length of an address and the offset of destination address
Signed-off-by: Eric Leblond <eric@xxxxxx>
---
input/packet/ulogd_inppkt_ULOG.c | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index c00d9bf..8abaa60 100644
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -35,7 +35,7 @@ struct ulog_input {
/* configuration entries */
static struct config_keyset libulog_kset = {
- .num_ces = 4,
+ .num_ces = 5,
.ces = {
{
.key = "bufsize",
@@ -61,11 +61,17 @@ static struct config_keyset libulog_kset = {
.options = CONFIG_OPT_NONE,
.u.value = 0,
},
-
+ {
+ .key = "hwaddrlen",
+ .type = CONFIG_TYPE_INT,
+ .options = CONFIG_OPT_NONE,
+ .u.value = 6, /* ETH_ALEN */
+ },
}
};
enum ulog_keys {
- ULOG_KEY_RAW_MAC = 0,
+ ULOG_KEY_RAW_MAC_SADDR = 0,
+ ULOG_KEY_RAW_MAC_DADDR,
ULOG_KEY_RAW_PCKT,
ULOG_KEY_RAW_PCKTLEN,
ULOG_KEY_RAW_PCKTCOUNT,
@@ -83,15 +89,24 @@ enum ulog_keys {
};
static struct ulogd_key output_keys[] = {
- [ULOG_KEY_RAW_MAC] = {
+ [ULOG_KEY_RAW_MAC_SADDR] = {
.type = ULOGD_RET_RAW,
.flags = ULOGD_RETF_NONE,
- .name = "raw.mac",
+ .name = "raw.mac.saddr",
.ipfix = {
.vendor = IPFIX_VENDOR_IETF,
.field_id = IPFIX_sourceMacAddress,
},
},
+ [ULOG_KEY_RAW_MAC_DADDR] = {
+ .type = ULOGD_RET_RAW,
+ .flags = ULOGD_RETF_NONE,
+ .name = "raw.mac.daddr",
+ .ipfix = {
+ .vendor = IPFIX_VENDOR_IETF,
+ .field_id = IPFIX_destinationMacAddress,
+ },
+ },
[ULOG_KEY_RAW_PCKT] = {
.type = ULOGD_RET_RAW,
.flags = ULOGD_RETF_NONE,
@@ -189,10 +204,14 @@ static int interp_packet(struct ulogd_pluginstance *ip, ulog_packet_msg_t *pkt)
{
struct ulogd_key *ret = ip->output.keys;
- if (pkt->mac_len) {
- ret[ULOG_KEY_RAW_MAC].u.value.ptr = pkt->mac;
- ret[ULOG_KEY_RAW_MAC].flags |= ULOGD_RETF_VALID;
- ret[ULOG_KEY_RAW_MAC_LEN].u.value.ui16 = pkt->mac_len;
+ if (pkt->mac_len >= 2 * ip->config_kset->ces[4].u.value) {
+ ret[ULOG_KEY_RAW_MAC_DADDR].u.value.ptr = pkt->mac;
+ ret[ULOG_KEY_RAW_MAC_DADDR].flags |= ULOGD_RETF_VALID;
+ ret[ULOG_KEY_RAW_MAC_SADDR].u.value.ptr = pkt->mac +
+ ip->config_kset->ces[4].u.value;
+ ret[ULOG_KEY_RAW_MAC_SADDR].flags |= ULOGD_RETF_VALID;
+ ret[ULOG_KEY_RAW_MAC_LEN].u.value.ui16 =
+ ip->config_kset->ces[4].u.value;
ret[ULOG_KEY_RAW_MAC_LEN].flags |= ULOGD_RETF_VALID;
}
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
