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

From Rob Casey: Fix for: Incorrect station identifier parsing in Kingfisher dissector 

See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3946

svn path=/trunk/; revision=29700
This commit is contained in:
Bill Meier 2009-09-04 18:18:34 +00:00
parent 314b693828
commit 3ab20de02b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-kingfisher.c
View File

@ -259,18 +259,18 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
kfp->version = (kfp->function & 0x80)?3:2;
kfp->system = tvb_get_guint8(tvb, 0);
kfp->message = tvb_get_guint8(tvb, 5);
kfp->system = tvb_get_guint8( tvb, 0 );
kfp->message = tvb_get_guint8( tvb, 5 );
kfp->target = tvb_get_guint8( tvb, 1 );
kfp->from = tvb_get_guint8( tvb, 3 );
kfp->via = tvb_get_guint8( tvb, 4 );
if(kfp->version == 2){
kfp->target = tvb_get_guint8(tvb, 1);
kfp->from = tvb_get_guint8(tvb, 3);
kfp->via = tvb_get_guint8(tvb, 4);
} else {
kfp->target |= (tvb_get_guint8(tvb, 7) << 8);
kfp->from |= (tvb_get_guint8(tvb, 8) << 8);
kfp->via |= (tvb_get_guint8(tvb, 9) << 8);
if( kfp->version == 3 )
{
kfp->target |= ( tvb_get_guint8( tvb, 7 ) << 8 );
kfp->from |= ( tvb_get_guint8( tvb, 8 ) << 8 );
kfp->via |= ( tvb_get_guint8( tvb, 9 ) << 8 );
}