diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-09-13 07:47:21 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-09-13 07:47:21 +0000 |
| commit | 7c688a70de518e715072e5358ae6bbd4c764ff0f (patch) | |
| tree | 9b845e41f3b0907d7c0f94e70cb669f711522c0d | |
| parent | f2361735a63c731c51949b65f17d4c08d7ae5106 (diff) | |
Changes from Craig Metz to:
decode type 7 LSAs (NSSA AS external);
print the LS checksum as a four digit hexadecimal number.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2425 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | packet-ospf.c | 8 | ||||
| -rw-r--r-- | packet-ospf.h | 3 |
4 files changed, 13 insertions, 3 deletions
@@ -382,6 +382,10 @@ Robert Tsai <rtsai@netapp.com> { Rsh support } +Craig Metz <cmetz@inner.net> { + OSPF type 7 LSA dissection +} + Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index be82ab2e8f..02e0ea511c 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -970,6 +970,7 @@ B<http://ethereal.zing.org>. Phil Techau <phil_t@altavista.net> Wes Hardaker <wjhardaker@ucdavis.edu> Robert Tsai <rtsai@netapp.com> + Craig Metz <cmetz@inner.net> Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-ospf.c b/packet-ospf.c index a770ef4f6a..b8675c8597 100644 --- a/packet-ospf.c +++ b/packet-ospf.c @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-ospf.c,v 1.27 2000/08/13 14:08:36 deniel Exp $ + * $Id: packet-ospf.c,v 1.28 2000/09/13 07:47:09 guy Exp $ * * At this time, this module is able to analyze OSPF * packets as specified in RFC2328. MOSPF (RFC1584) and other @@ -694,6 +694,9 @@ dissect_ospf_lsa(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, case OSPF_LSTYPE_ASEXT: lsa_type="AS-external-LSA"; break; + case OSPF_LSTYPE_ASEXT7: + lsa_type="AS-external-LSA Type 7/NSSA"; + break; case OSPF_LSTYPE_OP_LINKLOCAL: lsa_type="Opaque LSA, Link-local scope"; break; @@ -735,7 +738,7 @@ dissect_ospf_lsa(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, ip_to_str((guint8 *) &(lsa_hdr.adv_router))); proto_tree_add_text(ospf_lsa_tree, NullTVB, offset + 12, 4, "LS Sequence Number: 0x%04lx ", (unsigned long)ntohl(lsa_hdr.ls_seq)); - proto_tree_add_text(ospf_lsa_tree, NullTVB, offset + 16, 2, "LS Checksum: %d ", ntohs(lsa_hdr.ls_checksum)); + proto_tree_add_text(ospf_lsa_tree, NullTVB, offset + 16, 2, "LS Checksum: %04x ", ntohs(lsa_hdr.ls_checksum)); proto_tree_add_text(ospf_lsa_tree, NullTVB, offset + 18, 2, "Length: %d ", ntohs(lsa_hdr.length)); @@ -839,6 +842,7 @@ dissect_ospf_lsa(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, /* returns only the TOS 0 metric (even if there are more TOS metrics) */ break; case(OSPF_LSTYPE_ASEXT): + case(OSPF_LSTYPE_ASEXT7): memcpy(&summary_lsa, &pd[offset], sizeof(e_ospf_summary_lsa)); proto_tree_add_text(ospf_lsa_tree, NullTVB, offset, 4, "Netmask: %s", ip_to_str((guint8 *) &(summary_lsa.network_mask))); diff --git a/packet-ospf.h b/packet-ospf.h index ccf1664563..af526f61b2 100644 --- a/packet-ospf.h +++ b/packet-ospf.h @@ -1,6 +1,6 @@ /* packet-ospf.h * - * $Id: packet-ospf.h,v 1.9 2000/08/11 13:34:04 deniel Exp $ + * $Id: packet-ospf.h,v 1.10 2000/09/13 07:47:10 guy Exp $ * * (c) 1998 Hannes Boehm * @@ -56,6 +56,7 @@ #define OSPF_LSTYPE_SUMMERY 3 #define OSPF_LSTYPE_ASBR 4 #define OSPF_LSTYPE_ASEXT 5 +#define OSPF_LSTYPE_ASEXT7 7 /* Opaque LSA types */ #define OSPF_LSTYPE_OP_LINKLOCAL 9 |