diff options
author | Sam Leffler <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
---|---|---|
committer | Sam Leffler <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
commit | c1ad1296ec82096c8c861fcc68d08493af59a029 (patch) | |
tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/print-atm.c | |
parent | 3d1038b8ce710e81c5ab991a014653e333d19837 (diff) | |
download | src-c1ad1296ec82096c8c861fcc68d08493af59a029.tar.gz src-c1ad1296ec82096c8c861fcc68d08493af59a029.zip |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Notes
Notes:
svn path=/head/; revision=146778
Diffstat (limited to 'contrib/tcpdump/print-atm.c')
-rw-r--r-- | contrib/tcpdump/print-atm.c | 103 |
1 files changed, 96 insertions, 7 deletions
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c index 549af0e8c6b7..5690952bfe29 100644 --- a/contrib/tcpdump/print-atm.c +++ b/contrib/tcpdump/print-atm.c @@ -22,7 +22,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.33.2.2 2003/11/16 08:51:11 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38 2005/01/19 16:46:27 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -45,6 +45,54 @@ static const char rcsid[] _U_ = #include "ether.h" +struct tok oam_celltype_values[] = { + { 0x1, "Fault Management" }, + { 0x2, "Performance Management" }, + { 0x8, "activate/deactivate" }, + { 0xf, "System Management" }, + { 0, NULL } +}; + +struct tok oam_fm_functype_values[] = { + { 0x0, "AIS" }, + { 0x1, "RDI" }, + { 0x4, "Continuity Check" }, + { 0x8, "Loopback" }, + { 0, NULL } +}; + +struct tok oam_pm_functype_values[] = { + { 0x0, "Forward Monitoring" }, + { 0x1, "Backward Reporting" }, + { 0x2, "Monitoring and Reporting" }, + { 0, NULL } +}; + +struct tok oam_ad_functype_values[] = { + { 0x0, "Performance Monitoring" }, + { 0x1, "Continuity Check" }, + { 0, NULL } +}; + +static const struct tok *oam_functype_values[16] = { + NULL, + oam_fm_functype_values, /* 1 */ + oam_pm_functype_values, /* 2 */ + NULL, + NULL, + NULL, + NULL, + NULL, + oam_ad_functype_values, /* 8 */ + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL +}; + /* * Print an RFC 1483 LLC-encapsulated ATM frame. */ @@ -74,7 +122,7 @@ atm_llc_print(const u_char *p, int length, int caplen) /* * This is the top level routine of the printer. 'p' points * to the LLC/SNAP header of the packet, 'h->ts' is the timestamp, - * 'h->length' is the length of the packet off the wire, and 'h->caplen' + * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ u_int @@ -208,12 +256,9 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, printf("broadcast sig: "); return; - case OAMF4SC: - printf("oamF4(segment): "); - return; - + case OAMF4SC: /* fall through */ case OAMF4EC: - printf("oamF4(end): "); + oam_print(p, length); return; case METAC: @@ -242,3 +287,47 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, break; } } + +int +oam_print (const u_char *p, u_int length) { + + u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp; + + cell_header = EXTRACT_32BITS(p); + cell_type = ((*(p+4))>>4) & 0x0f; + func_type = *(p) & 0x0f; + + vpi = (cell_header>>20)&0xff; + vci = (cell_header>>4)&0xffff; + payload = (cell_header>>1)&0x7; + clp = cell_header&0x1; + + switch (vci) { + case OAMF4SC: + printf("OAM F4 (segment), "); + break; + case OAMF4EC: + printf("OAM F4 (end), "); + break; + default: + printf("OAM F5, "); + break; + } + + if (eflag) + printf("vpi %u, vci %u, payload %u, clp %u, ",vpi,vci,payload,clp); + + printf("cell-type %s (%u)", + tok2str(oam_celltype_values, "unknown", cell_type), + cell_type); + + if (oam_functype_values[cell_type] == NULL) + printf(", func-type unknown (%u)", func_type); + else + printf(", func-type %s (%u)", + bittok2str(oam_functype_values[cell_type],"none",func_type), + func_type); + + printf(", length %u",length); + return 1; +} |