The Tcpdump Group git mirrors - tcpdump/blobdiff

* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

*/

* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

*/

+#define NETDISSECT_REWORKED

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <stdio.h>

#include <string.h>

#include <stdio.h>

#include <string.h>

-#include <pcap.h>

-#include "addrtoname.h"

#include "interface.h"

+#include "addrtoname.h"

#include "ethertype.h"

#include "nlpid.h"

#include "extract.h"

#include "oui.h"

#include "ethertype.h"

#include "nlpid.h"

#include "extract.h"

#include "oui.h"

-static void frf15_print(const u_char *, u_int);

+static void frf15_print(netdissect_options *ndo, const u_char *, u_int);

/*

* the frame relay header has a variable length

/*

* the frame relay header has a variable length

* save the flags dep. on address length

*/

static int parse_q922_addr(const u_char *p, u_int *dlci,

* save the flags dep. on address length

*/

static int parse_q922_addr(const u_char *p, u_int *dlci,

- u_int *addr_len, u_int8_t *flags)

+ u_int *addr_len, uint8_t *flags)

{

if ((p[0] & FR_EA_BIT))

return -1;

{

if ((p[0] & FR_EA_BIT))

return -1;

char *q922_string(const u_char *p) {

static u_int dlci, addr_len;

char *q922_string(const u_char *p) {

static u_int dlci, addr_len;

- static u_int8_t flags[4];

+ static uint8_t flags[4];

static char buffer[sizeof("DLCI xxxxxxxxxx")];

memset(buffer, 0, sizeof(buffer));

static char buffer[sizeof("DLCI xxxxxxxxxx")];

memset(buffer, 0, sizeof(buffer));

}

static void

}

static void

-fr_hdr_print(int length, u_int addr_len, u_int dlci, u_int8_t *flags, u_int16_t nlpid)

+fr_hdr_print(netdissect_options *ndo,

+ int length, u_int addr_len, u_int dlci, uint8_t *flags, uint16_t nlpid)

{

- if (qflag) {

- (void)printf("Q.922, DLCI %u, length %u: ",

+ if (ndo->ndo_qflag) {

+ ND_PRINT((ndo, "Q.922, DLCI %u, length %u: ",

dlci,

- length);

+ length));

} else {

if (nlpid <= 0xff) /* if its smaller than 256 then its a NLPID */

} else {

if (nlpid <= 0xff) /* if its smaller than 256 then its a NLPID */

- (void)printf("Q.922, hdr-len %u, DLCI %u, Flags [%s], NLPID %s (0x%02x), length %u: ",

+ ND_PRINT((ndo, "Q.922, hdr-len %u, DLCI %u, Flags [%s], NLPID %s (0x%02x), length %u: ",

addr_len,

dlci,

bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),

tok2str(nlpid_values,"unknown", nlpid),

nlpid,

addr_len,

dlci,

bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),

tok2str(nlpid_values,"unknown", nlpid),

nlpid,

- length);

+ length));

else /* must be an ethertype */

- (void)printf("Q.922, hdr-len %u, DLCI %u, Flags [%s], cisco-ethertype %s (0x%04x), length %u: ",

+ ND_PRINT((ndo, "Q.922, hdr-len %u, DLCI %u, Flags [%s], cisco-ethertype %s (0x%04x), length %u: ",

addr_len,

dlci,

bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),

tok2str(ethertype_values, "unknown", nlpid),

nlpid,

addr_len,

dlci,

bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),

tok2str(ethertype_values, "unknown", nlpid),

nlpid,

- length);

+ length));

}

u_int

}

u_int

-fr_if_print(const struct pcap_pkthdr *h, register const u_char *p)

+fr_if_print(netdissect_options *ndo,

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

{

register u_int length = h->len;

register u_int caplen = h->caplen;

{

register u_int length = h->len;

register u_int caplen = h->caplen;

- TCHECK2(*p, 4); /* minimum frame header length */

+ ND_TCHECK2(*p, 4); /* minimum frame header length */

- if ((length = fr_print(p, length)) == 0)

+ if ((length = fr_print(ndo, p, length)) == 0)

return (0);

else

return length;

trunc:

return (0);

else

return length;

trunc:

- printf("[|fr]");

+ ND_PRINT((ndo, "[|fr]"));

return caplen;

}

u_int

return caplen;

}

u_int

-fr_print(register const u_char *p, u_int length)

+fr_print(netdissect_options *ndo,

+ register const u_char *p, u_int length)

{

- u_int16_t extracted_ethertype;

+ uint16_t extracted_ethertype;

u_int dlci;

u_int addr_len;

u_int dlci;

u_int addr_len;

- u_int16_t nlpid;

+ uint16_t nlpid;

u_int hdr_len;

- u_int8_t flags[4];

+ uint8_t flags[4];

if (parse_q922_addr(p, &dlci, &addr_len, flags)) {

- printf("Q.922, invalid address");

+ ND_PRINT((ndo, "Q.922, invalid address"));

return 0;

}

return 0;

}

- TCHECK2(*p,addr_len+1+1);

+ ND_TCHECK2(*p, addr_len+1+1);

hdr_len = fr_hdrlen(p, addr_len);

- TCHECK2(*p,hdr_len);

+ ND_TCHECK2(*p, hdr_len);

if (p[addr_len] != 0x03 && dlci != 0) {

/* lets figure out if we have cisco style encapsulation: */

extracted_ethertype = EXTRACT_16BITS(p+addr_len);

if (p[addr_len] != 0x03 && dlci != 0) {

/* lets figure out if we have cisco style encapsulation: */

extracted_ethertype = EXTRACT_16BITS(p+addr_len);

- if (eflag)

- fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype);

+ if (ndo->ndo_eflag)

+ fr_hdr_print(ndo, length, addr_len, dlci, flags, extracted_ethertype);

- if (ethertype_print(gndo, extracted_ethertype,

+ if (ethertype_print(ndo, extracted_ethertype,

p+addr_len+ETHERTYPE_LEN,

length-addr_len-ETHERTYPE_LEN,

length-addr_len-ETHERTYPE_LEN) == 0)

/* ether_type not known, probably it wasn't one */

p+addr_len+ETHERTYPE_LEN,

length-addr_len-ETHERTYPE_LEN,

length-addr_len-ETHERTYPE_LEN) == 0)

/* ether_type not known, probably it wasn't one */

- printf("UI %02x! ", p[addr_len]);

+ ND_PRINT((ndo, "UI %02x! ", p[addr_len]));

else

return hdr_len;

}

if (!p[addr_len + 1]) { /* pad byte should be used with 3-byte Q.922 */

if (addr_len != 3)

else

return hdr_len;

}

if (!p[addr_len + 1]) { /* pad byte should be used with 3-byte Q.922 */

if (addr_len != 3)

- printf("Pad! ");

+ ND_PRINT((ndo, "Pad! "));

} else if (addr_len == 3)

- printf("No pad! ");

+ ND_PRINT((ndo, "No pad! "));

nlpid = p[hdr_len - 1];

- if (eflag)

- fr_hdr_print(length, addr_len, dlci, flags, nlpid);

+ if (ndo->ndo_eflag)

+ fr_hdr_print(ndo, length, addr_len, dlci, flags, nlpid);

p += hdr_len;

length -= hdr_len;

switch (nlpid) {

case NLPID_IP:

p += hdr_len;

length -= hdr_len;

switch (nlpid) {

case NLPID_IP:

- ip_print(gndo, p, length);

+ ip_print(ndo, p, length);

break;

#ifdef INET6

case NLPID_IP6:

break;

#ifdef INET6

case NLPID_IP6:

- ip6_print(gndo, p, length);

+ ip6_print(ndo, p, length);

break;

#endif

case NLPID_CLNP:

case NLPID_ESIS:

case NLPID_ISIS:

break;

#endif

case NLPID_CLNP:

case NLPID_ESIS:

case NLPID_ISIS:

- isoclns_print(p-1, length+1, length+1); /* OSI printers need the NLPID field */

+ isoclns_print(ndo, p - 1, length + 1, length + 1); /* OSI printers need the NLPID field */

break;

case NLPID_SNAP:

break;

case NLPID_SNAP:

- if (snap_print(p, length, length, 0) == 0) {

+ if (snap_print(ndo, p, length, length, 0) == 0) {

/* ether_type not known, print raw packet */

- if (!eflag)

- fr_hdr_print(length + hdr_len, hdr_len,

+ if (!ndo->ndo_eflag)

+ fr_hdr_print(ndo, length + hdr_len, hdr_len,

dlci, flags, nlpid);

- if (!suppress_default_print)

- default_print(p - hdr_len, length + hdr_len);

+ if (!ndo->ndo_suppress_default_print)

+ ND_DEFAULTPRINT(p - hdr_len, length + hdr_len);

}

break;

case NLPID_Q933:

}

break;

case NLPID_Q933:

- q933_print(p, length);

+ q933_print(ndo, p, length);

break;

case NLPID_MFR:

break;

case NLPID_MFR:

- frf15_print(p, length);

+ frf15_print(ndo, p, length);

break;

case NLPID_PPP:

break;

case NLPID_PPP:

- ppp_print(p, length);

+ ppp_print(ndo, p, length);

break;

default:

break;

default:

- if (!eflag)

- fr_hdr_print(length + hdr_len, addr_len,

+ if (!ndo->ndo_eflag)

+ fr_hdr_print(ndo, length + hdr_len, addr_len,

dlci, flags, nlpid);

- if (!xflag)

- default_print(p, length);

+ if (!ndo->ndo_xflag)

+ ND_DEFAULTPRINT(p, length);

}

return hdr_len;

trunc:

}

return hdr_len;

trunc:

- printf("[|fr]");

+ ND_PRINT((ndo, "[|fr]"));

return 0;

}

u_int

return 0;

}

u_int

-mfr_if_print(const struct pcap_pkthdr *h, register const u_char *p)

+mfr_if_print(netdissect_options *ndo,

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

{

register u_int length = h->len;

register u_int caplen = h->caplen;

{

register u_int length = h->len;

register u_int caplen = h->caplen;

- TCHECK2(*p, 2); /* minimum frame header length */

+ ND_TCHECK2(*p, 2); /* minimum frame header length */

- if ((length = mfr_print(p, length)) == 0)

+ if ((length = mfr_print(ndo, p, length)) == 0)

return (0);

else

return length;

trunc:

return (0);

else

return length;

trunc:

- printf("[|mfr]");

+ ND_PRINT((ndo, "[|mfr]"));

return caplen;

}

return caplen;

}

#define MFR_ID_STRING_MAXLEN 50

struct ie_tlv_header_t {

#define MFR_ID_STRING_MAXLEN 50

struct ie_tlv_header_t {

- u_int8_t ie_type;

- u_int8_t ie_len;

+ uint8_t ie_type;

+ uint8_t ie_len;

};

u_int

};

u_int

-mfr_print(register const u_char *p, u_int length)

+mfr_print(netdissect_options *ndo,

+ register const u_char *p, u_int length)

{

u_int tlen,idx,hdr_len = 0;

{

u_int tlen,idx,hdr_len = 0;

- u_int16_t sequence_num;

- u_int8_t ie_type,ie_len;

- const u_int8_t *tptr;

+ uint16_t sequence_num;

+ uint8_t ie_type,ie_len;

+ const uint8_t *tptr;

/*

* +----+----+----+----+----+----+----+----+

*/

* +----+----+----+----+----+----+----+----+

*/

- TCHECK2(*p, 4); /* minimum frame header length */

+ ND_TCHECK2(*p, 4); /* minimum frame header length */

if ((p[0] & MFR_BEC_MASK) == MFR_CTRL_FRAME && p[1] == 0) {

- printf("FRF.16 Control, Flags [%s], %s, length %u",

+ ND_PRINT((ndo, "FRF.16 Control, Flags [%s], %s, length %u",

bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)),

tok2str(mfr_ctrl_msg_values,"Unknown Message (0x%02x)",p[2]),

bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)),

tok2str(mfr_ctrl_msg_values,"Unknown Message (0x%02x)",p[2]),

- length);

+ length));

tptr = p + 3;

tlen = length -3;

hdr_len = 3;

tptr = p + 3;

tlen = length -3;

hdr_len = 3;

- if (!vflag)

+ if (!ndo->ndo_vflag)

return hdr_len;

while (tlen>sizeof(struct ie_tlv_header_t)) {

return hdr_len;

while (tlen>sizeof(struct ie_tlv_header_t)) {

- TCHECK2(*tptr, sizeof(struct ie_tlv_header_t));

+ ND_TCHECK2(*tptr, sizeof(struct ie_tlv_header_t));

ie_type=tptr[0];

ie_len=tptr[1];

ie_type=tptr[0];

ie_len=tptr[1];

- printf("\n\tIE %s (%u), length %u: ",

+ ND_PRINT((ndo, "\n\tIE %s (%u), length %u: ",

tok2str(mfr_ctrl_ie_values,"Unknown",ie_type),

ie_type,

tok2str(mfr_ctrl_ie_values,"Unknown",ie_type),

ie_type,

- ie_len);

+ ie_len));

/* infinite loop check */

if (ie_type == 0 || ie_len <= sizeof(struct ie_tlv_header_t))

return hdr_len;

/* infinite loop check */

if (ie_type == 0 || ie_len <= sizeof(struct ie_tlv_header_t))

return hdr_len;

- TCHECK2(*tptr,ie_len);

+ ND_TCHECK2(*tptr, ie_len);

tptr+=sizeof(struct ie_tlv_header_t);

/* tlv len includes header */

ie_len-=sizeof(struct ie_tlv_header_t);

tptr+=sizeof(struct ie_tlv_header_t);

/* tlv len includes header */

ie_len-=sizeof(struct ie_tlv_header_t);

switch (ie_type) {

case MFR_CTRL_IE_MAGIC_NUM:

switch (ie_type) {

case MFR_CTRL_IE_MAGIC_NUM:

- printf("0x%08x",EXTRACT_32BITS(tptr));

+ ND_PRINT((ndo, "0x%08x", EXTRACT_32BITS(tptr)));

break;

case MFR_CTRL_IE_BUNDLE_ID: /* same message format */

case MFR_CTRL_IE_LINK_ID:

for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {

if (*(tptr+idx) != 0) /* don't print null termination */

break;

case MFR_CTRL_IE_BUNDLE_ID: /* same message format */

case MFR_CTRL_IE_LINK_ID:

for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {

if (*(tptr+idx) != 0) /* don't print null termination */

- safeputchar(*(tptr+idx));

+ safeputchar(ndo, *(tptr + idx));

else

break;

}

else

break;

}

case MFR_CTRL_IE_TIMESTAMP:

if (ie_len == sizeof(struct timeval)) {

case MFR_CTRL_IE_TIMESTAMP:

if (ie_len == sizeof(struct timeval)) {

- ts_print((const struct timeval *)tptr);

+ ts_print(ndo, (const struct timeval *)tptr);

break;

}

/* fall through and hexdump if no unix timestamp */

break;

}

/* fall through and hexdump if no unix timestamp */

case MFR_CTRL_IE_CAUSE:

default:

case MFR_CTRL_IE_CAUSE:

default:

- if (vflag <= 1)

- print_unknown_data(gndo,tptr,"\n\t ",ie_len);

+ if (ndo->ndo_vflag <= 1)

+ print_unknown_data(ndo, tptr, "\n\t ", ie_len);

break;

}

/* do we want to see a hexdump of the IE ? */

break;

}

/* do we want to see a hexdump of the IE ? */

- if (vflag > 1 )

- print_unknown_data(gndo,tptr,"\n\t ",ie_len);

+ if (ndo->ndo_vflag > 1 )

+ print_unknown_data(ndo, tptr, "\n\t ", ie_len);

tlen-=ie_len;

tptr+=ie_len;

tlen-=ie_len;

tptr+=ie_len;

/* whole packet or first fragment ? */

if ((p[0] & MFR_BEC_MASK) == MFR_FRAG_FRAME ||

(p[0] & MFR_BEC_MASK) == MFR_B_BIT) {

/* whole packet or first fragment ? */

if ((p[0] & MFR_BEC_MASK) == MFR_FRAG_FRAME ||

(p[0] & MFR_BEC_MASK) == MFR_B_BIT) {

- printf("FRF.16 Frag, seq %u, Flags [%s], ",

+ ND_PRINT((ndo, "FRF.16 Frag, seq %u, Flags [%s], ",

sequence_num,

- bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)));

+ bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))));

hdr_len = 2;

- fr_print(p+hdr_len,length-hdr_len);

+ fr_print(ndo, p+hdr_len,length-hdr_len);

return hdr_len;

}

/* must be a middle or the last fragment */

return hdr_len;

}

/* must be a middle or the last fragment */

- printf("FRF.16 Frag, seq %u, Flags [%s]",

+ ND_PRINT((ndo, "FRF.16 Frag, seq %u, Flags [%s]",

sequence_num,

- bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)));

- print_unknown_data(gndo,p,"\n\t",length);

+ bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))));

+ print_unknown_data(ndo, p, "\n\t", length);

return hdr_len;

trunc:

return hdr_len;

trunc:

- printf("[|mfr]");

+ ND_PRINT((ndo, "[|mfr]"));

return length;

}

return length;

}

#define FR_FRF15_FRAGTYPE 0x01

static void

#define FR_FRF15_FRAGTYPE 0x01

static void

-frf15_print (const u_char *p, u_int length) {

+frf15_print(netdissect_options *ndo,

+ const u_char *p, u_int length) {

- u_int16_t sequence_num, flags;

+ uint16_t sequence_num, flags;

flags = p[0]&MFR_BEC_MASK;

sequence_num = (p[0]&0x1e)<<7 | p[1];

flags = p[0]&MFR_BEC_MASK;

sequence_num = (p[0]&0x1e)<<7 | p[1];

- printf("FRF.15, seq 0x%03x, Flags [%s],%s Fragmentation, length %u",

+ ND_PRINT((ndo, "FRF.15, seq 0x%03x, Flags [%s],%s Fragmentation, length %u",

sequence_num,

bittok2str(frf_flag_values,"none",flags),

p[0]&FR_FRF15_FRAGTYPE ? "Interface" : "End-to-End",

sequence_num,

bittok2str(frf_flag_values,"none",flags),

p[0]&FR_FRF15_FRAGTYPE ? "Interface" : "End-to-End",

- length);

+ length));

/* TODO:

* depending on all permutations of the B, E and C bit

/* TODO:

* depending on all permutations of the B, E and C bit

NULL

};

NULL

};

-static int fr_q933_print_ie_codeset5(const struct ie_tlv_header_t *ie_p,

- const u_char *p);

+static int fr_q933_print_ie_codeset5(netdissect_options *ndo,

+ const struct ie_tlv_header_t *ie_p, const u_char *p);

-typedef int (*codeset_pr_func_t)(const struct ie_tlv_header_t *ie_p,

- const u_char *p);

+typedef int (*codeset_pr_func_t)(netdissect_options *,

+ const struct ie_tlv_header_t *ie_p, const u_char *p);

/* array of 16 codepages - currently we only support codepage 1,5 */

static const codeset_pr_func_t fr_q933_print_ie_codeset[] = {

/* array of 16 codepages - currently we only support codepage 1,5 */

static const codeset_pr_func_t fr_q933_print_ie_codeset[] = {

};

void

};

void

-q933_print(const u_char *p, u_int length)

+q933_print(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

const u_char *ptemp = p;

struct ie_tlv_header_t *ie_p;

{

const u_char *ptemp = p;

struct ie_tlv_header_t *ie_p;

u_int ie_is_known = 0;

if (length < 9) { /* shortest: Q.933a LINK VERIFY */

u_int ie_is_known = 0;

if (length < 9) { /* shortest: Q.933a LINK VERIFY */

- printf("[|q.933]");

+ ND_PRINT((ndo, "[|q.933]"));

return;

}

return;

}

is_ansi = 1;

}

is_ansi = 1;

}

- printf("%s", eflag ? "" : "Q.933, ");

+ ND_PRINT((ndo, "%s", ndo->ndo_eflag ? "" : "Q.933, "));

/* printing out header part */

- printf("%s, codeset %u", is_ansi ? "ANSI" : "CCITT", codeset);

+ ND_PRINT((ndo, "%s, codeset %u", is_ansi ? "ANSI" : "CCITT", codeset));

if (p[0]) {

- printf(", Call Ref: 0x%02x", p[0]);

+ ND_PRINT((ndo, ", Call Ref: 0x%02x", p[0]));

}

- if (vflag) {

- printf(", %s (0x%02x), length %u",

+ if (ndo->ndo_vflag) {

+ ND_PRINT((ndo, ", %s (0x%02x), length %u",

tok2str(fr_q933_msg_values,

"unknown message", p[1]),

p[1],

tok2str(fr_q933_msg_values,

"unknown message", p[1]),

p[1],

- length);

+ length));

} else {

- printf(", %s",

+ ND_PRINT((ndo, ", %s",

tok2str(fr_q933_msg_values,

- "unknown message 0x%02x", p[1]));

+ "unknown message 0x%02x", p[1])));

}

olen = length; /* preserve the original length for non verbose mode */

if (length < (u_int)(2 - is_ansi)) {

}

olen = length; /* preserve the original length for non verbose mode */

if (length < (u_int)(2 - is_ansi)) {

- printf("[|q.933]");

+ ND_PRINT((ndo, "[|q.933]"));

return;

}

length -= 2 + is_ansi;

return;

}

length -= 2 + is_ansi;

ie_p = (struct ie_tlv_header_t *)ptemp;

if (length < sizeof(struct ie_tlv_header_t) ||

length < sizeof(struct ie_tlv_header_t) + ie_p->ie_len) {

ie_p = (struct ie_tlv_header_t *)ptemp;

if (length < sizeof(struct ie_tlv_header_t) ||

length < sizeof(struct ie_tlv_header_t) + ie_p->ie_len) {

- if (vflag) { /* not bark if there is just a trailer */

- printf("\n[|q.933]");

+ if (ndo->ndo_vflag) { /* not bark if there is just a trailer */

+ ND_PRINT((ndo, "\n[|q.933]"));

} else {

- printf(", length %u",olen);

+ ND_PRINT((ndo, ", length %u", olen));

}

return;

}

return;

}

/* lets do the full IE parsing only in verbose mode

* however some IEs (DLCI Status, Link Verify)

* are also interestting in non-verbose mode */

/* lets do the full IE parsing only in verbose mode

* however some IEs (DLCI Status, Link Verify)

* are also interestting in non-verbose mode */

- if (vflag) {

- printf("\n\t%s IE (0x%02x), length %u: ",

+ if (ndo->ndo_vflag) {

+ ND_PRINT((ndo, "\n\t%s IE (0x%02x), length %u: ",

tok2str(fr_q933_ie_codesets[codeset],

"unknown", ie_p->ie_type),

ie_p->ie_type,

tok2str(fr_q933_ie_codesets[codeset],

"unknown", ie_p->ie_type),

ie_p->ie_type,

- ie_p->ie_len);

+ ie_p->ie_len));

}

/* sanity check */

}

/* sanity check */

}

if (fr_q933_print_ie_codeset[codeset] != NULL) {

}

if (fr_q933_print_ie_codeset[codeset] != NULL) {

- ie_is_known = fr_q933_print_ie_codeset[codeset](ie_p, ptemp);

+ ie_is_known = fr_q933_print_ie_codeset[codeset](ndo, ie_p, ptemp);

}

- if (vflag >= 1 && !ie_is_known) {

- print_unknown_data(gndo,ptemp+2,"\n\t",ie_p->ie_len);

+ if (ndo->ndo_vflag >= 1 && !ie_is_known) {

+ print_unknown_data(ndo, ptemp+2, "\n\t", ie_p->ie_len);

}

/* do we want to see a hexdump of the IE ? */

}

/* do we want to see a hexdump of the IE ? */

- if (vflag> 1 && ie_is_known) {

- print_unknown_data(gndo,ptemp+2,"\n\t ",ie_p->ie_len);

+ if (ndo->ndo_vflag> 1 && ie_is_known) {

+ print_unknown_data(ndo, ptemp+2, "\n\t ", ie_p->ie_len);

}

length = length - ie_p->ie_len - 2;

ptemp = ptemp + ie_p->ie_len + 2;

}

length = length - ie_p->ie_len - 2;

ptemp = ptemp + ie_p->ie_len + 2;

}

- if (!vflag) {

- printf(", length %u",olen);

+ if (!ndo->ndo_vflag) {

+ ND_PRINT((ndo, ", length %u", olen));

}

static int

}

static int

-fr_q933_print_ie_codeset5(const struct ie_tlv_header_t *ie_p, const u_char *p)

+fr_q933_print_ie_codeset5(netdissect_options *ndo,

+ const struct ie_tlv_header_t *ie_p, const u_char *p)

{

u_int dlci;

{

u_int dlci;

case FR_LMI_ANSI_REPORT_TYPE_IE: /* fall through */

case FR_LMI_CCITT_REPORT_TYPE_IE:

case FR_LMI_ANSI_REPORT_TYPE_IE: /* fall through */

case FR_LMI_CCITT_REPORT_TYPE_IE:

- if (vflag) {

- printf("%s (%u)",

+ if (ndo->ndo_vflag) {

+ ND_PRINT((ndo, "%s (%u)",

tok2str(fr_lmi_report_type_ie_values,"unknown",p[2]),

- p[2]);

+ p[2]));

}

return 1;

case FR_LMI_ANSI_LINK_VERIFY_IE: /* fall through */

case FR_LMI_CCITT_LINK_VERIFY_IE:

case FR_LMI_ANSI_LINK_VERIFY_IE_91:

}

return 1;

case FR_LMI_ANSI_LINK_VERIFY_IE: /* fall through */

case FR_LMI_CCITT_LINK_VERIFY_IE:

case FR_LMI_ANSI_LINK_VERIFY_IE_91:

- if (!vflag) {

- printf(", ");

+ if (!ndo->ndo_vflag) {

+ ND_PRINT((ndo, ", "));

}

- printf("TX Seq: %3d, RX Seq: %3d", p[2], p[3]);

+ ND_PRINT((ndo, "TX Seq: %3d, RX Seq: %3d", p[2], p[3]));

return 1;

case FR_LMI_ANSI_PVC_STATUS_IE: /* fall through */

case FR_LMI_CCITT_PVC_STATUS_IE:

return 1;

case FR_LMI_ANSI_PVC_STATUS_IE: /* fall through */

case FR_LMI_CCITT_PVC_STATUS_IE:

- if (!vflag) {

- printf(", ");

+ if (!ndo->ndo_vflag) {

+ ND_PRINT((ndo, ", "));

}

/* now parse the DLCI information element. */

if ((ie_p->ie_len < 3) ||

}

/* now parse the DLCI information element. */

if ((ie_p->ie_len < 3) ||

!(p[5] & 0x80))) ||

(ie_p->ie_len > 5) ||

!(p[ie_p->ie_len + 1] & 0x80)) {

!(p[5] & 0x80))) ||

(ie_p->ie_len > 5) ||

!(p[ie_p->ie_len + 1] & 0x80)) {

- printf("Invalid DLCI IE");

+ ND_PRINT((ndo, "Invalid DLCI IE"));

}

dlci = ((p[2] & 0x3F) << 4) | ((p[3] & 0x78) >> 3);

}

dlci = ((p[2] & 0x3F) << 4) | ((p[3] & 0x78) >> 3);

dlci = (dlci << 13) | (p[4] & 0x7F) | ((p[5] & 0x7E) >> 1);

}

dlci = (dlci << 13) | (p[4] & 0x7F) | ((p[5] & 0x7E) >> 1);

}

- printf("DLCI %u: status %s%s", dlci,

+ ND_PRINT((ndo, "DLCI %u: status %s%s", dlci,

p[ie_p->ie_len + 1] & 0x8 ? "New, " : "",

- p[ie_p->ie_len + 1] & 0x2 ? "Active" : "Inactive");

+ p[ie_p->ie_len + 1] & 0x2 ? "Active" : "Inactive"));

return 1;

}

return 1;

}