diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-04-13 20:39:38 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-04-13 20:39:38 +0000 |
| commit | b218a8f5504f8bbc83f8e0ef9649cb7df9e109af (patch) | |
| tree | 8a453940e94dc4accd5f61af0f2b789b4e0447a0 /packet-socks.c | |
| parent | 6a1c248625b669b42b9cedb732f5d39938cd0b74 (diff) | |
| download | wireshark-b218a8f5504f8bbc83f8e0ef9649cb7df9e109af.tar.gz wireshark-b218a8f5504f8bbc83f8e0ef9649cb7df9e109af.tar.bz2 wireshark-b218a8f5504f8bbc83f8e0ef9649cb7df9e109af.zip | |
Consolidate flags in struct frame_data, and add "visited" flag. Use
it in SOCKS dissector.
(Okay, how many times am I going to modify packet.h today, forcing you
to re-compile everything? :-)
svn path=/trunk/; revision=1850
Diffstat (limited to 'packet-socks.c')
| -rw-r--r-- | packet-socks.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packet-socks.c b/packet-socks.c index c756a13f3a..ac753b1e10 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.2 2000/04/13 11:11:38 gram Exp $ + * $Id: packet-socks.c,v 1.3 2000/04/13 20:39:15 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -214,8 +214,6 @@ static char *reply_table_v5[] = { static GMemChunk *socks_vals = NULL; -static guint32 last_row= 0; /* used to see if packet is new */ - /************************* Support routines ***************************/ @@ -1010,8 +1008,7 @@ dissect_socks(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { /* run state machine if needed */ - if ((hash_info->state != Done) && ( fd->num > last_row)){ - last_row = fd->num; + if ((hash_info->state != Done) && ( !fd->flags.visited)){ if ( hash_info->version == 4) state_machine_v4( hash_info, pd, offset, fd); @@ -1077,8 +1074,6 @@ static void socks_reinit( void){ /* performed. Reset the highest row seen counter and re-initialize the */ /* conversation memory chunks. */ - last_row = 0; - if (socks_vals) g_mem_chunk_destroy(socks_vals); |