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

AIM doesn't ever use it's private_data structure, so remove it. If it ever does, just pass the data into the subdissectors. 

svn path=/trunk/; revision=52830
This commit is contained in:
Michael Mann 2013-10-24 23:59:47 +00:00
parent 8a707b0af5
commit 9563de93a3
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-aim.c
View File

@ -675,14 +675,12 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
guint16 flags;
guint32 id;
proto_item *ti1;
struct aiminfo aiminfo;
proto_tree *aim_tree_fnac = NULL;
tvbuff_t *subtvb;
int orig_offset;
const aim_subtype *subtype;
proto_tree *family_tree = NULL;
const aim_family *family;
void* pd_save;
orig_offset = offset;
family_id = tvb_get_ntohs(tvb, offset);
@ -696,7 +694,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
id = tvb_get_ntohl(tvb, offset);
offset += 4;
if( aim_tree && subtype != NULL )
{
offset = orig_offset;
@ -740,11 +737,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
}
subtvb = tvb_new_subset_remaining(tvb, offset);
aiminfo.tcpinfo = (struct tcpinfo *)pinfo->private_data;
aiminfo.family = family_id;
aiminfo.subtype = subtype_id;
pd_save = pinfo->private_data;
pinfo->private_data = &aiminfo;
if (family)
col_set_str(pinfo->cinfo, COL_PROTOCOL, family->name);
@ -776,8 +768,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
{
subtype->dissector(subtvb, pinfo, family_tree);
}
pinfo->private_data = pd_save;
}
static void

6
epan/dissectors/packet-aim.h
View File

@ -36,12 +36,6 @@ typedef struct _aim_tlv {
int (*dissector) (proto_item *ti, guint16 value_id, tvbuff_t *tvb, packet_info *);
} aim_tlv;
struct aiminfo {
guint16 family;
guint16 subtype;
struct tcpinfo *tcpinfo;
};
typedef struct _aim_subtype {
guint16 id;
const char *name;