X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/27f414ac8e345dfb05643029788111be3cd3aaa9..579d53d4aa0adbf1e29b46b632722f419b5d231b:/print-atm.c diff --git a/print-atm.c b/print-atm.c index 4cbb475f..135898ba 100644 --- a/print-atm.c +++ b/print-atm.c @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.47 2006-02-08 16:50:16 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.49 2007-10-22 19:37:51 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -49,8 +49,8 @@ static const char rcsid[] _U_ = #define OAM_CELLTYPE_FUNCTYPE_LEN 1 struct tok oam_f_values[] = { - { OAMF4SC, "OAM F4 (segment)" }, - { OAMF4EC, "OAM F4 (end)" }, + { VCI_OAMF4SC, "OAM F4 (segment)" }, + { VCI_OAMF4EC, "OAM F4 (end)" }, { 0, NULL } }; @@ -295,24 +295,24 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, if (vpi == 0) { switch (vci) { - case PPC: + case VCI_PPC: sig_print(p, caplen); return; - case BCC: + case VCI_BCC: printf("broadcast sig: "); return; - case OAMF4SC: /* fall through */ - case OAMF4EC: + case VCI_OAMF4SC: /* fall through */ + case VCI_OAMF4EC: oam_print(p, length, ATM_OAM_HEC); return; - case METAC: + case VCI_METAC: printf("meta: "); return; - case ILMIC: + case VCI_ILMIC: printf("ilmi: "); snmp_print(p, length); return; @@ -349,42 +349,6 @@ struct oam_fm_ais_rdi_t { u_int8_t unused[28]; }; - -#define CRC10_POLYNOMIAL 0x633 -static u_int16_t crc10_table[256]; - -static void -gen_crc10_table(void) -{ - register int i, j; - register u_int16_t accum; - - for ( i = 0; i < 256; i++ ) - { - accum = ((unsigned short) i << 2); - for ( j = 0; j < 8; j++ ) - { - if ((accum <<= 1) & 0x400) accum ^= CRC10_POLYNOMIAL; - } - crc10_table[i] = accum; - } - return; -} - -static u_int16_t -verify_crc10_cksum(u_int16_t accum, const u_char *p, int length) -{ - register int i; - - for ( i = 0; i < length; i++ ) - { - accum = ((accum << 8) & 0x3ff) - ^ crc10_table[( accum >> 2) & 0xff] - ^ *p++; - } - return accum; -} - int oam_print (const u_char *p, u_int length, u_int hec) { @@ -437,7 +401,7 @@ oam_print (const u_char *p, u_int length, u_int hec) { tok2str(oam_fm_loopback_indicator_values, "Unknown", oam_ptr.oam_fm_loopback->loopback_indicator & OAM_FM_LOOPBACK_INDICATOR_MASK), - EXTRACT_LE_32BITS(&oam_ptr.oam_fm_loopback->correlation_tag)); + EXTRACT_32BITS(&oam_ptr.oam_fm_loopback->correlation_tag)); printf("\n\tLocation-ID "); for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->loopback_id); idx++) { if (idx % 2) { @@ -465,6 +429,7 @@ oam_print (const u_char *p, u_int length, u_int hec) { break; case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_CONTCHECK): + /* FIXME */ break; default: @@ -472,7 +437,6 @@ oam_print (const u_char *p, u_int length, u_int hec) { } /* crc10 checksum verification */ - gen_crc10_table(); cksum = EXTRACT_16BITS(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN) & OAM_CRC10_MASK; cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);