* Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-socks.c,v 1.26 2001/10/30 10:40:38 guy Exp $
+ * $Id: packet-socks.c,v 1.42 2002/08/02 23:36:03 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "alignment.h"
-#include "conversation.h"
+#include <epan/conversation.h>
#include "packet-tcp.h"
#include "packet-udp.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#define compare_packet(X) (X == (pinfo->fd->num))
static int hf_socks_ip6_dst = -1;
static int hf_user_name = -1;
static int hf_socks_dstport = -1;
-static int hf_socks_command = -1;
+static int hf_socks_cmd = -1;
+static int hf_socks_results = -1;
+static int hf_socks_results_4 = -1;
+static int hf_socks_results_5 = -1;
+
+
+/************* Dissector handles ***********/
+static dissector_handle_t socks_handle;
+static dissector_handle_t socks_udp_handle;
/************* State Machine names ***********/
/* String table for the V4 reply status messages */
+#ifdef __JUNK__
static char *reply_table_v4[] = {
"Granted",
"Rejected or Failed",
"Rejected because the client program and identd report different user-ids",
"Unknown"
};
+#endif
+static const value_string reply_table_v4[] = {
+ {90, "Granted"},
+ {91, "Rejected or Failed"},
+ {92, "Rejected because SOCKS server cannot connect to identd on the client"},
+ {93, "Rejected because the client program and identd report different user-ids"},
+ {0, NULL}
+};
/* String table for the V5 reply status messages */
+#ifdef __JUNK__
static char *reply_table_v5[] = {
"Succeeded",
"General SOCKS server failure",
"Address type not supported",
"Unknown"
};
+#endif
+
+static const value_string reply_table_v5[] = {
+ {0, "Succeeded"},
+ {1, "General SOCKS server failure"},
+ {2, "Connection not allowed by ruleset"},
+ {3, "Network unreachable"},
+ {4, "Host unreachable"},
+ {5, "Connection refused"},
+ {6, "TTL expired"},
+ {7, "Command not supported"},
+ {8, "Address type not supported"}
+};
+static const value_string cmd_strings[] = {
+ {0, "Unknow"},
+ {1, "Connect"},
+ {2, "Bind"},
+ {3, "UdpAssociate"},
+ {0x80, "Ping"},
+ {0x81, "Traceroute"},
+ {0, NULL}
+};
#define socks_hash_init_count 20
#define socks_hash_val_length (sizeof(socks_hash_entry_t))
/************************* Support routines ***************************/
-static int display_string(tvbuff_t *tvb, int offset, packet_info *pinfo,
+static int display_string(tvbuff_t *tvb, int offset,
proto_tree *tree, char *label){
/* display a string with a length, characters encoding */
proto_tree *name_tree;
proto_item *ti;
-
char temp[ 256];
int length = tvb_get_guint8(tvb, offset);
- strncpy( temp, tvb_get_ptr(tvb, offset+1, -1), length);
+ tvb_memcpy(tvb, (guint8 *)temp, offset+1, length);
temp[ length ] = 0;
ti = proto_tree_add_text(tree, tvb, offset, length + 1,
name_tree = proto_item_add_subtree(ti, ett_socks_name);
- proto_tree_add_text( name_tree, tvb, offset, 1, "Length: %d", length);
+ proto_tree_add_text( name_tree, tvb, offset, 1, "Length: %u", length);
++offset;
}
-static int display_address(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) {
/* decode and display the v5 address, return offset of next byte */
}
else if ( a_type == 3){ /* domain name address */
- offset += display_string(tvb, offset, pinfo, tree,
+ offset += display_string(tvb, offset, tree,
"Remote name");
}
else if ( a_type == 4){ /* IPv6 address */
hash_info = conversation_get_proto_data(conversation, proto_socks);
- if (check_col(pinfo->fd, COL_PROTOCOL))
- col_set_str(pinfo->fd, COL_PROTOCOL, "Socks");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
- if (check_col(pinfo->fd, COL_INFO))
- col_add_fstr(pinfo->fd, COL_INFO, "Version: 5, UDP Associated packet");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet");
if ( tree) {
- ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, offset,
- tvb_length_remaining(tvb, offset), "Socks" );
+ ti = proto_tree_add_protocol_format( tree, proto_socks, tvb,
+ offset, -1, "Socks" );
socks_tree = proto_item_add_subtree(ti, ett_socks);
++offset;
- offset = display_address( tvb, offset, pinfo, socks_tree);
+ offset = display_address( tvb, offset, socks_tree);
hash_info->udp_remote_port = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb,
*ptr = hash_info->udp_remote_port;
- decode_udp_ports( tvb, offset, &pi, tree, pinfo->srcport, pinfo->destport);
+ decode_udp_ports( tvb, offset, pinfo, tree, pinfo->srcport, pinfo->destport);
*ptr = hash_info->udp_port;
}
-void
+static void
new_udp_conversation( socks_hash_entry_t *hash_info, packet_info *pinfo){
conversation_t *conversation = conversation_new( &pinfo->src, &pinfo->dst, PT_UDP,
g_assert( conversation);
conversation_add_proto_data(conversation, proto_socks, hash_info);
- conversation_set_dissector(conversation, socks_udp_dissector);
+ conversation_set_dissector(conversation, socks_udp_handle);
}
/**************** Protocol Tree Display routines ******************/
-void
+static void
display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *parent, proto_tree *tree, socks_hash_entry_t *hash_info) {
+ proto_tree *tree, socks_hash_entry_t *hash_info) {
-/* Display the protocol tree for the V5 version. This routine uses the */
+/* Display the protocol tree for the V4 version. This routine uses the */
/* stored conversation information to decide what to do with the row. */
/* Per packet information would have been better to do this, but we */
/* didn't have that when I wrote this. And I didn't expect this to get */
/* so messy. */
- int command;
+ guint command;
/* Display command from client */
if (compare_packet( hash_info->connect_row)){
if ( tvb_offset_exists(tvb, offset)) {
/* display user name */
proto_tree_add_string( tree, hf_user_name, tvb, offset,
- strlen( tvb_get_ptr(tvb, offset, -1)) + 1,
+ tvb_strsize(tvb, offset),
tvb_get_ptr(tvb, offset, -1));
}
else if ( compare_packet( hash_info->cmd_reply_row)){
- proto_tree_add_text( tree, tvb, offset, 1,
- "Version: %u (should be 0) ", tvb_get_guint8(tvb, offset));
+ proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1,
+ FALSE);
++offset;
/* Do results code */
- proto_tree_add_text( tree, tvb, offset, 1,
- "Result Code: %u (%s)", tvb_get_guint8(tvb, offset) ,
- reply_table_v4[ MAX(0, MIN( tvb_get_guint8(tvb, offset) - 90, 4))]);
+ proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, FALSE);
+ proto_tree_add_item_hidden(tree, hf_socks_results, tvb, offset, 1, FALSE);
+
++offset;
/* Do remote port */
/* Should perhaps do TCP reassembly as well */
if ( tvb_offset_exists(tvb, offset)) {
proto_tree_add_text( tree, tvb, offset,
- strlen( tvb_get_ptr(tvb, offset, -1)),
+ tvb_strsize(tvb, offset),
"User Name: %s", tvb_get_ptr(tvb, offset, -1));
}
}
}
-void
+static void
display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *parent, proto_tree *tree, socks_hash_entry_t *hash_info) {
+ proto_tree *tree, socks_hash_entry_t *hash_info) {
/* Display the protocol tree for the version. This routine uses the */
/* stored conversation information to decide what to do with the row. */
proto_item *ti;
/* Do version */
- proto_tree_add_uint( tree, hf_socks_ver, tvb, offset, 1,
+ proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1,
hash_info->version);
++offset;
} /* handle user/password auth */
else if (compare_packet( hash_info->user_name_auth_row)) {
- proto_tree_add_text( tree, tvb, offset, 1,
- "Version: %u ", hash_info->version);
+ proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE);
++offset;
/* process user name */
- offset += display_string( tvb, offset, pinfo, tree,
+ offset += display_string( tvb, offset, tree,
"User name");
/* process password */
- offset += display_string( tvb, offset, pinfo, tree,
+ offset += display_string( tvb, offset, tree,
"Password");
}
/* command to the server */
(compare_packet( hash_info->cmd_reply_row)) ||
(compare_packet( hash_info->bind_reply_row))){
- proto_tree_add_text( tree, tvb, offset, 1,
- "Version: %u ", hash_info->version);
+ 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))
- proto_tree_add_text( tree, tvb, offset, 1, "Command: %u (%s)",
- command, get_command_name( command));
- else
- proto_tree_add_text( tree, tvb, offset, 1, "Status: %d (%s)",
- tvb_get_guint8(tvb, offset), reply_table_v5[ MAX( 0,
- MIN(tvb_get_guint8(tvb, offset) - 90, 9))]);
+ proto_tree_add_uint( tree, hf_socks_cmd, tvb, offset, 1,
+ command);
+
+ else {
+ proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, FALSE);
+ proto_tree_add_item_hidden(tree, hf_socks_results, tvb, offset, 1, FALSE);
+ }
+
++offset;
proto_tree_add_text( tree, tvb, offset, 1,
"Reserved: 0x%0x (should = 0x00)", tvb_get_guint8(tvb, offset));
++offset;
- offset = display_address(tvb, offset, pinfo, tree);
-
+ offset = display_address(tvb, offset, tree);
+/*XXX Add remote port for search somehow */
/* Do remote port */
proto_tree_add_text( tree, tvb, offset, 2,
"%sPort: %d",
if ( hash_info->state == None) { /* new connection */
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Connect to server request");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
hash_info->state = Connecting; /* change state */
offset += 8;
- if ( !tvb_offset_exists(tvb, offset)) /* if no user name */
+ if ( !tvb_offset_exists(tvb, offset)) { /* if no user name */
/* change state */
hash_info->state = V4UserNameWait;
-
-
- hash_info->connect_offset += strlen( tvb_get_ptr(tvb, offset, -1)) + 1;
+ /*
+ * XXX - add 1, or leave it alone?
+ * We were adding "strlen(...) + 1".
+ */
+ hash_info->connect_offset += 1;
+ } else {
+ /*
+ * Add in the length of the user name.
+ * XXX - what if the user name is split between
+ * TCP segments?
+ */
+ hash_info->connect_offset += tvb_strsize(tvb, offset);
+ }
if ( !hash_info->dst_addr){ /* if no dest address */
/* if more data */
/* waiting for V4 user name */
}else if ( hash_info->state == V4UserNameWait){
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Connect Request (User name)");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Connect Request (User name)");
hash_info->v4_user_name_row = get_packet_ptr;
/*XXX may need to check for domain name here */
}
else if ( hash_info->state == Connecting){
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Connect Response");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Connect Response");
/* save packet pointer */
hash_info->cmd_reply_row = get_packet_ptr;
if ( hash_info->state == None) {
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Connect to server request");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
hash_info->state = Connecting; /* change state */
hash_info->connect_row = get_packet_ptr;
guint AuthMethod = tvb_get_guint8(tvb, offset + 1);
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Connect to server response");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Connect to server response");
hash_info->auth_method_row = get_packet_ptr;
hash_info->command = tvb_get_guint8(tvb, offset + 1); /* get command */
- if (check_col(pinfo->fd, COL_INFO))
- col_append_fstr(pinfo->fd, COL_INFO, " Command Request - %s",
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Command Request - %s",
get_command_name(hash_info->command));
hash_info->state = V5Reply;
else if ( hash_info->state == V5Reply) { /* V5 Command Reply */
- if (check_col(pinfo->fd, COL_INFO))
- col_append_fstr(pinfo->fd, COL_INFO, " Command Response - %s",
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Command Response - %s",
get_command_name(hash_info->command));
hash_info->cmd_reply_row = get_packet_ptr;
}
else if ( hash_info->state == V5BindReply) { /* V5 Bind Second Reply */
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " Command Response: Bind remote host info");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " Command Response: Bind remote host info");
hash_info->bind_reply_row = get_packet_ptr;
hash_info->state = Done;
}
else if ( hash_info->state == UserNameAuth) { /* Handle V5 User Auth*/
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO,
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO,
" User authentication response");
hash_info->user_name_auth_row = get_packet_ptr;
}
else if ( hash_info->state == AuthReply){ /* V5 User Auth reply */
hash_info->cmd_reply_row = get_packet_ptr;
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, " User authentication reply");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply");
hash_info->state = V5Command;
}
}
/* Display the ping/trace_route conversation */
- const u_char *data, *dataend;
- const u_char *lineend, *eol;
+ const guchar *data, *dataend;
+ const guchar *lineend, *eol;
int linelen;
/* handle the end command */
if ( pinfo->destport == TCP_PORT_SOCKS){
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, ", Terminate Request");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request");
if ( tree)
proto_tree_add_text(tree, tvb, offset, 1,
"Traceroute: End command");
}
else{ /* display the PING or Traceroute results */
- if (check_col(pinfo->fd, COL_INFO))
- col_append_str(pinfo->fd, COL_INFO, ", Results");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_str(pinfo->cinfo, COL_INFO, ", Results");
if ( tree){
- proto_tree_add_text(tree, tvb, offset, END_OF_FRAME,
+ proto_tree_add_text(tree, tvb, offset, -1,
(hash_info->command == PING_COMMAND) ?
"Ping Results:" :
"Traceroute Results");
hash_info = g_mem_chunk_alloc(socks_vals);
hash_info->start_done_row = G_MAXINT;
hash_info->state = None;
-//XX hash_info->port = -1;
hash_info->port = 0;
hash_info->version = tvb_get_guint8(tvb, offset); /* get version*/
hash_info);
/* set dissector for now */
- conversation_set_dissector(conversation, dissect_socks);
+ conversation_set_dissector(conversation, socks_handle);
}
/* display summary window information */
- if (check_col(pinfo->fd, COL_PROTOCOL))
- col_set_str(pinfo->fd, COL_PROTOCOL, "Socks");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
- if (check_col(pinfo->fd, COL_INFO)){
+ if (check_col(pinfo->cinfo, COL_INFO)){
if (( hash_info->version == 4) || ( hash_info->version == 5)){
- col_add_fstr(pinfo->fd, COL_INFO, "Version: %d",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Version: %d",
hash_info->version);
}
else /* unknown version display error */
- col_set_str(pinfo->fd, COL_INFO, "Unknown");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown");
if ( hash_info->command == PING_COMMAND)
- col_append_str(pinfo->fd, COL_INFO, ", Ping Req");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Ping Req");
if ( hash_info->command == TRACERT_COMMAND)
- col_append_str(pinfo->fd, COL_INFO, ", Traceroute Req");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Traceroute Req");
-//XX if ( hash_info->port != -1)
+/*XXX if ( hash_info->port != -1) */
if ( hash_info->port != 0)
- col_append_fstr(pinfo->fd, COL_INFO, ", Remote Port: %d",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Remote Port: %d",
hash_info->port);
}
/* if proto tree, decode and display */
if (tree) {
- ti = proto_tree_add_item( tree, proto_socks, tvb, offset,
- tvb_length_remaining(tvb, offset), FALSE );
+ ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1,
+ FALSE );
socks_tree = proto_item_add_subtree(ti, ett_socks);
if ( hash_info->version == 4)
- display_socks_v4(tvb, offset, pinfo, tree, socks_tree,
+ display_socks_v4(tvb, offset, pinfo, socks_tree,
hash_info);
else if ( hash_info->version == 5)
- display_socks_v5(tvb, offset, pinfo, tree, socks_tree,
+ display_socks_v5(tvb, offset, pinfo, socks_tree,
hash_info);
/* if past startup, add the faked stuff */
{ &hf_socks_ver,
- { "Version", "socks.ver", FT_UINT8, BASE_DEC, NULL,
+ { "Version", "socks.version", FT_UINT8, BASE_DEC, NULL,
0x0, "", HFILL
}
},
}
},
{ &hf_socks_ip6_dst,
- { "Remote Address", "socks.dstV6", FT_IPv6, BASE_NONE, NULL,
+ { "Remote Address(ipv6)", "socks.dstV6", FT_IPv6, BASE_NONE, NULL,
0x0, "", HFILL
}
},
BASE_DEC, NULL, 0x0, "", HFILL
}
},
- { &hf_socks_command,
- { "Command", "socks.command", FT_UINT16,
+ { &hf_socks_cmd,
+ { "Command", "socks.command", FT_UINT8,
+ BASE_DEC, VALS(cmd_strings), 0x0, "", HFILL
+ }
+ },
+ { &hf_socks_results_4,
+ { "Results(V4)", "socks.results_v4", FT_UINT8,
+ BASE_DEC, VALS(reply_table_v4), 0x0, "", HFILL
+ }
+ },
+ { &hf_socks_results_5,
+ { "Results(V5)", "socks.results_v5", FT_UINT8,
+ BASE_DEC, VALS(reply_table_v5), 0x0, "", HFILL
+ }
+ },
+ { &hf_socks_results,
+ { "Results(V5)", "socks.results", FT_UINT8,
BASE_DEC, NULL, 0x0, "", HFILL
}
}
proto_register_subtree_array(ett, array_length(ett));
register_init_routine( &socks_reinit); /* register re-init routine */
+
+ socks_udp_handle = create_dissector_handle(socks_udp_dissector,
+ proto_socks);
+ socks_handle = create_dissector_handle(dissect_socks, proto_socks);
}
/* dissector install routine */
- dissector_add("tcp.port", TCP_PORT_SOCKS, dissect_socks,
- proto_socks);
+ dissector_add("tcp.port", TCP_PORT_SOCKS, socks_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff