Skip to content

Commit 298fb77

Browse files
author
hannes
committed
-share the grace LSA and TE LSA printer with the outside world.
-misc. cosmetic cleanups
1 parent 31e4acb commit 298fb77

File tree

2 files changed

+310
-267
lines changed

2 files changed

+310
-267
lines changed

Diff for: ospf.h

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.17 2005-08-23 11:07:34 hannes Exp $ (LBL) */
1+
/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.18 2006-09-05 15:46:42 hannes Exp $ (LBL) */
22
/*
33
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
44
* The Regents of the University of California. All rights reserved.
@@ -85,10 +85,10 @@
8585
#define LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW 7 /* rfc3630 */
8686
#define LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW 8 /* rfc3630 */
8787
#define LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP 9 /* rfc3630 */
88-
#define LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID 11 /* draft-ietf-ccamp-ospf-gmpls-extensions */
89-
#define LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE 14 /* draft-ietf-ccamp-ospf-gmpls-extensions */
90-
#define LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR 15 /* draft-ietf-ccamp-ospf-gmpls-extensions */
91-
#define LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP 16 /* draft-ietf-ccamp-ospf-gmpls-extensions */
88+
#define LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID 11 /* rfc4203 */
89+
#define LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE 14 /* rfc4203 */
90+
#define LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR 15 /* rfc4203 */
91+
#define LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP 16 /* rfc4203 */
9292
#define LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS 17 /* rfc4124 */
9393

9494
#define LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_PTP 1 /* rfc3630 */
@@ -105,12 +105,6 @@
105105

106106
#define LS_OPAQUE_RI_TLV_CAP 1 /* draft-ietf-ospf-cap-03 */
107107

108-
/*************************************************
109-
*
110-
* is the above a bug in the documentation?
111-
*
112-
*************************************************/
113-
114108

115109
/* rla_link.link_type */
116110
#define RLA_TYPE_ROUTER 1 /* point-to-point to another router */
@@ -313,3 +307,6 @@ struct ospfhdr {
313307
#define ospf_lsu ospf_un.un_lsu
314308
#define ospf_lsa ospf_un.un_lsa
315309

310+
/* Functions shared by ospf and ospf6 */
311+
extern int ospf_print_te_lsa(u_int8_t *, u_int);
312+
extern int ospf_print_grace_lsa(u_int8_t *, u_int);

0 commit comments

Comments
 (0)