[Guy Harris <guy@xxxxxxxxxx>]

> Attached is the socks dissector (packet-socks.c) and a diff
> file.  The diff file will update conversation.[ch] to add the
> conversational dissector functionality.  There are also changes
> to packet-tcp.c and packet-udp.c to do conversation based sub-dissector
> lookups.  In addition tcp & udp sub-dissector decoding has been
> broken out to separate subroutines so that the socks dissector 
> can call them to handle payload decodes.

Checked in.  (I moved the declarations of "decode_tcp_ports()" and
"decode_udp_ports()" to "packet-tcp.h" and "packet-udp.h", and had
"packet-socks.c" include both of those; that way, the declarations of
those routines are centralized, so other potential clients can use them,
*and* appear in header files included by the source files that define
those routines, so that if the declaration gets out of sync with the
definition, the compiler will catch it.)