The Tcpdump Group git mirrors - tcpdump/blobdiff

* OSPF support contributed by Jeffrey Honig ([email protected])

*/

* OSPF support contributed by Jeffrey Honig ([email protected])

*/

+/* \summary: IPv6 Open Shortest Path First (OSPFv3) printer */

+

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

-#include <tcpdump-stdinc.h>

+#include "netdissect-stdinc.h"

-#include <stdio.h>

#include <string.h>

-#include "interface.h"

+#include "netdissect.h"

#include "addrtoname.h"

#include "extract.h"

#include "addrtoname.h"

#include "extract.h"

#define RLA_FLAG_E 0x02

#define RLA_FLAG_V 0x04

#define RLA_FLAG_W 0x08

#define RLA_FLAG_E 0x02

#define RLA_FLAG_V 0x04

#define RLA_FLAG_W 0x08

-#define RLA_FLAG_N 0x10

+#define RLA_FLAG_Nt 0x10

/* lsa_prefix options */

#define LSA_PREFIX_OPT_NU 0x01

/* lsa_prefix options */

#define LSA_PREFIX_OPT_NU 0x01

#define LSA_PREFIX_OPT_MC 0x04

#define LSA_PREFIX_OPT_P 0x08

#define LSA_PREFIX_OPT_DN 0x10

#define LSA_PREFIX_OPT_MC 0x04

#define LSA_PREFIX_OPT_P 0x08

#define LSA_PREFIX_OPT_DN 0x10

+#define LSA_PREFIX_OPT_N 0x20

/* sla_tosmetric breakdown */

#define SLA_MASK_TOS 0x7f000000

/* sla_tosmetric breakdown */

#define SLA_MASK_TOS 0x7f000000

#define OSPF6_AT_HDRLEN 16U

#define OSPF6_AUTH_TYPE_HMAC 0x0001

#define OSPF6_AT_HDRLEN 16U

#define OSPF6_AUTH_TYPE_HMAC 0x0001

-typedef u_int32_t rtrid_t;

+typedef nd_uint32_t rtrid_t;

/* link state advertisement header */

struct lsa6_hdr {

/* link state advertisement header */

struct lsa6_hdr {

- u_int16_t ls_age;

- u_int16_t ls_type;

+ nd_uint16_t ls_age;

+ nd_uint16_t ls_type;

rtrid_t ls_stateid;

rtrid_t ls_router;

rtrid_t ls_stateid;

rtrid_t ls_router;

- u_int32_t ls_seq;

- u_int16_t ls_chksum;

- u_int16_t ls_length;

+ nd_uint32_t ls_seq;

+ nd_uint16_t ls_chksum;

+ nd_uint16_t ls_length;

};

+/* Length of an IPv6 address, in bytes. */

+#define IPV6_ADDR_LEN_BYTES (128/8)

+

struct lsa6_prefix {

- u_int8_t lsa_p_len;

- u_int8_t lsa_p_opt;

- u_int16_t lsa_p_metric;

- u_int8_t lsa_p_prefix[4];

+ nd_uint8_t lsa_p_len;

+ nd_uint8_t lsa_p_opt;

+ nd_uint16_t lsa_p_metric;

+ nd_byte lsa_p_prefix[IPV6_ADDR_LEN_BYTES]; /* maximum length */

};

/* link state advertisement */

};

/* link state advertisement */

/* Router links advertisements */

struct {

union {

/* Router links advertisements */

struct {

union {

- u_int8_t flg;

- u_int32_t opt;

+ nd_uint8_t flg;

+ nd_uint32_t opt;

} rla_flgandopt;

#define rla_flags rla_flgandopt.flg

#define rla_options rla_flgandopt.opt

struct rlalink6 {

} rla_flgandopt;

#define rla_flags rla_flgandopt.flg

#define rla_options rla_flgandopt.opt

struct rlalink6 {

- u_int8_t link_type;

- u_int8_t link_zero[1];

- u_int16_t link_metric;

- u_int32_t link_ifid;

- u_int32_t link_nifid;

+ nd_uint8_t link_type;

+ nd_byte link_zero;

+ nd_uint16_t link_metric;

+ nd_uint32_t link_ifid;

+ nd_uint32_t link_nifid;

rtrid_t link_nrtid;

} rla_link[1]; /* may repeat */

} un_rla;

/* Network links advertisements */

struct {

rtrid_t link_nrtid;

} rla_link[1]; /* may repeat */

} un_rla;

/* Network links advertisements */

struct {

- u_int32_t nla_options;

+ nd_uint32_t nla_options;

rtrid_t nla_router[1]; /* may repeat */

} un_nla;

/* Inter Area Prefix LSA */

struct {

rtrid_t nla_router[1]; /* may repeat */

} un_nla;

/* Inter Area Prefix LSA */

struct {

- u_int32_t inter_ap_metric;

+ nd_uint32_t inter_ap_metric;

struct lsa6_prefix inter_ap_prefix[1];

} un_inter_ap;

/* AS external links advertisements */

struct {

struct lsa6_prefix inter_ap_prefix[1];

} un_inter_ap;

/* AS external links advertisements */

struct {

- u_int32_t asla_metric;

+ nd_uint32_t asla_metric;

struct lsa6_prefix asla_prefix[1];

/* some optional fields follow */

} un_asla;

struct lsa6_prefix asla_prefix[1];

/* some optional fields follow */

} un_asla;

#if 0

/* Summary links advertisements */

struct {

#if 0

/* Summary links advertisements */

struct {

- struct in_addr sla_mask;

- u_int32_t sla_tosmetric[1]; /* may repeat */

+ nd_ipv4 sla_mask;

+ nd_uint32_t sla_tosmetric[1]; /* may repeat */

} un_sla;

/* Multicast group membership */

struct mcla {

} un_sla;

/* Multicast group membership */

struct mcla {

- u_int32_t mcla_vtype;

- struct in_addr mcla_vid;

+ nd_uint32_t mcla_vtype;

+ nd_ipv4 mcla_vid;

} un_mcla[1];

#endif

} un_mcla[1];

#endif

/* Link LSA */

struct llsa {

union {

/* Link LSA */

struct llsa {

union {

- u_int8_t pri;

- u_int32_t opt;

+ nd_uint8_t pri;

+ nd_uint32_t opt;

} llsa_priandopt;

#define llsa_priority llsa_priandopt.pri

#define llsa_options llsa_priandopt.opt

} llsa_priandopt;

#define llsa_priority llsa_priandopt.pri

#define llsa_options llsa_priandopt.opt

- struct in6_addr llsa_lladdr;

- u_int32_t llsa_nprefix;

+ nd_ipv6 llsa_lladdr;

+ nd_uint32_t llsa_nprefix;

struct lsa6_prefix llsa_prefix[1];

} un_llsa;

/* Intra-Area-Prefix */

struct {

struct lsa6_prefix llsa_prefix[1];

} un_llsa;

/* Intra-Area-Prefix */

struct {

- u_int16_t intra_ap_nprefix;

- u_int16_t intra_ap_lstype;

+ nd_uint16_t intra_ap_nprefix;

+ nd_uint16_t intra_ap_lstype;

rtrid_t intra_ap_lsid;

rtrid_t intra_ap_rtid;

struct lsa6_prefix intra_ap_prefix[1];

rtrid_t intra_ap_lsid;

rtrid_t intra_ap_rtid;

struct lsa6_prefix intra_ap_prefix[1];

* the main header

*/

struct ospf6hdr {

* the main header

*/

struct ospf6hdr {

- u_int8_t ospf6_version;

- u_int8_t ospf6_type;

- u_int16_t ospf6_len;

+ nd_uint8_t ospf6_version;

+ nd_uint8_t ospf6_type;

+ nd_uint16_t ospf6_len;

rtrid_t ospf6_routerid;

rtrid_t ospf6_areaid;

rtrid_t ospf6_routerid;

rtrid_t ospf6_areaid;

- u_int16_t ospf6_chksum;

- u_int8_t ospf6_instanceid;

- u_int8_t ospf6_rsvd;

- union {

+ nd_uint16_t ospf6_chksum;

+ nd_uint8_t ospf6_instanceid;

+ nd_uint8_t ospf6_rsvd;

+};

- /* Hello packet */

- struct {

- u_int32_t hello_ifid;

- union {

- u_int8_t pri;

- u_int32_t opt;

- } hello_priandopt;

+/*

+ * The OSPF6 header length is 16 bytes, regardless of how your compiler

+ * might choose to pad the above structure.

+ */

+#define OSPF6HDR_LEN 16

+

+/* Hello packet */

+struct hello6 {

+ nd_uint32_t hello_ifid;

+ union {

+ nd_uint8_t pri;

+ nd_uint32_t opt;

+ } hello_priandopt;

#define hello_priority hello_priandopt.pri

#define hello_options hello_priandopt.opt

#define hello_priority hello_priandopt.pri

#define hello_options hello_priandopt.opt

- u_int16_t hello_helloint;

- u_int16_t hello_deadint;

- rtrid_t hello_dr;

- rtrid_t hello_bdr;

- rtrid_t hello_neighbor[1]; /* may repeat */

- } un_hello;

-

- /* Database Description packet */

- struct {

- u_int32_t db_options;

- u_int16_t db_mtu;

- u_int8_t db_mbz;

- u_int8_t db_flags;

- u_int32_t db_seq;

- struct lsa6_hdr db_lshdr[1]; /* may repeat */

- } un_db;

-

- /* Link State Request */

- struct lsr6 {

- u_int16_t ls_mbz;

- u_int16_t ls_type;

- rtrid_t ls_stateid;

- rtrid_t ls_router;

- } un_lsr[1]; /* may repeat */

-

- /* Link State Update */

- struct {

- u_int32_t lsu_count;

- struct lsa6 lsu_lsa[1]; /* may repeat */

- } un_lsu;

+ nd_uint16_t hello_helloint;

+ nd_uint16_t hello_deadint;

+ rtrid_t hello_dr;

+ rtrid_t hello_bdr;

+ rtrid_t hello_neighbor[1]; /* may repeat */

+};

- /* Link State Acknowledgement */

- struct {

- struct lsa6_hdr lsa_lshdr[1]; /* may repeat */

- } un_lsa ;

- } ospf6_un ;

+/* Database Description packet */

+struct dd6 {

+ nd_uint32_t db_options;

+ nd_uint16_t db_mtu;

+ nd_uint8_t db_mbz;

+ nd_uint8_t db_flags;

+ nd_uint32_t db_seq;

+ struct lsa6_hdr db_lshdr[1]; /* may repeat */

+};

+

+/* Link State Request */

+struct lsr6 {

+ nd_uint16_t ls_mbz;

+ nd_uint16_t ls_type;

+ rtrid_t ls_stateid;

+ rtrid_t ls_router;

};

-#define ospf6_hello ospf6_un.un_hello

-#define ospf6_db ospf6_un.un_db

-#define ospf6_lsr ospf6_un.un_lsr

-#define ospf6_lsu ospf6_un.un_lsu

-#define ospf6_lsa ospf6_un.un_lsa

+/* Link State Update */

+struct lsu6 {

+ nd_uint32_t lsu_count;

+ struct lsa6 lsu_lsa[1]; /* may repeat */

+};

-static const char tstr[] = " [|ospf3]";

static const struct tok ospf6_option_values[] = {

{ OSPF6_OPTION_V6, "V6" },

static const struct tok ospf6_option_values[] = {

{ OSPF6_OPTION_V6, "V6" },

{ RLA_FLAG_B, "ABR" },

{ RLA_FLAG_E, "External" },

{ RLA_FLAG_V, "Virtual-Link Endpoint" },

{ RLA_FLAG_B, "ABR" },

{ RLA_FLAG_E, "External" },

{ RLA_FLAG_V, "Virtual-Link Endpoint" },

- { RLA_FLAG_W, "Wildcard Receiver" },

- { RLA_FLAG_N, "NSSA Translator" },

+ { RLA_FLAG_W, "Deprecated" },

+ { RLA_FLAG_Nt, "NSSA Translator" },

{ 0, NULL }

};

{ 0, NULL }

};

{ LSA_PREFIX_OPT_MC, "Deprecated" },

{ LSA_PREFIX_OPT_P, "Propagate" },

{ LSA_PREFIX_OPT_DN, "Down" },

{ LSA_PREFIX_OPT_MC, "Deprecated" },

{ LSA_PREFIX_OPT_P, "Propagate" },

{ LSA_PREFIX_OPT_DN, "Down" },

+ { LSA_PREFIX_OPT_N, "N-bit" },

{ 0, NULL }

};

{ 0, NULL }

};

static void

};

static void

-ospf6_print_ls_type(register u_int ls_type, register const rtrid_t *ls_stateid)

+ospf6_print_ls_type(netdissect_options *ndo,

+ u_int ls_type, const rtrid_t *ls_stateid)

{

- printf("\n\t %s LSA (%d), %s Scope%s, LSA-ID %s",

+ ND_PRINT("\n\t %s LSA (%u), %s Scope%s, LSA-ID %s",

tok2str(ospf6_lsa_values, "Unknown", ls_type & LS_TYPE_MASK),

ls_type & LS_TYPE_MASK,

tok2str(ospf6_ls_scope_values, "Unknown", ls_type & LS_SCOPE_MASK),

ls_type &0x8000 ? ", transitive" : "", /* U-bit */

tok2str(ospf6_lsa_values, "Unknown", ls_type & LS_TYPE_MASK),

ls_type & LS_TYPE_MASK,

tok2str(ospf6_ls_scope_values, "Unknown", ls_type & LS_SCOPE_MASK),

ls_type &0x8000 ? ", transitive" : "", /* U-bit */

- ipaddr_string(ls_stateid));

+ GET_IPADDR_STRING(ls_stateid));

}

static int

}

static int

-ospf6_print_lshdr(register const struct lsa6_hdr *lshp, const u_char *dataend)

+ospf6_print_lshdr(netdissect_options *ndo,

+ const struct lsa6_hdr *lshp, const u_char *dataend)

{

- if ((u_char *)(lshp + 1) > dataend)

+ if ((const u_char *)(lshp + 1) > dataend)

goto trunc;

- TCHECK(lshp->ls_type);

- TCHECK(lshp->ls_seq);

- printf("\n\t Advertising Router %s, seq 0x%08x, age %us, length %u",

- ipaddr_string(&lshp->ls_router),

- EXTRACT_32BITS(&lshp->ls_seq),

- EXTRACT_16BITS(&lshp->ls_age),

- EXTRACT_16BITS(&lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr));

+ ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %zu",

+ GET_IPADDR_STRING(lshp->ls_router),

+ GET_BE_U_4(lshp->ls_seq),

+ GET_BE_U_2(lshp->ls_age),

+ GET_BE_U_2(lshp->ls_length)-sizeof(struct lsa6_hdr));

- ospf6_print_ls_type(EXTRACT_16BITS(&lshp->ls_type), &lshp->ls_stateid);

+ ospf6_print_ls_type(ndo, GET_BE_U_2(lshp->ls_type),

+ &lshp->ls_stateid);

return (0);

trunc:

return (0);

trunc:

}

static int

}

static int

-ospf6_print_lsaprefix(const u_int8_t *tptr, u_int lsa_length)

+ospf6_print_lsaprefix(netdissect_options *ndo,

+ const uint8_t *tptr, u_int lsa_length)

{

- const struct lsa6_prefix *lsapp = (struct lsa6_prefix *)tptr;

+ const struct lsa6_prefix *lsapp = (const struct lsa6_prefix *)tptr;

u_int wordlen;

- struct in6_addr prefix;

+ nd_ipv6 prefix;

- if (lsa_length < sizeof (*lsapp) - 4)

+ if (lsa_length < sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES)

goto trunc;

- lsa_length -= sizeof (*lsapp) - 4;

- TCHECK2(*lsapp, sizeof (*lsapp) - 4);

- wordlen = (lsapp->lsa_p_len + 31) / 32;

- if (wordlen * 4 > sizeof(struct in6_addr)) {

- printf(" bogus prefixlen /%d", lsapp->lsa_p_len);

+ lsa_length -= sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES;

+ ND_TCHECK_LEN(lsapp, sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES);

+ wordlen = (GET_U_1(lsapp->lsa_p_len) + 31) / 32;

+ if (wordlen * 4 > sizeof(nd_ipv6)) {

+ ND_PRINT(" bogus prefixlen /%u", GET_U_1(lsapp->lsa_p_len));

goto trunc;

}

if (lsa_length < wordlen * 4)

goto trunc;

lsa_length -= wordlen * 4;

goto trunc;

}

if (lsa_length < wordlen * 4)

goto trunc;

lsa_length -= wordlen * 4;

- TCHECK2(lsapp->lsa_p_prefix, wordlen * 4);

- memset(&prefix, 0, sizeof(prefix));

- memcpy(&prefix, lsapp->lsa_p_prefix, wordlen * 4);

- printf("\n\t\t%s/%d", ip6addr_string(&prefix),

- lsapp->lsa_p_len);

- if (lsapp->lsa_p_opt) {

- printf(", Options [%s]",

+ memset(prefix, 0, sizeof(prefix));

+ GET_CPY_BYTES(prefix, lsapp->lsa_p_prefix, wordlen * 4);

+ ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */

+ GET_U_1(lsapp->lsa_p_len));

+ if (GET_U_1(lsapp->lsa_p_opt)) {

+ ND_PRINT(", Options [%s]",

bittok2str(ospf6_lsa_prefix_option_values,

- "none", lsapp->lsa_p_opt));

+ "none", GET_U_1(lsapp->lsa_p_opt)));

}

- printf(", metric %u", EXTRACT_16BITS(&lsapp->lsa_p_metric));

- return sizeof(*lsapp) - 4 + wordlen * 4;

+ ND_PRINT(", metric %u", GET_BE_U_2(lsapp->lsa_p_metric));

+ return sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES + wordlen * 4;

trunc:

return -1;

trunc:

return -1;

* Print a single link state advertisement. If truncated return 1, else 0.

*/

static int

* Print a single link state advertisement. If truncated return 1, else 0.

*/

static int

-ospf6_print_lsa(register const struct lsa6 *lsap, const u_char *dataend)

+ospf6_print_lsa(netdissect_options *ndo,

+ const struct lsa6 *lsap, const u_char *dataend)

{

- register const struct rlalink6 *rlp;

+ const struct rlalink6 *rlp;

#if 0

- register const struct tos_metric *tosp;

+ const struct tos_metric *tosp;

#endif

- register const rtrid_t *ap;

+ const rtrid_t *ap;

#if 0

- register const struct aslametric *almp;

- register const struct mcla *mcp;

+ const struct aslametric *almp;

+ const struct mcla *mcp;

#endif

- register const struct llsa *llsap;

- register const struct lsa6_prefix *lsapp;

+ const struct llsa *llsap;

+ const struct lsa6_prefix *lsapp;

#if 0

- register const u_int32_t *lp;

+ const uint32_t *lp;

#endif

- register u_int prefixes;

- register int bytelen;

- register u_int length, lsa_length;

- u_int32_t flags32;

- const u_int8_t *tptr;

+ u_int prefixes;

+ int bytelen;

+ u_int length, lsa_length;

+ uint32_t flags32;

+ const uint8_t *tptr;

- if (ospf6_print_lshdr(&lsap->ls_hdr, dataend))

+ if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))

return (1);

- TCHECK(lsap->ls_hdr.ls_length);

- length = EXTRACT_16BITS(&lsap->ls_hdr.ls_length);

+ length = GET_BE_U_2(lsap->ls_hdr.ls_length);

/*

* The LSA length includes the length of the header;

/*

* The LSA length includes the length of the header;

* If it does, find the length of what follows the

* header.

*/

* If it does, find the length of what follows the

* header.

*/

- if (length < sizeof(struct lsa6_hdr) || (u_char *)lsap + length > dataend)

- return (1);

+ if (length < sizeof(struct lsa6_hdr) || (const u_char *)lsap + length > dataend)

+ return (1);

lsa_length = length - sizeof(struct lsa6_hdr);

- tptr = (u_int8_t *)lsap+sizeof(struct lsa6_hdr);

+ tptr = (const uint8_t *)lsap+sizeof(struct lsa6_hdr);

- switch (EXTRACT_16BITS(&lsap->ls_hdr.ls_type)) {

+ switch (GET_BE_U_2(lsap->ls_hdr.ls_type)) {

case LS_TYPE_ROUTER | LS_SCOPE_AREA:

if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);

case LS_TYPE_ROUTER | LS_SCOPE_AREA:

if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);

- TCHECK(lsap->lsa_un.un_rla.rla_options);

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

- bittok2str(ospf6_option_values, "none",

- EXTRACT_32BITS(&lsap->lsa_un.un_rla.rla_options)));

- printf(", RLA-Flags [%s]",

- bittok2str(ospf6_rla_flag_values, "none",

- lsap->lsa_un.un_rla.rla_flags));

+ ND_PRINT("\n\t Options [%s]",

+ bittok2str(ospf6_option_values, "none",

+ GET_BE_U_4(lsap->lsa_un.un_rla.rla_options)));

+ ND_PRINT(", RLA-Flags [%s]",

+ bittok2str(ospf6_rla_flag_values, "none",

+ GET_U_1(lsap->lsa_un.un_rla.rla_flags)));

rlp = lsap->lsa_un.un_rla.rla_link;

while (lsa_length != 0) {

if (lsa_length < sizeof (*rlp))

return (1);

lsa_length -= sizeof (*rlp);

rlp = lsap->lsa_un.un_rla.rla_link;

while (lsa_length != 0) {

if (lsa_length < sizeof (*rlp))

return (1);

lsa_length -= sizeof (*rlp);

- TCHECK(*rlp);

- switch (rlp->link_type) {

+ ND_TCHECK_SIZE(rlp);

+ switch (GET_U_1(rlp->link_type)) {

case RLA_TYPE_VIRTUAL:

- printf("\n\t Virtual Link: Neighbor Router-ID %s"

+ ND_PRINT("\n\t Virtual Link: Neighbor Router-ID %s"

"\n\t Neighbor Interface-ID %s, Interface %s",

- ipaddr_string(&rlp->link_nrtid),

- ipaddr_string(&rlp->link_nifid),

- ipaddr_string(&rlp->link_ifid));

+ GET_IPADDR_STRING(rlp->link_nrtid),

+ GET_IPADDR_STRING(rlp->link_nifid),

+ GET_IPADDR_STRING(rlp->link_ifid));

break;

case RLA_TYPE_ROUTER:

break;

case RLA_TYPE_ROUTER:

- printf("\n\t Neighbor Router-ID %s"

+ ND_PRINT("\n\t Neighbor Router-ID %s"

"\n\t Neighbor Interface-ID %s, Interface %s",

- ipaddr_string(&rlp->link_nrtid),

- ipaddr_string(&rlp->link_nifid),

- ipaddr_string(&rlp->link_ifid));

+ GET_IPADDR_STRING(rlp->link_nrtid),

+ GET_IPADDR_STRING(rlp->link_nifid),

+ GET_IPADDR_STRING(rlp->link_ifid));

break;

case RLA_TYPE_TRANSIT:

break;

case RLA_TYPE_TRANSIT:

- printf("\n\t Neighbor Network-ID %s"

+ ND_PRINT("\n\t Neighbor Network-ID %s"

"\n\t Neighbor Interface-ID %s, Interface %s",

- ipaddr_string(&rlp->link_nrtid),

- ipaddr_string(&rlp->link_nifid),

- ipaddr_string(&rlp->link_ifid));

+ GET_IPADDR_STRING(rlp->link_nrtid),

+ GET_IPADDR_STRING(rlp->link_nifid),

+ GET_IPADDR_STRING(rlp->link_ifid));

break;

default:

break;

default:

- printf("\n\t Unknown Router Links Type 0x%02x",

- rlp->link_type);

+ ND_PRINT("\n\t Unknown Router Links Type 0x%02x",

+ GET_U_1(rlp->link_type));

return (0);

}

return (0);

}

- printf(", metric %d", EXTRACT_16BITS(&rlp->link_metric));

+ ND_PRINT(", metric %u", GET_BE_U_2(rlp->link_metric));

rlp++;

}

break;

rlp++;

}

break;

if (lsa_length < sizeof (lsap->lsa_un.un_nla.nla_options))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);

if (lsa_length < sizeof (lsap->lsa_un.un_nla.nla_options))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);

- TCHECK(lsap->lsa_un.un_nla.nla_options);

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

- bittok2str(ospf6_option_values, "none",

- EXTRACT_32BITS(&lsap->lsa_un.un_nla.nla_options)));

+ ND_PRINT("\n\t Options [%s]",

+ bittok2str(ospf6_option_values, "none",

+ GET_BE_U_4(lsap->lsa_un.un_nla.nla_options)));

- printf("\n\t Connected Routers:");

+ ND_PRINT("\n\t Connected Routers:");

ap = lsap->lsa_un.un_nla.nla_router;

while (lsa_length != 0) {

if (lsa_length < sizeof (*ap))

return (1);

lsa_length -= sizeof (*ap);

ap = lsap->lsa_un.un_nla.nla_router;

while (lsa_length != 0) {

if (lsa_length < sizeof (*ap))

return (1);

lsa_length -= sizeof (*ap);

- TCHECK(*ap);

- printf("\n\t\t%s", ipaddr_string(ap));

+ ND_PRINT("\n\t\t%s", GET_IPADDR_STRING(ap));

++ap;

}

break;

++ap;

}

break;

if (lsa_length < sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);

if (lsa_length < sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);

- TCHECK(lsap->lsa_un.un_inter_ap.inter_ap_metric);

- printf(", metric %u",

- EXTRACT_32BITS(&lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);

+ ND_PRINT(", metric %u",

+ GET_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);

- tptr = (u_int8_t *)lsap->lsa_un.un_inter_ap.inter_ap_prefix;

+ tptr = (const uint8_t *)lsap->lsa_un.un_inter_ap.inter_ap_prefix;

while (lsa_length != 0) {

- bytelen = ospf6_print_lsaprefix(tptr, lsa_length);

+ bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);

if (bytelen < 0)

goto trunc;

if (bytelen < 0)

goto trunc;

+ /*

+ * ospf6_print_lsaprefix() will return -1 if

+ * the length is too high, so this will not

+ * underflow.

+ */

lsa_length -= bytelen;

tptr += bytelen;

}

lsa_length -= bytelen;

tptr += bytelen;

}

if (lsa_length < sizeof (lsap->lsa_un.un_asla.asla_metric))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);

if (lsa_length < sizeof (lsap->lsa_un.un_asla.asla_metric))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);

- TCHECK(lsap->lsa_un.un_asla.asla_metric);

- flags32 = EXTRACT_32BITS(&lsap->lsa_un.un_asla.asla_metric);

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

- bittok2str(ospf6_asla_flag_values, "none", flags32));

- printf(" metric %u",

- EXTRACT_32BITS(&lsap->lsa_un.un_asla.asla_metric) &

+ flags32 = GET_BE_U_4(lsap->lsa_un.un_asla.asla_metric);

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

+ bittok2str(ospf6_asla_flag_values, "none", flags32));

+ ND_PRINT(" metric %u",

+ GET_BE_U_4(lsap->lsa_un.un_asla.asla_metric) &

ASLA_MASK_METRIC);

- tptr = (u_int8_t *)lsap->lsa_un.un_asla.asla_prefix;

- lsapp = (struct lsa6_prefix *)tptr;

- bytelen = ospf6_print_lsaprefix(tptr, lsa_length);

+ tptr = (const uint8_t *)lsap->lsa_un.un_asla.asla_prefix;

+ lsapp = (const struct lsa6_prefix *)tptr;

+ bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);

if (bytelen < 0)

goto trunc;

if (bytelen < 0)

goto trunc;

+ /*

+ * ospf6_print_lsaprefix() will return -1 if

+ * the length is too high, so this will not

+ * underflow.

+ */

lsa_length -= bytelen;

tptr += bytelen;

if ((flags32 & ASLA_FLAG_FWDADDR) != 0) {

lsa_length -= bytelen;

tptr += bytelen;

if ((flags32 & ASLA_FLAG_FWDADDR) != 0) {

- struct in6_addr *fwdaddr6;

-

- fwdaddr6 = (struct in6_addr *)tptr;

- if (lsa_length < sizeof (*fwdaddr6))

+ if (lsa_length < sizeof (nd_ipv6))

return (1);

- lsa_length -= sizeof (*fwdaddr6);

- TCHECK(*fwdaddr6);

- printf(" forward %s",

- ip6addr_string(fwdaddr6));

- tptr += sizeof(*fwdaddr6);

+ lsa_length -= sizeof (nd_ipv6);

+ ND_PRINT(" forward %s",

+ GET_IP6ADDR_STRING(tptr));

+ tptr += sizeof(nd_ipv6);

}

if ((flags32 & ASLA_FLAG_ROUTETAG) != 0) {

}

if ((flags32 & ASLA_FLAG_ROUTETAG) != 0) {

- if (lsa_length < sizeof (u_int32_t))

+ if (lsa_length < sizeof (uint32_t))

return (1);

- lsa_length -= sizeof (u_int32_t);

- TCHECK(*(u_int32_t *)tptr);

- printf(" tag %s",

- ipaddr_string((u_int32_t *)tptr));

- tptr += sizeof(u_int32_t);

+ lsa_length -= sizeof (uint32_t);

+ ND_PRINT(" tag %s",

+ GET_IPADDR_STRING(tptr));

+ tptr += sizeof(uint32_t);

}

- if (lsapp->lsa_p_metric) {

- if (lsa_length < sizeof (u_int32_t))

+ if (GET_U_1(lsapp->lsa_p_metric)) {

+ if (lsa_length < sizeof (uint32_t))

return (1);

- lsa_length -= sizeof (u_int32_t);

- TCHECK(*(u_int32_t *)tptr);

- printf(" RefLSID: %s",

- ipaddr_string((u_int32_t *)tptr));

- tptr += sizeof(u_int32_t);

+ lsa_length -= sizeof (uint32_t);

+ ND_PRINT(" RefLSID: %s",

+ GET_IPADDR_STRING(tptr));

+ tptr += sizeof(uint32_t);

}

break;

}

break;

if (lsa_length < sizeof (llsap->llsa_priandopt))

return (1);

lsa_length -= sizeof (llsap->llsa_priandopt);

if (lsa_length < sizeof (llsap->llsa_priandopt))

return (1);

lsa_length -= sizeof (llsap->llsa_priandopt);

- TCHECK(llsap->llsa_priandopt);

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

- bittok2str(ospf6_option_values, "none",

- EXTRACT_32BITS(&llsap->llsa_options)));

+ ND_TCHECK_SIZE(&llsap->llsa_priandopt);

+ ND_PRINT("\n\t Options [%s]",

+ bittok2str(ospf6_option_values, "none",

+ GET_BE_U_4(llsap->llsa_options)));

if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))

return (1);

lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);

if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))

return (1);

lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);

- prefixes = EXTRACT_32BITS(&llsap->llsa_nprefix);

- printf("\n\t Priority %d, Link-local address %s, Prefixes %d:",

- llsap->llsa_priority,

- ip6addr_string(&llsap->llsa_lladdr),

+ prefixes = GET_BE_U_4(llsap->llsa_nprefix);

+ ND_PRINT("\n\t Priority %u, Link-local address %s, Prefixes %u:",

+ GET_U_1(llsap->llsa_priority),

+ GET_IP6ADDR_STRING(llsap->llsa_lladdr),

prefixes);

- tptr = (u_int8_t *)llsap->llsa_prefix;

+ tptr = (const uint8_t *)llsap->llsa_prefix;

while (prefixes > 0) {

- bytelen = ospf6_print_lsaprefix(tptr, lsa_length);

+ bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);

if (bytelen < 0)

goto trunc;

prefixes--;

if (bytelen < 0)

goto trunc;

prefixes--;

+ /*

+ * ospf6_print_lsaprefix() will return -1 if

+ * the length is too high, so this will not

+ * underflow.

+ */

lsa_length -= bytelen;

tptr += bytelen;

}

lsa_length -= bytelen;

tptr += bytelen;

}

if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);

if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);

- TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_rtid);

- ospf6_print_ls_type(

- EXTRACT_16BITS(&lsap->lsa_un.un_intra_ap.intra_ap_lstype),

+ ND_TCHECK_4(lsap->lsa_un.un_intra_ap.intra_ap_rtid);

+ ospf6_print_ls_type(ndo,

+ GET_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_lstype),

&lsap->lsa_un.un_intra_ap.intra_ap_lsid);

if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

&lsap->lsa_un.un_intra_ap.intra_ap_lsid);

if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))

return (1);

lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

- TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

- prefixes = EXTRACT_16BITS(&lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

- printf("\n\t Prefixes %d:", prefixes);

+ prefixes = GET_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

+ ND_PRINT("\n\t Prefixes %u:", prefixes);

- tptr = (u_int8_t *)lsap->lsa_un.un_intra_ap.intra_ap_prefix;

+ tptr = (const uint8_t *)lsap->lsa_un.un_intra_ap.intra_ap_prefix;

while (prefixes > 0) {

- bytelen = ospf6_print_lsaprefix(tptr, lsa_length);

+ bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);

if (bytelen < 0)

goto trunc;

prefixes--;

if (bytelen < 0)

goto trunc;

prefixes--;

+ /*

+ * ospf6_print_lsaprefix() will return -1 if

+ * the length is too high, so this will not

+ * underflow.

+ */

lsa_length -= bytelen;

tptr += bytelen;

}

break;

case LS_TYPE_GRACE | LS_SCOPE_LINKLOCAL:

lsa_length -= bytelen;

tptr += bytelen;

}

break;

case LS_TYPE_GRACE | LS_SCOPE_LINKLOCAL:

- if (ospf_print_grace_lsa(tptr, lsa_length) == -1) {

+ if (ospf_grace_lsa_print(ndo, tptr, lsa_length) == -1) {

return 1;

}

break;

case LS_TYPE_INTRA_ATE | LS_SCOPE_LINKLOCAL:

return 1;

}

break;

case LS_TYPE_INTRA_ATE | LS_SCOPE_LINKLOCAL:

- if (ospf_print_te_lsa(tptr, lsa_length) == -1) {

+ if (ospf_te_lsa_print(ndo, tptr, lsa_length) == -1) {

return 1;

}

break;

default:

return 1;

}

break;

default:

- if(!print_unknown_data(gndo,tptr,

+ if(!print_unknown_data(ndo,tptr,

"\n\t ",

lsa_length)) {

return (1);

"\n\t ",

lsa_length)) {

return (1);

}

static int

}

static int

-ospf6_decode_v3(register const struct ospf6hdr *op,

- register const u_char *dataend)

+ospf6_decode_v3(netdissect_options *ndo,

+ const struct ospf6hdr *op,

+ const u_char *dataend)

{

- register const rtrid_t *ap;

- register const struct lsr6 *lsrp;

- register const struct lsa6_hdr *lshp;

- register const struct lsa6 *lsap;

- register int i;

-

- switch (op->ospf6_type) {

-

- case OSPF_TYPE_HELLO:

- printf("\n\tOptions [%s]",

- bittok2str(ospf6_option_values, "none",

- EXTRACT_32BITS(&op->ospf6_hello.hello_options)));

-

- TCHECK(op->ospf6_hello.hello_deadint);

- printf("\n\t Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",

- EXTRACT_16BITS(&op->ospf6_hello.hello_helloint),

- EXTRACT_16BITS(&op->ospf6_hello.hello_deadint),

- ipaddr_string(&op->ospf6_hello.hello_ifid),

- op->ospf6_hello.hello_priority);

-

- TCHECK(op->ospf6_hello.hello_dr);

- if (op->ospf6_hello.hello_dr != 0)

- printf("\n\t Designated Router %s",

- ipaddr_string(&op->ospf6_hello.hello_dr));

- TCHECK(op->ospf6_hello.hello_bdr);

- if (op->ospf6_hello.hello_bdr != 0)

- printf(", Backup Designated Router %s",

- ipaddr_string(&op->ospf6_hello.hello_bdr));

- if (vflag > 1) {

- printf("\n\t Neighbor List:");

- ap = op->ospf6_hello.hello_neighbor;

- while ((u_char *)ap < dataend) {

- TCHECK(*ap);

- printf("\n\t %s", ipaddr_string(ap));

+ const rtrid_t *ap;

+ const struct lsr6 *lsrp;

+ const struct lsa6_hdr *lshp;

+ const struct lsa6 *lsap;

+ int i;

+

+ switch (GET_U_1(op->ospf6_type)) {

+

+ case OSPF_TYPE_HELLO: {

+ const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+

+ ND_PRINT("\n\tOptions [%s]",

+ bittok2str(ospf6_option_values, "none",

+ GET_BE_U_4(hellop->hello_options)));

+

+ ND_PRINT("\n\t Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",

+ GET_BE_U_2(hellop->hello_helloint),

+ GET_BE_U_2(hellop->hello_deadint),

+ GET_IPADDR_STRING(hellop->hello_ifid),

+ GET_U_1(hellop->hello_priority));

+

+ if (GET_BE_U_4(hellop->hello_dr) != 0)

+ ND_PRINT("\n\t Designated Router %s",

+ GET_IPADDR_STRING(hellop->hello_dr));

+ if (GET_BE_U_4(hellop->hello_bdr) != 0)

+ ND_PRINT(", Backup Designated Router %s",

+ GET_IPADDR_STRING(hellop->hello_bdr));

+ if (ndo->ndo_vflag > 1) {

+ ND_PRINT("\n\t Neighbor List:");

+ ap = hellop->hello_neighbor;

+ while ((const u_char *)ap < dataend) {

+ ND_PRINT("\n\t %s", GET_IPADDR_STRING(ap));

++ap;

}

break; /* HELLO */

++ap;

}

break; /* HELLO */

+ }

- case OSPF_TYPE_DD:

- TCHECK(op->ospf6_db.db_options);

- printf("\n\tOptions [%s]",

- bittok2str(ospf6_option_values, "none",

- EXTRACT_32BITS(&op->ospf6_db.db_options)));

- TCHECK(op->ospf6_db.db_flags);

- printf(", DD Flags [%s]",

- bittok2str(ospf6_dd_flag_values,"none",op->ospf6_db.db_flags));

-

- TCHECK(op->ospf6_db.db_seq);

- printf(", MTU %u, DD-Sequence 0x%08x",

- EXTRACT_16BITS(&op->ospf6_db.db_mtu),

- EXTRACT_32BITS(&op->ospf6_db.db_seq));

- if (vflag > 1) {

+ case OSPF_TYPE_DD: {

+ const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+

+ ND_PRINT("\n\tOptions [%s]",

+ bittok2str(ospf6_option_values, "none",

+ GET_BE_U_4(ddp->db_options)));

+ ND_PRINT(", DD Flags [%s]",

+ bittok2str(ospf6_dd_flag_values,"none",GET_U_1(ddp->db_flags)));

+

+ ND_PRINT(", MTU %u, DD-Sequence 0x%08x",

+ GET_BE_U_2(ddp->db_mtu),

+ GET_BE_U_4(ddp->db_seq));

+ if (ndo->ndo_vflag > 1) {

/* Print all the LS adv's */

- lshp = op->ospf6_db.db_lshdr;

- while ((u_char *)lshp < dataend) {

- if (ospf6_print_lshdr(lshp++, dataend))

+ lshp = ddp->db_lshdr;

+ while ((const u_char *)lshp < dataend) {

+ if (ospf6_print_lshdr(ndo, lshp++, dataend))

goto trunc;

}

break;

goto trunc;

}

break;

+ }

case OSPF_TYPE_LS_REQ:

- if (vflag > 1) {

- lsrp = op->ospf6_lsr;

- while ((u_char *)lsrp < dataend) {

- TCHECK(*lsrp);

- printf("\n\t Advertising Router %s",

- ipaddr_string(&lsrp->ls_router));

- ospf6_print_ls_type(EXTRACT_16BITS(&lsrp->ls_type),

+ if (ndo->ndo_vflag > 1) {

+ lsrp = (const struct lsr6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+ while ((const u_char *)lsrp < dataend) {

+ ND_TCHECK_SIZE(lsrp);

+ ND_PRINT("\n\t Advertising Router %s",

+ GET_IPADDR_STRING(lsrp->ls_router));

+ ospf6_print_ls_type(ndo,

+ GET_BE_U_2(lsrp->ls_type),

&lsrp->ls_stateid);

++lsrp;

}

&lsrp->ls_stateid);

++lsrp;

}

break;

case OSPF_TYPE_LS_UPDATE:

break;

case OSPF_TYPE_LS_UPDATE:

- if (vflag > 1) {

- lsap = op->ospf6_lsu.lsu_lsa;

- TCHECK(op->ospf6_lsu.lsu_count);

- i = EXTRACT_32BITS(&op->ospf6_lsu.lsu_count);

- while ((u_char *)lsap < dataend && i--) {

- if (ospf6_print_lsa(lsap, dataend))

+ if (ndo->ndo_vflag > 1) {

+ const struct lsu6 *lsup = (const struct lsu6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+

+ i = GET_BE_U_4(lsup->lsu_count);

+ lsap = lsup->lsu_lsa;

+ while ((const u_char *)lsap < dataend && i--) {

+ if (ospf6_print_lsa(ndo, lsap, dataend))

goto trunc;

- lsap = (struct lsa6 *)((u_char *)lsap +

- EXTRACT_16BITS(&lsap->ls_hdr.ls_length));

+ lsap = (const struct lsa6 *)((const u_char *)lsap +

+ GET_BE_U_2(lsap->ls_hdr.ls_length));

}

break;

}

break;

-

case OSPF_TYPE_LS_ACK:

- if (vflag > 1) {

- lshp = op->ospf6_lsa.lsa_lshdr;

- while ((u_char *)lshp < dataend) {

- if (ospf6_print_lshdr(lshp++, dataend))

+ if (ndo->ndo_vflag > 1) {

+ lshp = (const struct lsa6_hdr *)((const uint8_t *)op + OSPF6HDR_LEN);

+ while ((const u_char *)lshp < dataend) {

+ if (ospf6_print_lshdr(ndo, lshp++, dataend))

goto trunc;

}

goto trunc;

}

/* RFC5613 Section 2.2 (w/o the TLVs) */

static int

/* RFC5613 Section 2.2 (w/o the TLVs) */

static int

-ospf6_print_lls(const u_char *cp, const u_int len)

+ospf6_print_lls(netdissect_options *ndo,

+ const u_char *cp, const u_int len)

{

uint16_t llsdatalen;

{

uint16_t llsdatalen;

if (len < OSPF_LLS_HDRLEN)

goto trunc;

/* Checksum */

if (len < OSPF_LLS_HDRLEN)

goto trunc;

/* Checksum */

- TCHECK2(*cp, 2);

- printf("\n\tLLS Checksum 0x%04x", EXTRACT_16BITS(cp));

+ ND_PRINT("\n\tLLS Checksum 0x%04x", GET_BE_U_2(cp));

cp += 2;

/* LLS Data Length */

cp += 2;

/* LLS Data Length */

- TCHECK2(*cp, 2);

- llsdatalen = EXTRACT_16BITS(cp);

- printf(", Data Length %u", llsdatalen);

+ llsdatalen = GET_BE_U_2(cp);

+ ND_PRINT(", Data Length %u", llsdatalen);

if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)

goto trunc;

cp += 2;

/* LLS TLVs */

if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)

goto trunc;

cp += 2;

/* LLS TLVs */

- TCHECK2(*cp, llsdatalen - OSPF_LLS_HDRLEN);

+ ND_TCHECK_LEN(cp, llsdatalen - OSPF_LLS_HDRLEN);

/* FIXME: code in print-ospf.c can be reused to decode the TLVs */

return llsdatalen;

/* FIXME: code in print-ospf.c can be reused to decode the TLVs */

return llsdatalen;

/* RFC6506 Section 4.1 */

static int

/* RFC6506 Section 4.1 */

static int

-ospf6_decode_at(const u_char *cp, const u_int len)

+ospf6_decode_at(netdissect_options *ndo,

+ const u_char *cp, const u_int len)

{

uint16_t authdatalen;

{

uint16_t authdatalen;

if (len < OSPF6_AT_HDRLEN)

goto trunc;

/* Authentication Type */

if (len < OSPF6_AT_HDRLEN)

goto trunc;

/* Authentication Type */

- TCHECK2(*cp, 2);

- printf("\n\tAuthentication Type %s", tok2str(ospf6_auth_type_str, "unknown (0x%04x)", EXTRACT_16BITS(cp)));

+ ND_PRINT("\n\tAuthentication Type %s",

+ tok2str(ospf6_auth_type_str, "unknown (0x%04x)", GET_BE_U_2(cp)));

cp += 2;

/* Auth Data Len */

cp += 2;

/* Auth Data Len */

- TCHECK2(*cp, 2);

- authdatalen = EXTRACT_16BITS(cp);

- printf(", Length %u", authdatalen);

+ authdatalen = GET_BE_U_2(cp);

+ ND_PRINT(", Length %u", authdatalen);

if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)

goto trunc;

cp += 2;

/* Reserved */

if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)

goto trunc;

cp += 2;

/* Reserved */

- TCHECK2(*cp, 2);

cp += 2;

/* Security Association ID */

cp += 2;

/* Security Association ID */

- TCHECK2(*cp, 2);

- printf(", SAID %u", EXTRACT_16BITS(cp));

+ ND_PRINT(", SAID %u", GET_BE_U_2(cp));

cp += 2;

/* Cryptographic Sequence Number (High-Order 32 Bits) */

cp += 2;

/* Cryptographic Sequence Number (High-Order 32 Bits) */

- TCHECK2(*cp, 4);

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

+ ND_PRINT(", CSN 0x%08x", GET_BE_U_4(cp));

cp += 4;

/* Cryptographic Sequence Number (Low-Order 32 Bits) */

cp += 4;

/* Cryptographic Sequence Number (Low-Order 32 Bits) */

- TCHECK2(*cp, 4);

- printf(":%08x", EXTRACT_32BITS(cp));

+ ND_PRINT(":%08x", GET_BE_U_4(cp));

cp += 4;

/* Authentication Data */

cp += 4;

/* Authentication Data */

- TCHECK2(*cp, authdatalen - OSPF6_AT_HDRLEN);

- if (vflag > 1)

- print_unknown_data(gndo,cp, "\n\tAuthentication Data ", authdatalen - OSPF6_AT_HDRLEN);

+ ND_TCHECK_LEN(cp, authdatalen - OSPF6_AT_HDRLEN);

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo,cp, "\n\tAuthentication Data ", authdatalen - OSPF6_AT_HDRLEN);

return 0;

trunc:

return 0;

trunc:

* any other packet type, thus decode the AT data regardless of the AT-bit.

*/

static int

* any other packet type, thus decode the AT data regardless of the AT-bit.

*/

static int

-ospf6_decode_v3_trailer(const struct ospf6hdr *op, const u_char *cp, const unsigned len)

+ospf6_decode_v3_trailer(netdissect_options *ndo,

+ const struct ospf6hdr *op, const u_char *cp, const unsigned len)

{

+ uint8_t type;

int llslen = 0;

- u_char lls_hello = op->ospf6_type == OSPF_TYPE_HELLO &&

- op->ospf6_hello.hello_options & OSPF6_OPTION_L;

- u_char lls_dd = op->ospf6_type == OSPF_TYPE_DD &&

- op->ospf6_db.db_options & OSPF6_OPTION_L;

-

- if ((lls_hello || lls_dd) && (llslen = ospf6_print_lls(cp, len)) < 0)

+ int lls_hello = 0;

+ int lls_dd = 0;

+

+ type = GET_U_1(op->ospf6_type);

+ if (type == OSPF_TYPE_HELLO) {

+ const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+ if (GET_BE_U_4(hellop->hello_options) & OSPF6_OPTION_L)

+ lls_hello = 1;

+ } else if (type == OSPF_TYPE_DD) {

+ const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);

+ if (GET_BE_U_4(ddp->db_options) & OSPF6_OPTION_L)

+ lls_dd = 1;

+ }

+ if ((lls_hello || lls_dd) && (llslen = ospf6_print_lls(ndo, cp, len)) < 0)

goto trunc;

- return ospf6_decode_at(cp + llslen, len - llslen);

+ return ospf6_decode_at(ndo, cp + llslen, len - llslen);

trunc:

return 1;

}

void

trunc:

return 1;

}

void

-ospf6_print(register const u_char *bp, register u_int length)

+ospf6_print(netdissect_options *ndo,

+ const u_char *bp, u_int length)

{

- register const struct ospf6hdr *op;

- register const u_char *dataend;

- register const char *cp;

+ const struct ospf6hdr *op;

+ const u_char *dataend;

+ const char *cp;

uint16_t datalen;

- op = (struct ospf6hdr *)bp;

+ ndo->ndo_protocol = "ospf3";

+ op = (const struct ospf6hdr *)bp;

/* If the type is valid translate it, or just print the type */

/* value. If it's not valid, say so and return */

/* If the type is valid translate it, or just print the type */

/* value. If it's not valid, say so and return */

- TCHECK(op->ospf6_type);

- cp = tok2str(ospf6_type_values, "unknown packet type (%u)", op->ospf6_type);

- printf("OSPFv%u, %s, length %d", op->ospf6_version, cp, length);

+ cp = tok2str(ospf6_type_values, "unknown packet type (%u)",

+ GET_U_1(op->ospf6_type));

+ ND_PRINT("OSPFv%u, %s, length %u", GET_U_1(op->ospf6_version), cp,

+ length);

if (*cp == 'u') {

return;

if (*cp == 'u') {

return;

- }

+ }

- if(!vflag) { /* non verbose - so lets bail out here */

- return;

- }

+ if(!ndo->ndo_vflag) { /* non verbose - so lets bail out here */

+ return;

+ }

/* OSPFv3 data always comes first and optional trailing data may follow. */

- TCHECK(op->ospf6_len);

- datalen = EXTRACT_16BITS(&op->ospf6_len);

+ datalen = GET_BE_U_2(op->ospf6_len);

if (datalen > length) {

- printf(" [len %d]", datalen);

+ ND_PRINT(" [len %u]", datalen);

return;

}

dataend = bp + datalen;

return;

}

dataend = bp + datalen;

- TCHECK(op->ospf6_routerid);

- printf("\n\tRouter-ID %s", ipaddr_string(&op->ospf6_routerid));

+ ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf6_routerid));

- TCHECK(op->ospf6_areaid);

- if (op->ospf6_areaid != 0)

- printf(", Area %s", ipaddr_string(&op->ospf6_areaid));

+ if (GET_BE_U_4(op->ospf6_areaid) != 0)

+ ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf6_areaid));

else

- printf(", Backbone Area");

- TCHECK(op->ospf6_instanceid);

- if (op->ospf6_instanceid)

- printf(", Instance %u", op->ospf6_instanceid);

+ ND_PRINT(", Backbone Area");

+ if (GET_U_1(op->ospf6_instanceid))

+ ND_PRINT(", Instance %u", GET_U_1(op->ospf6_instanceid));

/* Do rest according to version. */

- switch (op->ospf6_version) {

+ switch (GET_U_1(op->ospf6_version)) {

case 3:

/* ospf version 3 */

case 3:

/* ospf version 3 */

- if (ospf6_decode_v3(op, dataend) ||

- ospf6_decode_v3_trailer(op, dataend, length - datalen))

+ if (ospf6_decode_v3(ndo, op, dataend) ||

+ ospf6_decode_v3_trailer(ndo, op, dataend, length - datalen))

goto trunc;

break;

} /* end switch on version */

return;

trunc:

goto trunc;

break;

} /* end switch on version */

return;

trunc:

- fputs(tstr, stdout);

+ nd_print_trunc(ndo);

}