diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-15 19:57:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-15 19:57:27 +0000 |
| commit | c0a1b3149c6bd1a3aaa264d2b7cf01439bc69d4c (patch) | |
| tree | ab24cb950e26357cbb748714357e14b61848672b /packet-socks.c | |
| parent | a27dcb4e3f380699655eaa1854594defe5fdd16d (diff) | |
| download | wireshark-c0a1b3149c6bd1a3aaa264d2b7cf01439bc69d4c.tar.gz wireshark-c0a1b3149c6bd1a3aaa264d2b7cf01439bc69d4c.tar.bz2 wireshark-c0a1b3149c6bd1a3aaa264d2b7cf01439bc69d4c.zip | |
From David E. Weekly: move the code to put the SOCKS version up, so it's
done in common code.
svn path=/trunk/; revision=8708
Diffstat (limited to 'packet-socks.c')
| -rw-r--r-- | packet-socks.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/packet-socks.c b/packet-socks.c index 3cccfc21f0..d7b463187e 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.46 2003/09/17 15:58:11 jfoster Exp $ + * $Id: packet-socks.c,v 1.47 2003/10/15 19:57:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -535,17 +535,14 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, guint temp; char *AuthMethodStr; + proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE); + ++offset; if (compare_packet( hash_info->connect_row)){ proto_tree *AuthTree; proto_item *ti; - /* Do version */ - proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, - hash_info->version); - ++offset; - temp = tvb_get_guint8(tvb, offset); /* Get Auth method count */ /* build auth tree */ ti = proto_tree_add_text( tree, tvb, offset, 1, @@ -569,8 +566,6 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* Get accepted auth method */ else if (compare_packet( hash_info->auth_method_row)) { - ++offset; - proto_tree_add_text( tree, tvb, offset, 1, "Accepted Auth Method: 0x%0x (%s)", tvb_get_guint8( tvb, offset), get_auth_method_name( tvb_get_guint8( tvb, offset))); @@ -579,9 +574,6 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* handle user/password auth */ else if (compare_packet( hash_info->user_name_auth_row)) { - proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE); - ++offset; - /* process user name */ offset += display_string( tvb, offset, tree, "User name"); /* process password */ @@ -594,10 +586,6 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, (compare_packet( hash_info->cmd_reply_row)) || (compare_packet( hash_info->bind_reply_row))){ - proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE); - - ++offset; - command = tvb_get_guint8(tvb, offset); if (compare_packet( hash_info->command_row)) |