diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-15 08:23:26 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-15 08:23:26 +0000 |
| commit | 34d524177542d3cf2d6d353fd92c082888ef77c5 (patch) | |
| tree | 8555dd32903b3af9e8cb2afd9b8331e9e98e82fc /epan/dissectors | |
| parent | 49009428ca87e5f0e666e38e9756ceec448990f6 (diff) | |
Add support for SSH over SCTP.
svn path=/trunk/; revision=41556
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-sctp.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 18fdfbb562..49ed47f5c1 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -329,7 +329,7 @@ static const value_string chunk_type_values[] = { /* * Based on http://www.iana.org/assignments/sctp-parameters - * as of November 10th, 2010 + * as of March 15th, 2012 */ static const value_string sctp_payload_proto_id_values[] = { { NOT_SPECIFIED_PROTOCOL_ID, "not specified" }, @@ -377,6 +377,7 @@ static const value_string sctp_payload_proto_id_values[] = { { PROTO_3GPP_RNA_PROTOCOL_ID, "3GPP RNA" }, { PROTO_3GPP_M2AP_PROTOCOL_ID, "3GPP M2AP" }, { PROTO_3GPP_M3AP_PROTOCOL_ID, "3GPP M3AP" }, + { SSH_PAYLOAD_PROTOCOL_ID, "SSH" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index a0cb99e5a9..e07dc416c5 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -52,6 +52,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/emem.h> +#include <epan/sctpppids.h> #include "packet-tcp.h" #include <epan/prefs.h> @@ -1339,4 +1340,5 @@ proto_reg_handoff_ssh(void) dissector_add_uint("tcp.port", TCP_PORT_SSH, ssh_handle); dissector_add_uint("sctp.port", SCTP_PORT_SSH, ssh_handle); + dissector_add_uint("sctp.ppi", SSH_PAYLOAD_PROTOCOL_ID, ssh_handle); } |