The Tcpdump Group git mirrors - tcpdump/blobdiff

index 058bfd56ff3c935037df90d50b0ca0aaf7ea70da..94151c812fe967694abc76e965f51d4be0fcc122 100644 (file)

--- a/print-juniper.c

+++ b/print-juniper.c

@@ -20,14 +20,13 @@

__RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");

#endif

-#define NETDISSECT_REWORKED

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

-#include <tcpdump-stdinc.h>

+#include <netdissect-stdinc.h>

-#include "interface.h"

+#include "netdissect.h"

#include "addrtoname.h"

#include "extract.h"

#include "ppp.h"

@@ -362,8 +361,8 @@ static const struct tok juniper_ifle_values[] = {

};

struct juniper_cookie_table_t {

- u_int32_t pictype; /* pic type */

- u_int8_t cookie_len; /* cookie len */

+ uint32_t pictype; /* pic type */

+ uint8_t cookie_len; /* cookie len */

const char *s; /* pic name */

};

@@ -405,17 +404,17 @@ static const struct juniper_cookie_table_t juniper_cookie_table[] = {

};

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;

- u_int8_t flags;

+ uint32_t length;

+ uint32_t caplen;

+ uint32_t pictype;

+ uint8_t direction;

+ uint8_t header_len;

+ uint8_t cookie_len;

+ uint8_t cookie_type;

+ uint8_t cookie[8];

+ uint8_t bundle;

+ uint16_t proto;

+ uint8_t flags;

};

#define LS_COOKIE_ID 0x54

@@ -453,12 +452,12 @@ juniper_ggsn_print(netdissect_options *ndo,

{

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];

+ uint8_t svc_id;

+ uint8_t flags_len;

+ uint8_t proto;

+ uint8_t flags;

+ uint8_t vlan_id[2];

+ uint8_t res[2];

};

const struct juniper_ggsn_header *gh;

@@ -480,11 +479,9 @@ juniper_ggsn_print(netdissect_options *ndo,

case JUNIPER_PROTO_IPV4:

ip_print(ndo, p, l2info.length);

break;

-#ifdef INET6

case JUNIPER_PROTO_IPV6:

ip6_print(ndo, p, l2info.length);

break;

-#endif /* INET6 */

default:

if (!ndo->ndo_eflag)

ND_PRINT((ndo, "unknown GGSN proto (%u)", gh->proto));

@@ -501,12 +498,12 @@ juniper_es_print(netdissect_options *ndo,

{

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];

+ uint8_t sa_index[2];

+ uint8_t ttl;

+ uint8_t type;

+ uint8_t spi[4];

+ uint8_t src_ip[4];

+ uint8_t dst_ip[4];

};

u_int rewrite_len,es_type_bundle;

const struct juniper_ipsec_header *ih;

@@ -516,7 +513,7 @@ juniper_es_print(netdissect_options *ndo,

return l2info.header_len;

p+=l2info.header_len;

- ih = (struct juniper_ipsec_header *)p;

+ ih = (const struct juniper_ipsec_header *)p;

switch (ih->type) {

case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:

@@ -573,10 +570,10 @@ juniper_monitor_print(netdissect_options *ndo,

{

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];

+ uint8_t pkt_type;

+ uint8_t padding;

+ uint8_t iif[2];

+ uint8_t service_id[4];

};

const struct juniper_monitor_header *mh;

@@ -585,7 +582,7 @@ juniper_monitor_print(netdissect_options *ndo,

return l2info.header_len;

p+=l2info.header_len;

- mh = (struct juniper_monitor_header *)p;

+ mh = (const struct juniper_monitor_header *)p;

if (ndo->ndo_eflag)

ND_PRINT((ndo, "service-id %u, iif %u, pkt-type %u: ",

@@ -607,10 +604,10 @@ juniper_services_print(netdissect_options *ndo,

{

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];

+ uint8_t svc_id;

+ uint8_t flags_len;

+ uint8_t svc_set_id[2];

+ uint8_t dir_iif[4];

};

const struct juniper_services_header *sh;

@@ -619,7 +616,7 @@ juniper_services_print(netdissect_options *ndo,

return l2info.header_len;

p+=l2info.header_len;

- sh = (struct juniper_services_header *)p;

+ sh = (const struct juniper_services_header *)p;

if (ndo->ndo_eflag)

ND_PRINT((ndo, "service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",

@@ -731,7 +728,7 @@ juniper_pppoe_atm_print(netdissect_options *ndo,

const struct pcap_pkthdr *h, register const u_char *p)

{

struct juniper_l2info_t l2info;

- u_int16_t extracted_ethertype;

+ uint16_t extracted_ethertype;

l2info.pictype = DLT_JUNIPER_PPPOE_ATM;

if (juniper_parse_header(ndo, p, h, &l2info) == 0)

@@ -784,11 +781,9 @@ juniper_mlppp_print(netdissect_options *ndo,

else

ip_print(ndo, p, l2info.length);

return l2info.header_len;

-#ifdef INET6

case JUNIPER_LSQ_L3_PROTO_IPV6:

ip6_print(ndo, p,l2info.length);

return l2info.header_len;

-#endif

case JUNIPER_LSQ_L3_PROTO_MPLS:

mpls_print(ndo, p, l2info.length);

return l2info.header_len;

@@ -840,11 +835,9 @@ juniper_mfr_print(netdissect_options *ndo,

case JUNIPER_LSQ_L3_PROTO_IPV4:

ip_print(ndo, p, l2info.length);

return l2info.header_len;

-#ifdef INET6

case JUNIPER_LSQ_L3_PROTO_IPV6:

ip6_print(ndo, p,l2info.length);

return l2info.header_len;

-#endif

case JUNIPER_LSQ_L3_PROTO_MPLS:

mpls_print(ndo, p, l2info.length);

return l2info.header_len;

@@ -926,7 +919,7 @@ u_int

juniper_atm1_print(netdissect_options *ndo,

const struct pcap_pkthdr *h, register const u_char *p)

{

- u_int16_t extracted_ethertype;

+ int llc_hdrlen;

struct juniper_l2info_t l2info;

@@ -944,8 +937,8 @@ juniper_atm1_print(netdissect_options *ndo,

if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */

EXTRACT_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */

- if (llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL,

- &extracted_ethertype) != 0)

+ llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

+ if (llc_hdrlen > 0)

return l2info.header_len;

}

@@ -975,7 +968,7 @@ u_int

juniper_atm2_print(netdissect_options *ndo,

const struct pcap_pkthdr *h, register const u_char *p)

{

- u_int16_t extracted_ethertype;

+ int llc_hdrlen;

struct juniper_l2info_t l2info;

@@ -993,8 +986,8 @@ juniper_atm2_print(netdissect_options *ndo,

if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */

EXTRACT_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */

- if (llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL,

- &extracted_ethertype) != 0)

+ llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

+ if (llc_hdrlen > 0)

return l2info.header_len;

}

@@ -1025,8 +1018,8 @@ juniper_atm2_print(netdissect_options *ndo,

* a juniper router if the payload data is encapsulated using PPP */

static int

juniper_ppp_heuristic_guess(netdissect_options *ndo,

- register const u_char *p, u_int length) {

+ register const u_char *p, u_int length)

switch(EXTRACT_16BITS(p)) {

case PPP_IP :

case PPP_OSI :

@@ -1039,10 +1032,8 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo,

case PPP_PAP :

case PPP_CHAP :

case PPP_ML :

-#ifdef INET6

case PPP_IPV6 :

case PPP_IPV6CP :

-#endif

ppp_print(ndo, p, length);

break;

@@ -1055,8 +1046,8 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo,

static int

ip_heuristic_guess(netdissect_options *ndo,

- register const u_char *p, u_int length) {

+ register const u_char *p, u_int length)

switch(p[0]) {

case 0x45:

case 0x46:

@@ -1071,7 +1062,6 @@ ip_heuristic_guess(netdissect_options *ndo,

case 0x4f:

ip_print(ndo, p, length);

break;

-#ifdef INET6

case 0x60:

case 0x61:

case 0x62:

@@ -1090,7 +1080,6 @@ ip_heuristic_guess(netdissect_options *ndo,

case 0x6f:

ip6_print(ndo, p, length);

break;

-#endif

default:

return 0; /* did not find a ip header */

break;

@@ -1099,8 +1088,8 @@ ip_heuristic_guess(netdissect_options *ndo,

}

static int

-juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) {

+juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)

int tlv_value;

/* TLVs < 128 are little endian encoded */

@@ -1147,12 +1136,12 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) {

static int

juniper_parse_header(netdissect_options *ndo,

- const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {

+ const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info)

const struct juniper_cookie_table_t *lp = juniper_cookie_table;

u_int idx, jnx_ext_len, jnx_header_len = 0;

- u_int8_t tlv_type,tlv_len;

- u_int32_t control_word;

+ uint8_t tlv_type,tlv_len;

+ uint32_t control_word;

int tlv_value;

const u_char *tptr;