The Tcpdump Group git mirrors - tcpdump/blobdiff

index 5a3c4edc0ea1c7dac60f8eb3a871653d4c5bc242..8d68e858fb7b56814caa4a82cf1af2778844470e 100644 (file)

--- a/print-lmp.c

+++ b/print-lmp.c

@@ -17,21 +17,13 @@

* by Manu Pathak ([email protected]), May 2005

-#ifndef lint

-static const char rcsid[] _U_ =

- "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.11 2007-08-02 17:32:49 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"

@@ -50,11 +42,11 @@ static const char rcsid[] _U_ =

struct lmp_common_header {

- u_int8_t version_res[2];

- u_int8_t flags;

- u_int8_t msg_type;

- u_int8_t length[2];

- u_int8_t reserved[2];

+ uint8_t version_res[2];

+ uint8_t flags;

+ uint8_t msg_type;

+ uint8_t length[2];

+ uint8_t reserved[2];

};

#define LMP_VERSION 1

};

#define LMP_VERSION 1

@@ -220,9 +212,9 @@ static const struct tok lmp_msg_type_values[] = {

struct lmp_object_header {

- u_int8_t ctype;

- u_int8_t class_num;

- u_int8_t length[2];

+ uint8_t ctype;

+ uint8_t class_num;

+ uint8_t length[2];

};

#define LMP_OBJ_CC_ID 1

};

#define LMP_OBJ_CC_ID 1

@@ -361,7 +353,8 @@ static const struct tok lmp_ctype_values[] = {

};

void

};

void

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

+lmp_print(netdissect_options *ndo,

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

const struct lmp_common_header *lmp_com_header;

const struct lmp_object_header *lmp_obj_header;

const struct lmp_common_header *lmp_com_header;

const struct lmp_object_header *lmp_obj_header;

@@ -373,28 +366,28 @@ lmp_print(register const u_char *pptr, register u_int len) {

union { /* int to float conversion buffer */

float f;

union { /* int to float conversion buffer */

float f;

- u_int32_t i;

+ uint32_t i;

} bw;

tptr=pptr;

lmp_com_header = (const struct lmp_common_header *)pptr;

} bw;

tptr=pptr;

lmp_com_header = (const struct lmp_common_header *)pptr;

- TCHECK(*lmp_com_header);

+ ND_TCHECK(*lmp_com_header);

* Sanity checking of the header.

if (LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]) != LMP_VERSION) {

* Sanity checking of the header.

if (LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]) != LMP_VERSION) {

- printf("LMP version %u packet not supported",

- LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]));

+ ND_PRINT((ndo, "LMP version %u packet not supported",

+ LMP_EXTRACT_VERSION(lmp_com_header->version_res[0])));

return;

}

/* in non-verbose mode just lets print the basic Message Type*/

return;

}

/* in non-verbose mode just lets print the basic Message Type*/

- if (vflag < 1) {

- printf("LMPv%u %s Message, length: %u",

+ if (ndo->ndo_vflag < 1) {

+ ND_PRINT((ndo, "LMPv%u %s Message, length: %u",

LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),

tok2str(lmp_msg_type_values, "unknown (%u)",lmp_com_header->msg_type),

LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),

tok2str(lmp_msg_type_values, "unknown (%u)",lmp_com_header->msg_type),

- len);

+ len));

return;

}

return;

}

@@ -402,19 +395,18 @@ lmp_print(register const u_char *pptr, register u_int len) {

tlen=EXTRACT_16BITS(lmp_com_header->length);

- printf("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u",

+ ND_PRINT((ndo, "\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u",

LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),

tok2str(lmp_msg_type_values, "unknown, type: %u",lmp_com_header->msg_type),

bittok2str(lmp_header_flag_values,"none",lmp_com_header->flags),

LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),

tok2str(lmp_msg_type_values, "unknown, type: %u",lmp_com_header->msg_type),

bittok2str(lmp_header_flag_values,"none",lmp_com_header->flags),

- tlen);

+ tlen));

tptr+=sizeof(const struct lmp_common_header);

tlen-=sizeof(const struct lmp_common_header);

while(tlen>0) {

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

tptr+=sizeof(const struct lmp_common_header);

tlen-=sizeof(const struct lmp_common_header);

while(tlen>0) {

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

- if (!TTEST2(*tptr, sizeof(struct lmp_object_header)))

- goto trunc;

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

lmp_obj_header = (const struct lmp_object_header *)tptr;

lmp_obj_len=EXTRACT_16BITS(lmp_obj_header->length);

lmp_obj_header = (const struct lmp_object_header *)tptr;

lmp_obj_len=EXTRACT_16BITS(lmp_obj_header->length);

@@ -423,7 +415,7 @@ lmp_print(register const u_char *pptr, register u_int len) {

if(lmp_obj_len % 4 || lmp_obj_len < 4)

return;

if(lmp_obj_len % 4 || lmp_obj_len < 4)

return;

- printf("\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",

+ ND_PRINT((ndo, "\n\t %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",

tok2str(lmp_obj_values,

"Unknown",

lmp_obj_header->class_num),

tok2str(lmp_obj_values,

"Unknown",

lmp_obj_header->class_num),

@@ -433,14 +425,13 @@ lmp_print(register const u_char *pptr, register u_int len) {

((lmp_obj_header->class_num)<<8)+lmp_obj_ctype),

lmp_obj_ctype,

(lmp_obj_header->ctype)&0x80 ? "" : "non-",

((lmp_obj_header->class_num)<<8)+lmp_obj_ctype),

lmp_obj_ctype,

(lmp_obj_header->ctype)&0x80 ? "" : "non-",

- lmp_obj_len);

+ lmp_obj_len));

obj_tptr=tptr+sizeof(struct lmp_object_header);

obj_tlen=lmp_obj_len-sizeof(struct lmp_object_header);

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

obj_tptr=tptr+sizeof(struct lmp_object_header);

obj_tlen=lmp_obj_len-sizeof(struct lmp_object_header);

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

- if (!TTEST2(*tptr, lmp_obj_len))

- goto trunc;

+ ND_TCHECK2(*tptr, lmp_obj_len);

hexdump=FALSE;

switch(lmp_obj_header->class_num) {

hexdump=FALSE;

switch(lmp_obj_header->class_num) {

@@ -449,9 +440,9 @@ lmp_print(register const u_char *pptr, register u_int len) {

switch(lmp_obj_ctype) {

case LMP_CTYPE_LOC:

case LMP_CTYPE_RMT:

switch(lmp_obj_ctype) {

case LMP_CTYPE_LOC:

case LMP_CTYPE_RMT:

- printf("\n\t Control Channel ID: %u (0x%08x)",

+ ND_PRINT((ndo, "\n\t Control Channel ID: %u (0x%08x)",

EXTRACT_32BITS(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ EXTRACT_32BITS(obj_tptr)));

break;

default:

break;

default:

@@ -464,23 +455,23 @@ lmp_print(register const u_char *pptr, register u_int len) {

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4_LOC:

case LMP_CTYPE_IPV4_RMT:

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4_LOC:

case LMP_CTYPE_IPV4_RMT:

- printf("\n\t IPv4 Link ID: %s (0x%08x)",

- ipaddr_string(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ ND_PRINT((ndo, "\n\t IPv4 Link ID: %s (0x%08x)",

+ ipaddr_string(ndo, obj_tptr),

+ EXTRACT_32BITS(obj_tptr)));

break;

#ifdef INET6

case LMP_CTYPE_IPV6_LOC:

case LMP_CTYPE_IPV6_RMT:

break;

#ifdef INET6

case LMP_CTYPE_IPV6_LOC:

case LMP_CTYPE_IPV6_RMT:

- printf("\n\t IPv6 Link ID: %s (0x%08x)",

- ip6addr_string(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ ND_PRINT((ndo, "\n\t IPv6 Link ID: %s (0x%08x)",

+ ip6addr_string(ndo, obj_tptr),

+ EXTRACT_32BITS(obj_tptr)));

break;

#endif

case LMP_CTYPE_UNMD_LOC:

case LMP_CTYPE_UNMD_RMT:

break;

#endif

case LMP_CTYPE_UNMD_LOC:

case LMP_CTYPE_UNMD_RMT:

- printf("\n\t Link ID: %u (0x%08x)",

+ ND_PRINT((ndo, "\n\t Link ID: %u (0x%08x)",

EXTRACT_32BITS(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ EXTRACT_32BITS(obj_tptr)));

break;

default:

hexdump=TRUE;

break;

default:

hexdump=TRUE;

@@ -490,14 +481,14 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_MESSAGE_ID:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

case LMP_OBJ_MESSAGE_ID:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

- printf("\n\t Message ID: %u (0x%08x)",

+ ND_PRINT((ndo, "\n\t Message ID: %u (0x%08x)",

EXTRACT_32BITS(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ EXTRACT_32BITS(obj_tptr)));

break;

case LMP_CTYPE_2:

break;

case LMP_CTYPE_2:

- printf("\n\t Message ID Ack: %u (0x%08x)",

+ ND_PRINT((ndo, "\n\t Message ID Ack: %u (0x%08x)",

EXTRACT_32BITS(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ EXTRACT_32BITS(obj_tptr)));

break;

default:

hexdump=TRUE;

break;

default:

hexdump=TRUE;

@@ -508,9 +499,9 @@ lmp_print(register const u_char *pptr, register u_int len) {

switch(lmp_obj_ctype) {

case LMP_CTYPE_LOC:

case LMP_CTYPE_RMT:

switch(lmp_obj_ctype) {

case LMP_CTYPE_LOC:

case LMP_CTYPE_RMT:

- printf("\n\t Node ID: %s (0x%08x)",

- ipaddr_string(obj_tptr),

- EXTRACT_32BITS(obj_tptr));

+ ND_PRINT((ndo, "\n\t Node ID: %s (0x%08x)",

+ ipaddr_string(ndo, obj_tptr),

+ EXTRACT_32BITS(obj_tptr)));

break;

default:

break;

default:

@@ -521,9 +512,9 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_CONFIG:

switch(lmp_obj_ctype) {

case LMP_CTYPE_HELLO_CONFIG:

case LMP_OBJ_CONFIG:

switch(lmp_obj_ctype) {

case LMP_CTYPE_HELLO_CONFIG:

- printf("\n\t Hello Interval: %u\n\t Hello Dead Interval: %u",

+ ND_PRINT((ndo, "\n\t Hello Interval: %u\n\t Hello Dead Interval: %u",

EXTRACT_16BITS(obj_tptr),

- EXTRACT_16BITS(obj_tptr+2));

+ EXTRACT_16BITS(obj_tptr+2)));

break;

default:

break;

default:

@@ -534,9 +525,9 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_HELLO:

switch(lmp_obj_ctype) {

case LMP_CTYPE_HELLO:

case LMP_OBJ_HELLO:

switch(lmp_obj_ctype) {

case LMP_CTYPE_HELLO:

- printf("\n\t Tx Seq: %u, Rx Seq: %u",

+ ND_PRINT((ndo, "\n\t Tx Seq: %u, Rx Seq: %u",

EXTRACT_32BITS(obj_tptr),

- EXTRACT_32BITS(obj_tptr+4));

+ EXTRACT_32BITS(obj_tptr+4)));

break;

default:

break;

default:

@@ -545,19 +536,19 @@ lmp_print(register const u_char *pptr, register u_int len) {

break;

case LMP_OBJ_TE_LINK:

break;

case LMP_OBJ_TE_LINK:

- printf("\n\t Flags: [%s]",

+ ND_PRINT((ndo, "\n\t Flags: [%s]",

bittok2str(lmp_obj_te_link_flag_values,

"none",

bittok2str(lmp_obj_te_link_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr)>>8));

+ EXTRACT_16BITS(obj_tptr)>>8)));

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4:

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4:

- printf("\n\t Local Link-ID: %s (0x%08x)"

+ ND_PRINT((ndo, "\n\t Local Link-ID: %s (0x%08x)"

"\n\t Remote Link-ID: %s (0x%08x)",

- ipaddr_string(obj_tptr+4),

+ ipaddr_string(ndo, obj_tptr+4),

EXTRACT_32BITS(obj_tptr+4),

- ipaddr_string(obj_tptr+8),

- EXTRACT_32BITS(obj_tptr+8));

+ ipaddr_string(ndo, obj_tptr+8),

+ EXTRACT_32BITS(obj_tptr+8)));

break;

#ifdef INET6

break;

#ifdef INET6

@@ -570,54 +561,54 @@ lmp_print(register const u_char *pptr, register u_int len) {

break;

case LMP_OBJ_DATA_LINK:

break;

case LMP_OBJ_DATA_LINK:

- printf("\n\t Flags: [%s]",

+ ND_PRINT((ndo, "\n\t Flags: [%s]",

bittok2str(lmp_obj_data_link_flag_values,

"none",

bittok2str(lmp_obj_data_link_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr)>>8));

+ EXTRACT_16BITS(obj_tptr)>>8)));

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4:

case LMP_CTYPE_UNMD:

switch(lmp_obj_ctype) {

case LMP_CTYPE_IPV4:

case LMP_CTYPE_UNMD:

- printf("\n\t Local Interface ID: %s (0x%08x)"

+ ND_PRINT((ndo, "\n\t Local Interface ID: %s (0x%08x)"

"\n\t Remote Interface ID: %s (0x%08x)",

- ipaddr_string(obj_tptr+4),

+ ipaddr_string(ndo, obj_tptr+4),

EXTRACT_32BITS(obj_tptr+4),

- ipaddr_string(obj_tptr+8),

- EXTRACT_32BITS(obj_tptr+8));

+ ipaddr_string(ndo, obj_tptr+8),

+ EXTRACT_32BITS(obj_tptr+8)));

total_subobj_len = lmp_obj_len - 16;

offset = 12;

while (total_subobj_len > 0 && hexdump == FALSE ) {

subobj_type = EXTRACT_16BITS(obj_tptr+offset)>>8;

subobj_len = EXTRACT_16BITS(obj_tptr+offset)&0x00FF;

total_subobj_len = lmp_obj_len - 16;

offset = 12;

while (total_subobj_len > 0 && hexdump == FALSE ) {

subobj_type = EXTRACT_16BITS(obj_tptr+offset)>>8;

subobj_len = EXTRACT_16BITS(obj_tptr+offset)&0x00FF;

- printf("\n\t Subobject, Type: %s (%u), Length: %u",

+ ND_PRINT((ndo, "\n\t Subobject, Type: %s (%u), Length: %u",

tok2str(lmp_data_link_subobj,

"Unknown",

subobj_type),

subobj_type,

tok2str(lmp_data_link_subobj,

"Unknown",

subobj_type),

subobj_type,

- subobj_len);

+ subobj_len));

switch(subobj_type) {

case INT_SWITCHING_TYPE_SUBOBJ:

switch(subobj_type) {

case INT_SWITCHING_TYPE_SUBOBJ:

- printf("\n\t Switching Type: %s (%u)",

+ ND_PRINT((ndo, "\n\t Switching Type: %s (%u)",

tok2str(gmpls_switch_cap_values,

"Unknown",

EXTRACT_16BITS(obj_tptr+offset+2)>>8),

tok2str(gmpls_switch_cap_values,

"Unknown",

EXTRACT_16BITS(obj_tptr+offset+2)>>8),

- EXTRACT_16BITS(obj_tptr+offset+2)>>8);

- printf("\n\t Encoding Type: %s (%u)",

+ EXTRACT_16BITS(obj_tptr+offset+2)>>8));

+ ND_PRINT((ndo, "\n\t Encoding Type: %s (%u)",

tok2str(gmpls_encoding_values,

"Unknown",

EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF),

tok2str(gmpls_encoding_values,

"Unknown",

EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF),

- EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF);

+ EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF));

bw.i = EXTRACT_32BITS(obj_tptr+offset+4);

- printf("\n\t Min Reservable Bandwidth: %.3f Mbps",

- bw.f*8/1000000);

+ ND_PRINT((ndo, "\n\t Min Reservable Bandwidth: %.3f Mbps",

+ bw.f*8/1000000));

bw.i = EXTRACT_32BITS(obj_tptr+offset+8);

- printf("\n\t Max Reservable Bandwidth: %.3f Mbps",

- bw.f*8/1000000);

+ ND_PRINT((ndo, "\n\t Max Reservable Bandwidth: %.3f Mbps",

+ bw.f*8/1000000));

break;

case WAVELENGTH_SUBOBJ:

break;

case WAVELENGTH_SUBOBJ:

- printf("\n\t Wavelength: %u",

- EXTRACT_32BITS(obj_tptr+offset+4));

+ ND_PRINT((ndo, "\n\t Wavelength: %u",

+ EXTRACT_32BITS(obj_tptr+offset+4)));

break;

default:

/* Any Unknown Subobject ==> Exit loop */

break;

default:

/* Any Unknown Subobject ==> Exit loop */

@@ -640,24 +631,24 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_VERIFY_BEGIN:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

case LMP_OBJ_VERIFY_BEGIN:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

- printf("\n\t Flags: %s",

+ ND_PRINT((ndo, "\n\t Flags: %s",

bittok2str(lmp_obj_begin_verify_flag_values,

"none",

bittok2str(lmp_obj_begin_verify_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr)));

- printf("\n\t Verify Interval: %u",

- EXTRACT_16BITS(obj_tptr+2));

- printf("\n\t Data links: %u",

- EXTRACT_32BITS(obj_tptr+4));

- printf("\n\t Encoding type: %s",

- tok2str(gmpls_encoding_values, "Unknown", *(obj_tptr+8)));

- printf("\n\t Verify Transport Mechanism: %u (0x%x)%s",

+ EXTRACT_16BITS(obj_tptr))));

+ ND_PRINT((ndo, "\n\t Verify Interval: %u",

+ EXTRACT_16BITS(obj_tptr+2)));

+ ND_PRINT((ndo, "\n\t Data links: %u",

+ EXTRACT_32BITS(obj_tptr+4)));

+ ND_PRINT((ndo, "\n\t Encoding type: %s",

+ tok2str(gmpls_encoding_values, "Unknown", *(obj_tptr+8))));

+ ND_PRINT((ndo, "\n\t Verify Transport Mechanism: %u (0x%x)%s",

EXTRACT_16BITS(obj_tptr+10),

- EXTRACT_16BITS(obj_tptr+10)&8000 ? " (Payload test messages capable)" : "");

+ EXTRACT_16BITS(obj_tptr+10)&8000 ? " (Payload test messages capable)" : ""));

bw.i = EXTRACT_32BITS(obj_tptr+12);

- printf("\n\t Transmission Rate: %.3f Mbps",bw.f*8/1000000);

- printf("\n\t Wavelength: %u",

- EXTRACT_32BITS(obj_tptr+16));

+ ND_PRINT((ndo, "\n\t Transmission Rate: %.3f Mbps",bw.f*8/1000000));

+ ND_PRINT((ndo, "\n\t Wavelength: %u",

+ EXTRACT_32BITS(obj_tptr+16)));

break;

default:

break;

default:

@@ -668,10 +659,10 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_VERIFY_BEGIN_ACK:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

case LMP_OBJ_VERIFY_BEGIN_ACK:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

- printf("\n\t Verify Dead Interval: %u"

+ ND_PRINT((ndo, "\n\t Verify Dead Interval: %u"

"\n\t Verify Transport Response: %u",

EXTRACT_16BITS(obj_tptr),

"\n\t Verify Transport Response: %u",

EXTRACT_16BITS(obj_tptr),

- EXTRACT_16BITS(obj_tptr+2));

+ EXTRACT_16BITS(obj_tptr+2)));

break;

default:

break;

default:

@@ -682,8 +673,8 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_VERIFY_ID:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

case LMP_OBJ_VERIFY_ID:

switch(lmp_obj_ctype) {

case LMP_CTYPE_1:

- printf("\n\t Verify ID: %u",

- EXTRACT_32BITS(obj_tptr));

+ ND_PRINT((ndo, "\n\t Verify ID: %u",

+ EXTRACT_32BITS(obj_tptr)));

break;

default:

break;

default:

@@ -698,23 +689,23 @@ lmp_print(register const u_char *pptr, register u_int len) {

offset = 0;

/* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */

while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) {

offset = 0;

/* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */

while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) {

- printf("\n\t Interface ID: %s (0x%08x)",

- ipaddr_string(obj_tptr+offset),

- EXTRACT_32BITS(obj_tptr+offset));

+ ND_PRINT((ndo, "\n\t Interface ID: %s (0x%08x)",

+ ipaddr_string(ndo, obj_tptr+offset),

+ EXTRACT_32BITS(obj_tptr+offset)));

- printf("\n\t\t Active: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>31) ?

+ ND_PRINT((ndo, "\n\t\t Active: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>31) ?

"Allocated" : "Non-allocated",

- (EXTRACT_32BITS(obj_tptr+offset+4)>>31));

+ (EXTRACT_32BITS(obj_tptr+offset+4)>>31)));

- printf("\n\t\t Direction: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1 ?

+ ND_PRINT((ndo, "\n\t\t Direction: %s (%u)", (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1 ?

"Transmit" : "Receive",

- (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1);

+ (EXTRACT_32BITS(obj_tptr+offset+4)>>30)&0x1));

- printf("\n\t\t Channel Status: %s (%u)",

+ ND_PRINT((ndo, "\n\t\t Channel Status: %s (%u)",

tok2str(lmp_obj_channel_status_values,

"Unknown",

EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF),

tok2str(lmp_obj_channel_status_values,

"Unknown",

EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF),

- EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF);

+ EXTRACT_32BITS(obj_tptr+offset+4)&0x3FFFFFF));

offset+=8;

}

break;

offset+=8;

}

break;

@@ -732,9 +723,9 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_CTYPE_UNMD:

offset = 0;

while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) {

case LMP_CTYPE_UNMD:

offset = 0;

while (offset < (lmp_obj_len-(int)sizeof(struct lmp_object_header)) ) {

- printf("\n\t Interface ID: %s (0x%08x)",

- ipaddr_string(obj_tptr+offset),

- EXTRACT_32BITS(obj_tptr+offset));

+ ND_PRINT((ndo, "\n\t Interface ID: %s (0x%08x)",

+ ipaddr_string(ndo, obj_tptr+offset),

+ EXTRACT_32BITS(obj_tptr+offset)));

offset+=4;

}

break;

offset+=4;

}

break;

@@ -749,17 +740,17 @@ lmp_print(register const u_char *pptr, register u_int len) {

case LMP_OBJ_ERROR_CODE:

switch(lmp_obj_ctype) {

case LMP_CTYPE_BEGIN_VERIFY_ERROR:

case LMP_OBJ_ERROR_CODE:

switch(lmp_obj_ctype) {

case LMP_CTYPE_BEGIN_VERIFY_ERROR:

- printf("\n\t Error Code: %s",

+ ND_PRINT((ndo, "\n\t Error Code: %s",

bittok2str(lmp_obj_begin_verify_error_values,

"none",

bittok2str(lmp_obj_begin_verify_error_values,

"none",

- EXTRACT_32BITS(obj_tptr)));

+ EXTRACT_32BITS(obj_tptr))));

break;

case LMP_CTYPE_LINK_SUMMARY_ERROR:

break;

case LMP_CTYPE_LINK_SUMMARY_ERROR:

- printf("\n\t Error Code: %s",

+ ND_PRINT((ndo, "\n\t Error Code: %s",

bittok2str(lmp_obj_link_summary_error_values,

"none",

bittok2str(lmp_obj_link_summary_error_values,

"none",

- EXTRACT_32BITS(obj_tptr)));

+ EXTRACT_32BITS(obj_tptr))));

break;

default:

hexdump=TRUE;

break;

default:

hexdump=TRUE;

@@ -770,13 +761,13 @@ lmp_print(register const u_char *pptr, register u_int len) {

switch (lmp_obj_ctype) {

case LMP_CTYPE_SERVICE_CONFIG_SP:

switch (lmp_obj_ctype) {

case LMP_CTYPE_SERVICE_CONFIG_SP:

- printf("\n\t Flags: %s",

+ ND_PRINT((ndo, "\n\t Flags: %s",

bittok2str(lmp_obj_service_config_sp_flag_values,

"none",

bittok2str(lmp_obj_service_config_sp_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr)>>8));

+ EXTRACT_16BITS(obj_tptr)>>8)));

- printf("\n\t UNI Version: %u",

- EXTRACT_16BITS(obj_tptr) & 0x00FF);

+ ND_PRINT((ndo, "\n\t UNI Version: %u",

+ EXTRACT_16BITS(obj_tptr) & 0x00FF));

break;

@@ -784,78 +775,78 @@ lmp_print(register const u_char *pptr, register u_int len) {

link_type = EXTRACT_16BITS(obj_tptr)>>8;

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

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

tok2str(lmp_sd_service_config_cpsa_link_type_values,

"Unknown", link_type),

tok2str(lmp_sd_service_config_cpsa_link_type_values,

"Unknown", link_type),

- link_type);

+ link_type));

if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH) {

- printf("\n\t Signal Type: %s (%u)",

+ ND_PRINT((ndo, "\n\t Signal Type: %s (%u)",

tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values,

"Unknown",

EXTRACT_16BITS(obj_tptr) & 0x00FF),

tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values,

"Unknown",

EXTRACT_16BITS(obj_tptr) & 0x00FF),

- EXTRACT_16BITS(obj_tptr) & 0x00FF);

+ EXTRACT_16BITS(obj_tptr) & 0x00FF));

}

if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET) {

}

if (link_type == LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET) {

- printf("\n\t Signal Type: %s (%u)",

+ ND_PRINT((ndo, "\n\t Signal Type: %s (%u)",

tok2str(lmp_sd_service_config_cpsa_signal_type_sonet_values,

"Unknown",

EXTRACT_16BITS(obj_tptr) & 0x00FF),

tok2str(lmp_sd_service_config_cpsa_signal_type_sonet_values,

"Unknown",

EXTRACT_16BITS(obj_tptr) & 0x00FF),

- EXTRACT_16BITS(obj_tptr) & 0x00FF);

+ EXTRACT_16BITS(obj_tptr) & 0x00FF));

}

- printf("\n\t Transparency: %s",

+ ND_PRINT((ndo, "\n\t Transparency: %s",

bittok2str(lmp_obj_service_config_cpsa_tp_flag_values,

"none",

bittok2str(lmp_obj_service_config_cpsa_tp_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr+2)>>8));

+ EXTRACT_16BITS(obj_tptr+2)>>8)));

- printf("\n\t Contiguous Concatenation Types: %s",

+ ND_PRINT((ndo, "\n\t Contiguous Concatenation Types: %s",

bittok2str(lmp_obj_service_config_cpsa_cct_flag_values,

"none",

bittok2str(lmp_obj_service_config_cpsa_cct_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr+2)>>8 & 0x00FF));

+ EXTRACT_16BITS(obj_tptr+2)>>8 & 0x00FF)));

- printf("\n\t Minimum NCC: %u",

- EXTRACT_16BITS(obj_tptr+4));

+ ND_PRINT((ndo, "\n\t Minimum NCC: %u",

+ EXTRACT_16BITS(obj_tptr+4)));

- printf("\n\t Maximum NCC: %u",

- EXTRACT_16BITS(obj_tptr+6));

+ ND_PRINT((ndo, "\n\t Maximum NCC: %u",

+ EXTRACT_16BITS(obj_tptr+6)));

- printf("\n\t Minimum NVC:%u",

- EXTRACT_16BITS(obj_tptr+8));

+ ND_PRINT((ndo, "\n\t Minimum NVC:%u",

+ EXTRACT_16BITS(obj_tptr+8)));

- printf("\n\t Maximum NVC:%u",

- EXTRACT_16BITS(obj_tptr+10));

+ ND_PRINT((ndo, "\n\t Maximum NVC:%u",

+ EXTRACT_16BITS(obj_tptr+10)));

- printf("\n\t Local Interface ID: %s (0x%08x)",

- ipaddr_string(obj_tptr+12),

- EXTRACT_32BITS(obj_tptr+12));

+ ND_PRINT((ndo, "\n\t Local Interface ID: %s (0x%08x)",

+ ipaddr_string(ndo, obj_tptr+12),

+ EXTRACT_32BITS(obj_tptr+12)));

break;

case LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM:

break;

case LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM:

- printf("\n\t Transparency Flags: %s",

+ ND_PRINT((ndo, "\n\t Transparency Flags: %s",

bittok2str(

lmp_obj_service_config_nsa_transparency_flag_values,

"none",

bittok2str(

lmp_obj_service_config_nsa_transparency_flag_values,

"none",

- EXTRACT_32BITS(obj_tptr)));

+ EXTRACT_32BITS(obj_tptr))));

- printf("\n\t TCM Monitoring Flags: %s",

+ ND_PRINT((ndo, "\n\t TCM Monitoring Flags: %s",

bittok2str(

lmp_obj_service_config_nsa_tcm_flag_values,

"none",

bittok2str(

lmp_obj_service_config_nsa_tcm_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr+6) & 0x00FF));

+ EXTRACT_16BITS(obj_tptr+6) & 0x00FF)));

break;

case LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY:

break;

case LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY:

- printf("\n\t Diversity: Flags: %s",

+ ND_PRINT((ndo, "\n\t Diversity: Flags: %s",

bittok2str(

lmp_obj_service_config_nsa_network_diversity_flag_values,

"none",

bittok2str(

lmp_obj_service_config_nsa_network_diversity_flag_values,

"none",

- EXTRACT_16BITS(obj_tptr+2) & 0x00FF));

+ EXTRACT_16BITS(obj_tptr+2) & 0x00FF)));

break;

default:

break;

default:

@@ -865,13 +856,13 @@ lmp_print(register const u_char *pptr, register u_int len) {

break;

default:

break;

default:

- if (vflag <= 1)

- print_unknown_data(gndo,obj_tptr,"\n\t ",obj_tlen);

+ if (ndo->ndo_vflag <= 1)

+ print_unknown_data(ndo,obj_tptr,"\n\t ",obj_tlen);

break;

}

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

break;

}

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

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

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

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

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

lmp_obj_len-sizeof(struct lmp_object_header));

tptr+=lmp_obj_len;

lmp_obj_len-sizeof(struct lmp_object_header));

tptr+=lmp_obj_len;

@@ -879,7 +870,7 @@ lmp_print(register const u_char *pptr, register u_int len) {

}

return;

trunc:

}

return;

trunc:

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

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

}

* Local Variables:

}

* Local Variables: