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_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_PRINT("ES Invalid type %u, length %u",
GET_U_1(ih->type),
l2info.length);
- return l2info.header_len;
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
l2info.length-=rewrite_len;
}
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;
/* 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;
/* 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, FALSE);
- return l2info.header_len;
+ ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
+ 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, FALSE);
- 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 = GET_BE_U_2(p);
/* this DLT contains nothing but raw PPPoE frames,
* prepended with a type field*/
/* 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 */
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;
}
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 */
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;
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 (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 (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 (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, FALSE);
- return l2info.header_len;
+ ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
+ ndo->ndo_ll_hdr_len += l2info.header_len;
+ return;
}
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
l2info->length = h->len;
l2info->caplen = h->caplen;
- ND_TCHECK_4(p);
l2info->flags = GET_U_1(p + 3);
l2info->direction = GET_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
tptr = p+jnx_header_len;
/* ok to read extension length ? */
- ND_TCHECK_2(tptr);
jnx_ext_len = GET_BE_U_2(tptr);
jnx_header_len += 2;
tptr +=2;
if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/
- ND_TCHECK_2(p + l2info->cookie_len);
l2info->proto = GET_BE_U_2(p + l2info->cookie_len);
break;
}
case DLT_JUNIPER_MLFR:
switch (l2info->cookie_type) {
case LS_COOKIE_ID:
- ND_TCHECK_2(p);
l2info->bundle = l2info->cookie[1];
l2info->proto = GET_BE_U_2(p);
l2info->header_len += 2;
case DLT_JUNIPER_MFR:
switch (l2info->cookie_type) {
case LS_COOKIE_ID:
- ND_TCHECK_2(p);
l2info->bundle = l2info->cookie[1];
l2info->proto = GET_BE_U_2(p);
l2info->header_len += 2;
projects / tcpdump / blobdiff