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

From Ulf Lamping, support for ieee float and double types in the dcerpc 

dissectors.

svn path=/trunk/; revision=6170
This commit is contained in:
Ronnie Sahlberg 2002-09-03 08:39:16 +00:00
parent 46ac8aa4bd
commit 957f38e57c
3 changed files with 138 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packet-dcerpc-ndr.c
View File

@ -2,7 +2,7 @@
* Routines for DCERPC NDR dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
* $Id: packet-dcerpc-ndr.c,v 1.8 2002/08/28 21:00:09 jmayer Exp $
* $Id: packet-dcerpc-ndr.c,v 1.9 2002/09/03 08:39:16 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -121,6 +121,51 @@ dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
tree, drep, hfindex, pdata);
}
int
dissect_ndr_float(tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gfloat *pdata)
{
dcerpc_info *di;
di=pinfo->private_data;
if(di->conformant_run){
/* just a run to handle conformant arrays, no scalars to dissect */
return offset;
}
if (offset % 4) {
offset += 4 - (offset % 4);
}
return dissect_dcerpc_float(tvb, offset, pinfo,
tree, drep, hfindex, pdata);
}
int
dissect_ndr_double(tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gdouble *pdata)
{
dcerpc_info *di;
di=pinfo->private_data;
if(di->conformant_run){
/* just a run to handle conformant arrays, no scalars to dissect */
return offset;
}
if (offset % 8) {
offset += 8 - (offset % 8);
}
return dissect_dcerpc_double(tvb, offset, pinfo,
tree, drep, hfindex, pdata);
}
int
dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,

84
packet-dcerpc.c
View File

@ -2,7 +2,7 @@
* Routines for DCERPC packet disassembly
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
* $Id: packet-dcerpc.c,v 1.75 2002/08/30 05:13:45 tpot Exp $
* $Id: packet-dcerpc.c,v 1.76 2002/09/03 08:39:16 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -73,11 +73,16 @@ static const value_string drep_character_vals[] = {
{ 0, NULL }
};
#define DCE_RPC_DREP_FP_IEEE 0
#define DCE_RPC_DREP_FP_VAX 1
#define DCE_RPC_DREP_FP_CRAY 2
#define DCE_RPC_DREP_FP_IBM 3
static const value_string drep_fp_vals[] = {
{ 0, "IEEE" },
{ 1, "VAX" },
{ 2, "Cray" },
{ 3, "IBM" },
{ DCE_RPC_DREP_FP_IEEE, "IEEE" },
{ DCE_RPC_DREP_FP_VAX, "VAX" },
{ DCE_RPC_DREP_FP_CRAY, "Cray" },
{ DCE_RPC_DREP_FP_IBM, "IBM" },
{ 0, NULL }
};
@ -657,6 +662,75 @@ dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
return offset+8;
}
int
dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
proto_tree *tree, char *drep,
int hfindex, gfloat *pdata)
{
gfloat data;
switch(drep[1]) {
case(DCE_RPC_DREP_FP_IEEE):
data = ((drep[0] & 0x10)
? tvb_get_letohieee_float(tvb, offset)
: tvb_get_ntohieee_float(tvb, offset));
if (tree) {
proto_tree_add_float(tree, hfindex, tvb, offset, 4, data);
}
break;
case(DCE_RPC_DREP_FP_VAX): /* (fall trough) */
case(DCE_RPC_DREP_FP_CRAY): /* (fall trough) */
case(DCE_RPC_DREP_FP_IBM): /* (fall trough) */
default:
/* ToBeDone: non IEEE floating formats */
/* Set data to a negative infinity value */
data = -1.0 * 1e100 * 1e100;
if (tree) {
proto_tree_add_debug_text(tree, "DCE RPC: dissection of non IEEE floating formats currently not implemented (drep=%u)!", drep[1]);
}
}
if (pdata)
*pdata = data;
return offset + 4;
}
int
dissect_dcerpc_double(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
proto_tree *tree, char *drep,
int hfindex, gdouble *pdata)
{
gdouble data;
switch(drep[1]) {
case(DCE_RPC_DREP_FP_IEEE):
data = ((drep[0] & 0x10)
? tvb_get_letohieee_double(tvb, offset)
: tvb_get_ntohieee_double(tvb, offset));
if (tree) {
proto_tree_add_double(tree, hfindex, tvb, offset, 8, data);
}
break;
case(DCE_RPC_DREP_FP_VAX): /* (fall trough) */
case(DCE_RPC_DREP_FP_CRAY): /* (fall trough) */
case(DCE_RPC_DREP_FP_IBM): /* (fall trough) */
default:
/* ToBeDone: non IEEE double formats */
/* Set data to a negative infinity value */
data = -1.0 * 1e100 * 1e100;
if (tree) {
proto_tree_add_debug_text(tree, "DCE RPC: dissection of non IEEE double formats currently not implemented (drep=%u)!", drep[1]);
}
}
if (pdata)
*pdata = data;
return offset + 8;
}
/*
* a couple simpler things
*/

14
packet-dcerpc.h
View File

@ -1,7 +1,7 @@
/* packet-dcerpc.h
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
* $Id: packet-dcerpc.h,v 1.19 2002/08/28 21:00:12 jmayer Exp $
* $Id: packet-dcerpc.h,v 1.20 2002/09/03 08:39:16 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -115,6 +115,12 @@ int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, unsigned char *pdata);
int dissect_dcerpc_float (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gfloat *pdata);
int dissect_dcerpc_double (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gdouble *pdata);
/*
@ -132,6 +138,12 @@ int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, unsigned char *pdata);
int dissect_ndr_float (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gfloat *pdata);
int dissect_ndr_double (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, gdouble *pdata);
int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
int hfindex, e_uuid_t *pdata);