The Tcpdump Group git mirrors - tcpdump/blobdiff

* Original code by Matt Thomas, Digital Equipment Corporation

*

* Extensively modified by Hannes Gredler ([email protected]) for more

* Original code by Matt Thomas, Digital Equipment Corporation

*

* Extensively modified by Hannes Gredler ([email protected]) for more

- * complete IS-IS support.

+ * complete IS-IS & CLNP support.

*/

-#ifndef lint

-static const char rcsid[] =

- "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.93 2003-07-29 09:21:16 hannes Exp $ (LBL)";

-#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 <string.h>

#include "interface.h"

#include "addrtoname.h"

#include <string.h>

#include "interface.h"

#include "addrtoname.h"

-#include "ethertype.h"

#include "ether.h"

+#include "nlpid.h"

#include "extract.h"

#include "gmpls.h"

#include "extract.h"

#include "gmpls.h"

-

-#define NLPID_CLNS 129 /* 0x81 */

-#define NLPID_ESIS 130 /* 0x82 */

-#define NLPID_ISIS 131 /* 0x83 */

-#define NLPID_IP6 0x8e

-#define NLPID_IP 0xcc

-#define NLPID_NULLNS 0

-

-#define IPV4 1 /* AFI value */

-#define IPV6 2 /* AFI value */

+#include "oui.h"

+#include "signature.h"

/*

* IS-IS is defined in ISO 10589. Look there for protocol definitions.

/*

* IS-IS is defined in ISO 10589. Look there for protocol definitions.

#define LSP_ID_LEN SYSTEM_ID_LEN+2

#define ISIS_VERSION 1

#define LSP_ID_LEN SYSTEM_ID_LEN+2

#define ISIS_VERSION 1

-#define PDU_TYPE_MASK 0x1F

-#define PRIORITY_MASK 0x7F

-

-#define L1_LAN_IIH 15

-#define L2_LAN_IIH 16

-#define PTP_IIH 17

-#define L1_LSP 18

-#define L2_LSP 20

-#define L1_CSNP 24

-#define L2_CSNP 25

-#define L1_PSNP 26

-#define L2_PSNP 27

-

-static struct tok isis_pdu_values[] = {

- { L1_LAN_IIH, "L1 Lan IIH"},

- { L2_LAN_IIH, "L2 Lan IIH"},

- { PTP_IIH, "p2p IIH"},

- { L1_LSP, "L1 LSP"},

- { L2_LSP, "L2 LSP"},

- { L1_CSNP, "L1 CSNP"},

- { L2_CSNP, "L2 CSNP"},

- { L1_PSNP, "L1 PSNP"},

- { L2_PSNP, "L2 PSNP"},

+#define ESIS_VERSION 1

+#define CLNP_VERSION 1

+

+#define ISIS_PDU_TYPE_MASK 0x1F

+#define ESIS_PDU_TYPE_MASK 0x1F

+#define CLNP_PDU_TYPE_MASK 0x1F

+#define CLNP_FLAG_MASK 0xE0

+#define ISIS_LAN_PRIORITY_MASK 0x7F

+

+#define ISIS_PDU_L1_LAN_IIH 15

+#define ISIS_PDU_L2_LAN_IIH 16

+#define ISIS_PDU_PTP_IIH 17

+#define ISIS_PDU_L1_LSP 18

+#define ISIS_PDU_L2_LSP 20

+#define ISIS_PDU_L1_CSNP 24

+#define ISIS_PDU_L2_CSNP 25

+#define ISIS_PDU_L1_PSNP 26

+#define ISIS_PDU_L2_PSNP 27

+

+static const struct tok isis_pdu_values[] = {

+ { ISIS_PDU_L1_LAN_IIH, "L1 Lan IIH"},

+ { ISIS_PDU_L2_LAN_IIH, "L2 Lan IIH"},

+ { ISIS_PDU_PTP_IIH, "p2p IIH"},

+ { ISIS_PDU_L1_LSP, "L1 LSP"},

+ { ISIS_PDU_L2_LSP, "L2 LSP"},

+ { ISIS_PDU_L1_CSNP, "L1 CSNP"},

+ { ISIS_PDU_L2_CSNP, "L2 CSNP"},

+ { ISIS_PDU_L1_PSNP, "L1 PSNP"},

+ { ISIS_PDU_L2_PSNP, "L2 PSNP"},

{ 0, NULL}

};

{ 0, NULL}

};

* list taken from rfc3359 plus some memory from veterans ;-)

*/

* list taken from rfc3359 plus some memory from veterans ;-)

*/

-#define TLV_AREA_ADDR 1 /* iso10589 */

-#define TLV_IS_REACH 2 /* iso10589 */

-#define TLV_ESNEIGH 3 /* iso10589 */

-#define TLV_PART_DIS 4 /* iso10589 */

-#define TLV_PREFIX_NEIGH 5 /* iso10589 */

-#define TLV_ISNEIGH 6 /* iso10589 */

-#define TLV_ISNEIGH_VARLEN 7 /* iso10589 */

-#define TLV_PADDING 8 /* iso10589 */

-#define TLV_LSP 9 /* iso10589 */

-#define TLV_AUTH 10 /* iso10589, rfc3567 */

-#define TLV_CHECKSUM 12 /* rfc3358 */

-#define TLV_LSP_BUFFERSIZE 14 /* iso10589 rev2 */

-#define TLV_EXT_IS_REACH 22 /* draft-ietf-isis-traffic-04 */

-#define TLV_IS_ALIAS_ID 24 /* draft-ietf-isis-ext-lsp-frags-02 */

-#define TLV_DECNET_PHASE4 42

-#define TLV_LUCENT_PRIVATE 66

-#define TLV_IP_REACH 128 /* rfc1195, rfc2966 */

-#define TLV_PROTOCOLS 129 /* rfc1195 */

-#define TLV_IP_REACH_EXT 130 /* rfc1195, rfc2966 */

-#define TLV_IDRP_INFO 131 /* rfc1195 */

-#define TLV_IPADDR 132 /* rfc1195 */

-#define TLV_IPAUTH 133 /* rfc1195 */

-#define TLV_TE_ROUTER_ID 134 /* draft-ietf-isis-traffic-04 */

-#define TLV_EXT_IP_REACH 135 /* draft-ietf-isis-traffic-04 */

-#define TLV_HOSTNAME 137 /* rfc2763 */

-#define TLV_SHARED_RISK_GROUP 138 /* draft-ietf-isis-gmpls-extensions-14 */

-#define TLV_NORTEL_PRIVATE1 176

-#define TLV_NORTEL_PRIVATE2 177

-#define TLV_HOLDTIME 198 /* ES-IS */

-#define TLV_RESTART_SIGNALING 211 /* draft-ietf-isis-restart-01 */

-#define TLV_MT_IS_REACH 222 /* draft-ietf-isis-wg-multi-topology-05 */

-#define TLV_MT_SUPPORTED 229 /* draft-ietf-isis-wg-multi-topology-05 */

-#define TLV_IP6ADDR 232 /* draft-ietf-isis-ipv6-02 */

-#define TLV_MT_IP_REACH 235 /* draft-ietf-isis-wg-multi-topology-05 */

-#define TLV_IP6_REACH 236 /* draft-ietf-isis-ipv6-02 */

-#define TLV_MT_IP6_REACH 237 /* draft-ietf-isis-wg-multi-topology-05 */

-#define TLV_PTP_ADJ 240 /* rfc3373 */

-#define TLV_IIH_SEQNR 241 /* draft-shen-isis-iih-sequence-00 */

-#define TLV_VENDOR_PRIVATE 250 /* draft-ietf-isis-proprietary-tlv-00 */

-

-static struct tok isis_tlv_values[] = {

- { TLV_AREA_ADDR, "Area address(es)"},

- { TLV_IS_REACH, "IS Reachability"},

- { TLV_ESNEIGH, "ES Neighbor(s)"},

- { TLV_PART_DIS, "Partition DIS"},

- { TLV_PREFIX_NEIGH, "Prefix Neighbors"},

- { TLV_ISNEIGH, "IS Neighbor(s)"},

- { TLV_ISNEIGH_VARLEN, "IS Neighbor(s) (variable length)"},

- { TLV_PADDING, "Padding"},

- { TLV_LSP, "LSP entries"},

- { TLV_AUTH, "Authentication"},

- { TLV_CHECKSUM, "Checksum"},

- { TLV_LSP_BUFFERSIZE, "LSP Buffersize"},

- { TLV_EXT_IS_REACH, "Extended IS Reachability"},

- { TLV_IS_ALIAS_ID, "IS Alias ID"},

- { TLV_DECNET_PHASE4, "DECnet Phase IV"},

- { TLV_LUCENT_PRIVATE, "Lucent Proprietary"},

- { TLV_IP_REACH, "IPv4 Internal reachability"},

- { TLV_PROTOCOLS, "Protocols supported"},

- { TLV_IP_REACH_EXT, "IPv4 External reachability"},

- { TLV_IDRP_INFO, "Inter-Domain Information Type"},

- { TLV_IPADDR, "IPv4 Interface address(es)"},

- { TLV_IPAUTH, "IPv4 authentication (deprecated)"},

- { TLV_TE_ROUTER_ID, "Traffic Engineering Router ID"},

- { TLV_EXT_IP_REACH, "Extended IPv4 reachability"},

- { TLV_HOSTNAME, "Hostname"},

- { TLV_SHARED_RISK_GROUP, "Shared Risk Link Group"},

- { TLV_NORTEL_PRIVATE1, "Nortel Proprietary"},

- { TLV_NORTEL_PRIVATE2, "Nortel Proprietary"},

- { TLV_HOLDTIME, "Holdtime"},

- { TLV_RESTART_SIGNALING, "Restart Signaling"},

- { TLV_MT_IS_REACH, "Multi Topology IS Reachability"},

- { TLV_MT_SUPPORTED, "Multi Topology"},

- { TLV_IP6ADDR, "IPv6 Interface address(es)"},

- { TLV_MT_IP_REACH, "Multi-Topology IPv4 reachability"},

- { TLV_IP6_REACH, "IPv6 reachability"},

- { TLV_MT_IP6_REACH, "Multi-Topology IP6 reachability"},

- { TLV_PTP_ADJ, "Point-to-point Adjacency State"},

- { TLV_IIH_SEQNR, "Hello PDU Sequence Number"},

- { TLV_VENDOR_PRIVATE, "Vendor Private"},

+#define ISIS_TLV_AREA_ADDR 1 /* iso10589 */

+#define ISIS_TLV_IS_REACH 2 /* iso10589 */

+#define ISIS_TLV_ESNEIGH 3 /* iso10589 */

+#define ISIS_TLV_PART_DIS 4 /* iso10589 */

+#define ISIS_TLV_PREFIX_NEIGH 5 /* iso10589 */

+#define ISIS_TLV_ISNEIGH 6 /* iso10589 */

+#define ISIS_TLV_ISNEIGH_VARLEN 7 /* iso10589 */

+#define ISIS_TLV_PADDING 8 /* iso10589 */

+#define ISIS_TLV_LSP 9 /* iso10589 */

+#define ISIS_TLV_AUTH 10 /* iso10589, rfc3567 */

+#define ISIS_TLV_CHECKSUM 12 /* rfc3358 */

+#define ISIS_TLV_CHECKSUM_MINLEN 2

+#define ISIS_TLV_LSP_BUFFERSIZE 14 /* iso10589 rev2 */

+#define ISIS_TLV_LSP_BUFFERSIZE_MINLEN 2

+#define ISIS_TLV_EXT_IS_REACH 22 /* draft-ietf-isis-traffic-05 */

+#define ISIS_TLV_IS_ALIAS_ID 24 /* draft-ietf-isis-ext-lsp-frags-02 */

+#define ISIS_TLV_DECNET_PHASE4 42

+#define ISIS_TLV_LUCENT_PRIVATE 66

+#define ISIS_TLV_INT_IP_REACH 128 /* rfc1195, rfc2966 */

+#define ISIS_TLV_PROTOCOLS 129 /* rfc1195 */

+#define ISIS_TLV_EXT_IP_REACH 130 /* rfc1195, rfc2966 */

+#define ISIS_TLV_IDRP_INFO 131 /* rfc1195 */

+#define ISIS_TLV_IDRP_INFO_MINLEN 1

+#define ISIS_TLV_IPADDR 132 /* rfc1195 */

+#define ISIS_TLV_IPAUTH 133 /* rfc1195 */

+#define ISIS_TLV_TE_ROUTER_ID 134 /* draft-ietf-isis-traffic-05 */

+#define ISIS_TLV_EXTD_IP_REACH 135 /* draft-ietf-isis-traffic-05 */

+#define ISIS_TLV_HOSTNAME 137 /* rfc2763 */

+#define ISIS_TLV_SHARED_RISK_GROUP 138 /* draft-ietf-isis-gmpls-extensions */

+#define ISIS_TLV_MT_PORT_CAP 143 /* rfc6165 */

+#define ISIS_TLV_MT_CAPABILITY 144 /* rfc6329 */

+#define ISIS_TLV_NORTEL_PRIVATE1 176

+#define ISIS_TLV_NORTEL_PRIVATE2 177

+#define ISIS_TLV_RESTART_SIGNALING 211 /* rfc3847 */

+#define ISIS_TLV_RESTART_SIGNALING_FLAGLEN 1

+#define ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN 2

+#define ISIS_TLV_MT_IS_REACH 222 /* draft-ietf-isis-wg-multi-topology-05 */

+#define ISIS_TLV_MT_SUPPORTED 229 /* draft-ietf-isis-wg-multi-topology-05 */

+#define ISIS_TLV_MT_SUPPORTED_MINLEN 2

+#define ISIS_TLV_IP6ADDR 232 /* draft-ietf-isis-ipv6-02 */

+#define ISIS_TLV_MT_IP_REACH 235 /* draft-ietf-isis-wg-multi-topology-05 */

+#define ISIS_TLV_IP6_REACH 236 /* draft-ietf-isis-ipv6-02 */

+#define ISIS_TLV_MT_IP6_REACH 237 /* draft-ietf-isis-wg-multi-topology-05 */

+#define ISIS_TLV_PTP_ADJ 240 /* rfc3373 */

+#define ISIS_TLV_IIH_SEQNR 241 /* draft-shen-isis-iih-sequence-00 */

+#define ISIS_TLV_IIH_SEQNR_MINLEN 4

+#define ISIS_TLV_VENDOR_PRIVATE 250 /* draft-ietf-isis-experimental-tlv-01 */

+#define ISIS_TLV_VENDOR_PRIVATE_MINLEN 3

+

+static const struct tok isis_tlv_values[] = {

+ { ISIS_TLV_AREA_ADDR, "Area address(es)"},

+ { ISIS_TLV_IS_REACH, "IS Reachability"},

+ { ISIS_TLV_ESNEIGH, "ES Neighbor(s)"},

+ { ISIS_TLV_PART_DIS, "Partition DIS"},

+ { ISIS_TLV_PREFIX_NEIGH, "Prefix Neighbors"},

+ { ISIS_TLV_ISNEIGH, "IS Neighbor(s)"},

+ { ISIS_TLV_ISNEIGH_VARLEN, "IS Neighbor(s) (variable length)"},

+ { ISIS_TLV_PADDING, "Padding"},

+ { ISIS_TLV_LSP, "LSP entries"},

+ { ISIS_TLV_AUTH, "Authentication"},

+ { ISIS_TLV_CHECKSUM, "Checksum"},

+ { ISIS_TLV_LSP_BUFFERSIZE, "LSP Buffersize"},

+ { ISIS_TLV_EXT_IS_REACH, "Extended IS Reachability"},

+ { ISIS_TLV_IS_ALIAS_ID, "IS Alias ID"},

+ { ISIS_TLV_DECNET_PHASE4, "DECnet Phase IV"},

+ { ISIS_TLV_LUCENT_PRIVATE, "Lucent Proprietary"},

+ { ISIS_TLV_INT_IP_REACH, "IPv4 Internal Reachability"},

+ { ISIS_TLV_PROTOCOLS, "Protocols supported"},

+ { ISIS_TLV_EXT_IP_REACH, "IPv4 External Reachability"},

+ { ISIS_TLV_IDRP_INFO, "Inter-Domain Information Type"},

+ { ISIS_TLV_IPADDR, "IPv4 Interface address(es)"},

+ { ISIS_TLV_IPAUTH, "IPv4 authentication (deprecated)"},

+ { ISIS_TLV_TE_ROUTER_ID, "Traffic Engineering Router ID"},

+ { ISIS_TLV_EXTD_IP_REACH, "Extended IPv4 Reachability"},

+ { ISIS_TLV_SHARED_RISK_GROUP, "Shared Risk Link Group"},

+ { ISIS_TLV_MT_PORT_CAP, "Multi-Topology-Aware Port Capability"},

+ { ISIS_TLV_MT_CAPABILITY, "Multi-Topology Capability"},

+ { ISIS_TLV_NORTEL_PRIVATE1, "Nortel Proprietary"},

+ { ISIS_TLV_NORTEL_PRIVATE2, "Nortel Proprietary"},

+ { ISIS_TLV_HOSTNAME, "Hostname"},

+ { ISIS_TLV_RESTART_SIGNALING, "Restart Signaling"},

+ { ISIS_TLV_MT_IS_REACH, "Multi Topology IS Reachability"},

+ { ISIS_TLV_MT_SUPPORTED, "Multi Topology"},

+ { ISIS_TLV_IP6ADDR, "IPv6 Interface address(es)"},

+ { ISIS_TLV_MT_IP_REACH, "Multi-Topology IPv4 Reachability"},

+ { ISIS_TLV_IP6_REACH, "IPv6 reachability"},

+ { ISIS_TLV_MT_IP6_REACH, "Multi-Topology IP6 Reachability"},

+ { ISIS_TLV_PTP_ADJ, "Point-to-point Adjacency State"},

+ { ISIS_TLV_IIH_SEQNR, "Hello PDU Sequence Number"},

+ { ISIS_TLV_VENDOR_PRIVATE, "Vendor Private"},

+ { 0, NULL }

+};

+

+#define ESIS_OPTION_PROTOCOLS 129

+#define ESIS_OPTION_QOS_MAINTENANCE 195 /* iso9542 */

+#define ESIS_OPTION_SECURITY 197 /* iso9542 */

+#define ESIS_OPTION_ES_CONF_TIME 198 /* iso9542 */

+#define ESIS_OPTION_PRIORITY 205 /* iso9542 */

+#define ESIS_OPTION_ADDRESS_MASK 225 /* iso9542 */

+#define ESIS_OPTION_SNPA_MASK 226 /* iso9542 */

+

+static const struct tok esis_option_values[] = {

+ { ESIS_OPTION_PROTOCOLS, "Protocols supported"},

+ { ESIS_OPTION_QOS_MAINTENANCE, "QoS Maintenance" },

+ { ESIS_OPTION_SECURITY, "Security" },

+ { ESIS_OPTION_ES_CONF_TIME, "ES Configuration Time" },

+ { ESIS_OPTION_PRIORITY, "Priority" },

+ { ESIS_OPTION_ADDRESS_MASK, "Addressk Mask" },

+ { ESIS_OPTION_SNPA_MASK, "SNPA Mask" },

+ { 0, NULL }

+};

+

+#define CLNP_OPTION_DISCARD_REASON 193

+#define CLNP_OPTION_QOS_MAINTENANCE 195 /* iso8473 */

+#define CLNP_OPTION_SECURITY 197 /* iso8473 */

+#define CLNP_OPTION_SOURCE_ROUTING 200 /* iso8473 */

+#define CLNP_OPTION_ROUTE_RECORDING 203 /* iso8473 */

+#define CLNP_OPTION_PADDING 204 /* iso8473 */

+#define CLNP_OPTION_PRIORITY 205 /* iso8473 */

+

+static const struct tok clnp_option_values[] = {

+ { CLNP_OPTION_DISCARD_REASON, "Discard Reason"},

+ { CLNP_OPTION_PRIORITY, "Priority"},

+ { CLNP_OPTION_QOS_MAINTENANCE, "QoS Maintenance"},

+ { CLNP_OPTION_SECURITY, "Security"},

+ { CLNP_OPTION_SOURCE_ROUTING, "Source Routing"},

+ { CLNP_OPTION_ROUTE_RECORDING, "Route Recording"},

+ { CLNP_OPTION_PADDING, "Padding"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_class_values[] = {

+ { 0x0, "General"},

+ { 0x8, "Address"},

+ { 0x9, "Source Routeing"},

+ { 0xa, "Lifetime"},

+ { 0xb, "PDU Discarded"},

+ { 0xc, "Reassembly"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_general_values[] = {

+ { 0x0, "Reason not specified"},

+ { 0x1, "Protocol procedure error"},

+ { 0x2, "Incorrect checksum"},

+ { 0x3, "PDU discarded due to congestion"},

+ { 0x4, "Header syntax error (cannot be parsed)"},

+ { 0x5, "Segmentation needed but not permitted"},

+ { 0x6, "Incomplete PDU received"},

+ { 0x7, "Duplicate option"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_address_values[] = {

+ { 0x0, "Destination address unreachable"},

+ { 0x1, "Destination address unknown"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_source_routeing_values[] = {

+ { 0x0, "Unspecified source routeing error"},

+ { 0x1, "Syntax error in source routeing field"},

+ { 0x2, "Unknown address in source routeing field"},

+ { 0x3, "Path not acceptable"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_lifetime_values[] = {

+ { 0x0, "Lifetime expired while data unit in transit"},

+ { 0x1, "Lifetime expired during reassembly"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_pdu_discard_values[] = {

+ { 0x0, "Unsupported option not specified"},

+ { 0x1, "Unsupported protocol version"},

+ { 0x2, "Unsupported security option"},

+ { 0x3, "Unsupported source routeing option"},

+ { 0x4, "Unsupported recording of route option"},

+ { 0, NULL }

+};

+

+static const struct tok clnp_option_rfd_reassembly_values[] = {

+ { 0x0, "Reassembly interference"},

{ 0, NULL }

};

{ 0, NULL }

};

-#define SUBTLV_EXT_IS_REACH_ADMIN_GROUP 3

-#define SUBTLV_EXT_IS_REACH_LINK_LOCAL_ID 4

-#define SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID 5

-#define SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR 6

-#define SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR 8

-#define SUBTLV_EXT_IS_REACH_MAX_LINK_BW 9

-#define SUBTLV_EXT_IS_REACH_RESERVABLE_BW 10

-#define SUBTLV_EXT_IS_REACH_UNRESERVED_BW 11

-#define SUBTLV_EXT_IS_REACH_TE_METRIC 18

-#define SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE 20

-#define SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR 21

-

-static struct tok isis_ext_is_reach_subtlv_values[] = {

- { SUBTLV_EXT_IS_REACH_ADMIN_GROUP, "Administrative groups" },

- { SUBTLV_EXT_IS_REACH_LINK_LOCAL_ID, "Link Local Identifier" },

- { SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID, "Link Remote Identifier" },

- { SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR, "IPv4 interface address" },

- { SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR, "IPv4 neighbor address" },

- { SUBTLV_EXT_IS_REACH_MAX_LINK_BW, "Maximum link bandwidth" },

- { SUBTLV_EXT_IS_REACH_RESERVABLE_BW, "Reservable link bandwidth" },

- { SUBTLV_EXT_IS_REACH_UNRESERVED_BW, "Unreserved bandwidth" },

- { SUBTLV_EXT_IS_REACH_TE_METRIC, "Traffic Engineering Metric" },

- { SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE, "Link Protection Type" },

- { SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR, "Interface Switching Capability" },

- { 250, "Reserved for cisco specific extensions" },

- { 251, "Reserved for cisco specific extensions" },

- { 252, "Reserved for cisco specific extensions" },

- { 253, "Reserved for cisco specific extensions" },

- { 254, "Reserved for cisco specific extensions" },

- { 255, "Reserved for future expansion" },

+/* array of 16 error-classes */

+static const struct tok *clnp_option_rfd_error_class[] = {

+ clnp_option_rfd_general_values,

+ NULL,

+ clnp_option_rfd_address_values,

+ clnp_option_rfd_source_routeing_values,

+ clnp_option_rfd_lifetime_values,

+ clnp_option_rfd_pdu_discard_values,

+ clnp_option_rfd_reassembly_values,

+ NULL,

+ NULL

+};

+

+#define CLNP_OPTION_OPTION_QOS_MASK 0x3f

+#define CLNP_OPTION_SCOPE_MASK 0xc0

+#define CLNP_OPTION_SCOPE_SA_SPEC 0x40

+#define CLNP_OPTION_SCOPE_DA_SPEC 0x80

+#define CLNP_OPTION_SCOPE_GLOBAL 0xc0

+

+static const struct tok clnp_option_scope_values[] = {

+ { CLNP_OPTION_SCOPE_SA_SPEC, "Source Address Specific"},

+ { CLNP_OPTION_SCOPE_DA_SPEC, "Destination Address Specific"},

+ { CLNP_OPTION_SCOPE_GLOBAL, "Globally unique"},

{ 0, NULL }

};

{ 0, NULL }

};

-#define SUBTLV_IP_REACH_ADMIN_TAG32 1

-#define SUBTLV_IP_REACH_ADMIN_TAG64 2

+static const struct tok clnp_option_sr_rr_values[] = {

+ { 0x0, "partial"},

+ { 0x1, "complete"},

+ { 0, NULL }

+};

-static struct tok isis_ext_ip_reach_subtlv_values[] = {

- { SUBTLV_IP_REACH_ADMIN_TAG32, "32-Bit Administrative tag" },

- { SUBTLV_IP_REACH_ADMIN_TAG64, "64-Bit Administrative tag" },

+static const struct tok clnp_option_sr_rr_string_values[] = {

+ { CLNP_OPTION_SOURCE_ROUTING, "source routing"},

+ { CLNP_OPTION_ROUTE_RECORDING, "recording of route in progress"},

{ 0, NULL }

};

{ 0, NULL }

};

-#define SUBTLV_AUTH_SIMPLE 1

-#define SUBTLV_AUTH_MD5 54

-#define SUBTLV_AUTH_MD5_LEN 16

-#define SUBTLV_AUTH_PRIVATE 255

+static const struct tok clnp_option_qos_global_values[] = {

+ { 0x20, "reserved"},

+ { 0x10, "sequencing vs. delay"},

+ { 0x08, "congested"},

+ { 0x04, "delay vs. cost"},

+ { 0x02, "error vs. delay"},

+ { 0x01, "error vs. cost"},

+ { 0, NULL }

+};

-static struct tok isis_subtlv_auth_values[] = {

- { SUBTLV_AUTH_SIMPLE, "simple text password"},

- { SUBTLV_AUTH_MD5, "HMAC-MD5 password"},

- { SUBTLV_AUTH_PRIVATE, "Routing Domain private password"},

+#define ISIS_SUBTLV_EXT_IS_REACH_ADMIN_GROUP 3 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID 4 /* rfc4205 */

+#define ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID 5 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR 6 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR 8 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW 9 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW 10 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW 11 /* rfc4124 */

+#define ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD 12 /* draft-ietf-tewg-diff-te-proto-06 */

+#define ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC 18 /* draft-ietf-isis-traffic-05 */

+#define ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE 19 /* draft-ietf-isis-link-attr-01 */

+#define ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE 20 /* rfc4205 */

+#define ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR 21 /* rfc4205 */

+#define ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS 22 /* rfc4124 */

+

+#define ISIS_SUBTLV_SPB_METRIC 29 /* rfc6329 */

+

+static const struct tok isis_ext_is_reach_subtlv_values[] = {

+ { ISIS_SUBTLV_EXT_IS_REACH_ADMIN_GROUP, "Administrative groups" },

+ { ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID, "Link Local/Remote Identifier" },

+ { ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID, "Link Remote Identifier" },

+ { ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR, "IPv4 interface address" },

+ { ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR, "IPv4 neighbor address" },

+ { ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW, "Maximum link bandwidth" },

+ { ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW, "Reservable link bandwidth" },

+ { ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW, "Unreserved bandwidth" },

+ { ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC, "Traffic Engineering Metric" },

+ { ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE, "Link Attribute" },

+ { ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE, "Link Protection Type" },

+ { ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR, "Interface Switching Capability" },

+ { ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD, "Bandwidth Constraints (old)" },

+ { ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS, "Bandwidth Constraints" },

+ { ISIS_SUBTLV_SPB_METRIC, "SPB Metric" },

+ { 250, "Reserved for cisco specific extensions" },

+ { 251, "Reserved for cisco specific extensions" },

+ { 252, "Reserved for cisco specific extensions" },

+ { 253, "Reserved for cisco specific extensions" },

+ { 254, "Reserved for cisco specific extensions" },

+ { 255, "Reserved for future expansion" },

{ 0, NULL }

};

{ 0, NULL }

};

-#define SUBTLV_IDRP_RES 0

-#define SUBTLV_IDRP_LOCAL 1

-#define SUBTLV_IDRP_ASN 2

+#define ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32 1 /* draft-ietf-isis-admin-tags-01 */

+#define ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64 2 /* draft-ietf-isis-admin-tags-01 */

+#define ISIS_SUBTLV_EXTD_IP_REACH_MGMT_PREFIX_COLOR 117 /* draft-ietf-isis-wg-multi-topology-05 */

+

+static const struct tok isis_ext_ip_reach_subtlv_values[] = {

+ { ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32, "32-Bit Administrative tag" },

+ { ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64, "64-Bit Administrative tag" },

+ { ISIS_SUBTLV_EXTD_IP_REACH_MGMT_PREFIX_COLOR, "Management Prefix Color" },

+ { 0, NULL }

+};

+

+static const struct tok isis_subtlv_link_attribute_values[] = {

+ { 0x01, "Local Protection Available" },

+ { 0x02, "Link excluded from local protection path" },

+ { 0x04, "Local maintenance required"},

+ { 0, NULL }

+};

-static struct tok isis_subtlv_idrp_values[] = {

- { SUBTLV_IDRP_RES, "Reserved"},

- { SUBTLV_IDRP_LOCAL, "Routing-Domain Specific"},

- { SUBTLV_IDRP_ASN, "AS Number Tag"},

+#define ISIS_SUBTLV_AUTH_SIMPLE 1

+#define ISIS_SUBTLV_AUTH_GENERIC 3 /* rfc 5310 */

+#define ISIS_SUBTLV_AUTH_MD5 54

+#define ISIS_SUBTLV_AUTH_MD5_LEN 16

+#define ISIS_SUBTLV_AUTH_PRIVATE 255

+

+static const struct tok isis_subtlv_auth_values[] = {

+ { ISIS_SUBTLV_AUTH_SIMPLE, "simple text password"},

+ { ISIS_SUBTLV_AUTH_GENERIC, "Generic Crypto key-id"},

+ { ISIS_SUBTLV_AUTH_MD5, "HMAC-MD5 password"},

+ { ISIS_SUBTLV_AUTH_PRIVATE, "Routing Domain private password"},

+ { 0, NULL }

+};

+

+#define ISIS_SUBTLV_IDRP_RES 0

+#define ISIS_SUBTLV_IDRP_LOCAL 1

+#define ISIS_SUBTLV_IDRP_ASN 2

+

+static const struct tok isis_subtlv_idrp_values[] = {

+ { ISIS_SUBTLV_IDRP_RES, "Reserved"},

+ { ISIS_SUBTLV_IDRP_LOCAL, "Routing-Domain Specific"},

+ { ISIS_SUBTLV_IDRP_ASN, "AS Number Tag"},

{ 0, NULL}

};

{ 0, NULL}

};

-#define ISIS_8BIT_MASK(x) ((x)&0xff)

+#define ISIS_SUBTLV_SPB_MCID 4

+#define ISIS_SUBTLV_SPB_DIGEST 5

+#define ISIS_SUBTLV_SPB_BVID 6

+

+#define ISIS_SUBTLV_SPB_INSTANCE 1

+#define ISIS_SUBTLV_SPBM_SI 3

+

+#define ISIS_SPB_MCID_LEN 51

+#define ISIS_SUBTLV_SPB_MCID_MIN_LEN 102

+#define ISIS_SUBTLV_SPB_DIGEST_MIN_LEN 33

+#define ISIS_SUBTLV_SPB_BVID_MIN_LEN 6

+#define ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN 19

+#define ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN 8

+

+static const struct tok isis_mt_port_cap_subtlv_values[] = {

+ { ISIS_SUBTLV_SPB_MCID, "SPB MCID" },

+ { ISIS_SUBTLV_SPB_DIGEST, "SPB Digest" },

+ { ISIS_SUBTLV_SPB_BVID, "SPB BVID" },

+ { 0, NULL }

+};

+

+static const struct tok isis_mt_capability_subtlv_values[] = {

+ { ISIS_SUBTLV_SPB_INSTANCE, "SPB Instance" },

+ { ISIS_SUBTLV_SPBM_SI, "SPBM Service Identifier and Unicast Address" },

+ { 0, NULL }

+};

+

+struct isis_spb_mcid {

+ uint8_t format_id;

+ uint8_t name[32];

+ uint8_t revision_lvl[2];

+ uint8_t digest[16];

+};

+

+struct isis_subtlv_spb_mcid {

+ struct isis_spb_mcid mcid;

+ struct isis_spb_mcid aux_mcid;

+};

+

+struct isis_subtlv_spb_instance {

+ uint8_t cist_root_id[8];

+ uint8_t cist_external_root_path_cost[4];

+ uint8_t bridge_priority[2];

+ uint8_t spsourceid[4];

+ uint8_t no_of_trees;

+};

+

+#define CLNP_SEGMENT_PART 0x80

+#define CLNP_MORE_SEGMENTS 0x40

+#define CLNP_REQUEST_ER 0x20

+

+static const struct tok clnp_flag_values[] = {

+ { CLNP_SEGMENT_PART, "Segmentation permitted"},

+ { CLNP_MORE_SEGMENTS, "more Segments"},

+ { CLNP_REQUEST_ER, "request Error Report"},

+ { 0, NULL}

+};

#define ISIS_MASK_LSP_OL_BIT(x) ((x)&0x4)

#define ISIS_MASK_LSP_ISTYPE_BITS(x) ((x)&0x3)

#define ISIS_MASK_LSP_OL_BIT(x) ((x)&0x4)

#define ISIS_MASK_LSP_ISTYPE_BITS(x) ((x)&0x3)

#define ISIS_MASK_MTID(x) ((x)&0x0fff)

#define ISIS_MASK_MTFLAGS(x) ((x)&0xf000)

#define ISIS_MASK_MTID(x) ((x)&0x0fff)

#define ISIS_MASK_MTFLAGS(x) ((x)&0xf000)

-static struct tok isis_mt_flag_values[] = {

- { 0x4000, "sub-TLVs present"},

- { 0x8000, "ATT bit set"},

+static const struct tok isis_mt_flag_values[] = {

+ { 0x4000, "ATT bit set"},

+ { 0x8000, "Overload bit set"},

{ 0, NULL}

};

{ 0, NULL}

};

-#define ISIS_MASK_TLV_EXT_IP_UPDOWN(x) ((x)&0x80)

-#define ISIS_MASK_TLV_EXT_IP_SUBTLV(x) ((x)&0x40)

+#define ISIS_MASK_TLV_EXTD_IP_UPDOWN(x) ((x)&0x80)

+#define ISIS_MASK_TLV_EXTD_IP_SUBTLV(x) ((x)&0x40)

-#define ISIS_MASK_TLV_EXT_IP6_IE(x) ((x)&0x40)

-#define ISIS_MASK_TLV_EXT_IP6_SUBTLV(x) ((x)&0x20)

+#define ISIS_MASK_TLV_EXTD_IP6_IE(x) ((x)&0x40)

+#define ISIS_MASK_TLV_EXTD_IP6_SUBTLV(x) ((x)&0x20)

#define ISIS_LSP_TLV_METRIC_SUPPORTED(x) ((x)&0x80)

#define ISIS_LSP_TLV_METRIC_IE(x) ((x)&0x40)

#define ISIS_LSP_TLV_METRIC_SUPPORTED(x) ((x)&0x80)

#define ISIS_LSP_TLV_METRIC_IE(x) ((x)&0x40)

#define ISIS_MASK_TLV_SHARED_RISK_GROUP(x) ((x)&0x1)

-static struct tok isis_mt_values[] = {

+static const struct tok isis_mt_values[] = {

{ 0, "IPv4 unicast"},

{ 1, "In-Band Management"},

{ 2, "IPv6 unicast"},

{ 0, "IPv4 unicast"},

{ 1, "In-Band Management"},

{ 2, "IPv6 unicast"},

{ 0, NULL }

};

{ 0, NULL }

};

-static struct tok isis_iih_circuit_type_values[] = {

+static const struct tok isis_iih_circuit_type_values[] = {

{ 1, "Level 1 only"},

{ 2, "Level 2 only"},

{ 3, "Level 1, Level 2"},

{ 1, "Level 1 only"},

{ 2, "Level 2 only"},

{ 3, "Level 1, Level 2"},

#define ISIS_LSP_TYPE_UNUSED2 2

#define ISIS_LSP_TYPE_LEVEL_2 3

#define ISIS_LSP_TYPE_UNUSED2 2

#define ISIS_LSP_TYPE_LEVEL_2 3

-static struct tok isis_lsp_istype_values[] = {

+static const struct tok isis_lsp_istype_values[] = {

{ ISIS_LSP_TYPE_UNUSED0, "Unused 0x0 (invalid)"},

{ ISIS_LSP_TYPE_LEVEL_1, "L1 IS"},

{ ISIS_LSP_TYPE_UNUSED2, "Unused 0x2 (invalid)"},

{ ISIS_LSP_TYPE_UNUSED0, "Unused 0x0 (invalid)"},

{ ISIS_LSP_TYPE_LEVEL_1, "L1 IS"},

{ ISIS_LSP_TYPE_UNUSED2, "Unused 0x2 (invalid)"},

- { ISIS_LSP_TYPE_LEVEL_2, "L1L2 IS"},

- { 0, NULL }

-};

-

-static struct tok osi_nlpid_values[] = {

- { NLPID_CLNS, "CLNS"},

- { NLPID_IP, "IPv4"},

- { NLPID_IP6, "IPv6"},

+ { ISIS_LSP_TYPE_LEVEL_2, "L2 IS"},

{ 0, NULL }

};

{ 0, NULL }

};

#define ISIS_PTP_ADJ_INIT 1

#define ISIS_PTP_ADJ_DOWN 2

#define ISIS_PTP_ADJ_INIT 1

#define ISIS_PTP_ADJ_DOWN 2

-

-static struct tok isis_ptp_adjancey_values[] = {

+static const struct tok isis_ptp_adjancey_values[] = {

{ ISIS_PTP_ADJ_UP, "Up" },

{ ISIS_PTP_ADJ_INIT, "Initializing" },

{ ISIS_PTP_ADJ_DOWN, "Down" },

{ ISIS_PTP_ADJ_UP, "Up" },

{ ISIS_PTP_ADJ_INIT, "Initializing" },

{ ISIS_PTP_ADJ_DOWN, "Down" },

};

struct isis_tlv_ptp_adj {

};

struct isis_tlv_ptp_adj {

- u_int8_t adjacency_state;

- u_int8_t extd_local_circuit_id[4];

- u_int8_t neighbor_sysid[SYSTEM_ID_LEN];

- u_int8_t neighbor_extd_local_circuit_id[4];

+ uint8_t adjacency_state;

+ uint8_t extd_local_circuit_id[4];

+ uint8_t neighbor_sysid[SYSTEM_ID_LEN];

+ uint8_t neighbor_extd_local_circuit_id[4];

};

-static int osi_cksum(const u_int8_t *, u_int);

-static void esis_print(const u_int8_t *, u_int);

-static int isis_print(const u_int8_t *, u_int);

+static void osi_print_cksum(netdissect_options *, const uint8_t *pptr, uint16_t checksum,

+ u_int checksum_offset, u_int length);

+static int clnp_print(netdissect_options *, const uint8_t *, u_int);

+static void esis_print(netdissect_options *, const uint8_t *, u_int);

+static int isis_print(netdissect_options *, const uint8_t *, u_int);

struct isis_metric_block {

- u_int8_t metric_default;

- u_int8_t metric_delay;

- u_int8_t metric_expense;

- u_int8_t metric_error;

+ uint8_t metric_default;

+ uint8_t metric_delay;

+ uint8_t metric_expense;

+ uint8_t metric_error;

};

struct isis_tlv_is_reach {

struct isis_metric_block isis_metric_block;

};

struct isis_tlv_is_reach {

struct isis_metric_block isis_metric_block;

- u_int8_t neighbor_nodeid[NODE_ID_LEN];

+ uint8_t neighbor_nodeid[NODE_ID_LEN];

};

struct isis_tlv_es_reach {

struct isis_metric_block isis_metric_block;

};

struct isis_tlv_es_reach {

struct isis_metric_block isis_metric_block;

- u_int8_t neighbor_sysid[SYSTEM_ID_LEN];

+ uint8_t neighbor_sysid[SYSTEM_ID_LEN];

};

struct isis_tlv_ip_reach {

struct isis_metric_block isis_metric_block;

};

struct isis_tlv_ip_reach {

struct isis_metric_block isis_metric_block;

- u_int8_t prefix[4];

- u_int8_t mask[4];

+ uint8_t prefix[4];

+ uint8_t mask[4];

};

-static struct tok isis_is_reach_virtual_values[] = {

+static const struct tok isis_is_reach_virtual_values[] = {

{ 0, "IsNotVirtual"},

{ 1, "IsVirtual"},

{ 0, NULL }

};

{ 0, "IsNotVirtual"},

{ 1, "IsVirtual"},

{ 0, NULL }

};

-static struct tok isis_restart_flag_values[] = {

+static const struct tok isis_restart_flag_values[] = {

{ 0x1, "Restart Request"},

{ 0x2, "Restart Acknowledgement"},

{ 0x1, "Restart Request"},

{ 0x2, "Restart Acknowledgement"},

+ { 0x4, "Suppress adjacency advertisement"},

{ 0, NULL }

};

struct isis_common_header {

{ 0, NULL }

};

struct isis_common_header {

- u_int8_t nlpid;

- u_int8_t fixed_len;

- u_int8_t version; /* Protocol version */

- u_int8_t id_length;

- u_int8_t pdu_type; /* 3 MSbits are reserved */

- u_int8_t pdu_version; /* Packet format version */

- u_int8_t reserved;

- u_int8_t max_area;

+ uint8_t nlpid;

+ uint8_t fixed_len;

+ uint8_t version; /* Protocol version */

+ uint8_t id_length;

+ uint8_t pdu_type; /* 3 MSbits are reserved */

+ uint8_t pdu_version; /* Packet format version */

+ uint8_t reserved;

+ uint8_t max_area;

};

struct isis_iih_lan_header {

};

struct isis_iih_lan_header {

- u_int8_t circuit_type;

- u_int8_t source_id[SYSTEM_ID_LEN];

- u_int8_t holding_time[2];

- u_int8_t pdu_len[2];

- u_int8_t priority;

- u_int8_t lan_id[NODE_ID_LEN];

+ uint8_t circuit_type;

+ uint8_t source_id[SYSTEM_ID_LEN];

+ uint8_t holding_time[2];

+ uint8_t pdu_len[2];

+ uint8_t priority;

+ uint8_t lan_id[NODE_ID_LEN];

};

struct isis_iih_ptp_header {

};

struct isis_iih_ptp_header {

- u_int8_t circuit_type;

- u_int8_t source_id[SYSTEM_ID_LEN];

- u_int8_t holding_time[2];

- u_int8_t pdu_len[2];

- u_int8_t circuit_id;

+ uint8_t circuit_type;

+ uint8_t source_id[SYSTEM_ID_LEN];

+ uint8_t holding_time[2];

+ uint8_t pdu_len[2];

+ uint8_t circuit_id;

};

struct isis_lsp_header {

};

struct isis_lsp_header {

- u_int8_t pdu_len[2];

- u_int8_t remaining_lifetime[2];

- u_int8_t lsp_id[LSP_ID_LEN];

- u_int8_t sequence_number[4];

- u_int8_t checksum[2];

- u_int8_t typeblock;

+ uint8_t pdu_len[2];

+ uint8_t remaining_lifetime[2];

+ uint8_t lsp_id[LSP_ID_LEN];

+ uint8_t sequence_number[4];

+ uint8_t checksum[2];

+ uint8_t typeblock;

};

struct isis_csnp_header {

};

struct isis_csnp_header {

- u_int8_t pdu_len[2];

- u_int8_t source_id[NODE_ID_LEN];

- u_int8_t start_lsp_id[LSP_ID_LEN];

- u_int8_t end_lsp_id[LSP_ID_LEN];

+ uint8_t pdu_len[2];

+ uint8_t source_id[NODE_ID_LEN];

+ uint8_t start_lsp_id[LSP_ID_LEN];

+ uint8_t end_lsp_id[LSP_ID_LEN];

};

struct isis_psnp_header {

};

struct isis_psnp_header {

- u_int8_t pdu_len[2];

- u_int8_t source_id[NODE_ID_LEN];

+ uint8_t pdu_len[2];

+ uint8_t source_id[NODE_ID_LEN];

};

struct isis_tlv_lsp {

};

struct isis_tlv_lsp {

- u_int8_t remaining_lifetime[2];

- u_int8_t lsp_id[LSP_ID_LEN];

- u_int8_t sequence_number[4];

- u_int8_t checksum[2];

+ uint8_t remaining_lifetime[2];

+ uint8_t lsp_id[LSP_ID_LEN];

+ uint8_t sequence_number[4];

+ uint8_t checksum[2];

};

-

-/* allocate space for the following string

- * xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx

- * 50 bytes plus one termination byte */

-static char *

-print_nsap(register const u_int8_t *pptr, register int nsap_length)

-{

- int nsap_idx;

- static char nsap_ascii_output[51];

- char *junk_buf = nsap_ascii_output;

-

- if (nsap_length < 1 || nsap_length > 20) {

- sprintf(junk_buf, "illegal length");

- return (nsap_ascii_output);

- }

-

- for (nsap_idx = 0; nsap_idx < nsap_length; nsap_idx++) {

- if (!TTEST2(*pptr, 1))

- return (0);

- sprintf(junk_buf, "%02x", *pptr++);

- junk_buf += strlen(junk_buf);

- if (((nsap_idx & 1) == 0) &&

- (nsap_idx + 1 < nsap_length)) {

- *junk_buf++ = '.';

- }

- *(junk_buf) = '\0';

- return (nsap_ascii_output);

-}

-

#define ISIS_COMMON_HEADER_SIZE (sizeof(struct isis_common_header))

#define ISIS_IIH_LAN_HEADER_SIZE (sizeof(struct isis_iih_lan_header))

#define ISIS_IIH_PTP_HEADER_SIZE (sizeof(struct isis_iih_ptp_header))

#define ISIS_COMMON_HEADER_SIZE (sizeof(struct isis_common_header))

#define ISIS_IIH_LAN_HEADER_SIZE (sizeof(struct isis_iih_lan_header))

#define ISIS_IIH_PTP_HEADER_SIZE (sizeof(struct isis_iih_ptp_header))

#define ISIS_CSNP_HEADER_SIZE (sizeof(struct isis_csnp_header))

#define ISIS_PSNP_HEADER_SIZE (sizeof(struct isis_psnp_header))

#define ISIS_CSNP_HEADER_SIZE (sizeof(struct isis_csnp_header))

#define ISIS_PSNP_HEADER_SIZE (sizeof(struct isis_psnp_header))

-void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)

+void isoclns_print(netdissect_options *ndo,

+ const uint8_t *p, u_int length, u_int caplen)

{

- u_int8_t pdu_type;

- const struct isis_common_header *header;

-

- header = (const struct isis_common_header *)p;

- pdu_type = header->pdu_type & PDU_TYPE_MASK;

-

- printf("%sOSI", caplen < 1 ? "|" : "");

+ if (caplen <= 1) { /* enough bytes on the wire ? */

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

+ return;

+ }

- if (caplen < 1) /* enough bytes on the wire ? */

- return;

+ if (ndo->ndo_eflag)

+ ND_PRINT((ndo, "OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", *p), *p));

switch (*p) {

- case NLPID_CLNS:

- (void)printf(", CLNS, length %u", length);

+ case NLPID_CLNP:

+ if (!clnp_print(ndo, p, length))

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

break;

case NLPID_ESIS:

break;

case NLPID_ESIS:

- esis_print(p, length);

+ esis_print(ndo, p, length);

return;

case NLPID_ISIS:

return;

case NLPID_ISIS:

- if (!isis_print(p, length))

- print_unknown_data(p,"\n\t",caplen);

+ if (!isis_print(ndo, p, length))

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

break;

case NLPID_NULLNS:

break;

case NLPID_NULLNS:

- (void)printf(", ISO NULLNS, length: %u", length);

+ ND_PRINT((ndo, "%slength: %u", ndo->ndo_eflag ? "" : ", ", length));

+ break;

+

+ case NLPID_Q933:

+ q933_print(ndo, p + 1, length - 1);

+ break;

+

+ case NLPID_IP:

+ ip_print(ndo, p + 1, length - 1);

+ break;

+

+ case NLPID_IP6:

+ ip6_print(ndo, p + 1, length - 1);

+ break;

+

+ case NLPID_PPP:

+ ppp_print(ndo, p + 1, length - 1);

break;

default:

break;

default:

- (void)printf(", Unknown NLPID 0x%02x, length: %u", p[0], length);

+ if (!ndo->ndo_eflag)

+ ND_PRINT((ndo, "OSI NLPID 0x%02x unknown", *p));

+ ND_PRINT((ndo, "%slength: %u", ndo->ndo_eflag ? "" : ", ", length));

if (caplen > 1)

- print_unknown_data(p,"\n\t",caplen);

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

break;

}

break;

}

-#define ESIS_REDIRECT 6

-#define ESIS_ESH 2

-#define ESIS_ISH 4

+#define CLNP_PDU_ER 1

+#define CLNP_PDU_DT 28

+#define CLNP_PDU_MD 29

+#define CLNP_PDU_ERQ 30

+#define CLNP_PDU_ERP 31

+

+static const struct tok clnp_pdu_values[] = {

+ { CLNP_PDU_ER, "Error Report"},

+ { CLNP_PDU_MD, "MD"},

+ { CLNP_PDU_DT, "Data"},

+ { CLNP_PDU_ERQ, "Echo Request"},

+ { CLNP_PDU_ERP, "Echo Response"},

+ { 0, NULL }

+};

+

+struct clnp_header_t {

+ uint8_t nlpid;

+ uint8_t length_indicator;

+ uint8_t version;

+ uint8_t lifetime; /* units of 500ms */

+ uint8_t type;

+ uint8_t segment_length[2];

+ uint8_t cksum[2];

+};

+

+struct clnp_segment_header_t {

+ uint8_t data_unit_id[2];

+ uint8_t segment_offset[2];

+ uint8_t total_length[2];

+};

+

+/*

+ * clnp_print

+ * Decode CLNP packets. Return 0 on error.

+ */

+

+static int

+clnp_print(netdissect_options *ndo,

+ const uint8_t *pptr, u_int length)

+{

+ const uint8_t *optr,*source_address,*dest_address;

+ u_int li,tlen,nsap_offset,source_address_length,dest_address_length, clnp_pdu_type, clnp_flags;

+ const struct clnp_header_t *clnp_header;

+ const struct clnp_segment_header_t *clnp_segment_header;

+ uint8_t rfd_error_major,rfd_error_minor;

+

+ clnp_header = (const struct clnp_header_t *) pptr;

+ ND_TCHECK(*clnp_header);

+

+ li = clnp_header->length_indicator;

+ optr = pptr;

+

+ if (!ndo->ndo_eflag)

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

+

+ /*

+ * Sanity checking of the header.

+ */

+

+ if (clnp_header->version != CLNP_VERSION) {

+ ND_PRINT((ndo, "version %d packet not supported", clnp_header->version));

+ return (0);

+ }

+

+ /* FIXME further header sanity checking */

+

+ clnp_pdu_type = clnp_header->type & CLNP_PDU_TYPE_MASK;

+ clnp_flags = clnp_header->type & CLNP_FLAG_MASK;

+

+ pptr += sizeof(struct clnp_header_t);

+ li -= sizeof(struct clnp_header_t);

+ dest_address_length = *pptr;

+ dest_address = pptr + 1;

+

+ pptr += (1 + dest_address_length);

+ li -= (1 + dest_address_length);

+ source_address_length = *pptr;

+ source_address = pptr +1;

+

+ pptr += (1 + source_address_length);

+ li -= (1 + source_address_length);

+

+ if (ndo->ndo_vflag < 1) {

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

+ ndo->ndo_eflag ? "" : ", ",

+ isonsap_string(source_address, source_address_length),

+ isonsap_string(dest_address, dest_address_length),

+ tok2str(clnp_pdu_values,"unknown (%u)",clnp_pdu_type),

+ length));

+ return (1);

+ }

+ ND_PRINT((ndo, "%slength %u", ndo->ndo_eflag ? "" : ", ", length));

+

+ ND_PRINT((ndo, "\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x",

+ tok2str(clnp_pdu_values, "unknown (%u)",clnp_pdu_type),

+ clnp_header->length_indicator,

+ clnp_header->version,

+ clnp_header->lifetime/2,

+ (clnp_header->lifetime%2)*5,

+ EXTRACT_16BITS(clnp_header->segment_length),

+ EXTRACT_16BITS(clnp_header->cksum)));

+

+ osi_print_cksum(ndo, optr, EXTRACT_16BITS(clnp_header->cksum), 7,

+ clnp_header->length_indicator);

+

+ ND_PRINT((ndo, "\n\tFlags [%s]",

+ bittok2str(clnp_flag_values, "none", clnp_flags)));

+

+ ND_PRINT((ndo, "\n\tsource address (length %u): %s\n\tdest address (length %u): %s",

+ source_address_length,

+ isonsap_string(source_address, source_address_length),

+ dest_address_length,

+ isonsap_string(dest_address, dest_address_length)));

+

+ if (clnp_flags & CLNP_SEGMENT_PART) {

+ clnp_segment_header = (const struct clnp_segment_header_t *) pptr;

+ ND_TCHECK(*clnp_segment_header);

+ ND_PRINT((ndo, "\n\tData Unit ID: 0x%04x, Segment Offset: %u, Total PDU Length: %u",

+ EXTRACT_16BITS(clnp_segment_header->data_unit_id),

+ EXTRACT_16BITS(clnp_segment_header->segment_offset),

+ EXTRACT_16BITS(clnp_segment_header->total_length)));

+ pptr+=sizeof(const struct clnp_segment_header_t);

+ li-=sizeof(const struct clnp_segment_header_t);

+ }

+

+ /* now walk the options */

+ while (li >= 2) {

+ u_int op, opli;

+ const uint8_t *tptr;

+

+ ND_TCHECK2(*pptr, 2);

+ if (li < 2) {

+ ND_PRINT((ndo, ", bad opts/li"));

+ return (0);

+ }

+ op = *pptr++;

+ opli = *pptr++;

+ li -= 2;

+ ND_TCHECK2(*pptr, opli);

+ if (opli > li) {

+ ND_PRINT((ndo, ", opt (%d) too long", op));

+ return (0);

+ }

+ li -= opli;

+ tptr = pptr;

+ tlen = opli;

+

+ ND_PRINT((ndo, "\n\t %s Option #%u, length %u, value: ",

+ tok2str(clnp_option_values,"Unknown",op),

+ op,

+ opli));

+

+ switch (op) {

+

+ case CLNP_OPTION_ROUTE_RECORDING: /* those two options share the format */

+ case CLNP_OPTION_SOURCE_ROUTING:

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

+ tok2str(clnp_option_sr_rr_values,"Unknown",*tptr),

+ tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op)));

+ nsap_offset=*(tptr+1);

+ if (nsap_offset == 0) {

+ ND_PRINT((ndo, " Bad NSAP offset (0)"));

+ break;

+ }

+ nsap_offset-=1; /* offset to nsap list */

+ if (nsap_offset > tlen) {

+ ND_PRINT((ndo, " Bad NSAP offset (past end of option)"));

+ break;

+ }

+ tptr+=nsap_offset;

+ tlen-=nsap_offset;

+ while (tlen > 0) {

+ source_address_length=*tptr;

+ if (tlen < source_address_length+1) {

+ ND_PRINT((ndo, "\n\t NSAP address goes past end of option"));

+ break;

+ }

+ if (source_address_length > 0) {

+ source_address=(tptr+1);

+ ND_TCHECK2(*source_address, source_address_length);

+ ND_PRINT((ndo, "\n\t NSAP address (length %u): %s",

+ source_address_length,

+ isonsap_string(source_address, source_address_length)));

+ }

+ tlen-=source_address_length+1;

+ }

+ break;

+

+ case CLNP_OPTION_PRIORITY:

+ ND_PRINT((ndo, "0x%1x", *tptr&0x0f));

+ break;

+

+ case CLNP_OPTION_QOS_MAINTENANCE:

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

+ tok2str(clnp_option_scope_values, "Reserved", *tptr&CLNP_OPTION_SCOPE_MASK)));

+

+ if ((*tptr&CLNP_OPTION_SCOPE_MASK) == CLNP_OPTION_SCOPE_GLOBAL)

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

+ bittok2str(clnp_option_qos_global_values,

+ "none",

+ *tptr&CLNP_OPTION_OPTION_QOS_MASK)));

+ break;

+

+ case CLNP_OPTION_SECURITY:

+ ND_PRINT((ndo, "\n\t Format Code: %s, Security-Level %u",

+ tok2str(clnp_option_scope_values,"Reserved",*tptr&CLNP_OPTION_SCOPE_MASK),

+ *(tptr+1)));

+ break;

+

+ case CLNP_OPTION_DISCARD_REASON:

+ rfd_error_major = (*tptr&0xf0) >> 4;

+ rfd_error_minor = *tptr&0x0f;

+ ND_PRINT((ndo, "\n\t Class: %s Error (0x%01x), %s (0x%01x)",

+ tok2str(clnp_option_rfd_class_values,"Unknown",rfd_error_major),

+ rfd_error_major,

+ tok2str(clnp_option_rfd_error_class[rfd_error_major],"Unknown",rfd_error_minor),

+ rfd_error_minor));

+ break;

+

+ case CLNP_OPTION_PADDING:

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

+ break;

+

+ /*

+ * FIXME those are the defined Options that lack a decoder

+ * you are welcome to contribute code ;-)

+ */

+

+ default:

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

+ break;

+ }

+ if (ndo->ndo_vflag > 1)

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

+ pptr += opli;

+ }

+

+ switch (clnp_pdu_type) {

+

+ case CLNP_PDU_ER: /* fall through */

+ case CLNP_PDU_ERP:

+ ND_TCHECK(*pptr);

+ if (*(pptr) == NLPID_CLNP) {

+ ND_PRINT((ndo, "\n\t-----original packet-----\n\t"));

+ /* FIXME recursion protection */

+ clnp_print(ndo, pptr, length - clnp_header->length_indicator);

+ break;

+ }

+

+ case CLNP_PDU_DT:

+ case CLNP_PDU_MD:

+ case CLNP_PDU_ERQ:

+

+ default:

+ /* dump the PDU specific data */

+ if (length-(pptr-optr) > 0) {

+ ND_PRINT((ndo, "\n\t undecoded non-header data, length %u", length-clnp_header->length_indicator));

+ print_unknown_data(ndo, pptr, "\n\t ", length - (pptr - optr));

+ }

+

+ return (1);

+

+ trunc:

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

+ return (1);

+

+}

+

-static struct tok esis_values[] = {

- { ESIS_REDIRECT, "redirect"},

- { ESIS_ESH, "ESH"},

- { ESIS_ISH, "ISH"},

+#define ESIS_PDU_REDIRECT 6

+#define ESIS_PDU_ESH 2

+#define ESIS_PDU_ISH 4

+

+static const struct tok esis_pdu_values[] = {

+ { ESIS_PDU_REDIRECT, "redirect"},

+ { ESIS_PDU_ESH, "ESH"},

+ { ESIS_PDU_ISH, "ISH"},

{ 0, NULL }

};

{ 0, NULL }

};

-struct esis_hdr {

- u_int8_t version;

- u_int8_t reserved;

- u_int8_t type;

- u_int8_t tmo[2];

- u_int8_t cksum[2];

+struct esis_header_t {

+ uint8_t nlpid;

+ uint8_t length_indicator;

+ uint8_t version;

+ uint8_t reserved;

+ uint8_t type;

+ uint8_t holdtime[2];

+ uint8_t cksum[2];

};

static void

};

static void

-esis_print(const u_int8_t *p, u_int length)

+esis_print(netdissect_options *ndo,

+ const uint8_t *pptr, u_int length)

{

- const u_int8_t *ep;

- u_int li;

- const struct esis_hdr *eh;

+ const uint8_t *optr;

+ u_int li,esis_pdu_type,source_address_length, source_address_number;

+ const struct esis_header_t *esis_header;

+

+ if (!ndo->ndo_eflag)

+ ND_PRINT((ndo, "ES-IS"));

if (length <= 2) {

- if (qflag)

- printf(" bad pkt!");

- else

- printf(" no header at all!");

+ ND_PRINT((ndo, ndo->ndo_qflag ? "bad pkt!" : "no header at all!"));

return;

}

return;

}

- li = p[1];

- eh = (const struct esis_hdr *) &p[2];

- ep = p + li;

+

+ esis_header = (const struct esis_header_t *) pptr;

+ ND_TCHECK(*esis_header);

+ li = esis_header->length_indicator;

+ optr = pptr;

+

+ /*

+ * Sanity checking of the header.

+ */

+

+ if (esis_header->nlpid != NLPID_ESIS) {

+ ND_PRINT((ndo, " nlpid 0x%02x packet not supported", esis_header->nlpid));

+ return;

+ }

+

+ if (esis_header->version != ESIS_VERSION) {

+ ND_PRINT((ndo, " version %d packet not supported", esis_header->version));

+ return;

+ }

+

if (li > length) {

- if (qflag)

- printf(" bad pkt!");

- else

- printf(" LI(%d) > PDU size (%d)!", li, length);

- return;

+ ND_PRINT((ndo, " length indicator(%d) > PDU size (%d)!", li, length));

+ return;

}

- if (li < sizeof(struct esis_hdr) + 2) {

- if (qflag)

- printf(" bad pkt!");

- else {

- printf(" too short for esis header %d:", li);

- while (--length != 0)

- printf("%02X", *p++);

- }

- return;

+

+ if (li < sizeof(struct esis_header_t) + 2) {

+ ND_PRINT((ndo, " length indicator < min PDU size %d:", li));

+ while (--length != 0)

+ ND_PRINT((ndo, "%02X", *pptr++));

+ return;

}

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

- tok2str(esis_values,"unknown type: %u",eh->type & 0x1f),

- length);

+ esis_pdu_type = esis_header->type & ESIS_PDU_TYPE_MASK;

- if(vflag < 1)

- return;

+ if (ndo->ndo_vflag < 1) {

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

+ ndo->ndo_eflag ? "" : ", ",

+ tok2str(esis_pdu_values,"unknown type (%u)",esis_pdu_type),

+ length));

+ return;

+ } else

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

+ ndo->ndo_eflag ? "" : ", ",

+ length,

+ tok2str(esis_pdu_values,"unknown type: %u", esis_pdu_type),

+ esis_pdu_type));

- if (vflag && osi_cksum(p, li)) {

- printf(" bad cksum (got 0x%02x%02x)",

- eh->cksum[1], eh->cksum[0]);

- default_print(p, length);

- return;

- }

- if (eh->version != 1) {

- printf(" unsupported version %d", eh->version);

- return;

- }

- p += sizeof(*eh) + 2;

- li -= sizeof(*eh) + 2; /* protoid * li */

+ ND_PRINT((ndo, ", v: %u%s", esis_header->version, esis_header->version == ESIS_VERSION ? "" : "unsupported" ));

+ ND_PRINT((ndo, ", checksum: 0x%04x", EXTRACT_16BITS(esis_header->cksum)));

+

+ osi_print_cksum(ndo, pptr, EXTRACT_16BITS(esis_header->cksum), 7, li);

+

+ ND_PRINT((ndo, ", holding time: %us, length indicator: %u",

+ EXTRACT_16BITS(esis_header->holdtime), li));

+

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, optr, "\n\t", sizeof(struct esis_header_t));

- switch (eh->type & 0x1f) {

- case ESIS_REDIRECT: {

- const u_int8_t *dst, *snpa, *is;

+ pptr += sizeof(struct esis_header_t);

+ li -= sizeof(struct esis_header_t);

- dst = p; p += *p + 1;

- if (p > snapend)

+ switch (esis_pdu_type) {

+ case ESIS_PDU_REDIRECT: {

+ const uint8_t *dst, *snpa, *neta;

+ u_int dstl, snpal, netal;

+

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad redirect/li"));

+ return;

+ }

+ dstl = *pptr;

+ pptr++;

+ li--;

+ ND_TCHECK2(*pptr, dstl);

+ if (li < dstl) {

+ ND_PRINT((ndo, ", bad redirect/li"));

+ return;

+ }

+ dst = pptr;

+ pptr += dstl;

+ li -= dstl;

+ ND_PRINT((ndo, "\n\t %s", isonsap_string(dst, dstl)));

+

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad redirect/li"));

+ return;

+ }

+ snpal = *pptr;

+ pptr++;

+ li--;

+ ND_TCHECK2(*pptr, snpal);

+ if (li < snpal) {

+ ND_PRINT((ndo, ", bad redirect/li"));

return;

- printf("\n\t\t %s", isonsap_string(dst));

- snpa = p; p += *p + 1;

- is = p; p += *p + 1;

- if (p > snapend)

+ }

+ snpa = pptr;

+ pptr += snpal;

+ li -= snpal;

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad redirect/li"));

return;

- if (p > ep) {

- printf(" [bad li]");

+ }

+ netal = *pptr;

+ pptr++;

+ ND_TCHECK2(*pptr, netal);

+ if (li < netal) {

+ ND_PRINT((ndo, ", bad redirect/li"));

return;

}

return;

}

- if (is[0] == 0)

- printf(" > %s", etheraddr_string(&snpa[1]));

+ neta = pptr;

+ pptr += netal;

+ li -= netal;

+

+ if (netal == 0)

+ ND_PRINT((ndo, "\n\t %s", etheraddr_string(ndo, snpa)));

else

- printf(" > %s", isonsap_string(is));

- li = ep - p;

+ ND_PRINT((ndo, "\n\t %s", isonsap_string(neta, netal)));

break;

}

break;

}

- case ESIS_ESH:

- break;

+ case ESIS_PDU_ESH:

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad esh/li"));

+ return;

+ }

+ source_address_number = *pptr;

+ pptr++;

+ li--;

+

+ ND_PRINT((ndo, "\n\t Number of Source Addresses: %u", source_address_number));

+

+ while (source_address_number > 0) {

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad esh/li"));

+ return;

+ }

+ source_address_length = *pptr;

+ pptr++;

+ li--;

+

+ ND_TCHECK2(*pptr, source_address_length);

+ if (li < source_address_length) {

+ ND_PRINT((ndo, ", bad esh/li"));

+ return;

+ }

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

+ source_address_length,

+ isonsap_string(pptr, source_address_length)));

+ pptr += source_address_length;

+ li -= source_address_length;

+ source_address_number--;

+ }

- case ESIS_ISH: {

- const u_int8_t *is;

+ break;

- is = p; p += *p + 1;

- if (p > ep) {

- printf(" [bad li]");

- return;

- }

- if (p > snapend)

- return;

- if (!qflag)

- printf("\n\tNET: %s", print_nsap(is+1,*is));

- li = ep - p;

- break;

+ case ESIS_PDU_ISH: {

+ ND_TCHECK(*pptr);

+ if (li < 1) {

+ ND_PRINT((ndo, ", bad ish/li"));

+ return;

+ }

+ source_address_length = *pptr;

+ pptr++;

+ li--;

+ ND_TCHECK2(*pptr, source_address_length);

+ if (li < source_address_length) {

+ ND_PRINT((ndo, ", bad ish/li"));

+ return;

+ }

+ ND_PRINT((ndo, "\n\t NET (length: %u): %s", source_address_length, isonsap_string(pptr, source_address_length)));

+ pptr += source_address_length;

+ li -= source_address_length;

+ break;

}

default:

}

default:

- if (vflag <= 1) {

- if (p < snapend)

- print_unknown_data(p,"\n\t ",snapend-p);

- }

- return;

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

+ if (pptr < ndo->ndo_snapend)

+ print_unknown_data(ndo, pptr, "\n\t ", ndo->ndo_snapend - pptr);

+ }

+ return;

}

- /* hexdump - FIXME ? */

- if (vflag > 1) {

- if (p < snapend)

- print_unknown_data(p,"\n\t ",snapend-p);

+ /* now walk the options */

+ while (li != 0) {

+ u_int op, opli;

+ const uint8_t *tptr;

+

+ if (li < 2) {

+ ND_PRINT((ndo, ", bad opts/li"));

+ return;

+ }

+ ND_TCHECK2(*pptr, 2);

+ op = *pptr++;

+ opli = *pptr++;

+ li -= 2;

+ if (opli > li) {

+ ND_PRINT((ndo, ", opt (%d) too long", op));

+ return;

+ }

+ li -= opli;

+ tptr = pptr;

+

+ ND_PRINT((ndo, "\n\t %s Option #%u, length %u, value: ",

+ tok2str(esis_option_values,"Unknown",op),

+ op,

+ opli));

+

+ switch (op) {

+

+ case ESIS_OPTION_ES_CONF_TIME:

+ if (opli == 2) {

+ ND_TCHECK2(*pptr, 2);

+ ND_PRINT((ndo, "%us", EXTRACT_16BITS(tptr)));

+ } else

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

+ break;

+

+ case ESIS_OPTION_PROTOCOLS:

+ while (opli>0) {

+ ND_TCHECK(*pptr);

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

+ tok2str(nlpid_values,

+ "unknown",

+ *tptr),

+ *tptr));

+ if (opli>1) /* further NPLIDs ? - put comma */

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

+ tptr++;

+ opli--;

+ }

+ break;

+

+ /*

+ * FIXME those are the defined Options that lack a decoder

+ * you are welcome to contribute code ;-)

+ */

+

+ case ESIS_OPTION_QOS_MAINTENANCE:

+ case ESIS_OPTION_SECURITY:

+ case ESIS_OPTION_PRIORITY:

+ case ESIS_OPTION_ADDRESS_MASK:

+ case ESIS_OPTION_SNPA_MASK:

+

+ default:

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

+ break;

+ }

+ if (ndo->ndo_vflag > 1)

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

+ pptr += opli;

+ }

+trunc:

+ return;

+}

+

+static void

+isis_print_mcid(netdissect_options *ndo,

+ const struct isis_spb_mcid *mcid)

+{

+ int i;

+

+ ND_PRINT((ndo, "ID: %d, Name: ", mcid->format_id));

+

+ for(i=0; i<32; i++)

+ {

+ ND_PRINT((ndo, "%c", mcid->name[i]));

+ if(mcid->name[i] == '\0')

+ break;

+ }

+

+ ND_PRINT((ndo, "\n\t Lvl: %d", EXTRACT_16BITS(mcid->revision_lvl)));

+

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

+

+ for(i=0;i<16;i++)

+ ND_PRINT((ndo, "%.2x ", mcid->digest[i]));

+}

+

+static int

+isis_print_mt_port_cap_subtlv(netdissect_options *ndo,

+ const uint8_t *tptr, int len)

+{

+ int stlv_type, stlv_len;

+ const struct isis_subtlv_spb_mcid *subtlv_spb_mcid;

+ int i;

+

+ while (len > 0)

+ {

+ stlv_type = *(tptr++);

+ stlv_len = *(tptr++);

+

+ /* first lets see if we know the subTLVs name*/

+ ND_PRINT((ndo, "\n\t %s subTLV #%u, length: %u",

+ tok2str(isis_mt_port_cap_subtlv_values, "unknown", stlv_type),

+ stlv_type,

+ stlv_len));

+

+ /*len -= TLV_TYPE_LEN_OFFSET;*/

+ len = len -2;

+

+ switch (stlv_type)

+ {

+ case ISIS_SUBTLV_SPB_MCID:

+ {

+ if (!ND_TTEST2(*(tptr), ISIS_SUBTLV_SPB_MCID_MIN_LEN))

+ goto trunctlv;

+

+ subtlv_spb_mcid = (struct isis_subtlv_spb_mcid *)tptr;

+

+ ND_PRINT((ndo, "\n\t MCID: "));

+ isis_print_mcid(ndo, &(subtlv_spb_mcid->mcid));

+

+ /*tptr += SPB_MCID_MIN_LEN;

+ len -= SPB_MCID_MIN_LEN; */

+

+ ND_PRINT((ndo, "\n\t AUX-MCID: "));

+ isis_print_mcid(ndo, &(subtlv_spb_mcid->aux_mcid));

+

+ /*tptr += SPB_MCID_MIN_LEN;

+ len -= SPB_MCID_MIN_LEN; */

+ tptr = tptr + sizeof(struct isis_subtlv_spb_mcid);

+ len = len - sizeof(struct isis_subtlv_spb_mcid);

+

+ break;

+ }

+

+ case ISIS_SUBTLV_SPB_DIGEST:

+ {

+ if (!ND_TTEST2(*(tptr), ISIS_SUBTLV_SPB_DIGEST_MIN_LEN))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t RES: %d V: %d A: %d D: %d",

+ (*(tptr) >> 5), (((*tptr)>> 4) & 0x01),

+ ((*(tptr) >> 2) & 0x03), ((*tptr) & 0x03)));

+

+ tptr++;

+

+ ND_PRINT((ndo, "\n\t Digest: "));

+

+ for(i=1;i<=8; i++)

+ {

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

+ if (i%4 == 0 && i != 8)

+ ND_PRINT((ndo, "\n\t "));

+ tptr = tptr + 4;

}

- if (vflag)

- while (p < ep && li) {

- u_int op, opli;

- const u_int8_t *q;

-

- if (snapend - p < 2)

- return;

- if (li < 2) {

- printf(", bad opts/li");

- return;

- }

- op = *p++;

- opli = *p++;

- li -= 2;

- if (opli > li) {

- printf(", opt (%d) too long", op);

- return;

- }

- li -= opli;

- q = p;

- p += opli;

-

- if (snapend < p)

- return;

-

- if (op == TLV_HOLDTIME && opli == 2) {

- printf("\n\tholdtime: %us", EXTRACT_16BITS(q));

- continue;

- }

-

- if (op == TLV_PROTOCOLS && opli >= 1) {

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

- tok2str(isis_tlv_values, "unknown", op),

- opli,

- tok2str(osi_nlpid_values,"Unknown 0x%02x",*q));

- continue;

- }

-

- print_unknown_data(q,"\n\t ",opli);

- }

+

+ len = len - ISIS_SUBTLV_SPB_DIGEST_MIN_LEN;

+

+ break;

+ }

+

+ case ISIS_SUBTLV_SPB_BVID:

+ {

+ if (!ND_TTEST2(*(tptr), stlv_len))

+ goto trunctlv;

+

+ while (len)

+ {

+ if (!ND_TTEST2(*(tptr), ISIS_SUBTLV_SPB_BVID_MIN_LEN))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t ECT: %08x",

+ EXTRACT_32BITS(tptr)));

+

+ tptr = tptr+4;

+

+ ND_PRINT((ndo, " BVID: %d, U:%01x M:%01x ",

+ (EXTRACT_16BITS (tptr) >> 4) ,

+ (EXTRACT_16BITS (tptr) >> 3) & 0x01,

+ (EXTRACT_16BITS (tptr) >> 2) & 0x01));

+

+ tptr = tptr + 2;

+ len = len - ISIS_SUBTLV_SPB_BVID_MIN_LEN;

+ }

+

+ break;

+ }

+

+ default:

+ break;

+ }

+

+ return 0;

+

+ trunctlv:

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

+ return(1);

}

-/* shared routine for printing system, node and lsp-ids

- * allocate space for the worst-case string

- * xxxx.xxxx.xxxx.yy-zz

- * 20 bytes plus one termination byte */

+static int

+isis_print_mt_capability_subtlv(netdissect_options *ndo,

+ const uint8_t *tptr, int len)

+{

+ int stlv_type, stlv_len, tmp;

+

+ while (len > 0)

+ {

+ stlv_type = *(tptr++);

+ stlv_len = *(tptr++);

+

+ /* first lets see if we know the subTLVs name*/

+ ND_PRINT((ndo, "\n\t %s subTLV #%u, length: %u",

+ tok2str(isis_mt_capability_subtlv_values, "unknown", stlv_type),

+ stlv_type,

+ stlv_len));

+

+ len = len - 2;

+

+ switch (stlv_type)

+ {

+ case ISIS_SUBTLV_SPB_INSTANCE:

+

+ if (!ND_TTEST2(*(tptr), ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t CIST Root-ID: %08x", EXTRACT_32BITS(tptr)));

+ tptr = tptr+4;

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

+ tptr = tptr+4;

+ ND_PRINT((ndo, ", Path Cost: %08x", EXTRACT_32BITS(tptr)));

+ tptr = tptr+4;

+ ND_PRINT((ndo, ", Prio: %d", EXTRACT_16BITS(tptr)));

+ tptr = tptr + 2;

+ ND_PRINT((ndo, "\n\t RES: %d",

+ EXTRACT_16BITS(tptr) >> 5));

+ ND_PRINT((ndo, ", V: %d",

+ (EXTRACT_16BITS(tptr) >> 4) & 0x0001));

+ ND_PRINT((ndo, ", SPSource-ID: %d",

+ (EXTRACT_32BITS(tptr) & 0x000fffff)));

+ tptr = tptr+4;

+ ND_PRINT((ndo, ", No of Trees: %x", *(tptr)));

+

+ tmp = *(tptr++);

+

+ len = len - ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN;

+

+ while (tmp)

+ {

+ if (!ND_TTEST2(*(tptr), ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t U:%d, M:%d, A:%d, RES:%d",

+ *(tptr) >> 7, (*(tptr) >> 6) & 0x01,

+ (*(tptr) >> 5) & 0x01, (*(tptr) & 0x1f)));

+

+ tptr++;

+

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

+

+ tptr = tptr + 4;

+

+ ND_PRINT((ndo, ", BVID: %d, SPVID: %d",

+ (EXTRACT_24BITS(tptr) >> 12) & 0x000fff,

+ EXTRACT_24BITS(tptr) & 0x000fff));

+

+ tptr = tptr + 3;

+ len = len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN;

+ tmp--;

+ }

+

+ break;

+

+ case ISIS_SUBTLV_SPBM_SI:

+

+ if (!ND_TTEST2(*(tptr), 6))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t BMAC: %08x", EXTRACT_32BITS(tptr)));

+ tptr = tptr+4;

+ ND_PRINT((ndo, "%04x", EXTRACT_16BITS(tptr)));

+ tptr = tptr+2;

+

+ ND_PRINT((ndo, ", RES: %d, VID: %d", EXTRACT_16BITS(tptr) >> 12,

+ (EXTRACT_16BITS(tptr)) & 0x0fff));

+

+ tptr = tptr+2;

+ len = len - 8;

+ stlv_len = stlv_len - 8;

+

+ while (stlv_len)

+ {

+ ND_PRINT((ndo, "\n\t T: %d, R: %d, RES: %d, ISID: %d",

+ (EXTRACT_32BITS(tptr) >> 31),

+ (EXTRACT_32BITS(tptr) >> 30) & 0x01,

+ (EXTRACT_32BITS(tptr) >> 24) & 0x03f,

+ (EXTRACT_32BITS(tptr)) & 0x0ffffff));

+

+ tptr = tptr + 4;

+ len = len - 4;

+ stlv_len = stlv_len - 4;

+ }

+

+ break;

+

+ default:

+ break;

+ }

+ return 0;

+

+ trunctlv:

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

+ return(1);

+}

+

+/* shared routine for printing system, node and lsp-ids */

static char *

-isis_print_id(const u_int8_t *cp, int id_len)

+isis_print_id(const uint8_t *cp, int id_len)

{

int i;

{

int i;

- static char id[21];

+ static char id[sizeof("xxxx.xxxx.xxxx.yy-zz")];

char *pos = id;

for (i = 1; i <= SYSTEM_ID_LEN; i++) {

char *pos = id;

for (i = 1; i <= SYSTEM_ID_LEN; i++) {

- sprintf(pos, "%02x", *cp++);

+ snprintf(pos, sizeof(id) - (pos - id), "%02x", *cp++);

pos += strlen(pos);

if (i == 2 || i == 4)

*pos++ = '.';

}

if (id_len >= NODE_ID_LEN) {

pos += strlen(pos);

if (i == 2 || i == 4)

*pos++ = '.';

}

if (id_len >= NODE_ID_LEN) {

- sprintf(pos, ".%02x", *cp++);

+ snprintf(pos, sizeof(id) - (pos - id), ".%02x", *cp++);

pos += strlen(pos);

}

if (id_len == LSP_ID_LEN)

pos += strlen(pos);

}

if (id_len == LSP_ID_LEN)

- sprintf(pos, "-%02x", *cp);

+ snprintf(pos, sizeof(id) - (pos - id), "-%02x", *cp);

return (id);

}

/* print the 4-byte metric block which is common found in the old-style TLVs */

static int

return (id);

}

/* print the 4-byte metric block which is common found in the old-style TLVs */

static int

-isis_print_metric_block (const struct isis_metric_block *isis_metric_block)

+isis_print_metric_block(netdissect_options *ndo,

+ const struct isis_metric_block *isis_metric_block)

{

- printf(", Default Metric: %d, %s",

+ ND_PRINT((ndo, ", Default Metric: %d, %s",

ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_default),

- ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_default) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_default) ? "External" : "Internal"));

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_delay))

- printf("\n\t\t Delay Metric: %d, %s",

+ ND_PRINT((ndo, "\n\t\t Delay Metric: %d, %s",

ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_delay),

- ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_delay) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_delay) ? "External" : "Internal"));

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_expense))

- printf("\n\t\t Expense Metric: %d, %s",

+ ND_PRINT((ndo, "\n\t\t Expense Metric: %d, %s",

ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_expense),

- ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_expense) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_expense) ? "External" : "Internal"));

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_error))

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

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

ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_error),

- ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_error) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_error) ? "External" : "Internal"));

return(1); /* everything is ok */

}

static int

return(1); /* everything is ok */

}

static int

-isis_print_tlv_ip_reach (const u_int8_t *cp, const char *ident, int length)

+isis_print_tlv_ip_reach(netdissect_options *ndo,

+ const uint8_t *cp, const char *ident, int length)

{

int prefix_len;

const struct isis_tlv_ip_reach *tlv_ip_reach;

{

int prefix_len;

const struct isis_tlv_ip_reach *tlv_ip_reach;

while (length > 0) {

if ((size_t)length < sizeof(*tlv_ip_reach)) {

while (length > 0) {

if ((size_t)length < sizeof(*tlv_ip_reach)) {

- printf("short IPv4 reachability (%d vs %lu)",

+ ND_PRINT((ndo, "short IPv4 Reachability (%d vs %lu)",

length,

- (unsigned long)sizeof(*tlv_ip_reach));

+ (unsigned long)sizeof(*tlv_ip_reach)));

return (0);

}

return (0);

}

- if (!TTEST(*tlv_ip_reach))

+ if (!ND_TTEST(*tlv_ip_reach))

return (0);

prefix_len = mask2plen(EXTRACT_32BITS(tlv_ip_reach->mask));

if (prefix_len == -1)

return (0);

prefix_len = mask2plen(EXTRACT_32BITS(tlv_ip_reach->mask));

if (prefix_len == -1)

- printf("%sIPv4 prefix: %s mask %s",

+ ND_PRINT((ndo, "%sIPv4 prefix: %s mask %s",

ident,

- ipaddr_string((tlv_ip_reach->prefix)),

- ipaddr_string((tlv_ip_reach->mask)));

+ ipaddr_string(ndo, (tlv_ip_reach->prefix)),

+ ipaddr_string(ndo, (tlv_ip_reach->mask))));

else

- printf("%sIPv4 prefix: %15s/%u",

+ ND_PRINT((ndo, "%sIPv4 prefix: %15s/%u",

ident,

- ipaddr_string((tlv_ip_reach->prefix)),

- prefix_len);

+ ipaddr_string(ndo, (tlv_ip_reach->prefix)),

+ prefix_len));

- printf(", Distribution: %s, Metric: %u, %s",

+ ND_PRINT((ndo, ", Distribution: %s, Metric: %u, %s",

ISIS_LSP_TLV_METRIC_UPDOWN(tlv_ip_reach->isis_metric_block.metric_default) ? "down" : "up",

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_default),

ISIS_LSP_TLV_METRIC_UPDOWN(tlv_ip_reach->isis_metric_block.metric_default) ? "down" : "up",

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_default),

- ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_default) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_default) ? "External" : "Internal"));

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_delay))

- printf("%s Delay Metric: %u, %s",

+ ND_PRINT((ndo, "%s Delay Metric: %u, %s",

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay),

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay),

- ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal");

-

+ ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal"));

+

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_expense))

- printf("%s Expense Metric: %u, %s",

+ ND_PRINT((ndo, "%s Expense Metric: %u, %s",

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense),

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense),

- ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal");

-

+ ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal"));

+

if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_error))

- printf("%s Error Metric: %u, %s",

+ ND_PRINT((ndo, "%s Error Metric: %u, %s",

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error),

ident,

ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error),

- ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal");

+ ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal"));

length -= sizeof(struct isis_tlv_ip_reach);

tlv_ip_reach++;

length -= sizeof(struct isis_tlv_ip_reach);

tlv_ip_reach++;

*/

static int

*/

static int

-isis_print_ip_reach_subtlv (const u_int8_t *tptr,int subt,int subl,const char *ident) {

+isis_print_ip_reach_subtlv(netdissect_options *ndo,

+ const uint8_t *tptr, int subt, int subl,

+ const char *ident) {

/* first lets see if we know the subTLVs name*/

- printf("%s%s (subTLV #%u), length: %u",

- ident,

- tok2str(isis_ext_ip_reach_subtlv_values,

- "unknown",

- subt),

- subt,

- subl);

+ ND_PRINT((ndo, "%s%s subTLV #%u, length: %u",

+ ident, tok2str(isis_ext_ip_reach_subtlv_values, "unknown", subt),

+ subt, subl));

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

+ if (!ND_TTEST2(*tptr,subl))

goto trunctlv;

switch(subt) {

goto trunctlv;

switch(subt) {

- case SUBTLV_IP_REACH_ADMIN_TAG32:

+ case ISIS_SUBTLV_EXTD_IP_REACH_MGMT_PREFIX_COLOR: /* fall through */

+ case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32:

while (subl >= 4) {

- printf(", 0x%08x (=%u)",

+ ND_PRINT((ndo, ", 0x%08x (=%u)",

EXTRACT_32BITS(tptr),

- EXTRACT_32BITS(tptr));

+ EXTRACT_32BITS(tptr)));

tptr+=4;

subl-=4;

}

break;

tptr+=4;

subl-=4;

}

break;

- case SUBTLV_IP_REACH_ADMIN_TAG64:

+ case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64:

while (subl >= 8) {

- printf(", 0x%08x%08x",

+ ND_PRINT((ndo, ", 0x%08x%08x",

EXTRACT_32BITS(tptr),

- EXTRACT_32BITS(tptr+4));

+ EXTRACT_32BITS(tptr+4)));

tptr+=8;

subl-=8;

}

break;

default:

tptr+=8;

subl-=8;

}

break;

default:

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

- subl))

+ if (!print_unknown_data(ndo, tptr, "\n\t\t ", subl))

return(0);

break;

}

return(1);

return(0);

break;

}

return(1);

-

+

trunctlv:

- printf("%spacket exceeded snapshot",ident);

+ ND_PRINT((ndo, "%spacket exceeded snapshot", ident));

return(0);

}

return(0);

}

*/

static int

*/

static int

-isis_print_is_reach_subtlv (const u_int8_t *tptr,int subt,int subl,const char *ident) {

+isis_print_is_reach_subtlv(netdissect_options *ndo,

+ const uint8_t *tptr, u_int subt, u_int subl,

+ const char *ident) {

- int i;

+ u_int te_class,priority_level,gmpls_switch_cap;

union { /* int to float conversion buffer for several subTLVs */

- float f;

- u_int32_t i;

+ float f;

+ uint32_t i;

} bw;

/* first lets see if we know the subTLVs name*/

} bw;

/* first lets see if we know the subTLVs name*/

- printf("%s%s (subTLV #%u), length: %u",

- ident,

- tok2str(isis_ext_is_reach_subtlv_values,

- "unknown",

- subt),

- subt,

- subl);

+ ND_PRINT((ndo, "%s%s subTLV #%u, length: %u",

+ ident, tok2str(isis_ext_is_reach_subtlv_values, "unknown", subt),

+ subt, subl));

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

+ if (!ND_TTEST2(*tptr,subl))

goto trunctlv;

switch(subt) {

goto trunctlv;

switch(subt) {

- case SUBTLV_EXT_IS_REACH_ADMIN_GROUP:

- case SUBTLV_EXT_IS_REACH_LINK_LOCAL_ID:

- case SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID:

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

+ case ISIS_SUBTLV_EXT_IS_REACH_ADMIN_GROUP:

+ case ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID:

+ case ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID:

+ if (subl >= 4) {

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

+ if (subl == 8) /* rfc4205 */

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

+ }

break;

- case SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR:

- case SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR:

- printf(", %s", ipaddr_string(tptr));

+ case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR:

+ case ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR:

+ if (subl >= sizeof(struct in_addr))

+ ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));

break;

- case SUBTLV_EXT_IS_REACH_MAX_LINK_BW :

- case SUBTLV_EXT_IS_REACH_RESERVABLE_BW:

- bw.i = EXTRACT_32BITS(tptr);

- printf(", %.3f Mbps", bw.f*8/1000000 );

+ case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW :

+ case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW:

+ if (subl >= 4) {

+ bw.i = EXTRACT_32BITS(tptr);

+ ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));

+ }

+ break;

+ case ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW :

+ if (subl >= 32) {

+ for (te_class = 0; te_class < 8; te_class++) {

+ bw.i = EXTRACT_32BITS(tptr);

+ ND_PRINT((ndo, "%s TE-Class %u: %.3f Mbps",

+ ident,

+ te_class,

+ bw.f * 8 / 1000000));

+ tptr+=4;

+ }

break;

- case SUBTLV_EXT_IS_REACH_UNRESERVED_BW :

- for (i = 0; i < 8; i++) {

+ case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS: /* fall through */

+ case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD:

+ ND_PRINT((ndo, "%sBandwidth Constraints Model ID: %s (%u)",

+ ident,

+ tok2str(diffserv_te_bc_values, "unknown", *tptr),

+ *tptr));

+ tptr++;

+ /* decode BCs until the subTLV ends */

+ for (te_class = 0; te_class < (subl-1)/4; te_class++) {

bw.i = EXTRACT_32BITS(tptr);

- printf("%s priority level %d: %.3f Mbps",

+ ND_PRINT((ndo, "%s Bandwidth constraint CT%u: %.3f Mbps",

ident,

- i,

- bw.f*8/1000000 );

+ te_class,

+ bw.f * 8 / 1000000));

+ tptr+=4;

}

break;

}

break;

- case SUBTLV_EXT_IS_REACH_TE_METRIC:

- printf(", %u", EXTRACT_24BITS(tptr));

+ case ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC:

+ if (subl >= 3)

+ ND_PRINT((ndo, ", %u", EXTRACT_24BITS(tptr)));

+ break;

+ case ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE:

+ if (subl == 2) {

+ ND_PRINT((ndo, ", [ %s ] (0x%04x)",

+ bittok2str(isis_subtlv_link_attribute_values,

+ "Unknown",

+ EXTRACT_16BITS(tptr)),

+ EXTRACT_16BITS(tptr)));

+ }

break;

- case SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE:

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

+ case ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE:

+ if (subl >= 2) {

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

bittok2str(gmpls_link_prot_values, "none", *tptr),

- *(tptr+1));

+ *(tptr+1)));

+ }

+ break;

+ case ISIS_SUBTLV_SPB_METRIC:

+ if (subl >= 6) {

+ ND_PRINT((ndo, ", LM: %u", EXTRACT_24BITS(tptr)));

+ tptr=tptr+3;

+ ND_PRINT((ndo, ", P: %u", *(tptr)));

+ tptr++;

+ ND_PRINT((ndo, ", P-ID: %u", EXTRACT_16BITS(tptr)));

+ }

break;

- case SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:

- printf("%s Interface Switching Capability:%s",

+ case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:

+ if (subl >= 36) {

+ gmpls_switch_cap = *tptr;

+ ND_PRINT((ndo, "%s Interface Switching Capability:%s",

ident,

- tok2str(gmpls_switch_cap_values, "Unknown", *(tptr)));

- printf(", LSP Encoding: %s",

- tok2str(gmpls_encoding_values, "Unknown", *(tptr+1)));

- printf("%s Max LSP Bandwidth:",ident);

- for (i = 0; i < 8; i++) {

+ tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap)));

+ ND_PRINT((ndo, ", LSP Encoding: %s",

+ tok2str(gmpls_encoding_values, "Unknown", *(tptr + 1))));

+ tptr+=4;

+ ND_PRINT((ndo, "%s Max LSP Bandwidth:", ident));

+ for (priority_level = 0; priority_level < 8; priority_level++) {

bw.i = EXTRACT_32BITS(tptr);

- printf("%s priority level %d: %.3f Mbps",

+ ND_PRINT((ndo, "%s priority level %d: %.3f Mbps",

ident,

- i,

- bw.f*8/1000000 );

- }

- subl-=36;

- /* there is some optional stuff left to decode but this is as of yet

- not specified so just lets hexdump what is left */

- if(subl>0){

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

- subl-36))

+ priority_level,

+ bw.f * 8 / 1000000));

+ tptr+=4;

+ }

+ subl-=36;

+ switch (gmpls_switch_cap) {

+ case GMPLS_PSC1:

+ case GMPLS_PSC2:

+ case GMPLS_PSC3:

+ case GMPLS_PSC4:

+ bw.i = EXTRACT_32BITS(tptr);

+ ND_PRINT((ndo, "%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000));

+ ND_PRINT((ndo, "%s Interface MTU: %u", ident, EXTRACT_16BITS(tptr + 4)));

+ break;

+ case GMPLS_TSC:

+ bw.i = EXTRACT_32BITS(tptr);

+ ND_PRINT((ndo, "%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000));

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

+ tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", *(tptr + 4))));

+ break;

+ default:

+ /* there is some optional stuff left to decode but this is as of yet

+ not specified so just lets hexdump what is left */

+ if(subl>0){

+ if (!print_unknown_data(ndo, tptr, "\n\t\t ", subl))

return(0);

+ }

}

break;

default:

}

break;

default:

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

- subl))

+ if (!print_unknown_data(ndo, tptr, "\n\t\t ", subl))

return(0);

break;

}

return(1);

trunctlv:

return(0);

break;

}

return(1);

trunctlv:

- printf("%spacket exceeded snapshot",ident);

+ ND_PRINT((ndo, "%spacket exceeded snapshot", ident));

return(0);

}

return(0);

}

*/

static int

*/

static int

-isis_print_ext_is_reach (const u_int8_t *tptr,const char *ident, int tlv) {

+isis_print_ext_is_reach(netdissect_options *ndo,

+ const uint8_t *tptr, const char *ident, int tlv_type) {

char ident_buffer[20];

- int subt,subl,tslen;

+ int subtlv_type,subtlv_len,subtlv_sum_len;

int proc_bytes = 0; /* how many bytes did we process ? */

-

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

+

+ if (!ND_TTEST2(*tptr, NODE_ID_LEN))

return(0);

- printf("%sIS Neighbor: %s", ident, isis_print_id(tptr, NODE_ID_LEN));

+ ND_PRINT((ndo, "%sIS Neighbor: %s", ident, isis_print_id(tptr, NODE_ID_LEN)));

tptr+=(NODE_ID_LEN);

- if (tlv != TLV_IS_ALIAS_ID) {

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

+ if (tlv_type != ISIS_TLV_IS_ALIAS_ID) { /* the Alias TLV Metric field is implicit 0 */

+ if (!ND_TTEST2(*tptr, 3)) /* and is therefore skipped */

return(0);

- printf(", Metric: %d",EXTRACT_24BITS(tptr));

+ ND_PRINT((ndo, ", Metric: %d", EXTRACT_24BITS(tptr)));

tptr+=3;

}

tptr+=3;

}

-

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

+

+ if (!ND_TTEST2(*tptr, 1))

return(0);

- tslen=*(tptr++); /* read out subTLV length */

+ subtlv_sum_len=*(tptr++); /* read out subTLV length */

proc_bytes=NODE_ID_LEN+3+1;

- printf(", %ssub-TLVs present",tslen ? "" : "no ");

- if (tslen) {

- printf(" (%u)",tslen);

- while (tslen>0) {

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

+ ND_PRINT((ndo, ", %ssub-TLVs present",subtlv_sum_len ? "" : "no "));

+ if (subtlv_sum_len) {

+ ND_PRINT((ndo, " (%u)", subtlv_sum_len));

+ while (subtlv_sum_len>0) {

+ if (!ND_TTEST2(*tptr,2))

return(0);

- subt=*(tptr++);

- subl=*(tptr++);

+ subtlv_type=*(tptr++);

+ subtlv_len=*(tptr++);

/* prepend the ident string */

snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

/* prepend the ident string */

snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

- if(!isis_print_is_reach_subtlv(tptr,subt,subl,ident_buffer))

+ if (!isis_print_is_reach_subtlv(ndo, tptr, subtlv_type, subtlv_len, ident_buffer))

return(0);

- tptr+=subl;

- tslen-=(subl+2);

- proc_bytes+=(subl+2);

+ tptr+=subtlv_len;

+ subtlv_sum_len-=(subtlv_len+2);

+ proc_bytes+=(subtlv_len+2);

}

return(proc_bytes);

}

return(proc_bytes);

*/

static int

*/

static int

-isis_print_mtid (const u_int8_t *tptr,const char *ident) {

-

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

+isis_print_mtid(netdissect_options *ndo,

+ const uint8_t *tptr, const char *ident) {

+

+ if (!ND_TTEST2(*tptr, 2))

return(0);

- printf("%s%s",

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

ident,

tok2str(isis_mt_values,

"Reserved for IETF Consensus",

ident,

tok2str(isis_mt_values,

"Reserved for IETF Consensus",

- ISIS_MASK_MTID(EXTRACT_16BITS(tptr))));

+ ISIS_MASK_MTID(EXTRACT_16BITS(tptr)))));

- printf(" Topology (0x%03x), Flags: [%s]",

+ ND_PRINT((ndo, " Topology (0x%03x), Flags: [%s]",

ISIS_MASK_MTID(EXTRACT_16BITS(tptr)),

- bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(EXTRACT_16BITS(tptr))));

+ bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(EXTRACT_16BITS(tptr)))));

return(2);

}

return(2);

}

*/

static int

*/

static int

-isis_print_extd_ip_reach (const u_int8_t *tptr, const char *ident, u_int16_t afi) {

+isis_print_extd_ip_reach(netdissect_options *ndo,

+ const uint8_t *tptr, const char *ident, uint16_t afi) {

char ident_buffer[20];

- u_int8_t prefix[16]; /* shared copy buffer for IPv4 and IPv6 prefixes */

+#ifdef INET6

+ uint8_t prefix[sizeof(struct in6_addr)]; /* shared copy buffer for IPv4 and IPv6 prefixes */

+#else

+ uint8_t prefix[sizeof(struct in_addr)]; /* shared copy buffer for IPv4 prefixes */

+#endif

u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;

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

+ if (!ND_TTEST2(*tptr, 4))

return (0);

metric = EXTRACT_32BITS(tptr);

processed=4;

tptr+=4;

return (0);

metric = EXTRACT_32BITS(tptr);

processed=4;

tptr+=4;

-

- if (afi == IPV4) {

- if (!TTEST2(*tptr, 1)) /* fetch status byte */

+

+ if (afi == AF_INET) {

+ if (!ND_TTEST2(*tptr, 1)) /* fetch status byte */

return (0);

status_byte=*(tptr++);

bit_length = status_byte&0x3f;

return (0);

status_byte=*(tptr++);

bit_length = status_byte&0x3f;

+ if (bit_length > 32) {

+ ND_PRINT((ndo, "%sIPv4 prefix: bad bit length %u",

+ ident,

+ bit_length));

+ return (0);

+ }

processed++;

#ifdef INET6

processed++;

#ifdef INET6

- } else if (afi == IPV6) {

- if (!TTEST2(*tptr, 1)) /* fetch status & prefix_len byte */

+ } else if (afi == AF_INET6) {

+ if (!ND_TTEST2(*tptr, 1)) /* fetch status & prefix_len byte */

return (0);

status_byte=*(tptr++);

bit_length=*(tptr++);

return (0);

status_byte=*(tptr++);

bit_length=*(tptr++);

+ if (bit_length > 128) {

+ ND_PRINT((ndo, "%sIPv6 prefix: bad bit length %u",

+ ident,

+ bit_length));

+ return (0);

+ }

processed+=2;

#endif

} else

return (0); /* somebody is fooling us */

byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */

processed+=2;

#endif

} else

return (0); /* somebody is fooling us */

byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */

-

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

+

+ if (!ND_TTEST2(*tptr, byte_length))

return (0);

- memset(prefix, 0, 16); /* clear the copy buffer */

+ memset(prefix, 0, sizeof prefix); /* clear the copy buffer */

memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */

tptr+=byte_length;

processed+=byte_length;

memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */

tptr+=byte_length;

processed+=byte_length;

- if (afi == IPV4)

- printf("%sIPv4 prefix: %15s/%u",

+ if (afi == AF_INET)

+ ND_PRINT((ndo, "%sIPv4 prefix: %15s/%u",

ident,

- ipaddr_string(prefix),

- bit_length);

+ ipaddr_string(ndo, prefix),

+ bit_length));

#ifdef INET6

- if (afi == IPV6)

- printf("%sIPv6 prefix: %s/%u",

+ if (afi == AF_INET6)

+ ND_PRINT((ndo, "%sIPv6 prefix: %s/%u",

ident,

- ip6addr_string(prefix),

- bit_length);

-#endif

-

- printf(", Distribution: %s, Metric: %u",

- ISIS_MASK_TLV_EXT_IP_UPDOWN(status_byte) ? "down" : "up",

- metric);

-

- if (afi == IPV4 && ISIS_MASK_TLV_EXT_IP_SUBTLV(status_byte))

- printf(", sub-TLVs present");

+ ip6addr_string(ndo, prefix),

+ bit_length));

+#endif

+

+ ND_PRINT((ndo, ", Distribution: %s, Metric: %u",

+ ISIS_MASK_TLV_EXTD_IP_UPDOWN(status_byte) ? "down" : "up",

+ metric));

+

+ if (afi == AF_INET && ISIS_MASK_TLV_EXTD_IP_SUBTLV(status_byte))

+ ND_PRINT((ndo, ", sub-TLVs present"));

#ifdef INET6

- if (afi == IPV6)

- printf(", %s%s",

- ISIS_MASK_TLV_EXT_IP6_IE(status_byte) ? "External" : "Internal",

- ISIS_MASK_TLV_EXT_IP6_SUBTLV(status_byte) ? ", sub-TLVs present" : "");

+ if (afi == AF_INET6)

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

+ ISIS_MASK_TLV_EXTD_IP6_IE(status_byte) ? "External" : "Internal",

+ ISIS_MASK_TLV_EXTD_IP6_SUBTLV(status_byte) ? ", sub-TLVs present" : ""));

#endif

-

- if ((ISIS_MASK_TLV_EXT_IP_SUBTLV(status_byte) && afi == IPV4) ||

- (ISIS_MASK_TLV_EXT_IP6_SUBTLV(status_byte) && afi == IPV6)) {

+

+ if ((afi == AF_INET && ISIS_MASK_TLV_EXTD_IP_SUBTLV(status_byte))

+#ifdef INET6

+ || (afi == AF_INET6 && ISIS_MASK_TLV_EXTD_IP6_SUBTLV(status_byte))

+#endif

+ ) {

/* assume that one prefix can hold more

than one subTLV - therefore the first byte must reflect

the aggregate bytecount of the subTLVs for this prefix

*/

/* assume that one prefix can hold more

than one subTLV - therefore the first byte must reflect

the aggregate bytecount of the subTLVs for this prefix

*/

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

+ if (!ND_TTEST2(*tptr, 1))

return (0);

sublen=*(tptr++);

processed+=sublen+1;

return (0);

sublen=*(tptr++);

processed+=sublen+1;

- printf(" (%u)",sublen); /* print out subTLV length */

-

+ ND_PRINT((ndo, " (%u)", sublen)); /* print out subTLV length */

+

while (sublen>0) {

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

+ if (!ND_TTEST2(*tptr,2))

return (0);

subtlvtype=*(tptr++);

subtlvlen=*(tptr++);

/* prepend the ident string */

snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

return (0);

subtlvtype=*(tptr++);

subtlvlen=*(tptr++);

/* prepend the ident string */

snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident);

- if(!isis_print_ip_reach_subtlv(tptr,subtlvtype,subtlvlen,ident_buffer))

+ if (!isis_print_ip_reach_subtlv(ndo, tptr, subtlvtype, subtlvlen, ident_buffer))

return(0);

tptr+=subtlvlen;

sublen-=(subtlvlen+2);

return(0);

tptr+=subtlvlen;

sublen-=(subtlvlen+2);

* Decode IS-IS packets. Return 0 on error.

*/

* Decode IS-IS packets. Return 0 on error.

*/

-static int isis_print (const u_int8_t *p, u_int length)

+static int

+isis_print(netdissect_options *ndo,

+ const uint8_t *p, u_int length)

{

- const struct isis_common_header *header;

+ const struct isis_common_header *isis_header;

const struct isis_iih_lan_header *header_iih_lan;

const struct isis_iih_ptp_header *header_iih_ptp;

const struct isis_iih_lan_header *header_iih_lan;

const struct isis_iih_ptp_header *header_iih_ptp;

- const struct isis_lsp_header *header_lsp;

+ struct isis_lsp_header *header_lsp;

const struct isis_csnp_header *header_csnp;

const struct isis_psnp_header *header_psnp;

const struct isis_csnp_header *header_csnp;

const struct isis_psnp_header *header_psnp;

const struct isis_tlv_is_reach *tlv_is_reach;

const struct isis_tlv_es_reach *tlv_es_reach;

const struct isis_tlv_is_reach *tlv_is_reach;

const struct isis_tlv_es_reach *tlv_es_reach;

- u_int8_t pdu_type, max_area, id_length, tlv_type, tlv_len, tmp, alen, lan_alen, prefix_len;

- u_int8_t ext_is_len, ext_ip_len, mt_len;

- const u_int8_t *optr, *pptr, *tptr;

- u_short packet_len,pdu_len;

- u_int i;

+ uint8_t pdu_type, max_area, id_length, tlv_type, tlv_len, tmp, alen, lan_alen, prefix_len;

+ uint8_t ext_is_len, ext_ip_len, mt_len;

+ const uint8_t *optr, *pptr, *tptr;

+ u_short packet_len,pdu_len, key_id;

+ u_int i,vendor_id;

+ int sigcheck;

packet_len=length;

optr = p; /* initialize the _o_riginal pointer to the packet start -

packet_len=length;

optr = p; /* initialize the _o_riginal pointer to the packet start -

- need it for parsing the checksum TLV */

- header = (const struct isis_common_header *)p;

- TCHECK(*header);

+ need it for parsing the checksum TLV and authentication

+ TLV verification */

+ isis_header = (const struct isis_common_header *)p;

+ ND_TCHECK(*isis_header);

pptr = p+(ISIS_COMMON_HEADER_SIZE);

header_iih_lan = (const struct isis_iih_lan_header *)pptr;

header_iih_ptp = (const struct isis_iih_ptp_header *)pptr;

pptr = p+(ISIS_COMMON_HEADER_SIZE);

header_iih_lan = (const struct isis_iih_lan_header *)pptr;

header_iih_ptp = (const struct isis_iih_ptp_header *)pptr;

- header_lsp = (const struct isis_lsp_header *)pptr;

+ header_lsp = (struct isis_lsp_header *)pptr;

header_csnp = (const struct isis_csnp_header *)pptr;

header_psnp = (const struct isis_psnp_header *)pptr;

header_csnp = (const struct isis_csnp_header *)pptr;

header_psnp = (const struct isis_psnp_header *)pptr;

+ if (!ndo->ndo_eflag)

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

+

/*

* Sanity checking of the header.

*/

/*

* Sanity checking of the header.

*/

- if (header->version != ISIS_VERSION) {

- printf(", version %d packet not supported", header->version);

+ if (isis_header->version != ISIS_VERSION) {

+ ND_PRINT((ndo, "version %d packet not supported", isis_header->version));

return (0);

}

return (0);

}

- if ((header->id_length != SYSTEM_ID_LEN) && (header->id_length != 0)) {

- printf(", system ID length of %d is not supported",

- header->id_length);

+ if ((isis_header->id_length != SYSTEM_ID_LEN) && (isis_header->id_length != 0)) {

+ ND_PRINT((ndo, "system ID length of %d is not supported",

+ isis_header->id_length));

return (0);

}

return (0);

}

- if (header->pdu_version != ISIS_VERSION) {

- printf(", version %d packet not supported", header->pdu_version);

+ if (isis_header->pdu_version != ISIS_VERSION) {

+ ND_PRINT((ndo, "version %d packet not supported", isis_header->pdu_version));

return (0);

}

return (0);

}

- max_area = header->max_area;

+ max_area = isis_header->max_area;

switch(max_area) {

case 0:

max_area = 3; /* silly shit */

break;

case 255:

switch(max_area) {

case 0:

max_area = 3; /* silly shit */

break;

case 255:

- printf(", bad packet -- 255 areas");

+ ND_PRINT((ndo, "bad packet -- 255 areas"));

return (0);

default:

break;

}

return (0);

default:

break;

}

- id_length = header->id_length;

+ id_length = isis_header->id_length;

switch(id_length) {

case 0:

id_length = 6; /* silly shit again */

switch(id_length) {

case 0:

id_length = 6; /* silly shit again */

}

/* toss any non 6-byte sys-ID len PDUs */

}

/* toss any non 6-byte sys-ID len PDUs */

- if (id_length != 6 ) {

- printf(", bad packet -- illegal sys-ID length (%u)", id_length);

+ if (id_length != 6 ) {

+ ND_PRINT((ndo, "bad packet -- illegal sys-ID length (%u)", id_length));

return (0);

}

return (0);

}

- pdu_type=header->pdu_type;

+ pdu_type=isis_header->pdu_type;

/* in non-verbose mode print the basic PDU Type plus PDU specific brief information*/

- if (vflag < 1) {

- printf(", IS-IS, %s",

- tok2str(isis_pdu_values,"unknown PDU-Type %u",pdu_type));

+ if (ndo->ndo_vflag < 1) {

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

+ ndo->ndo_eflag ? "" : ", ",

+ tok2str(isis_pdu_values, "unknown PDU-Type %u", pdu_type)));

switch (pdu_type) {

- case L1_LAN_IIH:

- case L2_LAN_IIH:

- printf(", source-id %s", isis_print_id(header_iih_lan->source_id,SYSTEM_ID_LEN));

+ case ISIS_PDU_L1_LAN_IIH:

+ case ISIS_PDU_L2_LAN_IIH:

+ ND_PRINT((ndo, ", src-id %s",

+ isis_print_id(header_iih_lan->source_id, SYSTEM_ID_LEN)));

+ ND_PRINT((ndo, ", lan-id %s, prio %u",

+ isis_print_id(header_iih_lan->lan_id,NODE_ID_LEN),

+ header_iih_lan->priority));

break;

- case PTP_IIH:

- printf(", source-id %s", isis_print_id(header_iih_ptp->source_id,SYSTEM_ID_LEN));

+ case ISIS_PDU_PTP_IIH:

+ ND_PRINT((ndo, ", src-id %s", isis_print_id(header_iih_ptp->source_id, SYSTEM_ID_LEN)));

break;

- case L1_LSP:

- case L2_LSP:

- printf(", lsp-id %s, seq 0x%08x, lifetime %5us",

+ case ISIS_PDU_L1_LSP:

+ case ISIS_PDU_L2_LSP:

+ ND_PRINT((ndo, ", lsp-id %s, seq 0x%08x, lifetime %5us",

isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),

EXTRACT_32BITS(header_lsp->sequence_number),

isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),

EXTRACT_32BITS(header_lsp->sequence_number),

- EXTRACT_16BITS(header_lsp->remaining_lifetime));

+ EXTRACT_16BITS(header_lsp->remaining_lifetime)));

break;

- case L1_CSNP:

- case L2_CSNP:

- printf(", source-id %s", isis_print_id(header_csnp->source_id,SYSTEM_ID_LEN));

+ case ISIS_PDU_L1_CSNP:

+ case ISIS_PDU_L2_CSNP:

+ ND_PRINT((ndo, ", src-id %s", isis_print_id(header_csnp->source_id, NODE_ID_LEN)));

break;

- case L1_PSNP:

- case L2_PSNP:

- printf(", source-id %s", isis_print_id(header_psnp->source_id,SYSTEM_ID_LEN));

+ case ISIS_PDU_L1_PSNP:

+ case ISIS_PDU_L2_PSNP:

+ ND_PRINT((ndo, ", src-id %s", isis_print_id(header_psnp->source_id, NODE_ID_LEN)));

break;

}

break;

}

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

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

return(1);

}

/* ok they seem to want to know everything - lets fully decode it */

return(1);

}

/* ok they seem to want to know everything - lets fully decode it */

- printf(", IS-IS, length: %u",length);

+ ND_PRINT((ndo, "%slength %u", ndo->ndo_eflag ? "" : ", ", length));

- printf("\n\thlen: %u, v: %u, pdu-v: %u, sys-id-len: %u (%u), max-area: %u (%u)",

- header->fixed_len,

- header->version,

- header->pdu_version,

- id_length,

- header->id_length,

- max_area,

- header->max_area);

-

- /* first lets see if we know the PDU name*/

- printf(", pdu-type: %s",

+ ND_PRINT((ndo, "\n\t%s, hlen: %u, v: %u, pdu-v: %u, sys-id-len: %u (%u), max-area: %u (%u)",

tok2str(isis_pdu_values,

"unknown, type %u",

tok2str(isis_pdu_values,

"unknown, type %u",

- pdu_type));

+ pdu_type),

+ isis_header->fixed_len,

+ isis_header->version,

+ isis_header->pdu_version,

+ id_length,

+ isis_header->id_length,

+ max_area,

+ isis_header->max_area));

- if (vflag > 1) {

- if(!print_unknown_data(optr,"\n\t",8)) /* provide the _o_riginal pointer */

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, optr, "\n\t", 8)) /* provide the _o_riginal pointer */

return(0); /* for optionally debugging the common header */

}

switch (pdu_type) {

return(0); /* for optionally debugging the common header */

}

switch (pdu_type) {

- case L1_LAN_IIH:

- case L2_LAN_IIH:

- if (header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE)) {

- printf(", bogus fixed header length %u should be %lu",

- header->fixed_len, (unsigned long)ISIS_IIH_LAN_HEADER_SIZE);

+ case ISIS_PDU_L1_LAN_IIH:

+ case ISIS_PDU_L2_LAN_IIH:

+ if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE)) {

+ ND_PRINT((ndo, ", bogus fixed header length %u should be %lu",

+ isis_header->fixed_len, (unsigned long)ISIS_IIH_LAN_HEADER_SIZE));

return (0);

}

return (0);

}

length=pdu_len;

}

length=pdu_len;

}

- TCHECK(*header_iih_lan);

- printf("\n\t source-id: %s, holding time: %us, Flags: [%s]",

+ ND_TCHECK(*header_iih_lan);

+ ND_PRINT((ndo, "\n\t source-id: %s, holding time: %us, Flags: [%s]",

isis_print_id(header_iih_lan->source_id,SYSTEM_ID_LEN),

EXTRACT_16BITS(header_iih_lan->holding_time),

tok2str(isis_iih_circuit_type_values,

"unknown circuit type 0x%02x",

isis_print_id(header_iih_lan->source_id,SYSTEM_ID_LEN),

EXTRACT_16BITS(header_iih_lan->holding_time),

tok2str(isis_iih_circuit_type_values,

"unknown circuit type 0x%02x",

- header_iih_lan->circuit_type));

+ header_iih_lan->circuit_type)));

- printf("\n\t lan-id: %s, Priority: %u, PDU length: %u",

+ ND_PRINT((ndo, "\n\t lan-id: %s, Priority: %u, PDU length: %u",

isis_print_id(header_iih_lan->lan_id, NODE_ID_LEN),

- (header_iih_lan->priority) & PRIORITY_MASK,

- pdu_len);

+ (header_iih_lan->priority) & ISIS_LAN_PRIORITY_MASK,

+ pdu_len));

- if (vflag > 1) {

- if(!print_unknown_data(pptr,"\n\t ",ISIS_IIH_LAN_HEADER_SIZE))

- return(0);

- }

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_IIH_LAN_HEADER_SIZE))

+ return(0);

+ }

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE);

break;

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE);

break;

- case PTP_IIH:

- if (header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)) {

- printf(", bogus fixed header length %u should be %lu",

- header->fixed_len, (unsigned long)ISIS_IIH_PTP_HEADER_SIZE);

+ case ISIS_PDU_PTP_IIH:

+ if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)) {

+ ND_PRINT((ndo, ", bogus fixed header length %u should be %lu",

+ isis_header->fixed_len, (unsigned long)ISIS_IIH_PTP_HEADER_SIZE));

return (0);

}

return (0);

}

length=pdu_len;

}

length=pdu_len;

}

- TCHECK(*header_iih_ptp);

- printf("\n\t source-id: %s, holding time: %us, circuit-id: 0x%02x, %s, PDU length: %u",

+ ND_TCHECK(*header_iih_ptp);

+ ND_PRINT((ndo, "\n\t source-id: %s, holding time: %us, Flags: [%s]",

isis_print_id(header_iih_ptp->source_id,SYSTEM_ID_LEN),

EXTRACT_16BITS(header_iih_ptp->holding_time),

isis_print_id(header_iih_ptp->source_id,SYSTEM_ID_LEN),

EXTRACT_16BITS(header_iih_ptp->holding_time),

- header_iih_ptp->circuit_id,

tok2str(isis_iih_circuit_type_values,

"unknown circuit type 0x%02x",

tok2str(isis_iih_circuit_type_values,

"unknown circuit type 0x%02x",

- header_iih_ptp->circuit_type),

- pdu_len);

+ header_iih_ptp->circuit_type)));

- if (vflag > 1) {

- if(!print_unknown_data(pptr,"\n\t ",ISIS_IIH_PTP_HEADER_SIZE))

- return(0);

- }

+ ND_PRINT((ndo, "\n\t circuit-id: 0x%02x, PDU length: %u",

+ header_iih_ptp->circuit_id,

+ pdu_len));

+

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_IIH_PTP_HEADER_SIZE))

+ return(0);

+ }

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE);

break;

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE);

break;

- case L1_LSP:

- case L2_LSP:

- if (header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE)) {

- printf(", bogus fixed header length %u should be %lu",

- header->fixed_len, (unsigned long)ISIS_LSP_HEADER_SIZE);

+ case ISIS_PDU_L1_LSP:

+ case ISIS_PDU_L2_LSP:

+ if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE)) {

+ ND_PRINT((ndo, ", bogus fixed header length %u should be %lu",

+ isis_header->fixed_len, (unsigned long)ISIS_LSP_HEADER_SIZE));

return (0);

}

return (0);

}

length=pdu_len;

}

length=pdu_len;

}

- TCHECK(*header_lsp);

- printf("\n\t lsp-id: %s, seq: 0x%08x, lifetime: %5us",

+ ND_TCHECK(*header_lsp);

+ ND_PRINT((ndo, "\n\t lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t chksum: 0x%04x",

isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),

EXTRACT_32BITS(header_lsp->sequence_number),

isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),

EXTRACT_32BITS(header_lsp->sequence_number),

- EXTRACT_16BITS(header_lsp->remaining_lifetime));

- /* verify the checksum -

- * checking starts at the lsp-id field

- * which is 12 bytes after the packet start*/

- printf("\n\t chksum: 0x%04x (%s), PDU length: %u",

- EXTRACT_16BITS(header_lsp->checksum),

- (osi_cksum(optr+12, length-12)) ? "incorrect" : "correct",

- pdu_len);

+ EXTRACT_16BITS(header_lsp->remaining_lifetime),

+ EXTRACT_16BITS(header_lsp->checksum)));

+

+ osi_print_cksum(ndo, (uint8_t *)header_lsp->lsp_id,

+ EXTRACT_16BITS(header_lsp->checksum), 12, length-12);

- printf(", %s", ISIS_MASK_LSP_OL_BIT(header_lsp->typeblock) ? "Overload bit set, " : "");

+ /*

+ * Clear checksum and lifetime prior to signature verification.

+ */

+ header_lsp->checksum[0] = 0;

+ header_lsp->checksum[1] = 0;

+ header_lsp->remaining_lifetime[0] = 0;

+ header_lsp->remaining_lifetime[1] = 0;

+

+ ND_PRINT((ndo, ", PDU length: %u, Flags: [ %s",

+ pdu_len,

+ ISIS_MASK_LSP_OL_BIT(header_lsp->typeblock) ? "Overload bit set, " : ""));

if (ISIS_MASK_LSP_ATT_BITS(header_lsp->typeblock)) {

- printf("%s", ISIS_MASK_LSP_ATT_DEFAULT_BIT(header_lsp->typeblock) ? "default " : "");

- printf("%s", ISIS_MASK_LSP_ATT_DELAY_BIT(header_lsp->typeblock) ? "delay " : "");

- printf("%s", ISIS_MASK_LSP_ATT_EXPENSE_BIT(header_lsp->typeblock) ? "expense " : "");

- printf("%s", ISIS_MASK_LSP_ATT_ERROR_BIT(header_lsp->typeblock) ? "error " : "");

- printf("ATT bit set, ");

+ ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_DEFAULT_BIT(header_lsp->typeblock) ? "default " : ""));

+ ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_DELAY_BIT(header_lsp->typeblock) ? "delay " : ""));

+ ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_EXPENSE_BIT(header_lsp->typeblock) ? "expense " : ""));

+ ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_ERROR_BIT(header_lsp->typeblock) ? "error " : ""));

+ ND_PRINT((ndo, "ATT bit set, "));

}

- printf("%s", ISIS_MASK_LSP_PARTITION_BIT(header_lsp->typeblock) ? "P bit set, " : "");

- printf("%s", tok2str(isis_lsp_istype_values,"Unknown(0x%x)",ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock)));

+ ND_PRINT((ndo, "%s", ISIS_MASK_LSP_PARTITION_BIT(header_lsp->typeblock) ? "P bit set, " : ""));

+ ND_PRINT((ndo, "%s ]", tok2str(isis_lsp_istype_values, "Unknown(0x%x)",

+ ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock))));

- if (vflag > 1) {

- if(!print_unknown_data(pptr,"\n\t ",ISIS_LSP_HEADER_SIZE))

- return(0);

- }

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_LSP_HEADER_SIZE))

+ return(0);

+ }

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE);

break;

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE);

break;

- case L1_CSNP:

- case L2_CSNP:

- if (header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)) {

- printf(", bogus fixed header length %u should be %lu",

- header->fixed_len, (unsigned long)ISIS_CSNP_HEADER_SIZE);

+ case ISIS_PDU_L1_CSNP:

+ case ISIS_PDU_L2_CSNP:

+ if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)) {

+ ND_PRINT((ndo, ", bogus fixed header length %u should be %lu",

+ isis_header->fixed_len, (unsigned long)ISIS_CSNP_HEADER_SIZE));

return (0);

}

return (0);

}

length=pdu_len;

}

length=pdu_len;

}

- TCHECK(*header_csnp);

- printf("\n\t source-id: %s, PDU length: %u",

+ ND_TCHECK(*header_csnp);

+ ND_PRINT((ndo, "\n\t source-id: %s, PDU length: %u",

isis_print_id(header_csnp->source_id, NODE_ID_LEN),

- pdu_len);

- printf("\n\t start lsp-id: %s",

- isis_print_id(header_csnp->start_lsp_id, LSP_ID_LEN));

- printf("\n\t end lsp-id: %s",

- isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN));

-

- if (vflag > 1) {

- if(!print_unknown_data(pptr,"\n\t ",ISIS_CSNP_HEADER_SIZE))

- return(0);

- }

+ pdu_len));

+ ND_PRINT((ndo, "\n\t start lsp-id: %s",

+ isis_print_id(header_csnp->start_lsp_id, LSP_ID_LEN)));

+ ND_PRINT((ndo, "\n\t end lsp-id: %s",

+ isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN)));

+

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_CSNP_HEADER_SIZE))

+ return(0);

+ }

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE);

break;

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE);

break;

- case L1_PSNP:

- case L2_PSNP:

- if (header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)) {

- printf("- bogus fixed header length %u should be %lu",

- header->fixed_len, (unsigned long)ISIS_PSNP_HEADER_SIZE);

+ case ISIS_PDU_L1_PSNP:

+ case ISIS_PDU_L2_PSNP:

+ if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)) {

+ ND_PRINT((ndo, "- bogus fixed header length %u should be %lu",

+ isis_header->fixed_len, (unsigned long)ISIS_PSNP_HEADER_SIZE));

return (0);

}

return (0);

}

length=pdu_len;

}

length=pdu_len;

}

- TCHECK(*header_psnp);

- printf("\n\t source-id: %s",

- isis_print_id(header_psnp->source_id, NODE_ID_LEN));

+ ND_TCHECK(*header_psnp);

+ ND_PRINT((ndo, "\n\t source-id: %s, PDU length: %u",

+ isis_print_id(header_psnp->source_id, NODE_ID_LEN),

+ pdu_len));

- if (vflag > 1) {

- if(!print_unknown_data(pptr,"\n\t ",ISIS_PSNP_HEADER_SIZE))

- return(0);

- }

+ if (ndo->ndo_vflag > 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_PSNP_HEADER_SIZE))

+ return(0);

+ }

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE);

break;

default:

packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE);

pptr = p + (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE);

break;

default:

- if(!print_unknown_data(pptr,"\n\t ",length))

- return(0);

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

return (0);

}

return (0);

}

*/

while (packet_len >= 2) {

*/

while (packet_len >= 2) {

- if (pptr == snapend) {

- return (1);

+ if (pptr == ndo->ndo_snapend) {

+ return (1);

}

- if (!TTEST2(*pptr, 2)) {

- printf("\n\t\t packet exceeded snapshot (%ld) bytes",

- (long)(pptr-snapend));

+ if (!ND_TTEST2(*pptr, 2)) {

+ ND_PRINT((ndo, "\n\t\t packet exceeded snapshot (%ld) bytes",

+ (long)(pptr - ndo->ndo_snapend)));

return (1);

}

tlv_type = *pptr++;

return (1);

}

tlv_type = *pptr++;

}

/* first lets see if we know the TLVs name*/

}

/* first lets see if we know the TLVs name*/

- printf("\n\t %s TLV #%u, length: %u",

+ ND_PRINT((ndo, "\n\t %s TLV #%u, length: %u",

tok2str(isis_tlv_values,

"unknown",

tlv_type),

tlv_type,

tok2str(isis_tlv_values,

"unknown",

tlv_type),

tlv_type,

- tlv_len);

+ tlv_len));

+

+ if (tlv_len == 0) /* something is malformed */

+ continue;

/* now check if we have a decoder otherwise do a hexdump at the end*/

switch (tlv_type) {

/* now check if we have a decoder otherwise do a hexdump at the end*/

switch (tlv_type) {

- case TLV_AREA_ADDR:

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

+ case ISIS_TLV_AREA_ADDR:

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

alen = *tptr++;

while (tmp && alen < tmp) {

goto trunctlv;

alen = *tptr++;

while (tmp && alen < tmp) {

- printf("\n\t Area address (length: %u): %s",

+ ND_PRINT((ndo, "\n\t Area address (length: %u): %s",

alen,

- print_nsap(tptr, alen));

+ isonsap_string(tptr, alen)));

tptr += alen;

tmp -= alen + 1;

if (tmp==0) /* if this is the last area address do not attemt a boundary check */

break;

tptr += alen;

tmp -= alen + 1;

if (tmp==0) /* if this is the last area address do not attemt a boundary check */

break;

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

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

alen = *tptr++;

}

break;

goto trunctlv;

alen = *tptr++;

}

break;

- case TLV_ISNEIGH:

+ case ISIS_TLV_ISNEIGH:

while (tmp >= ETHER_ADDR_LEN) {

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

+ if (!ND_TTEST2(*tptr, ETHER_ADDR_LEN))

goto trunctlv;

- printf("\n\t IS Neighbor: %s",isis_print_id(tptr,ETHER_ADDR_LEN));

+ ND_PRINT((ndo, "\n\t SNPA: %s", isis_print_id(tptr, ETHER_ADDR_LEN)));

tmp -= ETHER_ADDR_LEN;

tptr += ETHER_ADDR_LEN;

}

break;

tmp -= ETHER_ADDR_LEN;

tptr += ETHER_ADDR_LEN;

}

break;

- case TLV_ISNEIGH_VARLEN:

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

+ case ISIS_TLV_ISNEIGH_VARLEN:

+ if (!ND_TTEST2(*tptr, 1) || tmp < 3) /* min. TLV length */

goto trunctlv;

- lan_alen = *tptr++; /* LAN adress length */

+ lan_alen = *tptr++; /* LAN address length */

+ if (lan_alen == 0) {

+ ND_PRINT((ndo, "\n\t LAN address length 0 bytes (invalid)"));

+ break;

+ }

tmp --;

- printf("\n\t LAN address length %u bytes ",lan_alen);

+ ND_PRINT((ndo, "\n\t LAN address length %u bytes ", lan_alen));

while (tmp >= lan_alen) {

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

+ if (!ND_TTEST2(*tptr, lan_alen))

goto trunctlv;

- printf("\n\t\tIS Neighbor: %s",isis_print_id(tptr,lan_alen));

+ ND_PRINT((ndo, "\n\t\tIS Neighbor: %s", isis_print_id(tptr, lan_alen)));

tmp -= lan_alen;

tptr +=lan_alen;

}

break;

tmp -= lan_alen;

tptr +=lan_alen;

}

break;

- case TLV_PADDING:

+ case ISIS_TLV_PADDING:

break;

- case TLV_MT_IS_REACH:

+ case ISIS_TLV_MT_IS_REACH:

+ mt_len = isis_print_mtid(ndo, tptr, "\n\t ");

+ if (mt_len == 0) /* did something go wrong ? */

+ goto trunctlv;

+ tptr+=mt_len;

+ tmp-=mt_len;

while (tmp >= 2+NODE_ID_LEN+3+1) {

- mt_len = isis_print_mtid(tptr, "\n\t ");

- if (mt_len == 0) /* did something go wrong ? */

- goto trunctlv;

- tptr+=mt_len;

- tmp-=mt_len;

-

- ext_is_len = isis_print_ext_is_reach(tptr,"\n\t ",tlv_type);

+ ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type);

if (ext_is_len == 0) /* did something go wrong ? */

goto trunctlv;

if (ext_is_len == 0) /* did something go wrong ? */

goto trunctlv;

-

+

tmp-=ext_is_len;

tptr+=ext_is_len;

}

break;

tmp-=ext_is_len;

tptr+=ext_is_len;

}

break;

- case TLV_IS_ALIAS_ID:

+ case ISIS_TLV_IS_ALIAS_ID:

while (tmp >= NODE_ID_LEN+1) { /* is it worth attempting a decode ? */

- ext_is_len = isis_print_ext_is_reach(tptr,"\n\t ",tlv_type);

+ ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type);

if (ext_is_len == 0) /* did something go wrong ? */

goto trunctlv;

tmp-=ext_is_len;

if (ext_is_len == 0) /* did something go wrong ? */

goto trunctlv;

tmp-=ext_is_len;

}

break;

}

break;

- case TLV_EXT_IS_REACH:

+ case ISIS_TLV_EXT_IS_REACH:

while (tmp >= NODE_ID_LEN+3+1) { /* is it worth attempting a decode ? */

- ext_is_len = isis_print_ext_is_reach(tptr,"\n\t ",tlv_type);

+ ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type);

if (ext_is_len == 0) /* did something go wrong ? */

- goto trunctlv;

+ goto trunctlv;

tmp-=ext_is_len;

tptr+=ext_is_len;

}

break;

tmp-=ext_is_len;

tptr+=ext_is_len;

}

break;

- case TLV_IS_REACH:

- if (!TTEST2(*tptr,1)) /* check if there is one byte left to read out the virtual flag */

+ case ISIS_TLV_IS_REACH:

+ if (!ND_TTEST2(*tptr,1)) /* check if there is one byte left to read out the virtual flag */

goto trunctlv;

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

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

tok2str(isis_is_reach_virtual_values,

"bogus virtual flag 0x%02x",

tok2str(isis_is_reach_virtual_values,

"bogus virtual flag 0x%02x",

- *tptr++));

+ *tptr++)));

tlv_is_reach = (const struct isis_tlv_is_reach *)tptr;

while (tmp >= sizeof(struct isis_tlv_is_reach)) {

tlv_is_reach = (const struct isis_tlv_is_reach *)tptr;

while (tmp >= sizeof(struct isis_tlv_is_reach)) {

- if (!TTEST(*tlv_is_reach))

+ if (!ND_TTEST(*tlv_is_reach))

goto trunctlv;

- printf("\n\t IS Neighbor: %s",

- isis_print_id(tlv_is_reach->neighbor_nodeid, NODE_ID_LEN));

- isis_print_metric_block(&tlv_is_reach->isis_metric_block);

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

+ isis_print_id(tlv_is_reach->neighbor_nodeid, NODE_ID_LEN)));

+ isis_print_metric_block(ndo, &tlv_is_reach->isis_metric_block);

tmp -= sizeof(struct isis_tlv_is_reach);

tlv_is_reach++;

}

break;

tmp -= sizeof(struct isis_tlv_is_reach);

tlv_is_reach++;

}

break;

- case TLV_ESNEIGH:

+ case ISIS_TLV_ESNEIGH:

tlv_es_reach = (const struct isis_tlv_es_reach *)tptr;

while (tmp >= sizeof(struct isis_tlv_es_reach)) {

tlv_es_reach = (const struct isis_tlv_es_reach *)tptr;

while (tmp >= sizeof(struct isis_tlv_es_reach)) {

- if (!TTEST(*tlv_es_reach))

+ if (!ND_TTEST(*tlv_es_reach))

goto trunctlv;

- printf("\n\t ES Neighbor: %s",

- isis_print_id(tlv_es_reach->neighbor_sysid,SYSTEM_ID_LEN));

- isis_print_metric_block(&tlv_es_reach->isis_metric_block);

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

+ isis_print_id(tlv_es_reach->neighbor_sysid, SYSTEM_ID_LEN)));

+ isis_print_metric_block(ndo, &tlv_es_reach->isis_metric_block);

tmp -= sizeof(struct isis_tlv_es_reach);

tlv_es_reach++;

}

break;

/* those two TLVs share the same format */

tmp -= sizeof(struct isis_tlv_es_reach);

tlv_es_reach++;

}

break;

/* those two TLVs share the same format */

- case TLV_IP_REACH:

- case TLV_IP_REACH_EXT:

- if (!isis_print_tlv_ip_reach(pptr, "\n\t ", tlv_len))

- return (1);

- break;

+ case ISIS_TLV_INT_IP_REACH:

+ case ISIS_TLV_EXT_IP_REACH:

+ if (!isis_print_tlv_ip_reach(ndo, pptr, "\n\t ", tlv_len))

+ return (1);

+ break;

- case TLV_EXT_IP_REACH:

+ case ISIS_TLV_EXTD_IP_REACH:

while (tmp>0) {

- ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV4);

+ ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET);

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

}

break;

}

break;

- case TLV_MT_IP_REACH:

- while (tmp>0) {

- mt_len = isis_print_mtid(tptr, "\n\t ");

- if (mt_len == 0) /* did something go wrong ? */

- goto trunctlv;

- tptr+=mt_len;

- tmp-=mt_len;

+ case ISIS_TLV_MT_IP_REACH:

+ mt_len = isis_print_mtid(ndo, tptr, "\n\t ");

+ if (mt_len == 0) { /* did something go wrong ? */

+ goto trunctlv;

+ }

+ tptr+=mt_len;

+ tmp-=mt_len;

- ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV4);

+ while (tmp>0) {

+ ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET);

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

break;

#ifdef INET6

break;

#ifdef INET6

- case TLV_IP6_REACH:

+ case ISIS_TLV_IP6_REACH:

while (tmp>0) {

- ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV6);

+ ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET6);

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

}

break;

}

break;

- case TLV_MT_IP6_REACH:

- while (tmp>0) {

- mt_len = isis_print_mtid(tptr, "\n\t ");

- if (mt_len == 0) /* did something go wrong ? */

- goto trunctlv;

- tptr+=mt_len;

- tmp-=mt_len;

+ case ISIS_TLV_MT_IP6_REACH:

+ mt_len = isis_print_mtid(ndo, tptr, "\n\t ");

+ if (mt_len == 0) { /* did something go wrong ? */

+ goto trunctlv;

+ }

+ tptr+=mt_len;

+ tmp-=mt_len;

- ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV6);

+ while (tmp>0) {

+ ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET6);

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

if (ext_ip_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=ext_ip_len;

}

break;

}

break;

- case TLV_IP6ADDR:

- while (tmp>0) {

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

+ case ISIS_TLV_IP6ADDR:

+ while (tmp>=sizeof(struct in6_addr)) {

+ if (!ND_TTEST2(*tptr, sizeof(struct in6_addr)))

goto trunctlv;

- printf("\n\t IPv6 interface address: %s",

- ip6addr_string(tptr));

+ ND_PRINT((ndo, "\n\t IPv6 interface address: %s",

+ ip6addr_string(ndo, tptr)));

- tptr += 16;

- tmp -= 16;

+ tptr += sizeof(struct in6_addr);

+ tmp -= sizeof(struct in6_addr);

}

break;

#endif

}

break;

#endif

- case TLV_AUTH:

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

+ case ISIS_TLV_AUTH:

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

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

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

tok2str(isis_subtlv_auth_values,

"unknown Authentication type 0x%02x",

tok2str(isis_subtlv_auth_values,

"unknown Authentication type 0x%02x",

- *tptr));

+ *tptr)));

switch (*tptr) {

- case SUBTLV_AUTH_SIMPLE:

+ case ISIS_SUBTLV_AUTH_SIMPLE:

for(i=1;i<tlv_len;i++) {

- if (!TTEST2(*(tptr+i), 1))

+ if (!ND_TTEST2(*(tptr + i), 1))

goto trunctlv;

- printf("%c",*(tptr+i));

+ ND_PRINT((ndo, "%c", *(tptr + i)));

}

break;

}

break;

- case SUBTLV_AUTH_MD5:

+ case ISIS_SUBTLV_AUTH_MD5:

for(i=1;i<tlv_len;i++) {

- if (!TTEST2(*(tptr+i), 1))

+ if (!ND_TTEST2(*(tptr + i), 1))

goto trunctlv;

- printf("%02x",*(tptr+i));

+ ND_PRINT((ndo, "%02x", *(tptr + i)));

}

- if (tlv_len != SUBTLV_AUTH_MD5_LEN+1)

- printf(", (malformed subTLV) ");

+ if (tlv_len != ISIS_SUBTLV_AUTH_MD5_LEN+1)

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

+

+#ifdef HAVE_LIBCRYPTO

+ sigcheck = signature_verify(ndo, optr, length,

+ (unsigned char *)tptr + 1);

+#else

+ sigcheck = CANT_CHECK_SIGNATURE;

+#endif

+ ND_PRINT((ndo, " (%s)", tok2str(signature_check_values, "Unknown", sigcheck)));

+

break;

- case SUBTLV_AUTH_PRIVATE:

+ case ISIS_SUBTLV_AUTH_GENERIC:

+ key_id = EXTRACT_16BITS((tptr+1));

+ ND_PRINT((ndo, "%u, password: ", key_id));

+ for(i=1 + sizeof(uint16_t);i<tlv_len;i++) {

+ if (!ND_TTEST2(*(tptr + i), 1))

+ goto trunctlv;

+ ND_PRINT((ndo, "%02x", *(tptr + i)));

+ }

+ break;

+ case ISIS_SUBTLV_AUTH_PRIVATE:

default:

- if(!print_unknown_data(tptr+1,"\n\t\t ",tlv_len-1))

+ if (!print_unknown_data(ndo, tptr + 1, "\n\t\t ", tlv_len - 1))

return(0);

break;

}

break;

return(0);

break;

}

break;

- case TLV_PTP_ADJ:

+ case ISIS_TLV_PTP_ADJ:

tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;

if(tmp>=1) {

tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;

if(tmp>=1) {

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

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

- printf("\n\t Adjacency State: %s",

- tok2str(isis_ptp_adjancey_values, "0x%02x", *tptr));

+ ND_PRINT((ndo, "\n\t Adjacency State: %s (%u)",

+ tok2str(isis_ptp_adjancey_values, "unknown", *tptr),

+ *tptr));

tmp--;

}

if(tmp>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {

tmp--;

}

if(tmp>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {

- if (!TTEST2(tlv_ptp_adj->extd_local_circuit_id,

+ if (!ND_TTEST2(tlv_ptp_adj->extd_local_circuit_id,

sizeof(tlv_ptp_adj->extd_local_circuit_id)))

goto trunctlv;

sizeof(tlv_ptp_adj->extd_local_circuit_id)))

goto trunctlv;

- printf("\n\t Extended Local circuit ID: 0x%08x",

- EXTRACT_32BITS(tlv_ptp_adj->extd_local_circuit_id));

+ ND_PRINT((ndo, "\n\t Extended Local circuit-ID: 0x%08x",

+ EXTRACT_32BITS(tlv_ptp_adj->extd_local_circuit_id)));

tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id);

}

if(tmp>=SYSTEM_ID_LEN) {

tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id);

}

if(tmp>=SYSTEM_ID_LEN) {

- if (!TTEST2(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN))

+ if (!ND_TTEST2(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN))

goto trunctlv;

- printf("\n\t Neighbor SystemID: %s",

- isis_print_id(tlv_ptp_adj->neighbor_sysid,SYSTEM_ID_LEN));

+ ND_PRINT((ndo, "\n\t Neighbor System-ID: %s",

+ isis_print_id(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN)));

tmp-=SYSTEM_ID_LEN;

}

if(tmp>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {

tmp-=SYSTEM_ID_LEN;

}

if(tmp>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {

- if (!TTEST2(tlv_ptp_adj->neighbor_extd_local_circuit_id,

+ if (!ND_TTEST2(tlv_ptp_adj->neighbor_extd_local_circuit_id,

sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)))

goto trunctlv;

sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)))

goto trunctlv;

- printf("\n\t Neighbor Extended Local circuit ID: 0x%08x",

- EXTRACT_32BITS(tlv_ptp_adj->neighbor_extd_local_circuit_id));

+ ND_PRINT((ndo, "\n\t Neighbor Extended Local circuit-ID: 0x%08x",

+ EXTRACT_32BITS(tlv_ptp_adj->neighbor_extd_local_circuit_id)));

}

break;

}

break;

- case TLV_PROTOCOLS:

- printf("\n\t NLPID(s): ");

+ case ISIS_TLV_PROTOCOLS:

+ ND_PRINT((ndo, "\n\t NLPID(s): "));

while (tmp>0) {

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

+ if (!ND_TTEST2(*(tptr), 1))

goto trunctlv;

- printf("%s",

- tok2str(osi_nlpid_values,

- "Unknown 0x%02x",

- *tptr++));

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

+ tok2str(nlpid_values,

+ "unknown",

+ *tptr),

+ *tptr));

if (tmp>1) /* further NPLIDs ? - put comma */

- printf(", ");

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

+ tptr++;

tmp--;

}

break;

tmp--;

}

break;

- case TLV_TE_ROUTER_ID:

- if (!TTEST2(*pptr, 4))

+ case ISIS_TLV_MT_PORT_CAP:

+ {

+ if (!ND_TTEST2(*(tptr), 2))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t RES: %d, MTID(s): %d",

+ (EXTRACT_16BITS (tptr) >> 12),

+ (EXTRACT_16BITS (tptr) & 0x0fff)));

+

+ tmp = tmp-2;

+ tptr = tptr+2;

+

+ if (tmp)

+ isis_print_mt_port_cap_subtlv(ndo, tptr, tmp);

+

+ break;

+ }

+

+ case ISIS_TLV_MT_CAPABILITY:

+

+ if (!ND_TTEST2(*(tptr), 2))

+ goto trunctlv;

+

+ ND_PRINT((ndo, "\n\t O: %d, RES: %d, MTID(s): %d",

+ (EXTRACT_16BITS(tptr) >> 15) & 0x01,

+ (EXTRACT_16BITS(tptr) >> 12) & 0x07,

+ EXTRACT_16BITS(tptr) & 0x0fff));

+

+ tmp = tmp-2;

+ tptr = tptr+2;

+

+ if (tmp)

+ isis_print_mt_capability_subtlv(ndo, tptr, tmp);

+

+ break;

+

+ case ISIS_TLV_TE_ROUTER_ID:

+ if (!ND_TTEST2(*pptr, sizeof(struct in_addr)))

goto trunctlv;

- printf("\n\t Traffic Engineering Router ID: %s", ipaddr_string(pptr));

+ ND_PRINT((ndo, "\n\t Traffic Engineering Router ID: %s", ipaddr_string(ndo, pptr)));

break;

- case TLV_IPADDR:

- while (tmp>0) {

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

+ case ISIS_TLV_IPADDR:

+ while (tmp>=sizeof(struct in_addr)) {

+ if (!ND_TTEST2(*tptr, sizeof(struct in_addr)))

goto trunctlv;

- printf("\n\t IPv4 interface address: %s", ipaddr_string(tptr));

- tptr += 4;

- tmp -= 4;

+ ND_PRINT((ndo, "\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)));

+ tptr += sizeof(struct in_addr);

+ tmp -= sizeof(struct in_addr);

}

break;

}

break;

- case TLV_HOSTNAME:

- printf("\n\t Hostname: ");

+ case ISIS_TLV_HOSTNAME:

+ ND_PRINT((ndo, "\n\t Hostname: "));

while (tmp>0) {

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

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

- printf("%c",*tptr++);

+ ND_PRINT((ndo, "%c", *tptr++));

tmp--;

}

break;

tmp--;

}

break;

- case TLV_SHARED_RISK_GROUP:

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

+ case ISIS_TLV_SHARED_RISK_GROUP:

+ if (tmp < NODE_ID_LEN)

+ break;

+ if (!ND_TTEST2(*tptr, NODE_ID_LEN))

goto trunctlv;

- printf("\n\t IS Neighbor: %s", isis_print_id(tptr, NODE_ID_LEN));

+ ND_PRINT((ndo, "\n\t IS Neighbor: %s", isis_print_id(tptr, NODE_ID_LEN)));

tptr+=(NODE_ID_LEN);

tmp-=(NODE_ID_LEN);

tptr+=(NODE_ID_LEN);

tmp-=(NODE_ID_LEN);

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

+ if (tmp < 1)

+ break;

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

- printf(", %s", ISIS_MASK_TLV_SHARED_RISK_GROUP(*tptr++) ? "numbered" : "unnumbered");

+ ND_PRINT((ndo, ", Flags: [%s]", ISIS_MASK_TLV_SHARED_RISK_GROUP(*tptr++) ? "numbered" : "unnumbered"));

tmp--;

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

+ if (tmp < sizeof(struct in_addr))

+ break;

+ if (!ND_TTEST2(*tptr, sizeof(struct in_addr)))

goto trunctlv;

- printf("\n\t IPv4 interface address: %s", ipaddr_string(tptr));

- tptr+=4;

- tmp-=4;

+ ND_PRINT((ndo, "\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)));

+ tptr+=sizeof(struct in_addr);

+ tmp-=sizeof(struct in_addr);

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

+ if (tmp < sizeof(struct in_addr))

+ break;

+ if (!ND_TTEST2(*tptr, sizeof(struct in_addr)))

goto trunctlv;

- printf("\n\t IPv4 neighbor address: %s", ipaddr_string(tptr));

- tptr+=4;

- tmp-=4;

+ ND_PRINT((ndo, "\n\t IPv4 neighbor address: %s", ipaddr_string(ndo, tptr)));

+ tptr+=sizeof(struct in_addr);

+ tmp-=sizeof(struct in_addr);

- while (tmp>0) {

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

+ while (tmp>=4) {

+ if (!ND_TTEST2(*tptr, 4))

goto trunctlv;

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

+ ND_PRINT((ndo, "\n\t Link-ID: 0x%08x", EXTRACT_32BITS(tptr)));

tptr+=4;

tmp-=4;

}

break;

tptr+=4;

tmp-=4;

}

break;

- case TLV_LSP:

+ case ISIS_TLV_LSP:

tlv_lsp = (const struct isis_tlv_lsp *)tptr;

- while(tmp>0) {

- if (!TTEST((tlv_lsp->lsp_id)[LSP_ID_LEN]))

+ while(tmp>=sizeof(struct isis_tlv_lsp)) {

+ if (!ND_TTEST((tlv_lsp->lsp_id)[LSP_ID_LEN-1]))

goto trunctlv;

- printf("\n\t lsp-id: %s",

- isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN));

- if (!TTEST2(tlv_lsp->sequence_number, 4))

+ ND_PRINT((ndo, "\n\t lsp-id: %s",

+ isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN)));

+ if (!ND_TTEST2(tlv_lsp->sequence_number, 4))

goto trunctlv;

- printf(", seq: 0x%08x",EXTRACT_32BITS(tlv_lsp->sequence_number));

- if (!TTEST2(tlv_lsp->remaining_lifetime, 2))

+ ND_PRINT((ndo, ", seq: 0x%08x", EXTRACT_32BITS(tlv_lsp->sequence_number)));

+ if (!ND_TTEST2(tlv_lsp->remaining_lifetime, 2))

goto trunctlv;

- printf(", lifetime: %5ds",EXTRACT_16BITS(tlv_lsp->remaining_lifetime));

- if (!TTEST2(tlv_lsp->checksum, 2))

+ ND_PRINT((ndo, ", lifetime: %5ds", EXTRACT_16BITS(tlv_lsp->remaining_lifetime)));

+ if (!ND_TTEST2(tlv_lsp->checksum, 2))

goto trunctlv;

- printf(", chksum: 0x%04x",EXTRACT_16BITS(tlv_lsp->checksum));

+ ND_PRINT((ndo, ", chksum: 0x%04x", EXTRACT_16BITS(tlv_lsp->checksum)));

tmp-=sizeof(struct isis_tlv_lsp);

tlv_lsp++;

}

break;

tmp-=sizeof(struct isis_tlv_lsp);

tlv_lsp++;

}

break;

- case TLV_CHECKSUM:

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

+ case ISIS_TLV_CHECKSUM:

+ if (tmp < ISIS_TLV_CHECKSUM_MINLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_CHECKSUM_MINLEN))

goto trunctlv;

- printf("\n\t checksum: 0x%04x (%s)",

- EXTRACT_16BITS(tptr),

- (osi_cksum(optr, length)) ? "incorrect" : "correct");

+ ND_PRINT((ndo, "\n\t checksum: 0x%04x ", EXTRACT_16BITS(tptr)));

+ /* do not attempt to verify the checksum if it is zero

+ * most likely a HMAC-MD5 TLV is also present and

+ * to avoid conflicts the checksum TLV is zeroed.

+ * see rfc3358 for details

+ */

+ osi_print_cksum(ndo, optr, EXTRACT_16BITS(tptr), tptr-optr, length);

break;

- case TLV_MT_SUPPORTED:

+ case ISIS_TLV_MT_SUPPORTED:

+ if (tmp < ISIS_TLV_MT_SUPPORTED_MINLEN)

+ break;

while (tmp>1) {

/* length can only be a multiple of 2, otherwise there is

something broken -> so decode down until length is 1 */

if (tmp!=1) {

while (tmp>1) {

/* length can only be a multiple of 2, otherwise there is

something broken -> so decode down until length is 1 */

if (tmp!=1) {

- mt_len = isis_print_mtid(tptr, "\n\t ");

+ mt_len = isis_print_mtid(ndo, tptr, "\n\t ");

if (mt_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=mt_len;

tmp-=mt_len;

} else {

if (mt_len == 0) /* did something go wrong ? */

goto trunctlv;

tptr+=mt_len;

tmp-=mt_len;

} else {

- printf("\n\t malformed MT-ID");

+ ND_PRINT((ndo, "\n\t malformed MT-ID"));

break;

}

break;

}

break;

- case TLV_RESTART_SIGNALING:

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

+ case ISIS_TLV_RESTART_SIGNALING:

+ /* first attempt to decode the flags */

+ if (tmp < ISIS_TLV_RESTART_SIGNALING_FLAGLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_RESTART_SIGNALING_FLAGLEN))

goto trunctlv;

- printf("\n\t Flags [%s], Remaining holding time %us",

- bittok2str(isis_restart_flag_values, "none", *tptr),

- EXTRACT_16BITS(tptr+1));

- tptr+=3;

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

+ bittok2str(isis_restart_flag_values, "none", *tptr)));

+ tptr+=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;

+ tmp-=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;

+

+ /* is there anything other than the flags field? */

+ if (tmp == 0)

+ break;

+

+ if (tmp < ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN))

+ goto trunctlv;

+

+ ND_PRINT((ndo, ", Remaining holding time %us", EXTRACT_16BITS(tptr)));

+ tptr+=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;

+ tmp-=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;

+

+ /* is there an additional sysid field present ?*/

+ if (tmp == SYSTEM_ID_LEN) {

+ if (!ND_TTEST2(*tptr, SYSTEM_ID_LEN))

+ goto trunctlv;

+ ND_PRINT((ndo, ", for %s", isis_print_id(tptr,SYSTEM_ID_LEN)));

+ }

break;

- case TLV_IDRP_INFO:

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

+ case ISIS_TLV_IDRP_INFO:

+ if (tmp < ISIS_TLV_IDRP_INFO_MINLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_IDRP_INFO_MINLEN))

goto trunctlv;

- printf("\n\t Inter-Domain Information Type: %s",

+ ND_PRINT((ndo, "\n\t Inter-Domain Information Type: %s",

tok2str(isis_subtlv_idrp_values,

"Unknown (0x%02x)",

tok2str(isis_subtlv_idrp_values,

"Unknown (0x%02x)",

- *tptr));

+ *tptr)));

switch (*tptr++) {

- case SUBTLV_IDRP_ASN:

- if (!TTEST2(*tptr, 2)) /* fetch AS number */

+ case ISIS_SUBTLV_IDRP_ASN:

+ if (!ND_TTEST2(*tptr, 2)) /* fetch AS number */

goto trunctlv;

- printf("AS Number: %u",EXTRACT_16BITS(tptr));

+ ND_PRINT((ndo, "AS Number: %u", EXTRACT_16BITS(tptr)));

break;

- case SUBTLV_IDRP_LOCAL:

- case SUBTLV_IDRP_RES:

+ case ISIS_SUBTLV_IDRP_LOCAL:

+ case ISIS_SUBTLV_IDRP_RES:

default:

- if(!print_unknown_data(tptr,"\n\t ",tlv_len-1))

+ if (!print_unknown_data(ndo, tptr, "\n\t ", tlv_len - 1))

return(0);

break;

}

break;

return(0);

break;

}

break;

- case TLV_LSP_BUFFERSIZE:

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

+ case ISIS_TLV_LSP_BUFFERSIZE:

+ if (tmp < ISIS_TLV_LSP_BUFFERSIZE_MINLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_LSP_BUFFERSIZE_MINLEN))

goto trunctlv;

- printf("\n\t LSP Buffersize: %u",EXTRACT_16BITS(tptr));

+ ND_PRINT((ndo, "\n\t LSP Buffersize: %u", EXTRACT_16BITS(tptr)));

break;

- case TLV_PART_DIS:

+ case ISIS_TLV_PART_DIS:

while (tmp >= SYSTEM_ID_LEN) {

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

+ if (!ND_TTEST2(*tptr, SYSTEM_ID_LEN))

goto trunctlv;

- printf("\n\t %s",isis_print_id(tptr,SYSTEM_ID_LEN));

+ ND_PRINT((ndo, "\n\t %s", isis_print_id(tptr, SYSTEM_ID_LEN)));

tptr+=SYSTEM_ID_LEN;

tmp-=SYSTEM_ID_LEN;

}

break;

tptr+=SYSTEM_ID_LEN;

tmp-=SYSTEM_ID_LEN;

}

break;

- case TLV_PREFIX_NEIGH:

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

+ case ISIS_TLV_PREFIX_NEIGH:

+ if (tmp < sizeof(struct isis_metric_block))

+ break;

+ if (!ND_TTEST2(*tptr, sizeof(struct isis_metric_block)))

goto trunctlv;

- printf("\n\t Metric Block");

- isis_print_metric_block((const struct isis_metric_block *)tptr);

+ ND_PRINT((ndo, "\n\t Metric Block"));

+ isis_print_metric_block(ndo, (const struct isis_metric_block *)tptr);

tptr+=sizeof(struct isis_metric_block);

tmp-=sizeof(struct isis_metric_block);

while(tmp>0) {

tptr+=sizeof(struct isis_metric_block);

tmp-=sizeof(struct isis_metric_block);

while(tmp>0) {

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

+ if (!ND_TTEST2(*tptr, 1))

goto trunctlv;

prefix_len=*tptr++; /* read out prefix length in semioctets*/

goto trunctlv;

prefix_len=*tptr++; /* read out prefix length in semioctets*/

+ if (prefix_len < 2) {

+ ND_PRINT((ndo, "\n\t\tAddress: prefix length %u < 2", prefix_len));

+ break;

+ }

tmp--;

- if (!TTEST2(*tptr, prefix_len/2))

+ if (tmp < prefix_len/2)

+ break;

+ if (!ND_TTEST2(*tptr, prefix_len / 2))

goto trunctlv;

- printf("\n\t\tAddress: %s/%u",

- print_nsap(tptr,prefix_len/2),

- prefix_len*4);

+ ND_PRINT((ndo, "\n\t\tAddress: %s/%u",

+ isonsap_string(tptr, prefix_len / 2), prefix_len * 4));

tptr+=prefix_len/2;

tmp-=prefix_len/2;

}

break;

tptr+=prefix_len/2;

tmp-=prefix_len/2;

}

break;

- case TLV_IIH_SEQNR:

- if (!TTEST2(*tptr, 4)) /* check if four bytes are on the wire */

+ case ISIS_TLV_IIH_SEQNR:

+ if (tmp < ISIS_TLV_IIH_SEQNR_MINLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_IIH_SEQNR_MINLEN)) /* check if four bytes are on the wire */

goto trunctlv;

- printf("\n\t Sequence number: %u", EXTRACT_32BITS(tptr) );

+ ND_PRINT((ndo, "\n\t Sequence number: %u", EXTRACT_32BITS(tptr)));

break;

- case TLV_VENDOR_PRIVATE:

- if (!TTEST2(*tptr, 3)) /* check if enough byte for a full oui */

+ case ISIS_TLV_VENDOR_PRIVATE:

+ if (tmp < ISIS_TLV_VENDOR_PRIVATE_MINLEN)

+ break;

+ if (!ND_TTEST2(*tptr, ISIS_TLV_VENDOR_PRIVATE_MINLEN)) /* check if enough byte for a full oui */

goto trunctlv;

- printf("\n\t Vendor OUI Code: 0x%06x", EXTRACT_24BITS(tptr) );

+ vendor_id = EXTRACT_24BITS(tptr);

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

+ tok2str(oui_values, "Unknown", vendor_id),

+ vendor_id));

tptr+=3;

tmp-=3;

if (tmp > 0) /* hexdump the rest */

tptr+=3;

tmp-=3;

if (tmp > 0) /* hexdump the rest */

- if(!print_unknown_data(tptr,"\n\t\t",tmp))

+ if (!print_unknown_data(ndo, tptr, "\n\t\t", tmp))

return(0);

break;

/*

return(0);

break;

/*

* you are welcome to contribute code ;-)

*/

* you are welcome to contribute code ;-)

*/

- case TLV_DECNET_PHASE4:

- case TLV_LUCENT_PRIVATE:

- case TLV_IPAUTH:

- case TLV_NORTEL_PRIVATE1:

- case TLV_NORTEL_PRIVATE2:

+ case ISIS_TLV_DECNET_PHASE4:

+ case ISIS_TLV_LUCENT_PRIVATE:

+ case ISIS_TLV_IPAUTH:

+ case ISIS_TLV_NORTEL_PRIVATE1:

+ case ISIS_TLV_NORTEL_PRIVATE2:

default:

- if (vflag <= 1) {

- if(!print_unknown_data(pptr,"\n\t\t",tlv_len))

- return(0);

- }

- break;

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

+ if (!print_unknown_data(ndo, pptr, "\n\t\t", tlv_len))

+ return(0);

+ }

+ break;

}

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

}

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

- if (vflag> 1) {

- if(!print_unknown_data(pptr,"\n\t ",tlv_len))

- return(0);

- }

+ if (ndo->ndo_vflag> 1) {

+ if (!print_unknown_data(ndo, pptr, "\n\t ", tlv_len))

+ return(0);

+ }

pptr += tlv_len;

packet_len -= tlv_len;

}

if (packet_len != 0) {

pptr += tlv_len;

packet_len -= tlv_len;

}

if (packet_len != 0) {

- printf("\n\t %u straggler bytes", packet_len);

+ ND_PRINT((ndo, "\n\t %u straggler bytes", packet_len));

}

return (1);

trunc:

}

return (1);

trunc:

- fputs("[|isis]", stdout);

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

return (1);

trunctlv:

return (1);

trunctlv:

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

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

return(1);

}

return(1);

}

-/*

- * Verify the checksum. See 8473-1, Appendix C, section C.4.

- */

-

-static int

-osi_cksum(const u_int8_t *tptr, u_int len)

+static void

+osi_print_cksum(netdissect_options *ndo,

+ const uint8_t *pptr, uint16_t checksum,

+ u_int checksum_offset, u_int length)

{

- int32_t c0 = 0, c1 = 0;

-

- while ((int)--len >= 0) {

- c0 += *tptr++;

- c0 %= 255;

- c1 += c0;

- c1 %= 255;

- }

- return (c0 | c1);

+ uint16_t calculated_checksum;

+

+ /* do not attempt to verify the checksum if it is zero */

+ if (!checksum) {

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

+ } else {

+ calculated_checksum = create_osi_cksum(pptr, checksum_offset, length);

+ if (checksum == calculated_checksum) {

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

+ } else {

+ ND_PRINT((ndo, " (incorrect should be 0x%04x)", calculated_checksum));

+ }

}

+

+/*

+ * Local Variables:

+ * c-style: whitesmith

+ * c-basic-offset: 8

+ * End:

+ */