X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=packet-osi-options.c;h=0f950a9e32424681f76a04060ed8bebdb978997a;hb=a7f232ed674f28928266a44a4fc59eaf3e6fa282;hp=63d60b33719b4085aabad9c64ca55e4a5ffcedd8;hpb=ec47ea7ff43c5cfa158f0826fc57f2deefc38280;p=obnox%2Fwireshark%2Fwip.git diff --git a/packet-osi-options.c b/packet-osi-options.c index 63d60b3371..0f950a9e32 100644 --- a/packet-osi-options.c +++ b/packet-osi-options.c @@ -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.10 2002/04/07 21:54:48 guy Exp $ + * $Id: packet-osi-options.c,v 1.12 2002/04/30 23:56:58 guy Exp $ * Ralf Schneider * * Ethereal - Network traffic analyzer @@ -165,7 +165,7 @@ static const value_string osi_opt_rfd_reassembly[] = { { 0, NULL} }; -void +static void dissect_option_qos( const u_char type, const u_char sub_type, int offset, u_char len, tvbuff_t *tvb, proto_tree *tree ) { @@ -216,7 +216,7 @@ dissect_option_qos( const u_char type, const u_char sub_type, int offset, } } -void +static void dissect_option_route( u_char parm_type, u_char offset, u_char parm_len, tvbuff_t *tvb, proto_tree *tree ) { @@ -277,7 +277,7 @@ dissect_option_route( u_char parm_type, u_char offset, u_char parm_len, -void +static void dissect_option_rfd( const u_char error, const u_char field, u_char offset, u_char len, tvbuff_t *tvb, proto_tree *tree ) { u_char error_class = 0; @@ -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;