X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3c8f3e13b03380742c24070f8a7b56fe12c6b8ee..61c422a88caefe986c2bc0a7f2f3028f696fa5cd:/print-juniper.c diff --git a/print-juniper.c b/print-juniper.c index f023d178..e36b0a8f 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -477,7 +477,7 @@ juniper_ggsn_if_print(netdissect_options *ndo, ND_PRINT((ndo, "proto %s (%u), vlan %u: ", tok2str(juniper_protocol_values,"Unknown",gh->proto), gh->proto, - EXTRACT_BE_16BITS(&gh->vlan_id[0]))); + EXTRACT_BE_U_2(&gh->vlan_id[0]))); } switch (gh->proto) { @@ -550,17 +550,17 @@ juniper_es_if_print(netdissect_options *ndo, if (ndo->ndo_eflag) { if (!es_type_bundle) { ND_PRINT((ndo, "ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n", - EXTRACT_BE_16BITS(&ih->sa_index), + EXTRACT_BE_U_2(&ih->sa_index), ih->ttl, tok2str(juniper_ipsec_type_values,"Unknown",ih->type), ih->type, - EXTRACT_BE_32BITS(&ih->spi), + EXTRACT_BE_U_4(&ih->spi), ipaddr_string(ndo, &ih->src_ip), ipaddr_string(ndo, &ih->dst_ip), l2info.length)); } else { ND_PRINT((ndo, "ES SA, index %u, ttl %u type %s (%u), length %u\n", - EXTRACT_BE_16BITS(&ih->sa_index), + EXTRACT_BE_U_2(&ih->sa_index), ih->ttl, tok2str(juniper_ipsec_type_values,"Unknown",ih->type), ih->type, @@ -601,8 +601,8 @@ juniper_monitor_if_print(netdissect_options *ndo, ND_TCHECK(*mh); if (ndo->ndo_eflag) ND_PRINT((ndo, "service-id %u, iif %u, pkt-type %u: ", - EXTRACT_BE_32BITS(&mh->service_id), - EXTRACT_BE_16BITS(&mh->iif), + EXTRACT_BE_U_4(&mh->service_id), + EXTRACT_BE_U_2(&mh->iif), mh->pkt_type)); /* no proto field - lets guess by first byte of IP header*/ @@ -642,8 +642,8 @@ juniper_services_if_print(netdissect_options *ndo, ND_PRINT((ndo, "service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ", sh->svc_id, sh->flags_len, - EXTRACT_BE_16BITS(&sh->svc_set_id), - EXTRACT_BE_24BITS(&sh->dir_iif[1]))); + EXTRACT_BE_U_2(&sh->svc_set_id), + EXTRACT_BE_U_3(&sh->dir_iif[1]))); /* no proto field - lets guess by first byte of IP header*/ ip_heuristic_guess (ndo, p, l2info.length); @@ -760,8 +760,8 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo, p+=l2info.header_len; - ND_TCHECK2(p[0], 2); - extracted_ethertype = EXTRACT_BE_16BITS(p); + ND_TCHECK_2(p); + extracted_ethertype = EXTRACT_BE_U_2(p); /* this DLT contains nothing but raw PPPoE frames, * prepended with a type field*/ if (ethertype_print(ndo, extracted_ethertype, @@ -794,8 +794,8 @@ juniper_mlppp_if_print(netdissect_options *ndo, /* suppress Bundle-ID if frame was captured on a child-link * best indicator if the cookie looks like a proto */ if (ndo->ndo_eflag && - EXTRACT_BE_16BITS(&l2info.cookie) != PPP_OSI && - EXTRACT_BE_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) + EXTRACT_BE_U_2(&l2info.cookie) != PPP_OSI && + EXTRACT_BE_U_2(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) ND_PRINT((ndo, "Bundle-ID %u: ", l2info.bundle)); p+=l2info.header_len; @@ -825,7 +825,7 @@ juniper_mlppp_if_print(netdissect_options *ndo, } /* zero length cookie ? */ - switch (EXTRACT_BE_16BITS(&l2info.cookie)) { + switch (EXTRACT_BE_U_2(&l2info.cookie)) { case PPP_OSI: ppp_print(ndo, p - 2, l2info.length + 2); break; @@ -882,7 +882,7 @@ juniper_mfr_if_print(netdissect_options *ndo, } /* suppress Bundle-ID if frame was captured on a child-link */ - if (ndo->ndo_eflag && EXTRACT_BE_32BITS(l2info.cookie) != 1) + if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1) ND_PRINT((ndo, "Bundle-ID %u, ", l2info.bundle)); switch (l2info.proto) { case (LLCSAP_ISONS<<8 | LLCSAP_ISONS): @@ -916,7 +916,7 @@ juniper_mlfr_if_print(netdissect_options *ndo, p+=l2info.header_len; /* suppress Bundle-ID if frame was captured on a child-link */ - if (ndo->ndo_eflag && EXTRACT_BE_32BITS(l2info.cookie) != 1) + if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1) ND_PRINT((ndo, "Bundle-ID %u, ", l2info.bundle)); switch (l2info.proto) { case (LLC_UI): @@ -965,16 +965,16 @@ juniper_atm1_if_print(netdissect_options *ndo, return l2info.header_len; } - ND_TCHECK2(p[0], 3); - if (EXTRACT_BE_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_BE_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */ + ND_TCHECK_3(p); + if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ + EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL); if (llc_hdrlen > 0) return l2info.header_len; } - if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ + if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */ isoclns_print(ndo, p + 1, l2info.length - 1); /* FIXME check if frame was recognized */ return l2info.header_len; @@ -1019,9 +1019,9 @@ juniper_atm2_if_print(netdissect_options *ndo, return l2info.header_len; } - ND_TCHECK2(p[0], 3); - if (EXTRACT_BE_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_BE_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */ + ND_TCHECK_3(p); + if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ + EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL); if (llc_hdrlen > 0) @@ -1029,12 +1029,12 @@ juniper_atm2_if_print(netdissect_options *ndo, } if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */ - (EXTRACT_BE_32BITS(l2info.cookie) & ATM2_GAP_COUNT_MASK)) { + (EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) { ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL); return l2info.header_len; } - if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ + if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */ isoclns_print(ndo, p + 1, l2info.length - 1); /* FIXME check if frame was recognized */ return l2info.header_len; @@ -1061,7 +1061,7 @@ static int juniper_ppp_heuristic_guess(netdissect_options *ndo, register const u_char *p, u_int length) { - switch(EXTRACT_BE_16BITS(p)) { + switch(EXTRACT_BE_U_2(p)) { case PPP_IP : case PPP_OSI : case PPP_MPLS_UCAST : @@ -1089,7 +1089,7 @@ static int ip_heuristic_guess(netdissect_options *ndo, register const u_char *p, u_int length) { - switch(p[0]) { + switch(EXTRACT_U_1(p)) { case 0x45: case 0x46: case 0x47: @@ -1140,13 +1140,13 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) tlv_value = *p; break; case 2: - tlv_value = EXTRACT_LE_16BITS(p); + tlv_value = EXTRACT_LE_U_2(p); break; case 3: - tlv_value = EXTRACT_LE_24BITS(p); + tlv_value = EXTRACT_LE_U_3(p); break; case 4: - tlv_value = EXTRACT_LE_32BITS(p); + tlv_value = EXTRACT_LE_U_4(p); break; default: tlv_value = -1; @@ -1159,13 +1159,13 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) tlv_value = *p; break; case 2: - tlv_value = EXTRACT_BE_16BITS(p); + tlv_value = EXTRACT_BE_U_2(p); break; case 3: - tlv_value = EXTRACT_BE_24BITS(p); + tlv_value = EXTRACT_BE_U_3(p); break; case 4: - tlv_value = EXTRACT_BE_32BITS(p); + tlv_value = EXTRACT_BE_U_4(p); break; default: tlv_value = -1; @@ -1194,11 +1194,11 @@ juniper_parse_header(netdissect_options *ndo, l2info->length = h->len; l2info->caplen = h->caplen; - ND_TCHECK2(p[0], 4); + ND_TCHECK_4(p); l2info->flags = p[3]; l2info->direction = p[3]&JUNIPER_BPF_PKT_IN; - if (EXTRACT_BE_24BITS(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ + if (EXTRACT_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ ND_PRINT((ndo, "no magic-number found!")); return 0; } @@ -1219,8 +1219,8 @@ juniper_parse_header(netdissect_options *ndo, tptr = p+jnx_header_len; /* ok to read extension length ? */ - ND_TCHECK2(tptr[0], 2); - jnx_ext_len = EXTRACT_BE_16BITS(tptr); + ND_TCHECK_2(tptr); + jnx_ext_len = EXTRACT_BE_U_2(tptr); jnx_header_len += 2; tptr +=2; @@ -1234,9 +1234,9 @@ juniper_parse_header(netdissect_options *ndo, ND_TCHECK2(tptr[0], jnx_ext_len); while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) { - tlv_type = EXTRACT_8BITS(tptr); + tlv_type = EXTRACT_U_1(tptr); tptr++; - tlv_len = EXTRACT_8BITS(tptr); + tlv_len = EXTRACT_U_1(tptr); tptr++; tlv_value = 0; @@ -1302,7 +1302,7 @@ juniper_parse_header(netdissect_options *ndo, * perform the v4/v6 heuristics * to figure out what it is */ - ND_TCHECK2(p[jnx_header_len + 4], 1); + ND_TCHECK_1(p + (jnx_header_len + 4)); if (ip_heuristic_guess(ndo, p + jnx_header_len + 4, l2info->length - (jnx_header_len + 4)) == 0) ND_PRINT((ndo, "no IP-hdr found!")); @@ -1323,7 +1323,7 @@ juniper_parse_header(netdissect_options *ndo, l2info->cookie_len += lp->cookie_len; - switch (p[0]) { + switch (EXTRACT_U_1(p)) { case LS_COOKIE_ID: l2info->cookie_type = LS_COOKIE_ID; l2info->cookie_len += 2; @@ -1342,7 +1342,7 @@ juniper_parse_header(netdissect_options *ndo, #ifdef DLT_JUNIPER_MFR /* MFR child links don't carry cookies */ if (l2info->pictype == DLT_JUNIPER_MFR && - (p[0] & MFR_BE_MASK) == MFR_BE_MASK) { + (EXTRACT_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) { l2info->cookie_len = 0; } #endif @@ -1362,7 +1362,7 @@ juniper_parse_header(netdissect_options *ndo, ND_PRINT((ndo, ", cookie 0x")); for (idx = 0; idx < l2info->cookie_len; idx++) { l2info->cookie[idx] = p[idx]; /* copy cookie data */ - if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", p[idx])); + if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", EXTRACT_U_1(p + idx))); } } @@ -1370,7 +1370,7 @@ juniper_parse_header(netdissect_options *ndo, ND_TCHECK_2(p + l2info->cookie_len); - l2info->proto = EXTRACT_BE_16BITS(p + l2info->cookie_len); + l2info->proto = EXTRACT_BE_U_2(p + l2info->cookie_len); break; } ++lp; @@ -1386,7 +1386,7 @@ juniper_parse_header(netdissect_options *ndo, l2info->bundle = l2info->cookie[1]; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_BE_16BITS(&l2info->cookie[6])>>3)&0xfff; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1399,15 +1399,15 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MLFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: - ND_TCHECK2(p[0], 2); + ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_BE_16BITS(p); + l2info->proto = EXTRACT_BE_U_2(p); l2info->header_len += 2; l2info->length -= 2; l2info->caplen -= 2; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_BE_16BITS(&l2info->cookie[6])>>3)&0xfff; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1423,15 +1423,15 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: - ND_TCHECK2(p[0], 2); + ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_BE_16BITS(p); + l2info->proto = EXTRACT_BE_U_2(p); l2info->header_len += 2; l2info->length -= 2; l2info->caplen -= 2; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_BE_16BITS(&l2info->cookie[6])>>3)&0xfff; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1442,10 +1442,10 @@ juniper_parse_header(netdissect_options *ndo, #endif #ifdef DLT_JUNIPER_ATM2 case DLT_JUNIPER_ATM2: - ND_TCHECK2(p[0], 4); + ND_TCHECK_4(p); /* ATM cell relay control word present ? */ if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) { - control_word = EXTRACT_BE_32BITS(p); + control_word = EXTRACT_BE_U_4(p); /* some control word heuristics */ switch(control_word) { case 0: /* zero control word */