osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Joerg Mayer: get rid of unused PDU type argument to 

"dissect_osi_options()".

svn path=/trunk/; revision=5318
This commit is contained in:
Guy Harris 2002-04-30 23:56:58 +00:00
parent a06dd1c724
commit 56ddb63961
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packet-clnp.c
View File

@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
* $Id: packet-clnp.c,v 1.53 2002/04/07 21:54:48 guy Exp $
* $Id: packet-clnp.c,v 1.54 2002/04/30 23:56:58 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@ -1802,8 +1802,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
/* QUICK HACK Option Len:= PDU_Hd_length-( FixedPart+AddresPart+SegmentPart )*/
dissect_osi_options( 0xff,
opt_len,
dissect_osi_options( opt_len,
tvb, offset, clnp_tree );
}

8
packet-esis.c
View File

@ -2,7 +2,7 @@
* Routines for ISO/OSI End System to Intermediate System
* Routing Exchange Protocol ISO 9542.
*
* $Id: packet-esis.c,v 1.24 2002/04/07 22:00:34 guy Exp $
* $Id: packet-esis.c,v 1.25 2002/04/30 23:56:58 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@ -182,7 +182,7 @@ esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) {
offset += sal;
len -= ( sal + 1 );
}
dissect_osi_options( PDU_TYPE_ESIS_ESH, len, tvb, offset, tree );
dissect_osi_options( len, tvb, offset, tree );
}
} /* esis_dissect_esh_pdu */ ;
@ -205,7 +205,7 @@ esis_dissect_ish_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) {
offset += netl;
len -= ( netl + 1 );
dissect_osi_options( PDU_TYPE_ESIS_ISH, len, tvb, offset, tree );
dissect_osi_options( len, tvb, offset, tree );
}
};
@ -255,7 +255,7 @@ esis_dissect_redirect_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) {
offset += tmpl;
len -= ( tmpl + 1 );
}
dissect_osi_options( PDU_TYPE_ESIS_RD, len, tvb, offset, tree );
dissect_osi_options( len, tvb, offset, tree );
}
}

5
packet-osi-options.c
View File

@ -5,7 +5,7 @@
* ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol)
* ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol)
*
* $Id: packet-osi-options.c,v 1.11 2002/04/14 23:04:03 guy Exp $
* $Id: packet-osi-options.c,v 1.12 2002/04/30 23:56:58 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@ -338,7 +338,6 @@ dissect_option_rfd( const u_char error, const u_char field, u_char offset,
* main esis tree data and call the sub-protocols as needed.
*
* Input:
* u_char : PDU type to check if option is allowed or not
* u_char : length of option section
* tvbuff_t * : tvbuff containing packet data
* int : offset into packet where we are (packet_data[offset]== start
@ -349,7 +348,7 @@ dissect_option_rfd( const u_char error, const u_char field, u_char offset,
* void, but we will add to the proto_tree if it is not NULL.
*/
void
dissect_osi_options( u_char pdu_type, u_char opt_len, tvbuff_t *tvb,
dissect_osi_options( u_char opt_len, tvbuff_t *tvb,
int offset, proto_tree *tree) {
proto_item *ti;
proto_tree *osi_option_tree = NULL;

4
packet-osi-options.h
View File

@ -1,7 +1,7 @@
/* packet-osi-options.h
* Defines for OSI options part decode
*
* $Id: packet-osi-options.h,v 1.3 2002/04/07 21:54:48 guy Exp $
* $Id: packet-osi-options.h,v 1.4 2002/04/30 23:56:58 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@ -29,7 +29,7 @@
/*
* published API functions
*/
extern void dissect_osi_options( u_char, u_char, tvbuff_t *, int,
extern void dissect_osi_options( u_char, tvbuff_t *, int,
proto_tree *);
extern void proto_register_osi_options(void);