18c18
< "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8 2005/04/06 21:32:41 mcr Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8.2.13 2005/06/20 07:45:05 hannes Exp $ (LBL)";
30a31
> #include "addrtoname.h"
34a36,37
> #include "ethertype.h"
> #include "atm.h"
39a43
> #define JUNIPER_MGC_NUMBER 0x4d4743 /* = "MGC" */
40a45,128
> #define JUNIPER_LSQ_L3_PROTO_SHIFT 4
> #define JUNIPER_LSQ_L3_PROTO_MASK (0x17 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_IPV4 (0 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_IPV6 (1 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_MPLS (2 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_ISO (3 << JUNIPER_LSQ_L3_PROTO_SHIFT)
>
> #define JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE 1
> #define JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE 2
> #define JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE 3
> #define JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE 4
> #define JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE 5
>
> static struct tok juniper_ipsec_type_values[] = {
> { JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE, "ESP ENCR-AUTH" },
> { JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE, "ESP ENCR-AH AUTH" },
> { JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE, "ESP AUTH" },
> { JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE, "AH AUTH" },
> { JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE, "ESP ENCR" },
> { 0, NULL}
> };
>
> static struct tok juniper_direction_values[] = {
> { JUNIPER_BPF_IN, "In"},
> { JUNIPER_BPF_OUT, "Out"},
> { 0, NULL}
> };
>
> struct juniper_cookie_table_t {
> u_int32_t pictype; /* pic type */
> u_int8_t cookie_len; /* cookie len */
> const char *s; /* pic name */
> };
>
> static struct juniper_cookie_table_t juniper_cookie_table[] = {
> #ifdef DLT_JUNIPER_ATM1
> { DLT_JUNIPER_ATM1, 4, "ATM1"},
> #endif
> #ifdef DLT_JUNIPER_ATM2
> { DLT_JUNIPER_ATM2, 8, "ATM2"},
> #endif
> #ifdef DLT_JUNIPER_MLPPP
> { DLT_JUNIPER_MLPPP, 2, "MLPPP"},
> #endif
> #ifdef DLT_JUNIPER_MLFR
> { DLT_JUNIPER_MLFR, 2, "MLFR"},
> #endif
> #ifdef DLT_JUNIPER_MFR
> { DLT_JUNIPER_MFR, 4, "MFR"},
> #endif
> #ifdef DLT_JUNIPER_PPPOE
> { DLT_JUNIPER_PPPOE, 0, "PPPoE"},
> #endif
> #ifdef DLT_JUNIPER_PPPOE_ATM
> { DLT_JUNIPER_PPPOE_ATM, 0, "PPPoE ATM"},
> #endif
> #ifdef DLT_JUNIPER_GGSN
> { DLT_JUNIPER_GGSN, 8, "GGSN"},
> #endif
> #ifdef DLT_JUNIPER_MONITOR
> { DLT_JUNIPER_MONITOR, 8, "MONITOR"},
> #endif
> #ifdef DLT_JUNIPER_SERVICES
> { DLT_JUNIPER_SERVICES, 8, "AS"},
> #endif
> #ifdef DLT_JUNIPER_ES
> { DLT_JUNIPER_ES, 0, "ES"},
> #endif
> { 0, 0, NULL }
> };
>
> struct juniper_l2info_t {
> u_int32_t length;
> u_int32_t caplen;
> u_int32_t pictype;
> u_int8_t direction;
> u_int8_t header_len;
> u_int8_t cookie_len;
> u_int8_t cookie_type;
> u_int8_t cookie[8];
> u_int8_t bundle;
> u_int16_t proto;
> };
>
42,43c130,135
< #define LS_MLFR_LEN 4
< #define ML_MLFR_LEN 2
---
> #define AS_COOKIE_ID 0x47
> #define LS_MLFR_COOKIE_LEN 4
> #define ML_MLFR_COOKIE_LEN 2
> #define LS_MFR_COOKIE_LEN 6
> #define ATM1_COOKIE_LEN 4
> #define ATM2_COOKIE_LEN 8
47a140,150
> #define JUNIPER_PROTO_NULL 1
> #define JUNIPER_PROTO_IPV4 2
> #define JUNIPER_PROTO_IPV6 6
>
> static struct tok juniper_protocol_values[] = {
> { JUNIPER_PROTO_NULL, "Null" },
> { JUNIPER_PROTO_IPV4, "IPv4" },
> { JUNIPER_PROTO_IPV6, "IPv6" },
> { 0, NULL}
> };
>
50c153
< static int juniper_parse_header (const u_char *, u_int8_t *, u_int);
---
> static int juniper_parse_header (const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
51a155
> #ifdef DLT_JUNIPER_GGSN
53c157
< juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
---
> juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p)
55,61c159,168
< register u_int length = h->len;
< register u_int caplen = h->caplen;
< u_int8_t direction,bundle,cookie_len;
< u_int32_t cookie,proto;
<
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
> struct juniper_ggsn_header {
> u_int8_t svc_id;
> u_int8_t flags_len;
> u_int8_t proto;
> u_int8_t flags;
> u_int8_t vlan_id[2];
> u_int8_t res[2];
> };
> const struct juniper_ggsn_header *gh;
63,65c170,172
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_GGSN;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
67,76c174,194
< if (p[0] == LS_COOKIE_ID) {
< cookie=EXTRACT_32BITS(p);
< if (eflag) printf("LSPIC-MLPPP cookie 0x%08x, ",cookie);
< cookie_len = LS_MLFR_LEN;
< bundle = cookie & 0xff;
< } else {
< cookie=EXTRACT_16BITS(p);
< if (eflag) printf("MLPIC-MLPPP cookie 0x%04x, ",cookie);
< cookie_len = ML_MLFR_LEN;
< bundle = (cookie >> 8) & 0xff;
---
> p+=l2info.header_len;
> gh = (struct juniper_ggsn_header *)p;
>
> if (eflag)
> printf("proto %s (%u), vlan %u: ",
> tok2str(juniper_protocol_values,"Unknown",gh->proto),
> gh->proto,
> EXTRACT_16BITS(&gh->vlan_id[0]));
>
> switch (gh->proto) {
> case JUNIPER_PROTO_IPV4:
> ip_print(gndo, p, l2info.length);
> break;
> #ifdef INET6
> case JUNIPER_PROTO_IPV6:
> ip6_print(p, l2info.length);
> break;
> #endif /* INET6 */
> default:
> if (!eflag)
> printf("unknown GGSN proto (%u)", gh->proto);
79,82c197,199
< proto = EXTRACT_16BITS(p+cookie_len);
< p += cookie_len;
< length-= cookie_len;
< caplen-= cookie_len;
---
> return l2info.header_len;
> }
> #endif
83a201,392
> #ifdef DLT_JUNIPER_ES
> u_int
> juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_ipsec_header {
> u_int8_t sa_index[2];
> u_int8_t ttl;
> u_int8_t type;
> u_int8_t spi[4];
> u_int8_t src_ip[4];
> u_int8_t dst_ip[4];
> };
> u_int rewrite_len,es_type_bundle;
> const struct juniper_ipsec_header *ih;
>
> l2info.pictype = DLT_JUNIPER_ES;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> ih = (struct juniper_ipsec_header *)p;
>
> switch (ih->type) {
> case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:
> case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE:
> rewrite_len = 0;
> es_type_bundle = 1;
> break;
> case JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE:
> case JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE:
> case JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE:
> rewrite_len = 16;
> es_type_bundle = 0;
> default:
> printf("ES Invalid type %u, length %u",
> ih->type,
> l2info.length);
> return l2info.header_len;
> }
>
> l2info.length-=rewrite_len;
> p+=rewrite_len;
>
> if (eflag) {
> if (!es_type_bundle) {
> printf("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n",
> EXTRACT_16BITS(&ih->sa_index),
> ih->ttl,
> tok2str(juniper_ipsec_type_values,"Unknown",ih->type),
> ih->type,
> EXTRACT_32BITS(&ih->spi),
> ipaddr_string(EXTRACT_32BITS(&ih->src_ip)),
> ipaddr_string(EXTRACT_32BITS(&ih->dst_ip)),
> l2info.length);
> } else {
> printf("ES SA, index %u, ttl %u type %s (%u), length %u\n",
> EXTRACT_16BITS(&ih->sa_index),
> ih->ttl,
> tok2str(juniper_ipsec_type_values,"Unknown",ih->type),
> ih->type,
> l2info.length);
> }
> }
>
> ip_print(gndo, p, l2info.length);
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_MONITOR
> u_int
> juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_monitor_header {
> u_int8_t pkt_type;
> u_int8_t padding;
> u_int8_t iif[2];
> u_int8_t service_id[4];
> };
> const struct juniper_monitor_header *mh;
>
> l2info.pictype = DLT_JUNIPER_MONITOR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> mh = (struct juniper_monitor_header *)p;
>
> if (eflag)
> printf("service-id %u, iif %u, pkt-type %u: ",
> EXTRACT_32BITS(&mh->service_id),
> EXTRACT_16BITS(&mh->iif),
> mh->pkt_type);
>
> /* no proto field - lets guess by first byte of IP header*/
> ip_heuristic_guess(p, l2info.length);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_SERVICES
> u_int
> juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_services_header {
> u_int8_t svc_id;
> u_int8_t flags_len;
> u_int8_t svc_set_id[2];
> u_int8_t dir_iif[4];
> };
> const struct juniper_services_header *sh;
>
> l2info.pictype = DLT_JUNIPER_SERVICES;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> sh = (struct juniper_services_header *)p;
>
> if (eflag)
> printf("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",
> sh->svc_id,
> sh->flags_len,
> EXTRACT_16BITS(&sh->svc_set_id),
> EXTRACT_24BITS(&sh->dir_iif[1]));
>
> /* no proto field - lets guess by first byte of IP header*/
> ip_heuristic_guess(p, l2info.length);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_PPPOE
> u_int
> juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_PPPOE;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> /* this DLT contains nothing but raw ethernet frames */
> ether_print(p, l2info.length, l2info.caplen);
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_PPPOE_ATM
> u_int
> juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> u_int16_t extracted_ethertype;
>
> l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
>
> extracted_ethertype = EXTRACT_16BITS(p);
> /* this DLT contains nothing but raw PPPoE frames,
> * prepended with a type field*/
> if (ether_encap_print(extracted_ethertype,
> p+ETHERTYPE_LEN,
> l2info.length-ETHERTYPE_LEN,
> l2info.caplen-ETHERTYPE_LEN,
> &extracted_ethertype) == 0)
> /* ether_type not known, probably it wasn't one */
> printf("unknown ethertype 0x%04x", extracted_ethertype);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_MLPPP
> u_int
> juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_MLPPP;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
85c394
< * this may be the case if the cookie looks like a proto */
---
> * best indicator if the cookie looks like a proto */
87,89c396,398
< cookie != PPP_OSI &&
< cookie != (PPP_ADDRESS << 8 | PPP_CONTROL))
< printf("Bundle-ID %u, ",bundle);
---
> EXTRACT_16BITS(&l2info.cookie) != PPP_OSI &&
> EXTRACT_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL))
> printf("Bundle-ID %u: ",l2info.bundle);
91c400,423
< switch (cookie) {
---
> p+=l2info.header_len;
>
> /* first try the LSQ protos */
> switch(l2info.proto) {
> case JUNIPER_LSQ_L3_PROTO_IPV4:
> ip_print(gndo, p, l2info.length);
> return l2info.header_len;
> #ifdef INET6
> case JUNIPER_LSQ_L3_PROTO_IPV6:
> ip6_print(p,l2info.length);
> return l2info.header_len;
> #endif
> case JUNIPER_LSQ_L3_PROTO_MPLS:
> mpls_print(p,l2info.length);
> return l2info.header_len;
> case JUNIPER_LSQ_L3_PROTO_ISO:
> isoclns_print(p,l2info.length,l2info.caplen);
> return l2info.header_len;
> default:
> break;
> }
>
> /* zero length cookie ? */
> switch (EXTRACT_16BITS(&l2info.cookie)) {
93c425
< ppp_print(p-2,length+2);
---
> ppp_print(p-2,l2info.length+2);
97c429
< ppp_print(p,length);
---
> ppp_print(p,l2info.length);
101c433
< return cookie_len;
---
> return l2info.header_len;
102a435
> #endif
104a438
> #ifdef DLT_JUNIPER_MFR
106c440
< juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
---
> juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
108,111c442,446
< register u_int length = h->len;
< register u_int caplen = h->caplen;
< u_int8_t direction,bundle,cookie_len;
< u_int32_t cookie,proto,frelay_len = 0;
---
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_MFR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
113,114c448,463
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> p+=l2info.header_len;
> /* suppress Bundle-ID if frame was captured on a child-link */
> if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
> switch (l2info.proto) {
> case (LLCSAP_ISONS<<8 | LLCSAP_ISONS):
> isoclns_print(p+1, l2info.length-1, l2info.caplen-1);
> break;
> case (LLC_UI<<8 | NLPID_Q933):
> case (LLC_UI<<8 | NLPID_IP):
> case (LLC_UI<<8 | NLPID_IP6):
> /* pass IP{4,6} to the OSI layer for proper link-layer printing */
> isoclns_print(p-1, l2info.length+1, l2info.caplen+1);
> break;
> default:
> printf("unknown protocol 0x%04x, length %u",l2info.proto, l2info.length);
> }
116,118c465,467
< p+=4;
< length-=4;
< caplen-=4;
---
> return l2info.header_len;
> }
> #endif
120,130c469,473
< if (p[0] == LS_COOKIE_ID) {
< cookie=EXTRACT_32BITS(p);
< if (eflag) printf("LSPIC-MLFR cookie 0x%08x, ",cookie);
< cookie_len = LS_MLFR_LEN;
< bundle = cookie & 0xff;
< } else {
< cookie=EXTRACT_16BITS(p);
< if (eflag) printf("MLPIC-MLFR cookie 0x%04x, ",cookie);
< cookie_len = ML_MLFR_LEN;
< bundle = (cookie >> 8) & 0xff;
< }
---
> #ifdef DLT_JUNIPER_MLFR
> u_int
> juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
132,135c475,477
< proto = EXTRACT_16BITS(p+cookie_len);
< p += cookie_len+2;
< length-= cookie_len+2;
< caplen-= cookie_len+2;
---
> l2info.pictype = DLT_JUNIPER_MLFR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
137,138c479
< /* suppress Bundle-ID if frame was captured on a child-link */
< if (eflag && cookie != 1) printf("Bundle-ID %u, ",bundle);
---
> p+=l2info.header_len;
140c481,483
< switch (proto) {
---
> /* suppress Bundle-ID if frame was captured on a child-link */
> if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
> switch (l2info.proto) {
143c486
< isoclns_print(p, length, caplen);
---
> isoclns_print(p, l2info.length, l2info.caplen);
148c491,492
< isoclns_print(p-1, length+1, caplen+1); /* pass IP{4,6} to the OSI layer for proper link-layer printing */
---
> /* pass IP{4,6} to the OSI layer for proper link-layer printing */
> isoclns_print(p-1, l2info.length+1, l2info.caplen+1);
151c495
< printf("unknown protocol 0x%04x, length %u",proto, length);
---
> printf("unknown protocol 0x%04x, length %u",l2info.proto, l2info.length);
154c498
< return cookie_len + frelay_len;
---
> return l2info.header_len;
155a500
> #endif
164a510
> #ifdef DLT_JUNIPER_ATM1
168,169d513
< register u_int length = h->len;
< register u_int caplen = h->caplen;
171,172d514
< u_int8_t direction;
< u_int32_t cookie1;
174,175c516
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
177,179c518,520
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_ATM1;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
181c522
< cookie1=EXTRACT_32BITS(p);
---
> p+=l2info.header_len;
183,187c524,526
< if (eflag) {
< /* FIXME decode channel-id, vc-index, fmt-id
< for once lets just hexdump the cookie */
<
< printf("ATM1 cookie 0x%08x, ", cookie1);
---
> if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
> oam_print(p,l2info.length,ATM_OAM_NOHEC);
> return l2info.header_len;
190,198d528
< p+=4;
< length-=4;
< caplen-=4;
<
< if ((cookie1 >> 24) == 0x80) { /* OAM cell ? */
< oam_print(p,length);
< return 0;
< }
<
202c532
< if (llc_print(p, length, caplen, NULL, NULL,
---
> if (llc_print(p, l2info.length, l2info.caplen, NULL, NULL,
204c534
< return 8;
---
> return l2info.header_len;
208c538
< isoclns_print(p + 1, length - 1, caplen - 1);
---
> isoclns_print(p + 1, l2info.length - 1, l2info.caplen - 1);
210c540
< return 8;
---
> return l2info.header_len;
213,214c543,544
< if(ip_heuristic_guess(p, length) != 0) /* last try - vcmux encaps ? */
< return 0;
---
> if(ip_heuristic_guess(p, l2info.length) != 0) /* last try - vcmux encaps ? */
> return l2info.header_len;
216c546
< return (8);
---
> return l2info.header_len;
217a548
> #endif
226a558
> #ifdef DLT_JUNIPER_ATM2
230,231d561
< register u_int length = h->len;
< register u_int caplen = h->caplen;
233,234c563
< u_int8_t direction;
< u_int32_t cookie1,cookie2;
---
> u_int32_t control_word;
236,237c565
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
239,241c567,569
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_ATM2;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
243,244c571
< cookie1=EXTRACT_32BITS(p);
< cookie2=EXTRACT_32BITS(p+4);
---
> p+=l2info.header_len;
246,252c573,581
< if (eflag) {
< /* FIXME decode channel, fmt-id, ccrq, aal, gap cnt
< for once lets just hexdump the cookie */
<
< printf("ATM2 cookie 0x%08x%08x, ",
< EXTRACT_32BITS(p),
< EXTRACT_32BITS(p+4));
---
> if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
> control_word = EXTRACT_32BITS(p);
> if(control_word == 0 || control_word == 0x08000000) {
> l2info.header_len += 4;
> l2info.length -= 4;
> p += 4;
> }
> oam_print(p,l2info.length,ATM_OAM_NOHEC);
> return l2info.header_len;
255,263d583
< p+=8;
< length-=8;
< caplen-=8;
<
< if (cookie2 & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
< oam_print(p,length);
< return 12;
< }
<
267c587
< if (llc_print(p, length, caplen, NULL, NULL,
---
> if (llc_print(p, l2info.length, l2info.caplen, NULL, NULL,
269c589
< return 12;
---
> return l2info.header_len;
272,275c592,595
< if (direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
< (cookie1 & ATM2_GAP_COUNT_MASK)) {
< ether_print(p, length, caplen);
< return 12;
---
> if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
> (EXTRACT_32BITS(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
> ether_print(p, l2info.length, l2info.caplen);
> return l2info.header_len;
279c599
< isoclns_print(p + 1, length - 1, caplen - 1);
---
> isoclns_print(p + 1, l2info.length - 1, l2info.caplen - 1);
281c601
< return 12;
---
> return l2info.header_len;
284,285c604,605
< if(juniper_ppp_heuristic_guess(p, length) != 0) /* PPPoA vcmux encaps ? */
< return 12;
---
> if(juniper_ppp_heuristic_guess(p, l2info.length) != 0) /* PPPoA vcmux encaps ? */
> return l2info.header_len;
287,288c607,608
< if(ip_heuristic_guess(p, length) != 0) /* last try - vcmux encaps ? */
< return 12;
---
> if(ip_heuristic_guess(p, l2info.length) != 0) /* last try - vcmux encaps ? */
> return l2info.header_len;
290c610
< return (12);
---
> return l2info.header_len;
291a612
> #endif
370c691
< juniper_parse_header (const u_char *p, u_int8_t *direction, u_int length) {
---
> juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {
372c693,703
< *direction = p[3]&JUNIPER_BPF_PKT_IN;
---
> struct juniper_cookie_table_t *lp = juniper_cookie_table;
> u_int idx;
>
> l2info->header_len = 0;
> l2info->cookie_len = 0;
> l2info->proto = 0;
>
>
> l2info->length = h->len;
> l2info->caplen = h->caplen;
> l2info->direction = p[3]&JUNIPER_BPF_PKT_IN;
374,384c705,709
< if (EXTRACT_24BITS(p) != 0x4d4743) /* magic number found ? */
< return -1;
<
< if (*direction == JUNIPER_BPF_PKT_IN) {
< if (eflag)
< printf("%3s ", "In");
< }
< else {
< if (eflag)
< printf("%3s ", "Out");
< }
---
> TCHECK2(p[0],4);
> if (EXTRACT_24BITS(p) != JUNIPER_MGC_NUMBER) /* magic number found ? */
> return 0;
> else
> l2info->header_len = 4;
385a711,713
> if (eflag) /* print direction */
> printf("%3s ",tok2str(juniper_direction_values,"---",l2info->direction));
>
394c722,723
< if(ip_heuristic_guess(p+8,length-8) == 0)
---
> TCHECK2(p[8],1);
> if(ip_heuristic_guess(p+8,l2info->length-8) == 0)
396a726
> l2info->header_len+=4;
399a730,834
>
> p+=l2info->header_len;
> l2info->length -= l2info->header_len;
> l2info->caplen -= l2info->header_len;
>
> /* search through the cookie table and copy values matching for our PIC type */
> while (lp->s != NULL) {
> if (lp->pictype == l2info->pictype) {
>
> l2info->cookie_len = lp->cookie_len;
> l2info->header_len += lp->cookie_len;
>
> switch (p[0]) {
> case LS_COOKIE_ID:
> l2info->cookie_type = LS_COOKIE_ID;
> l2info->cookie_len += 2;
> l2info->header_len += 2;
> break;
> case AS_COOKIE_ID:
> l2info->cookie_type = AS_COOKIE_ID;
> l2info->cookie_len += 6;
> l2info->header_len += 6;
> break;
>
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
>
> if (eflag)
> printf("%s-PIC, cookie-len %u",
> lp->s,
> l2info->cookie_len);
>
> if (l2info->cookie_len > 0) {
> TCHECK2(p[0],l2info->cookie_len);
> if (eflag)
> printf(", cookie 0x");
> for (idx = 0; idx < l2info->cookie_len; idx++) {
> l2info->cookie[idx] = p[idx]; /* copy cookie data */
> if (eflag) printf("%02x",p[idx]);
> }
> }
>
> if (eflag) printf(": "); /* print demarc b/w L2/L3*/
>
>
> l2info->proto = EXTRACT_16BITS(p+l2info->cookie_len);
> break;
> }
> ++lp;
> }
> p+=l2info->cookie_len;
>
> /* DLT_ specific parsing */
> switch(l2info->pictype) {
> case DLT_JUNIPER_MLPPP:
> switch (l2info->cookie_type) {
> case LS_COOKIE_ID:
> l2info->bundle = l2info->cookie[1];
> break;
> case AS_COOKIE_ID:
> l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
> l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
> break;
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
> break;
> case DLT_JUNIPER_MLFR: /* fall through */
> case DLT_JUNIPER_MFR:
> switch (l2info->cookie_type) {
> case LS_COOKIE_ID:
> l2info->bundle = l2info->cookie[1];
> break;
> case AS_COOKIE_ID:
> l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
> break;
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
> l2info->proto = EXTRACT_16BITS(p);
> l2info->header_len += 2;
> l2info->length -= 2;
> l2info->caplen -= 2;
> break;
> case DLT_JUNIPER_ATM2:
> TCHECK2(p[0],4);
> /* ATM cell relay control word present ? */
> if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK && *p & 0x08) {
> l2info->header_len += 4;
> if (eflag)
> printf("control-word 0x%08x ",EXTRACT_32BITS(p));
> }
> break;
> case DLT_JUNIPER_ATM1:
> default:
> break;
> }
>
> if (eflag > 1)
> printf("hlen %u, proto 0x%04x, ",l2info->header_len,l2info->proto);
>
400a836,838
> trunc:
> printf("[|juniper_hdr], length %u",h->len);
> return 0;
407c845
< * c-basic-offset: 8
---
> * c-basic-offset: 4
< "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8 2005/04/06 21:32:41 mcr Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8.2.13 2005/06/20 07:45:05 hannes Exp $ (LBL)";
30a31
> #include "addrtoname.h"
34a36,37
> #include "ethertype.h"
> #include "atm.h"
39a43
> #define JUNIPER_MGC_NUMBER 0x4d4743 /* = "MGC" */
40a45,128
> #define JUNIPER_LSQ_L3_PROTO_SHIFT 4
> #define JUNIPER_LSQ_L3_PROTO_MASK (0x17 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_IPV4 (0 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_IPV6 (1 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_MPLS (2 << JUNIPER_LSQ_L3_PROTO_SHIFT)
> #define JUNIPER_LSQ_L3_PROTO_ISO (3 << JUNIPER_LSQ_L3_PROTO_SHIFT)
>
> #define JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE 1
> #define JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE 2
> #define JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE 3
> #define JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE 4
> #define JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE 5
>
> static struct tok juniper_ipsec_type_values[] = {
> { JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE, "ESP ENCR-AUTH" },
> { JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE, "ESP ENCR-AH AUTH" },
> { JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE, "ESP AUTH" },
> { JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE, "AH AUTH" },
> { JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE, "ESP ENCR" },
> { 0, NULL}
> };
>
> static struct tok juniper_direction_values[] = {
> { JUNIPER_BPF_IN, "In"},
> { JUNIPER_BPF_OUT, "Out"},
> { 0, NULL}
> };
>
> struct juniper_cookie_table_t {
> u_int32_t pictype; /* pic type */
> u_int8_t cookie_len; /* cookie len */
> const char *s; /* pic name */
> };
>
> static struct juniper_cookie_table_t juniper_cookie_table[] = {
> #ifdef DLT_JUNIPER_ATM1
> { DLT_JUNIPER_ATM1, 4, "ATM1"},
> #endif
> #ifdef DLT_JUNIPER_ATM2
> { DLT_JUNIPER_ATM2, 8, "ATM2"},
> #endif
> #ifdef DLT_JUNIPER_MLPPP
> { DLT_JUNIPER_MLPPP, 2, "MLPPP"},
> #endif
> #ifdef DLT_JUNIPER_MLFR
> { DLT_JUNIPER_MLFR, 2, "MLFR"},
> #endif
> #ifdef DLT_JUNIPER_MFR
> { DLT_JUNIPER_MFR, 4, "MFR"},
> #endif
> #ifdef DLT_JUNIPER_PPPOE
> { DLT_JUNIPER_PPPOE, 0, "PPPoE"},
> #endif
> #ifdef DLT_JUNIPER_PPPOE_ATM
> { DLT_JUNIPER_PPPOE_ATM, 0, "PPPoE ATM"},
> #endif
> #ifdef DLT_JUNIPER_GGSN
> { DLT_JUNIPER_GGSN, 8, "GGSN"},
> #endif
> #ifdef DLT_JUNIPER_MONITOR
> { DLT_JUNIPER_MONITOR, 8, "MONITOR"},
> #endif
> #ifdef DLT_JUNIPER_SERVICES
> { DLT_JUNIPER_SERVICES, 8, "AS"},
> #endif
> #ifdef DLT_JUNIPER_ES
> { DLT_JUNIPER_ES, 0, "ES"},
> #endif
> { 0, 0, NULL }
> };
>
> struct juniper_l2info_t {
> u_int32_t length;
> u_int32_t caplen;
> u_int32_t pictype;
> u_int8_t direction;
> u_int8_t header_len;
> u_int8_t cookie_len;
> u_int8_t cookie_type;
> u_int8_t cookie[8];
> u_int8_t bundle;
> u_int16_t proto;
> };
>
42,43c130,135
< #define LS_MLFR_LEN 4
< #define ML_MLFR_LEN 2
---
> #define AS_COOKIE_ID 0x47
> #define LS_MLFR_COOKIE_LEN 4
> #define ML_MLFR_COOKIE_LEN 2
> #define LS_MFR_COOKIE_LEN 6
> #define ATM1_COOKIE_LEN 4
> #define ATM2_COOKIE_LEN 8
47a140,150
> #define JUNIPER_PROTO_NULL 1
> #define JUNIPER_PROTO_IPV4 2
> #define JUNIPER_PROTO_IPV6 6
>
> static struct tok juniper_protocol_values[] = {
> { JUNIPER_PROTO_NULL, "Null" },
> { JUNIPER_PROTO_IPV4, "IPv4" },
> { JUNIPER_PROTO_IPV6, "IPv6" },
> { 0, NULL}
> };
>
50c153
< static int juniper_parse_header (const u_char *, u_int8_t *, u_int);
---
> static int juniper_parse_header (const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
51a155
> #ifdef DLT_JUNIPER_GGSN
53c157
< juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
---
> juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p)
55,61c159,168
< register u_int length = h->len;
< register u_int caplen = h->caplen;
< u_int8_t direction,bundle,cookie_len;
< u_int32_t cookie,proto;
<
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
> struct juniper_ggsn_header {
> u_int8_t svc_id;
> u_int8_t flags_len;
> u_int8_t proto;
> u_int8_t flags;
> u_int8_t vlan_id[2];
> u_int8_t res[2];
> };
> const struct juniper_ggsn_header *gh;
63,65c170,172
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_GGSN;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
67,76c174,194
< if (p[0] == LS_COOKIE_ID) {
< cookie=EXTRACT_32BITS(p);
< if (eflag) printf("LSPIC-MLPPP cookie 0x%08x, ",cookie);
< cookie_len = LS_MLFR_LEN;
< bundle = cookie & 0xff;
< } else {
< cookie=EXTRACT_16BITS(p);
< if (eflag) printf("MLPIC-MLPPP cookie 0x%04x, ",cookie);
< cookie_len = ML_MLFR_LEN;
< bundle = (cookie >> 8) & 0xff;
---
> p+=l2info.header_len;
> gh = (struct juniper_ggsn_header *)p;
>
> if (eflag)
> printf("proto %s (%u), vlan %u: ",
> tok2str(juniper_protocol_values,"Unknown",gh->proto),
> gh->proto,
> EXTRACT_16BITS(&gh->vlan_id[0]));
>
> switch (gh->proto) {
> case JUNIPER_PROTO_IPV4:
> ip_print(gndo, p, l2info.length);
> break;
> #ifdef INET6
> case JUNIPER_PROTO_IPV6:
> ip6_print(p, l2info.length);
> break;
> #endif /* INET6 */
> default:
> if (!eflag)
> printf("unknown GGSN proto (%u)", gh->proto);
79,82c197,199
< proto = EXTRACT_16BITS(p+cookie_len);
< p += cookie_len;
< length-= cookie_len;
< caplen-= cookie_len;
---
> return l2info.header_len;
> }
> #endif
83a201,392
> #ifdef DLT_JUNIPER_ES
> u_int
> juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_ipsec_header {
> u_int8_t sa_index[2];
> u_int8_t ttl;
> u_int8_t type;
> u_int8_t spi[4];
> u_int8_t src_ip[4];
> u_int8_t dst_ip[4];
> };
> u_int rewrite_len,es_type_bundle;
> const struct juniper_ipsec_header *ih;
>
> l2info.pictype = DLT_JUNIPER_ES;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> ih = (struct juniper_ipsec_header *)p;
>
> switch (ih->type) {
> case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:
> case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE:
> rewrite_len = 0;
> es_type_bundle = 1;
> break;
> case JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE:
> case JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE:
> case JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE:
> rewrite_len = 16;
> es_type_bundle = 0;
> default:
> printf("ES Invalid type %u, length %u",
> ih->type,
> l2info.length);
> return l2info.header_len;
> }
>
> l2info.length-=rewrite_len;
> p+=rewrite_len;
>
> if (eflag) {
> if (!es_type_bundle) {
> printf("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n",
> EXTRACT_16BITS(&ih->sa_index),
> ih->ttl,
> tok2str(juniper_ipsec_type_values,"Unknown",ih->type),
> ih->type,
> EXTRACT_32BITS(&ih->spi),
> ipaddr_string(EXTRACT_32BITS(&ih->src_ip)),
> ipaddr_string(EXTRACT_32BITS(&ih->dst_ip)),
> l2info.length);
> } else {
> printf("ES SA, index %u, ttl %u type %s (%u), length %u\n",
> EXTRACT_16BITS(&ih->sa_index),
> ih->ttl,
> tok2str(juniper_ipsec_type_values,"Unknown",ih->type),
> ih->type,
> l2info.length);
> }
> }
>
> ip_print(gndo, p, l2info.length);
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_MONITOR
> u_int
> juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_monitor_header {
> u_int8_t pkt_type;
> u_int8_t padding;
> u_int8_t iif[2];
> u_int8_t service_id[4];
> };
> const struct juniper_monitor_header *mh;
>
> l2info.pictype = DLT_JUNIPER_MONITOR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> mh = (struct juniper_monitor_header *)p;
>
> if (eflag)
> printf("service-id %u, iif %u, pkt-type %u: ",
> EXTRACT_32BITS(&mh->service_id),
> EXTRACT_16BITS(&mh->iif),
> mh->pkt_type);
>
> /* no proto field - lets guess by first byte of IP header*/
> ip_heuristic_guess(p, l2info.length);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_SERVICES
> u_int
> juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> struct juniper_services_header {
> u_int8_t svc_id;
> u_int8_t flags_len;
> u_int8_t svc_set_id[2];
> u_int8_t dir_iif[4];
> };
> const struct juniper_services_header *sh;
>
> l2info.pictype = DLT_JUNIPER_SERVICES;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> sh = (struct juniper_services_header *)p;
>
> if (eflag)
> printf("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",
> sh->svc_id,
> sh->flags_len,
> EXTRACT_16BITS(&sh->svc_set_id),
> EXTRACT_24BITS(&sh->dir_iif[1]));
>
> /* no proto field - lets guess by first byte of IP header*/
> ip_heuristic_guess(p, l2info.length);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_PPPOE
> u_int
> juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_PPPOE;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
> /* this DLT contains nothing but raw ethernet frames */
> ether_print(p, l2info.length, l2info.caplen);
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_PPPOE_ATM
> u_int
> juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
> u_int16_t extracted_ethertype;
>
> l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
> p+=l2info.header_len;
>
> extracted_ethertype = EXTRACT_16BITS(p);
> /* this DLT contains nothing but raw PPPoE frames,
> * prepended with a type field*/
> if (ether_encap_print(extracted_ethertype,
> p+ETHERTYPE_LEN,
> l2info.length-ETHERTYPE_LEN,
> l2info.caplen-ETHERTYPE_LEN,
> &extracted_ethertype) == 0)
> /* ether_type not known, probably it wasn't one */
> printf("unknown ethertype 0x%04x", extracted_ethertype);
>
> return l2info.header_len;
> }
> #endif
>
> #ifdef DLT_JUNIPER_MLPPP
> u_int
> juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_MLPPP;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
>
85c394
< * this may be the case if the cookie looks like a proto */
---
> * best indicator if the cookie looks like a proto */
87,89c396,398
< cookie != PPP_OSI &&
< cookie != (PPP_ADDRESS << 8 | PPP_CONTROL))
< printf("Bundle-ID %u, ",bundle);
---
> EXTRACT_16BITS(&l2info.cookie) != PPP_OSI &&
> EXTRACT_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL))
> printf("Bundle-ID %u: ",l2info.bundle);
91c400,423
< switch (cookie) {
---
> p+=l2info.header_len;
>
> /* first try the LSQ protos */
> switch(l2info.proto) {
> case JUNIPER_LSQ_L3_PROTO_IPV4:
> ip_print(gndo, p, l2info.length);
> return l2info.header_len;
> #ifdef INET6
> case JUNIPER_LSQ_L3_PROTO_IPV6:
> ip6_print(p,l2info.length);
> return l2info.header_len;
> #endif
> case JUNIPER_LSQ_L3_PROTO_MPLS:
> mpls_print(p,l2info.length);
> return l2info.header_len;
> case JUNIPER_LSQ_L3_PROTO_ISO:
> isoclns_print(p,l2info.length,l2info.caplen);
> return l2info.header_len;
> default:
> break;
> }
>
> /* zero length cookie ? */
> switch (EXTRACT_16BITS(&l2info.cookie)) {
93c425
< ppp_print(p-2,length+2);
---
> ppp_print(p-2,l2info.length+2);
97c429
< ppp_print(p,length);
---
> ppp_print(p,l2info.length);
101c433
< return cookie_len;
---
> return l2info.header_len;
102a435
> #endif
104a438
> #ifdef DLT_JUNIPER_MFR
106c440
< juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
---
> juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
108,111c442,446
< register u_int length = h->len;
< register u_int caplen = h->caplen;
< u_int8_t direction,bundle,cookie_len;
< u_int32_t cookie,proto,frelay_len = 0;
---
> struct juniper_l2info_t l2info;
>
> l2info.pictype = DLT_JUNIPER_MFR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
113,114c448,463
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> p+=l2info.header_len;
> /* suppress Bundle-ID if frame was captured on a child-link */
> if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
> switch (l2info.proto) {
> case (LLCSAP_ISONS<<8 | LLCSAP_ISONS):
> isoclns_print(p+1, l2info.length-1, l2info.caplen-1);
> break;
> case (LLC_UI<<8 | NLPID_Q933):
> case (LLC_UI<<8 | NLPID_IP):
> case (LLC_UI<<8 | NLPID_IP6):
> /* pass IP{4,6} to the OSI layer for proper link-layer printing */
> isoclns_print(p-1, l2info.length+1, l2info.caplen+1);
> break;
> default:
> printf("unknown protocol 0x%04x, length %u",l2info.proto, l2info.length);
> }
116,118c465,467
< p+=4;
< length-=4;
< caplen-=4;
---
> return l2info.header_len;
> }
> #endif
120,130c469,473
< if (p[0] == LS_COOKIE_ID) {
< cookie=EXTRACT_32BITS(p);
< if (eflag) printf("LSPIC-MLFR cookie 0x%08x, ",cookie);
< cookie_len = LS_MLFR_LEN;
< bundle = cookie & 0xff;
< } else {
< cookie=EXTRACT_16BITS(p);
< if (eflag) printf("MLPIC-MLFR cookie 0x%04x, ",cookie);
< cookie_len = ML_MLFR_LEN;
< bundle = (cookie >> 8) & 0xff;
< }
---
> #ifdef DLT_JUNIPER_MLFR
> u_int
> juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
> {
> struct juniper_l2info_t l2info;
132,135c475,477
< proto = EXTRACT_16BITS(p+cookie_len);
< p += cookie_len+2;
< length-= cookie_len+2;
< caplen-= cookie_len+2;
---
> l2info.pictype = DLT_JUNIPER_MLFR;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
137,138c479
< /* suppress Bundle-ID if frame was captured on a child-link */
< if (eflag && cookie != 1) printf("Bundle-ID %u, ",bundle);
---
> p+=l2info.header_len;
140c481,483
< switch (proto) {
---
> /* suppress Bundle-ID if frame was captured on a child-link */
> if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
> switch (l2info.proto) {
143c486
< isoclns_print(p, length, caplen);
---
> isoclns_print(p, l2info.length, l2info.caplen);
148c491,492
< isoclns_print(p-1, length+1, caplen+1); /* pass IP{4,6} to the OSI layer for proper link-layer printing */
---
> /* pass IP{4,6} to the OSI layer for proper link-layer printing */
> isoclns_print(p-1, l2info.length+1, l2info.caplen+1);
151c495
< printf("unknown protocol 0x%04x, length %u",proto, length);
---
> printf("unknown protocol 0x%04x, length %u",l2info.proto, l2info.length);
154c498
< return cookie_len + frelay_len;
---
> return l2info.header_len;
155a500
> #endif
164a510
> #ifdef DLT_JUNIPER_ATM1
168,169d513
< register u_int length = h->len;
< register u_int caplen = h->caplen;
171,172d514
< u_int8_t direction;
< u_int32_t cookie1;
174,175c516
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
177,179c518,520
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_ATM1;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
181c522
< cookie1=EXTRACT_32BITS(p);
---
> p+=l2info.header_len;
183,187c524,526
< if (eflag) {
< /* FIXME decode channel-id, vc-index, fmt-id
< for once lets just hexdump the cookie */
<
< printf("ATM1 cookie 0x%08x, ", cookie1);
---
> if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
> oam_print(p,l2info.length,ATM_OAM_NOHEC);
> return l2info.header_len;
190,198d528
< p+=4;
< length-=4;
< caplen-=4;
<
< if ((cookie1 >> 24) == 0x80) { /* OAM cell ? */
< oam_print(p,length);
< return 0;
< }
<
202c532
< if (llc_print(p, length, caplen, NULL, NULL,
---
> if (llc_print(p, l2info.length, l2info.caplen, NULL, NULL,
204c534
< return 8;
---
> return l2info.header_len;
208c538
< isoclns_print(p + 1, length - 1, caplen - 1);
---
> isoclns_print(p + 1, l2info.length - 1, l2info.caplen - 1);
210c540
< return 8;
---
> return l2info.header_len;
213,214c543,544
< if(ip_heuristic_guess(p, length) != 0) /* last try - vcmux encaps ? */
< return 0;
---
> if(ip_heuristic_guess(p, l2info.length) != 0) /* last try - vcmux encaps ? */
> return l2info.header_len;
216c546
< return (8);
---
> return l2info.header_len;
217a548
> #endif
226a558
> #ifdef DLT_JUNIPER_ATM2
230,231d561
< register u_int length = h->len;
< register u_int caplen = h->caplen;
233,234c563
< u_int8_t direction;
< u_int32_t cookie1,cookie2;
---
> u_int32_t control_word;
236,237c565
< if(juniper_parse_header(p, &direction,length) == 0)
< return 0;
---
> struct juniper_l2info_t l2info;
239,241c567,569
< p+=4;
< length-=4;
< caplen-=4;
---
> l2info.pictype = DLT_JUNIPER_ATM2;
> if(juniper_parse_header(p, h, &l2info) == 0)
> return l2info.header_len;
243,244c571
< cookie1=EXTRACT_32BITS(p);
< cookie2=EXTRACT_32BITS(p+4);
---
> p+=l2info.header_len;
246,252c573,581
< if (eflag) {
< /* FIXME decode channel, fmt-id, ccrq, aal, gap cnt
< for once lets just hexdump the cookie */
<
< printf("ATM2 cookie 0x%08x%08x, ",
< EXTRACT_32BITS(p),
< EXTRACT_32BITS(p+4));
---
> if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
> control_word = EXTRACT_32BITS(p);
> if(control_word == 0 || control_word == 0x08000000) {
> l2info.header_len += 4;
> l2info.length -= 4;
> p += 4;
> }
> oam_print(p,l2info.length,ATM_OAM_NOHEC);
> return l2info.header_len;
255,263d583
< p+=8;
< length-=8;
< caplen-=8;
<
< if (cookie2 & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
< oam_print(p,length);
< return 12;
< }
<
267c587
< if (llc_print(p, length, caplen, NULL, NULL,
---
> if (llc_print(p, l2info.length, l2info.caplen, NULL, NULL,
269c589
< return 12;
---
> return l2info.header_len;
272,275c592,595
< if (direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
< (cookie1 & ATM2_GAP_COUNT_MASK)) {
< ether_print(p, length, caplen);
< return 12;
---
> if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
> (EXTRACT_32BITS(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
> ether_print(p, l2info.length, l2info.caplen);
> return l2info.header_len;
279c599
< isoclns_print(p + 1, length - 1, caplen - 1);
---
> isoclns_print(p + 1, l2info.length - 1, l2info.caplen - 1);
281c601
< return 12;
---
> return l2info.header_len;
284,285c604,605
< if(juniper_ppp_heuristic_guess(p, length) != 0) /* PPPoA vcmux encaps ? */
< return 12;
---
> if(juniper_ppp_heuristic_guess(p, l2info.length) != 0) /* PPPoA vcmux encaps ? */
> return l2info.header_len;
287,288c607,608
< if(ip_heuristic_guess(p, length) != 0) /* last try - vcmux encaps ? */
< return 12;
---
> if(ip_heuristic_guess(p, l2info.length) != 0) /* last try - vcmux encaps ? */
> return l2info.header_len;
290c610
< return (12);
---
> return l2info.header_len;
291a612
> #endif
370c691
< juniper_parse_header (const u_char *p, u_int8_t *direction, u_int length) {
---
> juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {
372c693,703
< *direction = p[3]&JUNIPER_BPF_PKT_IN;
---
> struct juniper_cookie_table_t *lp = juniper_cookie_table;
> u_int idx;
>
> l2info->header_len = 0;
> l2info->cookie_len = 0;
> l2info->proto = 0;
>
>
> l2info->length = h->len;
> l2info->caplen = h->caplen;
> l2info->direction = p[3]&JUNIPER_BPF_PKT_IN;
374,384c705,709
< if (EXTRACT_24BITS(p) != 0x4d4743) /* magic number found ? */
< return -1;
<
< if (*direction == JUNIPER_BPF_PKT_IN) {
< if (eflag)
< printf("%3s ", "In");
< }
< else {
< if (eflag)
< printf("%3s ", "Out");
< }
---
> TCHECK2(p[0],4);
> if (EXTRACT_24BITS(p) != JUNIPER_MGC_NUMBER) /* magic number found ? */
> return 0;
> else
> l2info->header_len = 4;
385a711,713
> if (eflag) /* print direction */
> printf("%3s ",tok2str(juniper_direction_values,"---",l2info->direction));
>
394c722,723
< if(ip_heuristic_guess(p+8,length-8) == 0)
---
> TCHECK2(p[8],1);
> if(ip_heuristic_guess(p+8,l2info->length-8) == 0)
396a726
> l2info->header_len+=4;
399a730,834
>
> p+=l2info->header_len;
> l2info->length -= l2info->header_len;
> l2info->caplen -= l2info->header_len;
>
> /* search through the cookie table and copy values matching for our PIC type */
> while (lp->s != NULL) {
> if (lp->pictype == l2info->pictype) {
>
> l2info->cookie_len = lp->cookie_len;
> l2info->header_len += lp->cookie_len;
>
> switch (p[0]) {
> case LS_COOKIE_ID:
> l2info->cookie_type = LS_COOKIE_ID;
> l2info->cookie_len += 2;
> l2info->header_len += 2;
> break;
> case AS_COOKIE_ID:
> l2info->cookie_type = AS_COOKIE_ID;
> l2info->cookie_len += 6;
> l2info->header_len += 6;
> break;
>
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
>
> if (eflag)
> printf("%s-PIC, cookie-len %u",
> lp->s,
> l2info->cookie_len);
>
> if (l2info->cookie_len > 0) {
> TCHECK2(p[0],l2info->cookie_len);
> if (eflag)
> printf(", cookie 0x");
> for (idx = 0; idx < l2info->cookie_len; idx++) {
> l2info->cookie[idx] = p[idx]; /* copy cookie data */
> if (eflag) printf("%02x",p[idx]);
> }
> }
>
> if (eflag) printf(": "); /* print demarc b/w L2/L3*/
>
>
> l2info->proto = EXTRACT_16BITS(p+l2info->cookie_len);
> break;
> }
> ++lp;
> }
> p+=l2info->cookie_len;
>
> /* DLT_ specific parsing */
> switch(l2info->pictype) {
> case DLT_JUNIPER_MLPPP:
> switch (l2info->cookie_type) {
> case LS_COOKIE_ID:
> l2info->bundle = l2info->cookie[1];
> break;
> case AS_COOKIE_ID:
> l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
> l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
> break;
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
> break;
> case DLT_JUNIPER_MLFR: /* fall through */
> case DLT_JUNIPER_MFR:
> switch (l2info->cookie_type) {
> case LS_COOKIE_ID:
> l2info->bundle = l2info->cookie[1];
> break;
> case AS_COOKIE_ID:
> l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
> break;
> default:
> l2info->bundle = l2info->cookie[0];
> break;
> }
> l2info->proto = EXTRACT_16BITS(p);
> l2info->header_len += 2;
> l2info->length -= 2;
> l2info->caplen -= 2;
> break;
> case DLT_JUNIPER_ATM2:
> TCHECK2(p[0],4);
> /* ATM cell relay control word present ? */
> if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK && *p & 0x08) {
> l2info->header_len += 4;
> if (eflag)
> printf("control-word 0x%08x ",EXTRACT_32BITS(p));
> }
> break;
> case DLT_JUNIPER_ATM1:
> default:
> break;
> }
>
> if (eflag > 1)
> printf("hlen %u, proto 0x%04x, ",l2info->header_len,l2info->proto);
>
400a836,838
> trunc:
> printf("[|juniper_hdr], length %u",h->len);
> return 0;
407c845
< * c-basic-offset: 8
---
> * c-basic-offset: 4