uint32_t caplen;
uint32_t pictype;
uint8_t direction;
- uint8_t header_len;
+ u_int header_len;
uint8_t cookie_len;
uint8_t cookie_type;
uint8_t cookie[8];
- uint8_t bundle;
+ u_int bundle;
uint16_t proto;
uint8_t flags;
};
static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
#ifdef DLT_JUNIPER_GGSN
-u_int
+void
juniper_ggsn_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_ggsn";
l2info.pictype = DLT_JUNIPER_GGSN;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
gh = (struct juniper_ggsn_header *)&l2info.cookie;
ND_TCHECK_SIZE(gh);
- proto = EXTRACT_U_1(gh->proto);
+ proto = GET_U_1(gh->proto);
if (ndo->ndo_eflag) {
ND_PRINT("proto %s (%u), vlan %u: ",
tok2str(juniper_protocol_values,"Unknown",proto),
proto,
- EXTRACT_BE_U_2(gh->vlan_id));
+ GET_BE_U_2(gh->vlan_id));
}
switch (proto) {
ND_PRINT("unknown GGSN proto (%u)", proto);
}
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
trunc:
nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_ES
-u_int
+void
juniper_es_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_es";
l2info.pictype = DLT_JUNIPER_ES;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
ih = (const struct juniper_ipsec_header *)p;
ND_TCHECK_SIZE(ih);
- switch (EXTRACT_U_1(ih->type)) {
+ switch (GET_U_1(ih->type)) {
case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:
case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE:
rewrite_len = 0;
break;
default:
ND_PRINT("ES Invalid type %u, length %u",
- EXTRACT_U_1(ih->type),
+ GET_U_1(ih->type),
l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
l2info.length-=rewrite_len;
if (ndo->ndo_eflag) {
if (!es_type_bundle) {
ND_PRINT("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n",
- EXTRACT_BE_U_2(ih->sa_index),
- EXTRACT_U_1(ih->ttl),
- tok2str(juniper_ipsec_type_values,"Unknown",EXTRACT_U_1(ih->type)),
- EXTRACT_U_1(ih->type),
- EXTRACT_BE_U_4(ih->spi),
- ipaddr_string(ndo, ih->src_ip),
- ipaddr_string(ndo, ih->dst_ip),
+ GET_BE_U_2(ih->sa_index),
+ GET_U_1(ih->ttl),
+ tok2str(juniper_ipsec_type_values,"Unknown",GET_U_1(ih->type)),
+ GET_U_1(ih->type),
+ GET_BE_U_4(ih->spi),
+ GET_IPADDR_STRING(ih->src_ip),
+ GET_IPADDR_STRING(ih->dst_ip),
l2info.length);
} else {
ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n",
- EXTRACT_BE_U_2(ih->sa_index),
- EXTRACT_U_1(ih->ttl),
- tok2str(juniper_ipsec_type_values,"Unknown",EXTRACT_U_1(ih->type)),
- EXTRACT_U_1(ih->type),
+ GET_BE_U_2(ih->sa_index),
+ GET_U_1(ih->ttl),
+ tok2str(juniper_ipsec_type_values,"Unknown",GET_U_1(ih->type)),
+ GET_U_1(ih->type),
l2info.length);
}
}
ip_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
trunc:
nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_MONITOR
-u_int
+void
juniper_monitor_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_monitor";
l2info.pictype = DLT_JUNIPER_MONITOR;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
mh = (const struct juniper_monitor_header *)p;
ND_TCHECK_SIZE(mh);
if (ndo->ndo_eflag)
ND_PRINT("service-id %u, iif %u, pkt-type %u: ",
- EXTRACT_BE_U_4(mh->service_id),
- EXTRACT_BE_U_2(mh->iif),
- EXTRACT_U_1(mh->pkt_type));
+ GET_BE_U_4(mh->service_id),
+ GET_BE_U_2(mh->iif),
+ GET_U_1(mh->pkt_type));
/* no proto field - lets guess by first byte of IP header*/
ip_heuristic_guess (ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
trunc:
nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_SERVICES
-u_int
+void
juniper_services_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_services";
l2info.pictype = DLT_JUNIPER_SERVICES;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
sh = (const struct juniper_services_header *)p;
ND_TCHECK_SIZE(sh);
if (ndo->ndo_eflag)
ND_PRINT("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",
- EXTRACT_U_1(sh->svc_id),
- EXTRACT_U_1(sh->flags_len),
- EXTRACT_BE_U_2(sh->svc_set_id),
- EXTRACT_BE_U_3(sh->dir_iif));
+ GET_U_1(sh->svc_id),
+ GET_U_1(sh->flags_len),
+ GET_BE_U_2(sh->svc_set_id),
+ GET_BE_U_3(sh->dir_iif));
/* no proto field - lets guess by first byte of IP header*/
ip_heuristic_guess (ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
trunc:
nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_PPPOE
-u_int
+void
juniper_pppoe_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_pppoe";
l2info.pictype = DLT_JUNIPER_PPPOE;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* this DLT contains nothing but raw ethernet frames */
ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_ETHER
-u_int
+void
juniper_ether_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_ether";
l2info.pictype = DLT_JUNIPER_ETHER;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* this DLT contains nothing but raw Ethernet frames */
- ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len +=
+ l2info.header_len +
+ ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
}
#endif
#ifdef DLT_JUNIPER_PPP
-u_int
+void
juniper_ppp_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_ppp";
l2info.pictype = DLT_JUNIPER_PPP;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* this DLT contains nothing but raw ppp frames */
ppp_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_FRELAY
-u_int
+void
juniper_frelay_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_frelay";
l2info.pictype = DLT_JUNIPER_FRELAY;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* this DLT contains nothing but raw frame-relay frames */
fr_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_CHDLC
-u_int
+void
juniper_chdlc_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_chdlc";
l2info.pictype = DLT_JUNIPER_CHDLC;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* this DLT contains nothing but raw c-hdlc frames */
chdlc_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_PPPOE_ATM
-u_int
+void
juniper_pppoe_atm_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_pppoe_atm";
l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
- ND_TCHECK_2(p);
- extracted_ethertype = EXTRACT_BE_U_2(p);
+ extracted_ethertype = GET_BE_U_2(p);
/* this DLT contains nothing but raw PPPoE frames,
* prepended with a type field*/
if (ethertype_print(ndo, extracted_ethertype,
/* ether_type not known, probably it wasn't one */
ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype);
- return l2info.header_len;
-
-trunc:
- nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_MLPPP
-u_int
+void
juniper_mlppp_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_mlppp";
l2info.pictype = DLT_JUNIPER_MLPPP;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
/* suppress Bundle-ID if frame was captured on a child-link
* best indicator if the cookie looks like a proto */
if (ndo->ndo_eflag &&
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
EXTRACT_BE_U_2(&l2info.cookie) != PPP_OSI &&
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
EXTRACT_BE_U_2(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL))
ND_PRINT("Bundle-ID %u: ", l2info.bundle);
ppp_print(ndo, p, l2info.length);
else
ip_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_IPV6:
ip6_print(ndo, p,l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_MPLS:
mpls_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_ISO:
isoclns_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
default:
break;
}
/* zero length cookie ? */
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
switch (EXTRACT_BE_U_2(&l2info.cookie)) {
case PPP_OSI:
ppp_print(ndo, p - 2, l2info.length + 2);
break;
}
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_MFR
-u_int
+void
juniper_mfr_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_mfr";
memset(&l2info, 0, sizeof(l2info));
l2info.pictype = DLT_JUNIPER_MFR;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* child-link ? */
if (l2info.cookie_len == 0) {
mfr_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
/* first try the LSQ protos */
switch(l2info.proto) {
case JUNIPER_LSQ_L3_PROTO_IPV4:
ip_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_IPV6:
ip6_print(ndo, p,l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_MPLS:
mpls_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
case JUNIPER_LSQ_L3_PROTO_ISO:
isoclns_print(ndo, p, l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
default:
break;
}
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
/* suppress Bundle-ID if frame was captured on a child-link */
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
ND_PRINT("Bundle-ID %u, ", l2info.bundle);
switch (l2info.proto) {
ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
}
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
#ifdef DLT_JUNIPER_MLFR
-u_int
+void
juniper_mlfr_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_mlfr";
l2info.pictype = DLT_JUNIPER_MLFR;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
/* suppress Bundle-ID if frame was captured on a child-link */
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
ND_PRINT("Bundle-ID %u, ", l2info.bundle);
switch (l2info.proto) {
ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
}
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
*/
#ifdef DLT_JUNIPER_ATM1
-u_int
+void
juniper_atm1_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_atm1";
l2info.pictype = DLT_JUNIPER_ATM1;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
- ND_TCHECK_3(p);
- if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
- EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
+ if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
+ GET_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 (llc_hdrlen > 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
}
- if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
+ if (GET_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;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
- if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
- return l2info.header_len;
-
- return l2info.header_len;
+ if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
-trunc:
- nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
#endif
*/
#ifdef DLT_JUNIPER_ATM2
-u_int
+void
juniper_atm2_if_print(netdissect_options *ndo,
const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "juniper_atm2";
l2info.pictype = DLT_JUNIPER_ATM2;
- if (juniper_parse_header(ndo, p, h, &l2info) == 0)
- return l2info.header_len;
+ if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
p+=l2info.header_len;
if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
- ND_TCHECK_3(p);
- if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
- EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
+ if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
+ GET_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 (llc_hdrlen > 0) {
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
}
if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
(EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
- if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
+ if (GET_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;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
- if(juniper_ppp_heuristic_guess(ndo, p, l2info.length) != 0) /* PPPoA vcmux encaps ? */
- return l2info.header_len;
-
- if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
- return l2info.header_len;
+ if(juniper_ppp_heuristic_guess(ndo, p, l2info.length) != 0) { /* PPPoA vcmux encaps ? */
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
- return l2info.header_len;
+ if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
+ }
-trunc:
- nd_print_trunc(ndo);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
}
/* try to guess, based on all PPP protos that are supported in
juniper_ppp_heuristic_guess(netdissect_options *ndo,
const u_char *p, u_int length)
{
- switch(EXTRACT_BE_U_2(p)) {
+ switch(GET_BE_U_2(p)) {
case PPP_IP :
case PPP_OSI :
case PPP_MPLS_UCAST :
ip_heuristic_guess(netdissect_options *ndo,
const u_char *p, u_int length)
{
- switch(EXTRACT_U_1(p)) {
+ switch(GET_U_1(p)) {
case 0x45:
case 0x46:
case 0x47:
}
static int
-juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
+juniper_read_tlv_value(netdissect_options *ndo,
+ const u_char *p, u_int tlv_type, u_int tlv_len)
{
int tlv_value;
if (tlv_type < 128) {
switch (tlv_len) {
case 1:
- tlv_value = EXTRACT_U_1(p);
+ tlv_value = GET_U_1(p);
break;
case 2:
- tlv_value = EXTRACT_LE_U_2(p);
+ tlv_value = GET_LE_U_2(p);
break;
case 3:
- tlv_value = EXTRACT_LE_U_3(p);
+ tlv_value = GET_LE_U_3(p);
break;
case 4:
- tlv_value = EXTRACT_LE_U_4(p);
+ tlv_value = GET_LE_U_4(p);
break;
default:
tlv_value = -1;
/* TLVs >= 128 are big endian encoded */
switch (tlv_len) {
case 1:
- tlv_value = EXTRACT_U_1(p);
+ tlv_value = GET_U_1(p);
break;
case 2:
- tlv_value = EXTRACT_BE_U_2(p);
+ tlv_value = GET_BE_U_2(p);
break;
case 3:
- tlv_value = EXTRACT_BE_U_3(p);
+ tlv_value = GET_BE_U_3(p);
break;
case 4:
- tlv_value = EXTRACT_BE_U_4(p);
+ tlv_value = GET_BE_U_4(p);
break;
default:
tlv_value = -1;
l2info->length = h->len;
l2info->caplen = h->caplen;
- ND_TCHECK_4(p);
- l2info->flags = EXTRACT_U_1(p + 3);
- l2info->direction = EXTRACT_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
+ l2info->flags = GET_U_1(p + 3);
+ l2info->direction = GET_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
- if (EXTRACT_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */
+ if (GET_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */
ND_PRINT("no magic-number found!");
return 0;
}
tptr = p+jnx_header_len;
/* ok to read extension length ? */
- ND_TCHECK_2(tptr);
- jnx_ext_len = EXTRACT_BE_U_2(tptr);
+ jnx_ext_len = GET_BE_U_2(tptr);
jnx_header_len += 2;
tptr +=2;
ND_TCHECK_LEN(tptr, jnx_ext_len);
while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
- tlv_type = EXTRACT_U_1(tptr);
+ tlv_type = GET_U_1(tptr);
tptr++;
- tlv_len = EXTRACT_U_1(tptr);
+ tlv_len = GET_U_1(tptr);
tptr++;
tlv_value = 0;
tlv_type,
tlv_len);
- tlv_value = juniper_read_tlv_value(tptr, tlv_type, tlv_len);
+ tlv_value = juniper_read_tlv_value(ndo, tptr, tlv_type, tlv_len);
switch (tlv_type) {
case JUNIPER_EXT_TLV_IFD_NAME:
/* FIXME */
l2info->cookie_len += lp->cookie_len;
- switch (EXTRACT_U_1(p)) {
+ switch (GET_U_1(p)) {
case LS_COOKIE_ID:
l2info->cookie_type = LS_COOKIE_ID;
l2info->cookie_len += 2;
#ifdef DLT_JUNIPER_MFR
/* MFR child links don't carry cookies */
if (l2info->pictype == DLT_JUNIPER_MFR &&
- (EXTRACT_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
+ (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
l2info->cookie_len = 0;
}
#endif
lp->s,
l2info->cookie_len);
+ if (l2info->cookie_len > 8) {
+ nd_print_invalid(ndo);
+ return 0;
+ }
+
if (l2info->cookie_len > 0) {
ND_TCHECK_LEN(p, l2info->cookie_len);
if (ndo->ndo_eflag)
ND_PRINT(", cookie 0x");
for (idx = 0; idx < l2info->cookie_len; idx++) {
- l2info->cookie[idx] = EXTRACT_U_1(p + idx); /* copy cookie data */
- if (ndo->ndo_eflag) ND_PRINT("%02x", EXTRACT_U_1(p + idx));
+ l2info->cookie[idx] = GET_U_1(p + idx); /* copy cookie data */
+ if (ndo->ndo_eflag) ND_PRINT("%02x", GET_U_1(p + idx));
}
}
if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/
- ND_TCHECK_2(p + l2info->cookie_len);
- l2info->proto = EXTRACT_BE_U_2(p + l2info->cookie_len);
+ l2info->proto = GET_BE_U_2(p + l2info->cookie_len);
break;
}
++lp;
l2info->bundle = l2info->cookie[1];
break;
case AS_COOKIE_ID:
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
break;
case DLT_JUNIPER_MLFR:
switch (l2info->cookie_type) {
case LS_COOKIE_ID:
- ND_TCHECK_2(p);
l2info->bundle = l2info->cookie[1];
- l2info->proto = EXTRACT_BE_U_2(p);
+ l2info->proto = GET_BE_U_2(p);
l2info->header_len += 2;
l2info->length -= 2;
l2info->caplen -= 2;
break;
case AS_COOKIE_ID:
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
break;
case DLT_JUNIPER_MFR:
switch (l2info->cookie_type) {
case LS_COOKIE_ID:
- ND_TCHECK_2(p);
l2info->bundle = l2info->cookie[1];
- l2info->proto = EXTRACT_BE_U_2(p);
+ l2info->proto = GET_BE_U_2(p);
l2info->header_len += 2;
l2info->length -= 2;
l2info->caplen -= 2;
break;
case AS_COOKIE_ID:
+ /* use EXTRACT_, not GET_ (not packet buffer pointer) */
l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
break;
ND_TCHECK_4(p);
/* ATM cell relay control word present ? */
if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) {
- control_word = EXTRACT_BE_U_4(p);
+ control_word = GET_BE_U_4(p);
/* some control word heuristics */
switch(control_word) {
case 0: /* zero control word */
projects / tcpdump / blobdiff