osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Changes from Craig Metz to: 

decode type 7 LSAs (NSSA AS external);

	print the LS checksum as a four digit hexadecimal number.

svn path=/trunk/; revision=2425
This commit is contained in:
Guy Harris 2000-09-13 07:47:21 +00:00
parent 6a6c346426
commit ed185bcdfc
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -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.

1
doc/ethereal.pod.template
View File

@ -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.

8
packet-ospf.c
View File

@ -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)));

3
packet-ospf.h
View File

@ -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