The Tcpdump Group git mirrors - tcpdump/blobdiff

index 327b852fe803eb61e2ef3d4a2d47db3199a123c7..fec76cab3ff2e12ce29c23f137fb66a9f3f2bb51 100644 (file)

--- a/print-slow.c

+++ b/print-slow.c

@@ -18,21 +18,13 @@

* Original code by Hannes Gredler ([email protected])

-#ifndef lint

-static const char rcsid[] _U_ =

- "@(#) $Header: /tcpdump/master/tcpdump/print-slow.c,v 1.5 2006-05-18 08:23:26 hannes Exp $";

-#endif

+#define NETDISSECT_REWORKED

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <tcpdump-stdinc.h>

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <tcpdump-stdinc.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

#include "interface.h"

#include "extract.h"

#include "addrtoname.h"

#include "interface.h"

#include "extract.h"

#include "addrtoname.h"

@@ -40,8 +32,8 @@ static const char rcsid[] _U_ =

#include "oui.h"

struct slow_common_header_t {

#include "oui.h"

struct slow_common_header_t {

- u_int8_t proto_subtype;

- u_int8_t version;

+ uint8_t proto_subtype;

+ uint8_t version;

};

#define SLOW_PROTO_LACP 1

};

#define SLOW_PROTO_LACP 1

@@ -67,7 +59,7 @@ static const struct tok slow_oam_flag_values[] = {

{ 0x0020, "Remote Evaluating" },

{ 0x0040, "Remote Stable" },

{ 0, NULL}

{ 0x0020, "Remote Evaluating" },

{ 0x0040, "Remote Stable" },

{ 0, NULL}

-};

+};

#define SLOW_OAM_CODE_INFO 0x00

#define SLOW_OAM_CODE_EVENT_NOTIF 0x01

#define SLOW_OAM_CODE_INFO 0x00

#define SLOW_OAM_CODE_EVENT_NOTIF 0x01

@@ -87,15 +79,15 @@ static const struct tok slow_oam_code_values[] = {

};

struct slow_oam_info_t {

};

struct slow_oam_info_t {

- u_int8_t info_type;

- u_int8_t info_length;

- u_int8_t oam_version;

- u_int8_t revision[2];

- u_int8_t state;

- u_int8_t oam_config;

- u_int8_t oam_pdu_config;

- u_int8_t oui[3];

- u_int8_t vendor_private[4];

+ uint8_t info_type;

+ uint8_t info_length;

+ uint8_t oam_version;

+ uint8_t revision[2];

+ uint8_t state;

+ uint8_t oam_config;

+ uint8_t oam_pdu_config[2];

+ uint8_t oui[3];

+ uint8_t vendor_private[4];

};

#define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00

};

#define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00

@@ -157,25 +149,29 @@ static const struct tok slow_oam_link_event_values[] = {

};

struct slow_oam_link_event_t {

};

struct slow_oam_link_event_t {

- u_int8_t event_type;

- u_int8_t event_length;

- u_int8_t time_stamp[2];

- u_int8_t window[8];

- u_int8_t threshold[8];

- u_int8_t errors[8];

- u_int8_t errors_running_total[8];

- u_int8_t event_running_total[4];

+ uint8_t event_type;

+ uint8_t event_length;

+ uint8_t time_stamp[2];

+ uint8_t window[8];

+ uint8_t threshold[8];

+ uint8_t errors[8];

+ uint8_t errors_running_total[8];

+ uint8_t event_running_total[4];

};

struct slow_oam_variablerequest_t {

};

struct slow_oam_variablerequest_t {

- u_int8_t branch;

- u_int8_t leaf[2];

+ uint8_t branch;

+ uint8_t leaf[2];

};

struct slow_oam_variableresponse_t {

};

struct slow_oam_variableresponse_t {

- u_int8_t branch;

- u_int8_t leaf[2];

- u_int8_t length;

+ uint8_t branch;

+ uint8_t leaf[2];

+ uint8_t length;

+};

+struct slow_oam_loopbackctrl_t {

+ uint8_t command;

};

static const struct tok slow_oam_loopbackctrl_cmd_values[] = {

};

static const struct tok slow_oam_loopbackctrl_cmd_values[] = {

@@ -185,8 +181,8 @@ static const struct tok slow_oam_loopbackctrl_cmd_values[] = {

};

struct tlv_header_t {

};

struct tlv_header_t {

- u_int8_t type;

- u_int8_t length;

+ uint8_t type;

+ uint8_t length;

};

#define LACP_TLV_TERMINATOR 0x00

};

#define LACP_TLV_TERMINATOR 0x00

@@ -209,14 +205,14 @@ static const struct tok slow_tlv_values[] = {

};

struct lacp_tlv_actor_partner_info_t {

};

struct lacp_tlv_actor_partner_info_t {

- u_int8_t sys_pri[2];

- u_int8_t sys[ETHER_ADDR_LEN];

- u_int8_t key[2];

- u_int8_t port_pri[2];

- u_int8_t port[2];

- u_int8_t state;

- u_int8_t pad[3];

-};

+ uint8_t sys_pri[2];

+ uint8_t sys[ETHER_ADDR_LEN];

+ uint8_t key[2];

+ uint8_t port_pri[2];

+ uint8_t port[2];

+ uint8_t state;

+ uint8_t pad[3];

+};

static const struct tok lacp_tlv_actor_partner_info_state_values[] = {

{ 0x01, "Activity"},

static const struct tok lacp_tlv_actor_partner_info_state_values[] = {

{ 0x01, "Activity"},

@@ -231,33 +227,34 @@ static const struct tok lacp_tlv_actor_partner_info_state_values[] = {

};

struct lacp_tlv_collector_info_t {

};

struct lacp_tlv_collector_info_t {

- u_int8_t max_delay[2];

- u_int8_t pad[12];

-};

+ uint8_t max_delay[2];

+ uint8_t pad[12];

+};

struct marker_tlv_marker_info_t {

- u_int8_t req_port[2];

- u_int8_t req_sys[ETHER_ADDR_LEN];

- u_int8_t req_trans_id[4];

- u_int8_t pad[2];

-};

+ uint8_t req_port[2];

+ uint8_t req_sys[ETHER_ADDR_LEN];

+ uint8_t req_trans_id[4];

+ uint8_t pad[2];

+};

struct lacp_marker_tlv_terminator_t {

- u_int8_t pad[50];

-};

+ uint8_t pad[50];

+};

-void slow_marker_lacp_print(register const u_char *, register u_int);

-void slow_oam_print(register const u_char *, register u_int);

+static void slow_marker_lacp_print(netdissect_options *, register const u_char *, register u_int);

+static void slow_oam_print(netdissect_options *, register const u_char *, register u_int);

const struct slow_common_header_t *slow_com_header;

void

const struct slow_common_header_t *slow_com_header;

void

-slow_print(register const u_char *pptr, register u_int len) {

+slow_print(netdissect_options *ndo,

+ register const u_char *pptr, register u_int len) {

int print_version;

slow_com_header = (const struct slow_common_header_t *)pptr;

int print_version;

slow_com_header = (const struct slow_common_header_t *)pptr;

- TCHECK(*slow_com_header);

+ ND_TCHECK(*slow_com_header);

* Sanity checking of the header.

@@ -265,7 +262,7 @@ slow_print(register const u_char *pptr, register u_int len) {

switch (slow_com_header->proto_subtype) {

case SLOW_PROTO_LACP:

if (slow_com_header->version != LACP_VERSION) {

switch (slow_com_header->proto_subtype) {

case SLOW_PROTO_LACP:

if (slow_com_header->version != LACP_VERSION) {

- printf("LACP version %u packet not supported",slow_com_header->version);

+ ND_PRINT((ndo, "LACP version %u packet not supported",slow_com_header->version));

return;

}

print_version = 1;

return;

}

print_version = 1;

@@ -273,7 +270,7 @@ slow_print(register const u_char *pptr, register u_int len) {

case SLOW_PROTO_MARKER:

if (slow_com_header->version != MARKER_VERSION) {

case SLOW_PROTO_MARKER:

if (slow_com_header->version != MARKER_VERSION) {

- printf("MARKER version %u packet not supported",slow_com_header->version);

+ ND_PRINT((ndo, "MARKER version %u packet not supported",slow_com_header->version));

return;

}

print_version = 1;

return;

}

print_version = 1;

@@ -290,24 +287,24 @@ slow_print(register const u_char *pptr, register u_int len) {

}

if (print_version) {

}

if (print_version) {

- printf("%sv%u, length %u",

+ ND_PRINT((ndo, "%sv%u, length %u",

tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype),

slow_com_header->version,

tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype),

slow_com_header->version,

- len);

+ len));

} else {

/* some slow protos don't have a version number in the header */

} else {

/* some slow protos don't have a version number in the header */

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

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

tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype),

- len);

+ len));

}

/* unrecognized subtype */

if (print_version == -1) {

}

/* unrecognized subtype */

if (print_version == -1) {

- print_unknown_data(pptr, "\n\t", len);

+ print_unknown_data(ndo, pptr, "\n\t", len);

return;

}

return;

}

- if (!vflag)

+ if (!ndo->ndo_vflag)

return;

switch (slow_com_header->proto_subtype) {

return;

switch (slow_com_header->proto_subtype) {

@@ -316,7 +313,7 @@ slow_print(register const u_char *pptr, register u_int len) {

case SLOW_PROTO_OAM:

/* skip proto_subtype */

case SLOW_PROTO_OAM:

/* skip proto_subtype */

- slow_oam_print(pptr+1, len-1);

+ slow_oam_print(ndo, pptr+1, len-1);

break;

case SLOW_PROTO_LACP: /* LACP and MARKER share the same semantics */

break;

case SLOW_PROTO_LACP: /* LACP and MARKER share the same semantics */

@@ -324,16 +321,18 @@ slow_print(register const u_char *pptr, register u_int len) {

/* skip slow_common_header */

len -= sizeof(const struct slow_common_header_t);

pptr += sizeof(const struct slow_common_header_t);

/* skip slow_common_header */

len -= sizeof(const struct slow_common_header_t);

pptr += sizeof(const struct slow_common_header_t);

- slow_marker_lacp_print(pptr, len);

+ slow_marker_lacp_print(ndo, pptr, len);

break;

}

return;

trunc:

break;

}

return;

trunc:

- printf("\n\t\t packet exceeded snapshot");

+ ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));

}

-void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

+static void

+slow_marker_lacp_print(netdissect_options *ndo,

+ register const u_char *tptr, register u_int tlen) {

const struct tlv_header_t *tlv_header;

const u_char *tlv_tptr;

const struct tlv_header_t *tlv_header;

const u_char *tlv_tptr;

@@ -345,26 +344,26 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

const struct lacp_tlv_collector_info_t *lacp_tlv_collector_info;

const struct marker_tlv_marker_info_t *marker_tlv_marker_info;

} tlv_ptr;

const struct lacp_tlv_collector_info_t *lacp_tlv_collector_info;

const struct marker_tlv_marker_info_t *marker_tlv_marker_info;

} tlv_ptr;

while(tlen>0) {

/* did we capture enough for fully decoding the tlv header ? */

while(tlen>0) {

/* did we capture enough for fully decoding the tlv header ? */

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

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

tlv_header = (const struct tlv_header_t *)tptr;

tlv_len = tlv_header->length;

tlv_header = (const struct tlv_header_t *)tptr;

tlv_len = tlv_header->length;

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

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

tok2str(slow_tlv_values,

"Unknown",

(slow_com_header->proto_subtype << 8) + tlv_header->type),

tlv_header->type,

tok2str(slow_tlv_values,

"Unknown",

(slow_com_header->proto_subtype << 8) + tlv_header->type),

tlv_header->type,

- tlv_len);

+ tlv_len));

if ((tlv_len < sizeof(struct tlv_header_t) ||

tlv_len > tlen) &&

tlv_header->type != LACP_TLV_TERMINATOR &&

tlv_header->type != MARKER_TLV_TERMINATOR) {

if ((tlv_len < sizeof(struct tlv_header_t) ||

tlv_len > tlen) &&

tlv_header->type != LACP_TLV_TERMINATOR &&

tlv_header->type != MARKER_TLV_TERMINATOR) {

- printf("\n\t-----trailing data-----");

- print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t ",tlen);

+ ND_PRINT((ndo, "\n\t-----trailing data-----"));

+ print_unknown_data(ndo, tptr+sizeof(struct tlv_header_t), "\n\t ", tlen);

return;

}

return;

}

@@ -372,7 +371,7 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

tlv_tlen=tlv_len-sizeof(struct tlv_header_t);

/* did we capture enough for fully decoding the tlv ? */

tlv_tlen=tlv_len-sizeof(struct tlv_header_t);

/* did we capture enough for fully decoding the tlv ? */

- TCHECK2(*tptr, tlv_len);

+ ND_TCHECK2(*tptr, tlv_len);

switch((slow_com_header->proto_subtype << 8) + tlv_header->type) {

@@ -381,34 +380,34 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):

tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr;

case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):

tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr;

- printf("\n\t System %s, System Priority %u, Key %u" \

+ ND_PRINT((ndo, "\n\t System %s, System Priority %u, Key %u" \

", Port %u, Port Priority %u\n\t State Flags [%s]",

- etheraddr_string(tlv_ptr.lacp_tlv_actor_partner_info->sys),

+ etheraddr_string(ndo, tlv_ptr.lacp_tlv_actor_partner_info->sys),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->key),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port_pri),

bittok2str(lacp_tlv_actor_partner_info_state_values,

"none",

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->key),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port),

EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port_pri),

bittok2str(lacp_tlv_actor_partner_info_state_values,

"none",

- tlv_ptr.lacp_tlv_actor_partner_info->state));

+ tlv_ptr.lacp_tlv_actor_partner_info->state)));

break;

case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO):

tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr;

break;

case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO):

tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr;

- printf("\n\t Max Delay %u",

- EXTRACT_16BITS(tlv_ptr.lacp_tlv_collector_info->max_delay));

+ ND_PRINT((ndo, "\n\t Max Delay %u",

+ EXTRACT_16BITS(tlv_ptr.lacp_tlv_collector_info->max_delay)));

break;

case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO):

tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;

break;

case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO):

tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;

- printf("\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x",

- etheraddr_string(tlv_ptr.marker_tlv_marker_info->req_sys),

+ ND_PRINT((ndo, "\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x",

+ etheraddr_string(ndo, tlv_ptr.marker_tlv_marker_info->req_sys),

EXTRACT_16BITS(tlv_ptr.marker_tlv_marker_info->req_port),

- EXTRACT_32BITS(tlv_ptr.marker_tlv_marker_info->req_trans_id));

+ EXTRACT_32BITS(tlv_ptr.marker_tlv_marker_info->req_trans_id)));

break;

@@ -420,24 +419,24 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

tlv_len = sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad) +

sizeof(struct tlv_header_t);

/* tell the user that we modified the length field */

tlv_len = sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad) +

sizeof(struct tlv_header_t);

/* tell the user that we modified the length field */

- if (vflag>1)

- printf(" (=%u)",tlv_len);

+ if (ndo->ndo_vflag>1)

+ ND_PRINT((ndo, " (=%u)", tlv_len));

/* we have messed around with the length field - now we need to check

* again if there are enough bytes on the wire for the hexdump */

/* we have messed around with the length field - now we need to check

* again if there are enough bytes on the wire for the hexdump */

- TCHECK2(tlv_ptr.lacp_marker_tlv_terminator->pad[0],

+ ND_TCHECK2(tlv_ptr.lacp_marker_tlv_terminator->pad[0],

sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad));

}

break;

default:

sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad));

}

break;

default:

- if (vflag <= 1)

- print_unknown_data(tlv_tptr,"\n\t ",tlv_tlen);

+ if (ndo->ndo_vflag <= 1)

+ print_unknown_data(ndo, tlv_tptr, "\n\t ", tlv_tlen);

break;

}

/* do we want to see an additional hexdump ? */

break;

}

/* do we want to see an additional hexdump ? */

- if (vflag > 1) {

- print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t ",

+ if (ndo->ndo_vflag > 1) {

+ print_unknown_data(ndo, tptr+sizeof(struct tlv_header_t), "\n\t ",

tlv_len-sizeof(struct tlv_header_t));

}

tlv_len-sizeof(struct tlv_header_t));

}

@@ -446,21 +445,23 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {

}

return;

trunc:

}

return;

trunc:

- printf("\n\t\t packet exceeded snapshot");

+ ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));

}

-void slow_oam_print(register const u_char *tptr, register u_int tlen) {

+static void

+slow_oam_print(netdissect_options *ndo,

+ register const u_char *tptr, register u_int tlen) {

u_int hexdump;

struct slow_oam_common_header_t {

u_int hexdump;

struct slow_oam_common_header_t {

- u_int8_t flags[2];

- u_int8_t code;

+ uint8_t flags[2];

+ uint8_t code;

};

struct slow_oam_tlv_header_t {

};

struct slow_oam_tlv_header_t {

- u_int8_t type;

- u_int8_t length;

+ uint8_t type;

+ uint8_t length;

};

union {

};

union {

@@ -473,72 +474,73 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

const struct slow_oam_link_event_t *slow_oam_link_event;

const struct slow_oam_variablerequest_t *slow_oam_variablerequest;

const struct slow_oam_variableresponse_t *slow_oam_variableresponse;

const struct slow_oam_link_event_t *slow_oam_link_event;

const struct slow_oam_variablerequest_t *slow_oam_variablerequest;

const struct slow_oam_variableresponse_t *slow_oam_variableresponse;

+ const struct slow_oam_loopbackctrl_t *slow_oam_loopbackctrl;

} tlv;

ptr.slow_oam_common_header = (struct slow_oam_common_header_t *)tptr;

tptr += sizeof(struct slow_oam_common_header_t);

tlen -= sizeof(struct slow_oam_common_header_t);

ptr.slow_oam_common_header = (struct slow_oam_common_header_t *)tptr;

tptr += sizeof(struct slow_oam_common_header_t);

tlen -= sizeof(struct slow_oam_common_header_t);

- printf("\n\tCode %s OAM PDU, Flags [%s]",

+ ND_PRINT((ndo, "\n\tCode %s OAM PDU, Flags [%s]",

tok2str(slow_oam_code_values, "Unknown (%u)", ptr.slow_oam_common_header->code),

bittok2str(slow_oam_flag_values,

"none",

tok2str(slow_oam_code_values, "Unknown (%u)", ptr.slow_oam_common_header->code),

bittok2str(slow_oam_flag_values,

"none",

- EXTRACT_16BITS(&ptr.slow_oam_common_header->flags)));

+ EXTRACT_16BITS(&ptr.slow_oam_common_header->flags))));

switch (ptr.slow_oam_common_header->code) {

case SLOW_OAM_CODE_INFO:

while (tlen > 0) {

ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;

switch (ptr.slow_oam_common_header->code) {

case SLOW_OAM_CODE_INFO:

while (tlen > 0) {

ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;

- printf("\n\t %s Information Type (%u), length %u",

+ ND_PRINT((ndo, "\n\t %s Information Type (%u), length %u",

tok2str(slow_oam_info_type_values, "Reserved",

ptr.slow_oam_tlv_header->type),

ptr.slow_oam_tlv_header->type,

tok2str(slow_oam_info_type_values, "Reserved",

ptr.slow_oam_tlv_header->type),

ptr.slow_oam_tlv_header->type,

- ptr.slow_oam_tlv_header->length);

+ ptr.slow_oam_tlv_header->length));

hexdump = FALSE;

switch (ptr.slow_oam_tlv_header->type) {

case SLOW_OAM_INFO_TYPE_END_OF_TLV:

if (ptr.slow_oam_tlv_header->length != 0) {

hexdump = FALSE;

switch (ptr.slow_oam_tlv_header->type) {

case SLOW_OAM_INFO_TYPE_END_OF_TLV:

if (ptr.slow_oam_tlv_header->length != 0) {

- printf("\n\t ERROR: illegal length - should be 0");

+ ND_PRINT((ndo, "\n\t ERROR: illegal length - should be 0"));

}

return;

}

return;

case SLOW_OAM_INFO_TYPE_LOCAL: /* identical format - fall through */

case SLOW_OAM_INFO_TYPE_REMOTE:

tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;

case SLOW_OAM_INFO_TYPE_LOCAL: /* identical format - fall through */

case SLOW_OAM_INFO_TYPE_REMOTE:

tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;

if (tlv.slow_oam_info->info_length !=

sizeof(struct slow_oam_info_t)) {

if (tlv.slow_oam_info->info_length !=

sizeof(struct slow_oam_info_t)) {

- printf("\n\t ERROR: illegal length - should be %u",

- sizeof(struct slow_oam_info_t));

+ ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu",

+ (unsigned long) sizeof(struct slow_oam_info_t)));

return;

}

return;

}

- printf("\n\t OAM-Version %u, Revision %u",

+ ND_PRINT((ndo, "\n\t OAM-Version %u, Revision %u",

tlv.slow_oam_info->oam_version,

- EXTRACT_16BITS(&tlv.slow_oam_info->revision));

+ EXTRACT_16BITS(&tlv.slow_oam_info->revision)));

- printf("\n\t State-MUX-Action %s, State-Parser-Action %s",

+ ND_PRINT((ndo, "\n\t State-Parser-Action %s, State-MUX-Action %s",

tok2str(slow_oam_info_type_state_parser_values, "Reserved",

tlv.slow_oam_info->state & OAM_INFO_TYPE_PARSER_MASK),

tok2str(slow_oam_info_type_state_mux_values, "Reserved",

tok2str(slow_oam_info_type_state_parser_values, "Reserved",

tlv.slow_oam_info->state & OAM_INFO_TYPE_PARSER_MASK),

tok2str(slow_oam_info_type_state_mux_values, "Reserved",

- tlv.slow_oam_info->state & OAM_INFO_TYPE_MUX_MASK));

- printf("\n\t OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u",

+ tlv.slow_oam_info->state & OAM_INFO_TYPE_MUX_MASK)));

+ ND_PRINT((ndo, "\n\t OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u",

bittok2str(slow_oam_info_type_oam_config_values, "none",

tlv.slow_oam_info->oam_config),

EXTRACT_16BITS(&tlv.slow_oam_info->oam_pdu_config) &

bittok2str(slow_oam_info_type_oam_config_values, "none",

tlv.slow_oam_info->oam_config),

EXTRACT_16BITS(&tlv.slow_oam_info->oam_pdu_config) &

- OAM_INFO_TYPE_PDU_SIZE_MASK);

- printf("\n\t OUI %s (0x%06x), Vendor-Private 0x%08x",

+ OAM_INFO_TYPE_PDU_SIZE_MASK));

+ ND_PRINT((ndo, "\n\t OUI %s (0x%06x), Vendor-Private 0x%08x",

tok2str(oui_values, "Unknown",

EXTRACT_24BITS(&tlv.slow_oam_info->oui)),

EXTRACT_24BITS(&tlv.slow_oam_info->oui),

tok2str(oui_values, "Unknown",

EXTRACT_24BITS(&tlv.slow_oam_info->oui)),

EXTRACT_24BITS(&tlv.slow_oam_info->oui),

- EXTRACT_32BITS(&tlv.slow_oam_info->vendor_private));

+ EXTRACT_32BITS(&tlv.slow_oam_info->vendor_private)));

break;

case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:

hexdump = TRUE;

break;

case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:

hexdump = TRUE;

break;

default:

hexdump = TRUE;

break;

default:

hexdump = TRUE;

break;

@@ -550,8 +552,8 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

}

/* do we also want to see a hex dump ? */

}

/* do we also want to see a hex dump ? */

- if (vflag > 1 || hexdump==TRUE) {

- print_unknown_data(tptr,"\n\t ",

+ if (ndo->ndo_vflag > 1 || hexdump==TRUE) {

+ print_unknown_data(ndo, tptr, "\n\t ",

ptr.slow_oam_tlv_header->length);

}

ptr.slow_oam_tlv_header->length);

}

@@ -563,34 +565,34 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

case SLOW_OAM_CODE_EVENT_NOTIF:

while (tlen > 0) {

ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;

case SLOW_OAM_CODE_EVENT_NOTIF:

while (tlen > 0) {

ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;

- printf("\n\t %s Link Event Type (%u), length %u",

+ ND_PRINT((ndo, "\n\t %s Link Event Type (%u), length %u",

tok2str(slow_oam_link_event_values, "Reserved",

ptr.slow_oam_tlv_header->type),

ptr.slow_oam_tlv_header->type,

tok2str(slow_oam_link_event_values, "Reserved",

ptr.slow_oam_tlv_header->type),

ptr.slow_oam_tlv_header->type,

- ptr.slow_oam_tlv_header->length);

+ ptr.slow_oam_tlv_header->length));

hexdump = FALSE;

switch (ptr.slow_oam_tlv_header->type) {

case SLOW_OAM_LINK_EVENT_END_OF_TLV:

if (ptr.slow_oam_tlv_header->length != 0) {

hexdump = FALSE;

switch (ptr.slow_oam_tlv_header->type) {

case SLOW_OAM_LINK_EVENT_END_OF_TLV:

if (ptr.slow_oam_tlv_header->length != 0) {

- printf("\n\t ERROR: illegal length - should be 0");

+ ND_PRINT((ndo, "\n\t ERROR: illegal length - should be 0"));

}

return;

}

return;

case SLOW_OAM_LINK_EVENT_ERR_SYM_PER: /* identical format - fall through */

case SLOW_OAM_LINK_EVENT_ERR_FRM:

case SLOW_OAM_LINK_EVENT_ERR_FRM_PER:

case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM:

tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr;

case SLOW_OAM_LINK_EVENT_ERR_SYM_PER: /* identical format - fall through */

case SLOW_OAM_LINK_EVENT_ERR_FRM:

case SLOW_OAM_LINK_EVENT_ERR_FRM_PER:

case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM:

tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr;

if (tlv.slow_oam_link_event->event_length !=

sizeof(struct slow_oam_link_event_t)) {

if (tlv.slow_oam_link_event->event_length !=

sizeof(struct slow_oam_link_event_t)) {

- printf("\n\t ERROR: illegal length - should be %u",

- sizeof(struct slow_oam_link_event_t));

+ ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu",

+ (unsigned long) sizeof(struct slow_oam_link_event_t)));

return;

}

return;

}

- printf("\n\t Timestamp %u ms, Errored Window %" PRIu64

+ ND_PRINT((ndo, "\n\t Timestamp %u ms, Errored Window %" PRIu64

"\n\t Errored Threshold %" PRIu64

"\n\t Errors %" PRIu64

"\n\t Error Running Total %" PRIu64

"\n\t Errored Threshold %" PRIu64

"\n\t Errors %" PRIu64

"\n\t Error Running Total %" PRIu64

@@ -600,13 +602,13 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

EXTRACT_64BITS(&tlv.slow_oam_link_event->threshold),

EXTRACT_64BITS(&tlv.slow_oam_link_event->errors),

EXTRACT_64BITS(&tlv.slow_oam_link_event->errors_running_total),

EXTRACT_64BITS(&tlv.slow_oam_link_event->threshold),

EXTRACT_64BITS(&tlv.slow_oam_link_event->errors),

EXTRACT_64BITS(&tlv.slow_oam_link_event->errors_running_total),

- EXTRACT_32BITS(&tlv.slow_oam_link_event->event_running_total));

+ EXTRACT_32BITS(&tlv.slow_oam_link_event->event_running_total)));

break;

case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC:

hexdump = TRUE;

break;

case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC:

hexdump = TRUE;

break;

default:

hexdump = TRUE;

break;

default:

hexdump = TRUE;

break;

@@ -618,8 +620,8 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

}

/* do we also want to see a hex dump ? */

}

/* do we also want to see a hex dump ? */

- if (vflag > 1 || hexdump==TRUE) {

- print_unknown_data(tptr,"\n\t ",

+ if (ndo->ndo_vflag > 1 || hexdump==TRUE) {

+ print_unknown_data(ndo, tptr, "\n\t ",

ptr.slow_oam_tlv_header->length);

}

ptr.slow_oam_tlv_header->length);

}

@@ -628,17 +630,27 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) {

}

break;

}

break;

+ case SLOW_OAM_CODE_LOOPBACK_CTRL:

+ tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr;

+ ND_PRINT((ndo, "\n\t Command %s (%u)",

+ tok2str(slow_oam_loopbackctrl_cmd_values,

+ "Unknown",

+ tlv.slow_oam_loopbackctrl->command),

+ tlv.slow_oam_loopbackctrl->command));

+ tptr ++;

+ tlen --;

+ break;

* FIXME those are the defined codes that lack a decoder

* you are welcome to contribute code ;-)

case SLOW_OAM_CODE_VAR_REQUEST:

case SLOW_OAM_CODE_VAR_RESPONSE:

* FIXME those are the defined codes that lack a decoder

* you are welcome to contribute code ;-)

case SLOW_OAM_CODE_VAR_REQUEST:

case SLOW_OAM_CODE_VAR_RESPONSE:

- case SLOW_OAM_CODE_LOOPBACK_CTRL:

case SLOW_OAM_CODE_PRIVATE:

default:

case SLOW_OAM_CODE_PRIVATE:

default:

- if (vflag <= 1) {

- print_unknown_data(tptr,"\n\t ", tlen);

+ if (ndo->ndo_vflag <= 1) {

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

}

break;

}

break;

}