Merge pull request #744 from vivien/dsa

Add DLT support for decoding (E)DSA tags
This commit is contained in:
Guy Harris 2019-04-16 11:33:24 -07:00 committed by GitHub
commit 01b4db0cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 292 additions and 248 deletions

View File

@ -957,6 +957,7 @@ set(NETDISSECT_SOURCE_LIST_C
print-decnet.c
print-dhcp6.c
print-domain.c
print-dsa.c
print-dtp.c
print-dvmrp.c
print-eap.c
@ -1004,7 +1005,6 @@ set(NETDISSECT_SOURCE_LIST_C
print-lwapp.c
print-lwres.c
print-m3ua.c
print-medsa.c
print-mobile.c
print-mobility.c
print-mpcp.c

View File

@ -120,6 +120,7 @@ LIBNETDISSECT_SRC=\
print-decnet.c \
print-dhcp6.c \
print-domain.c \
print-dsa.c \
print-dtp.c \
print-dvmrp.c \
print-eap.c \
@ -167,7 +168,6 @@ LIBNETDISSECT_SRC=\
print-lwapp.c \
print-lwres.c \
print-m3ua.c \
print-medsa.c \
print-mobile.c \
print-mobility.c \
print-mpcp.c \

View File

@ -206,8 +206,5 @@
#ifndef ETHERTYPE_GEONET
#define ETHERTYPE_GEONET 0x8947 /* ETSI GeoNetworking (Official IEEE registration from Jan 2013) */
#endif
#ifndef ETHERTYPE_MEDSA
#define ETHERTYPE_MEDSA 0xdada /* Marvel Distributed Switch Architecture */
#endif
extern const struct tok ethertype_values[];

View File

@ -469,6 +469,8 @@ extern u_int brcm_tag_if_print IF_PRINTER_ARGS;
extern u_int brcm_tag_prepend_if_print IF_PRINTER_ARGS;
extern u_int chdlc_if_print IF_PRINTER_ARGS;
extern u_int cip_if_print IF_PRINTER_ARGS;
extern u_int dsa_if_print IF_PRINTER_ARGS;
extern u_int edsa_if_print IF_PRINTER_ARGS;
extern u_int enc_if_print IF_PRINTER_ARGS;
extern u_int ether_if_print IF_PRINTER_ARGS;
extern u_int fddi_if_print IF_PRINTER_ARGS;
@ -619,7 +621,6 @@ extern void lwapp_control_print(netdissect_options *, const u_char *, u_int, int
extern void lwapp_data_print(netdissect_options *, const u_char *, u_int);
extern void lwres_print(netdissect_options *, const u_char *, u_int);
extern void m3ua_print(netdissect_options *, const u_char *, const u_int);
extern void medsa_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
extern u_int mfr_print(netdissect_options *, const u_char *, u_int);
extern void mobile_print(netdissect_options *, const u_char *, u_int);
extern int mobility_print(netdissect_options *, const u_char *, const u_char *);

235
print-dsa.c Normal file
View File

@ -0,0 +1,235 @@
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
* retain the above copyright notice and this paragraph in its entirety, (2)
* distributions including binary code include the above copyright notice and
* this paragraph in its entirety in the documentation or other materials
* provided with the distribution, and (3) all advertising materials mentioning
* features or use of this software display the following acknowledgement:
* ``This product includes software developed by the University of California,
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
* the University nor the names of its contributors may be used to endorse
* or promote products derived from this software without specific prior
* written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
/* \summary: Marvell (Ethertype) Distributed Switch Architecture printer */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "ethertype.h"
#include "addrtoname.h"
#include "extract.h"
/*
* Format of (Ethertyped or not) DSA tagged frames:
*
* 7 6 5 4 3 2 1 0
* . . . . . . . . .
* 0 +---+---+---+---+---+---+---+---+
* | Ether Destination Address |
* +6 +---+---+---+---+---+---+---+---+
* | Ether Source Address |
* +6 +---+---+---+---+---+---+---+---+ +-
* | Prog. DSA Ether Type [15:8] | | (8-byte) EDSA Tag
* +1 +---+---+---+---+---+---+---+---+ | Contains a programmable Ether type,
* | Prog. DSA Ether Type [7:0] | | two reserved bytes (always 0),
* +1 +---+---+---+---+---+---+---+---+ | and a standard DSA tag.
* | Reserved (0x00 0x00) | |
* +2 +---+---+---+---+---+---+---+---+ | +-
* | Mode |b29| Src/Trg Dev | | | (4-byte) DSA Tag
* +1 +---+---+---+---+---+---+---+---+ | | Contains a DSA tag mode,
* |Src/Trg Port/Trunk |b18|b17|b16| | | source or target switch device,
* +1 +---+---+---+---+---+---+---+---+ | | source or target port or trunk,
* | PRI [2:0] |b12| VID [11:8] | | | and misc (IEEE and FPri) bits.
* +1 +---+---+---+---+---+---+---+---+ | |
* | VID [7:0] | | |
* +1 +---+---+---+---+---+---+---+---+ +- +-
* | Ether Length/Type |
* +2 +---+---+---+---+---+---+---+---+
* . . . . . . . . .
*
* Mode: Forward, To_CPU, From_CPU, To_Sniffer
* b29: (Source or Target) IEEE Tag Mode
* b18: Forward's Src_Is_Trunk, To_CPU's Code[2], To_Sniffer's Rx_Sniff
* b17: To_CPU's Code[1]
* b16: Original frame's CFI
* b12: To_CPU's Code[0]
*/
#define TOK(tag, byte, mask, shift) ((((const u_char *) tag)[byte] & (mask)) >> (shift))
#define DSA_LEN 4
#define DSA_MODE(tag) TOK(tag, 0, 0xc0, 6)
#define DSA_MODE_TO_CPU 0x0
#define DSA_MODE_FROM_CPU 0x1
#define DSA_MODE_TO_SNIFFER 0x2
#define DSA_MODE_FORWARD 0x3
#define DSA_TAGGED(tag) TOK(tag, 0, 0x20, 5)
#define DSA_DEV(tag) TOK(tag, 0, 0x1f, 0)
#define DSA_PORT(tag) TOK(tag, 1, 0xf8, 3)
#define DSA_TRUNK(tag) TOK(tag, 1, 0x04, 2)
#define DSA_RX_SNIFF(tag) TOK(tag, 1, 0x04, 2)
#define DSA_CFI(tag) TOK(tag, 1, 0x01, 0)
#define DSA_PRI(tag) TOK(tag, 2, 0xe0, 5)
#define DSA_VID(tag) ((u_short)((TOK(tag, 2, 0xe0, 5) << 8) | (TOK(tag, 3, 0xff, 0))))
#define DSA_CODE(tag) ((TOK(tag, 1, 0x06, 1) << 1) | TOK(tag, 2, 0x10, 4))
#define EDSA_LEN 8
#define EDSA_ETYPE(tag) ((u_short)((TOK(tag, 0, 0xff, 0) << 8) | (TOK(tag, 1, 0xff, 0))))
static const struct tok dsa_mode_values[] = {
{ DSA_MODE_TO_CPU, "To CPU" },
{ DSA_MODE_FROM_CPU, "From CPU" },
{ DSA_MODE_TO_SNIFFER, "To Sniffer"},
{ DSA_MODE_FORWARD, "Forward" },
{ 0, NULL }
};
static const struct tok dsa_code_values[] = {
{ 0x0, "BPDU (MGMT) Trap" },
{ 0x1, "Frame2Reg" },
{ 0x2, "IGMP/MLD Trap" },
{ 0x3, "Policy Trap" },
{ 0x4, "ARP Mirror" },
{ 0x5, "Policy Mirror" },
{ 0, NULL }
};
static u_int
dsa_if_print_full(netdissect_options *ndo, const struct pcap_pkthdr *h,
const u_char *p, u_int taglen)
{
const u_char *edsa, *dsa;
int eflag, ret;
if (h->caplen < 12 + taglen) {
nd_print_trunc(ndo);
return (h->caplen);
}
if (h->len < 12 + taglen) {
nd_print_trunc(ndo);
return (h->len);
}
if (taglen == EDSA_LEN) {
edsa = p + 12;
dsa = edsa + 4;
} else {
edsa = NULL;
dsa = p + 12;
}
if (ndo->ndo_eflag) {
ND_PRINT("%s > %s, ",
etheraddr_string(ndo, p + 6),
etheraddr_string(ndo, p));
if (edsa) {
ND_PRINT("Marvell EDSA ethertype 0x%04x (%s), ", EDSA_ETYPE(edsa),
tok2str(ethertype_values, "unregistered", EDSA_ETYPE(edsa)));
ND_PRINT("rsvd %u %u, ", edsa[2], edsa[3]);
} else {
ND_PRINT("Marvell DSA ");
}
ND_PRINT("mode %s, ", tok2str(dsa_mode_values, "unknown", DSA_MODE(dsa)));
switch (DSA_MODE(dsa)) {
case DSA_MODE_FORWARD:
ND_PRINT("dev %u, %s %u, ", DSA_DEV(dsa),
DSA_TRUNK(dsa) ? "trunk" : "port", DSA_PORT(dsa));
break;
case DSA_MODE_FROM_CPU:
ND_PRINT("target dev %u, port %u, ",
DSA_DEV(dsa), DSA_PORT(dsa));
break;
case DSA_MODE_TO_CPU:
ND_PRINT("source dev %u, port %u, ",
DSA_DEV(dsa), DSA_PORT(dsa));
ND_PRINT("code %s, ",
tok2str(dsa_code_values, "reserved", DSA_CODE(dsa)));
break;
case DSA_MODE_TO_SNIFFER:
ND_PRINT("source dev %u, port %u, ",
DSA_DEV(dsa), DSA_PORT(dsa));
ND_PRINT("%s sniff, ",
DSA_RX_SNIFF(dsa) ? "ingress" : "egress");
break;
default:
break;
}
ND_PRINT("%s, ", DSA_TAGGED(dsa) ? "tagged" : "untagged");
ND_PRINT("%s", DSA_CFI(dsa) ? "CFI, " : "");
ND_PRINT("VID %u, ", DSA_VID(dsa));
ND_PRINT("FPri %u, ", DSA_PRI(dsa));
} else {
if (edsa) {
ND_PRINT("EDSA 0x%04x, ", EDSA_ETYPE(edsa));
} else {
ND_PRINT("DSA ");
}
switch (DSA_MODE(dsa)) {
case DSA_MODE_FORWARD:
ND_PRINT("Forward %s %u.%u, ",
DSA_TRUNK(dsa) ? "trunk" : "port",
DSA_DEV(dsa), DSA_PORT(dsa));
break;
case DSA_MODE_FROM_CPU:
ND_PRINT("CPU > port %u.%u, ",
DSA_DEV(dsa), DSA_PORT(dsa));
break;
case DSA_MODE_TO_CPU:
ND_PRINT("port %u.%u > CPU, ",
DSA_DEV(dsa), DSA_PORT(dsa));
break;
case DSA_MODE_TO_SNIFFER:
ND_PRINT("port %u.%u > %s Sniffer, ",
DSA_DEV(dsa), DSA_PORT(dsa),
DSA_RX_SNIFF(dsa) ? "Rx" : "Tx");
break;
default:
break;
}
ND_PRINT("VLAN %u%c, ", DSA_VID(dsa), DSA_TAGGED(dsa) ? 't' : 'u');
}
eflag = ndo->ndo_eflag;
ndo->ndo_eflag = 0;
ret = ether_hdr_len_print(ndo, p, h->len, h->caplen, NULL, NULL,
12 + taglen + 2);
ndo->ndo_eflag = eflag;
return ret;
}
u_int
dsa_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "dsa";
return dsa_if_print_full(ndo, h, p, DSA_LEN);
}
u_int
edsa_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "edsa";
return dsa_if_print_full(ndo, h, p, EDSA_LEN);
}

View File

@ -100,7 +100,6 @@ const struct tok ethertype_values[] = {
{ ETHERTYPE_GEONET, "GeoNet"},
{ ETHERTYPE_CALM_FAST, "CALM FAST"},
{ ETHERTYPE_AOE, "AoE" },
{ ETHERTYPE_MEDSA, "MEDSA" },
{ 0, NULL}
};
@ -493,10 +492,6 @@ ethertype_print(netdissect_options *ndo,
aoe_print(ndo, p, length);
return (1);
case ETHERTYPE_MEDSA:
medsa_print(ndo, p, length, caplen, src, dst);
return (1);
case ETHERTYPE_LAT:
case ETHERTYPE_SCA:
case ETHERTYPE_MOPRC:

View File

@ -1,192 +0,0 @@
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
* retain the above copyright notice and this paragraph in its entirety, (2)
* distributions including binary code include the above copyright notice and
* this paragraph in its entirety in the documentation or other materials
* provided with the distribution, and (3) all advertising materials mentioning
* features or use of this software display the following acknowledgement:
* ``This product includes software developed by the University of California,
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
* the University nor the names of its contributors may be used to endorse
* or promote products derived from this software without specific prior
* written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
/* \summary: Marvell Extended Distributed Switch Architecture (MEDSA) printer */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "ethertype.h"
#include "addrtoname.h"
#include "extract.h"
/*
* Marvell Extended Distributed Switch Archiecture.
*
* A Marvell proprietary header used for passing packets to/from
* specific ports of a switch. There is no open specification of this
* header, but is documented in the Marvell Switch data sheets. For
* background, see:
*
* https://lwn.net/Articles/302333/
*/
struct medsa_pkthdr {
nd_byte reserved[2];
nd_uint8_t tag_flags_dev;
nd_uint8_t port_trunc_codehi_cfi;
nd_uint8_t pri_vidhi_codelo;
nd_uint8_t vidlo;
nd_uint16_t ether_type;
};
/* Bytes 0 and 1 are reserved and should contain 0 */
#define TAG(medsa) (GET_U_1(medsa->tag_flags_dev) >> 6)
#define TAG_TO_CPU 0
#define TAG_FROM_CPU 1
#define TAG_FORWARD 3
#define SRC_TAG(medsa) ((GET_U_1(medsa->tag_flags_dev) >> 5) & 0x01)
#define SRC_DEV(medsa) (GET_U_1(medsa->tag_flags_dev) & 0x1f)
#define SRC_PORT(medsa) ((GET_U_1(medsa->port_trunc_codehi_cfi) >> 3) & 0x01f)
#define TRUNK(medsa) ((GET_U_1(medsa->port_trunc_codehi_cfi) >> 2) & 0x01)
#define CODE(medsa) ((GET_U_1(medsa->port_trunc_codehi_cfi) & 0x06) | \
((GET_U_1(medsa->pri_vidhi_codelo) >> 4) & 0x01))
#define CODE_BDPU 0
#define CODE_IGMP_MLD 2
#define CODE_ARP_MIRROR 4
#define CFI(medsa) (GET_U_1(medsa->port_trunc_codehi_cfi) & 0x01)
#define PRI(medsa) (GET_U_1(medsa->pri_vidhi_codelo) >> 5)
#define VID(medsa) ((u_short)(GET_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 | \
GET_U_1(medsa->vidlo))
static const struct tok tag_values[] = {
{ TAG_TO_CPU, "To_CPU" },
{ TAG_FROM_CPU, "From_CPU" },
{ TAG_FORWARD, "Forward" },
{ 0, NULL },
};
static const struct tok code_values[] = {
{ CODE_BDPU, "BDPU" },
{ CODE_IGMP_MLD, "IGMP/MLD" },
{ CODE_ARP_MIRROR, "APR_Mirror" },
{ 0, NULL },
};
static void
medsa_print_full(netdissect_options *ndo,
const struct medsa_pkthdr *medsa,
u_int caplen)
{
u_char tag = TAG(medsa);
ND_PRINT("%s",
tok2str(tag_values, "Unknown (%u)", tag));
switch (tag) {
case TAG_TO_CPU:
ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
ND_PRINT(", dev.port:vlan %u.%u:%u",
SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
ND_PRINT(", %s",
tok2str(code_values, "Unknown (%u)", CODE(medsa)));
if (CFI(medsa))
ND_PRINT(", CFI");
ND_PRINT(", pri %u: ", PRI(medsa));
break;
case TAG_FROM_CPU:
ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
ND_PRINT(", dev.port:vlan %u.%u:%u",
SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
if (CFI(medsa))
ND_PRINT(", CFI");
ND_PRINT(", pri %u: ", PRI(medsa));
break;
case TAG_FORWARD:
ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
if (TRUNK(medsa))
ND_PRINT(", dev.trunk:vlan %u.%u:%u",
SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
else
ND_PRINT(", dev.port:vlan %u.%u:%u",
SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
if (CFI(medsa))
ND_PRINT(", CFI");
ND_PRINT(", pri %u: ", PRI(medsa));
break;
default:
ND_DEFAULTPRINT((const u_char *)medsa, caplen);
return;
}
}
void
medsa_print(netdissect_options *ndo,
const u_char *bp, u_int length, u_int caplen,
const struct lladdr_info *src, const struct lladdr_info *dst)
{
const struct medsa_pkthdr *medsa;
u_short ether_type;
ndo->ndo_protocol = "medsa";
medsa = (const struct medsa_pkthdr *)bp;
ND_TCHECK_SIZE(medsa);
if (!ndo->ndo_eflag)
ND_PRINT("MEDSA %u.%u:%u: ",
SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
else
medsa_print_full(ndo, medsa, caplen);
bp += 8;
length -= 8;
caplen -= 8;
ether_type = GET_BE_U_2(medsa->ether_type);
if (ether_type <= MAX_ETHERNET_LENGTH_VAL) {
/* Try to print the LLC-layer header & higher layers */
if (llc_print(ndo, bp, length, caplen, src, dst) < 0) {
/* packet type not known, print raw packet */
if (!ndo->ndo_suppress_default_print)
ND_DEFAULTPRINT(bp, caplen);
}
} else {
if (ndo->ndo_eflag)
ND_PRINT("ethertype %s (0x%04x) ",
tok2str(ethertype_values, "Unknown",
ether_type),
ether_type);
if (ethertype_print(ndo, ether_type, bp, length, caplen, src, dst) == 0) {
/* ether_type not known, print raw packet */
if (!ndo->ndo_eflag)
ND_PRINT("ethertype %s (0x%04x) ",
tok2str(ethertype_values, "Unknown",
ether_type),
ether_type);
if (!ndo->ndo_suppress_default_print)
ND_DEFAULTPRINT(bp, caplen);
}
}
return;
trunc:
nd_print_trunc(ndo);
}

View File

@ -236,6 +236,12 @@ static const struct printer printers[] = {
#endif
#ifdef DLT_VSOCK
{ vsock_if_print, DLT_VSOCK },
#endif
#ifdef DLT_DSA_TAG_DSA
{ dsa_if_print, DLT_DSA_TAG_DSA },
#endif
#ifdef DLT_DSA_TAG_EDSA
{ edsa_if_print, DLT_DSA_TAG_EDSA },
#endif
{ NULL, 0 },
};

View File

@ -35,9 +35,17 @@ brcmtag brcm-tag.pcap brcm-tag.out
brcmtag-e brcm-tag.pcap brcm-tag-e.out -e
brcmtagprepend brcm-tag-prepend.pcap brcm-tag-prepend.out -e
# Marvell DSA tag tests
dsa dsa.pcap dsa.out
dsa-e dsa.pcap dsa-e.out -e
# EAP tests
eapon1 eapon1.pcap eapon1.out
# Marvell DSA tag tests
edsa edsa.pcap edsa.out
edsa-e edsa.pcap edsa-e.out -e
# ESP tests
esp0 02-sunrise-sunset-esp.pcap esp0.out
# more ESP tests in crypto.sh
@ -335,10 +343,6 @@ dhcp-rfc3004 dhcp-rfc3004.pcap dhcp-rfc3004-v.out -v
dhcp-rfc5859 dhcp-rfc5859.pcap dhcp-rfc5859-v.out -v
dhcp-mud dhcp-mud.pcap dhcp-mud.out -vv
# MEDSA tests
medsa medsa.pcap medsa.out
medsa-e medsa.pcap medsa-e.out -e
# VXLAN tests
vxlan vxlan.pcap vxlan.out -e

View File

@ -1,4 +1,6 @@
1 05:27:12.808464432 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144:
0x0000: 3030 3030 3030 3030 3030 3030 3030 3030 0000000000000000
0x0010: 3030 3030 0000
2 05:27:12.808464432 MEDSA 16.6:48: [|decnet]
2 05:27:12.808464432 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0xdada), length 262144:
0x0000: 3030 3030 3030 6003 3030 8a30 3030 3030 000000`.00.00000
0x0010: 3030 3030 0000

8
tests/dsa-e.out Normal file
View File

@ -0,0 +1,8 @@
1 22:21:39.544060 00:50:b6:29:10:70 > d6:c5:28:21:3e:af, Marvell DSA mode Forward, dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 1, length 64
2 22:21:39.544382 d6:c5:28:21:3e:af > 00:50:b6:29:10:70, Marvell DSA mode From CPU, target dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 1, length 64
3 22:21:40.563126 00:50:b6:29:10:70 > d6:c5:28:21:3e:af, Marvell DSA mode Forward, dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 2, length 64
4 22:21:40.563252 d6:c5:28:21:3e:af > 00:50:b6:29:10:70, Marvell DSA mode From CPU, target dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 2, length 64
5 22:21:41.576445 00:50:b6:29:10:70 > d6:c5:28:21:3e:af, Marvell DSA mode Forward, dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 3, length 64
6 22:21:41.576541 d6:c5:28:21:3e:af > 00:50:b6:29:10:70, Marvell DSA mode From CPU, target dev 0, port 1, untagged, VID 0, FPri 0, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 3, length 64
7 22:21:44.560086 d6:c5:28:21:3e:af > 00:50:b6:29:10:70, Marvell DSA mode From CPU, target dev 0, port 1, untagged, VID 0, FPri 0, ARP, Request who-has 192.168.30.1 tell 192.168.30.2, length 28
8 22:21:44.560415 00:50:b6:29:10:70 > d6:c5:28:21:3e:af, Marvell DSA mode Forward, dev 0, port 1, untagged, VID 0, FPri 0, ARP, Reply 192.168.30.1 is-at 00:50:b6:29:10:70, length 46

8
tests/dsa.out Normal file
View File

@ -0,0 +1,8 @@
1 22:21:39.544060 DSA Forward port 0.1, VLAN 0u, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 1, length 64
2 22:21:39.544382 DSA CPU > port 0.1, VLAN 0u, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 1, length 64
3 22:21:40.563126 DSA Forward port 0.1, VLAN 0u, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 2, length 64
4 22:21:40.563252 DSA CPU > port 0.1, VLAN 0u, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 2, length 64
5 22:21:41.576445 DSA Forward port 0.1, VLAN 0u, IP 192.168.30.1 > 192.168.30.2: ICMP echo request, id 13586, seq 3, length 64
6 22:21:41.576541 DSA CPU > port 0.1, VLAN 0u, IP 192.168.30.2 > 192.168.30.1: ICMP echo reply, id 13586, seq 3, length 64
7 22:21:44.560086 DSA CPU > port 0.1, VLAN 0u, ARP, Request who-has 192.168.30.1 tell 192.168.30.2, length 28
8 22:21:44.560415 DSA Forward port 0.1, VLAN 0u, ARP, Reply 192.168.30.1 is-at 00:50:b6:29:10:70, length 46

BIN
tests/dsa.pcap Normal file

Binary file not shown.

10
tests/edsa-e.out Normal file
View File

@ -0,0 +1,10 @@
1 22:21:44.604675 00:50:b6:29:10:7e > c6:e8:9f:7d:69:da, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode Forward, dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 1, length 64
2 22:21:44.604995 c6:e8:9f:7d:69:da > 00:50:b6:29:10:7e, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode From CPU, target dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 1, length 64
3 22:21:45.622749 00:50:b6:29:10:7e > c6:e8:9f:7d:69:da, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode Forward, dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 2, length 64
4 22:21:45.622883 c6:e8:9f:7d:69:da > 00:50:b6:29:10:7e, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode From CPU, target dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 2, length 64
5 22:21:46.636035 00:50:b6:29:10:7e > c6:e8:9f:7d:69:da, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode Forward, dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 3, length 64
6 22:21:46.636142 c6:e8:9f:7d:69:da > 00:50:b6:29:10:7e, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode From CPU, target dev 0, port 0, untagged, VID 0, FPri 0, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 3, length 64
7 22:21:49.680084 c6:e8:9f:7d:69:da > 00:50:b6:29:10:7e, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode From CPU, target dev 0, port 0, untagged, VID 0, FPri 0, ARP, Request who-has 192.168.20.1 tell 192.168.20.2, length 28
8 22:21:49.680474 00:50:b6:29:10:7e > c6:e8:9f:7d:69:da, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode Forward, dev 0, port 0, untagged, VID 0, FPri 0, ARP, Reply 192.168.20.1 is-at 00:50:b6:29:10:7e, length 46
9 22:21:49.809266 00:50:b6:29:10:7e > c6:e8:9f:7d:69:da, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode Forward, dev 0, port 0, untagged, VID 0, FPri 0, ARP, Request who-has 192.168.20.2 tell 192.168.20.1, length 46
10 22:21:49.809342 c6:e8:9f:7d:69:da > 00:50:b6:29:10:7e, Marvell EDSA ethertype 0xdada (unregistered), rsvd 0 0, mode From CPU, target dev 0, port 0, untagged, VID 0, FPri 0, ARP, Reply 192.168.20.2 is-at c6:e8:9f:7d:69:da, length 28

10
tests/edsa.out Normal file
View File

@ -0,0 +1,10 @@
1 22:21:44.604675 EDSA 0xdada, Forward port 0.0, VLAN 0u, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 1, length 64
2 22:21:44.604995 EDSA 0xdada, CPU > port 0.0, VLAN 0u, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 1, length 64
3 22:21:45.622749 EDSA 0xdada, Forward port 0.0, VLAN 0u, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 2, length 64
4 22:21:45.622883 EDSA 0xdada, CPU > port 0.0, VLAN 0u, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 2, length 64
5 22:21:46.636035 EDSA 0xdada, Forward port 0.0, VLAN 0u, IP 192.168.20.1 > 192.168.20.2: ICMP echo request, id 13583, seq 3, length 64
6 22:21:46.636142 EDSA 0xdada, CPU > port 0.0, VLAN 0u, IP 192.168.20.2 > 192.168.20.1: ICMP echo reply, id 13583, seq 3, length 64
7 22:21:49.680084 EDSA 0xdada, CPU > port 0.0, VLAN 0u, ARP, Request who-has 192.168.20.1 tell 192.168.20.2, length 28
8 22:21:49.680474 EDSA 0xdada, Forward port 0.0, VLAN 0u, ARP, Reply 192.168.20.1 is-at 00:50:b6:29:10:7e, length 46
9 22:21:49.809266 EDSA 0xdada, Forward port 0.0, VLAN 0u, ARP, Request who-has 192.168.20.2 tell 192.168.20.1, length 46
10 22:21:49.809342 EDSA 0xdada, CPU > port 0.0, VLAN 0u, ARP, Reply 192.168.20.2 is-at c6:e8:9f:7d:69:da, length 28

BIN
tests/edsa.pcap Normal file

Binary file not shown.

View File

@ -1,20 +0,0 @@
1 12:57:38.954696 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
2 12:57:40.089958 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 98: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.59483 > 198.110.48.12.123: NTPv4, Client, length 48
3 12:57:40.129554 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 98: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 198.110.48.12.123 > 10.0.0.12.59483: NTPv4, Server, length 48
4 12:57:40.955210 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
5 12:57:42.956001 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
6 12:57:44.130355 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 98: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.59809 > 66.228.42.59.123: NTPv4, Client, length 48
7 12:57:44.130393 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 98: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.58880 > 199.102.46.76.123: NTPv4, Client, length 48
8 12:57:44.175132 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 98: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 199.102.46.76.123 > 10.0.0.12.58880: NTPv4, Server, length 48
9 12:57:44.189786 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 98: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 66.228.42.59.123 > 10.0.0.12.59809: NTPv4, Server, length 48
10 12:57:44.956531 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
11 12:57:46.190350 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 98: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.41068 > 208.97.140.69.123: NTPv4, Client, length 48
12 12:57:46.257959 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 98: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 208.97.140.69.123 > 10.0.0.12.41068: NTPv4, Server, length 48
13 12:57:46.956710 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
14 12:57:48.956704 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
15 12:57:50.560492 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 350: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.68 > 10.0.0.1.67: BOOTP/DHCP, Request from 94:10:3e:80:bc:f3, length 300
16 12:57:50.561440 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 350: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.1.67 > 10.0.0.12.68: BOOTP/DHCP, Reply, length 300
17 12:57:50.956688 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
18 12:57:52.956681 26:a1:fb:92:da:73 > 01:80:c2:00:00:00, ethertype MEDSA (0xdada), length 68: To_CPU, untagged, dev.port:vlan 0.2:0, BDPU, pri 7: LLC, dsap STP (0x42) Individual, ssap STP (0x42) Command, ctrl 0x03: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
19 12:57:53.260353 94:10:3e:80:bc:f3 > 00:22:02:00:18:44, ethertype MEDSA (0xdada), length 98: From_CPU, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 10.0.0.12.45651 > 171.66.97.126.123: NTPv4, Client, length 48
20 12:57:53.325316 00:22:02:00:18:44 > 94:10:3e:80:bc:f3, ethertype MEDSA (0xdada), length 98: Forward, untagged, dev.port:vlan 0.3:0, pri 0: ethertype IPv4 (0x0800) 171.66.97.126.123 > 10.0.0.12.45651: NTPv4, Server, length 48

View File

@ -1,20 +0,0 @@
1 12:57:38.954696 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
2 12:57:40.089958 MEDSA 0.3:0: IP 10.0.0.12.59483 > 198.110.48.12.123: NTPv4, Client, length 48
3 12:57:40.129554 MEDSA 0.3:0: IP 198.110.48.12.123 > 10.0.0.12.59483: NTPv4, Server, length 48
4 12:57:40.955210 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
5 12:57:42.956001 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
6 12:57:44.130355 MEDSA 0.3:0: IP 10.0.0.12.59809 > 66.228.42.59.123: NTPv4, Client, length 48
7 12:57:44.130393 MEDSA 0.3:0: IP 10.0.0.12.58880 > 199.102.46.76.123: NTPv4, Client, length 48
8 12:57:44.175132 MEDSA 0.3:0: IP 199.102.46.76.123 > 10.0.0.12.58880: NTPv4, Server, length 48
9 12:57:44.189786 MEDSA 0.3:0: IP 66.228.42.59.123 > 10.0.0.12.59809: NTPv4, Server, length 48
10 12:57:44.956531 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
11 12:57:46.190350 MEDSA 0.3:0: IP 10.0.0.12.41068 > 208.97.140.69.123: NTPv4, Client, length 48
12 12:57:46.257959 MEDSA 0.3:0: IP 208.97.140.69.123 > 10.0.0.12.41068: NTPv4, Server, length 48
13 12:57:46.956710 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
14 12:57:48.956704 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
15 12:57:50.560492 MEDSA 0.3:0: IP 10.0.0.12.68 > 10.0.0.1.67: BOOTP/DHCP, Request from 94:10:3e:80:bc:f3, length 300
16 12:57:50.561440 MEDSA 0.3:0: IP 10.0.0.1.67 > 10.0.0.12.68: BOOTP/DHCP, Reply, length 300
17 12:57:50.956688 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
18 12:57:52.956681 MEDSA 0.2:0: STP 802.1d, Config, Flags [none], bridge-id 8000.26:a1:fb:92:da:73.8001, length 43
19 12:57:53.260353 MEDSA 0.3:0: IP 10.0.0.12.45651 > 171.66.97.126.123: NTPv4, Client, length 48
20 12:57:53.325316 MEDSA 0.3:0: IP 171.66.97.126.123 > 10.0.0.12.45651: NTPv4, Server, length 48

Binary file not shown.