diff options
| author | Daniël van Eeden <wireshark@myname.nl> | 2014-07-20 21:30:54 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-07-21 09:39:46 +0000 |
| commit | 13288b05e1d5bd0c6985b74c87ccf464e3efd917 (patch) | |
| tree | 9fd89e4873b257f956a5997cc44b2996cd2e53ee | |
| parent | 56a241137aeccb29268a4c0b8f924fc8a1b50d56 (diff) | |
| download | wireshark-13288b05e1d5bd0c6985b74c87ccf464e3efd917.tar.gz | |
Add auth plugin to server greeting info
Change-Id: I862203c9be0cd10c72599609631629bf976a7a22
Reviewed-on: https://code.wireshark.org/review/3137
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-mysql.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index a603748de6..94aa6985ba 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -487,6 +487,7 @@ static int hf_mysql_schema = -1; static int hf_mysql_thread_id = -1; static int hf_mysql_salt = -1; static int hf_mysql_salt2 = -1; +static int hf_mysql_auth_plugin = -1; static int hf_mysql_charset = -1; static int hf_mysql_passwd = -1; static int hf_mysql_unused = -1; @@ -782,6 +783,13 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset, offset += lenstr; } + /* 5.x server: auth plugin */ + if (tvb_reported_length_remaining(tvb, offset)) { + lenstr = tvb_strsize(tvb,offset); + proto_tree_add_item(greeting_tree, hf_mysql_auth_plugin, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + offset += lenstr; + } + return offset; } @@ -2385,6 +2393,11 @@ void proto_register_mysql(void) FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mysql_auth_plugin, + { "Authentication Plugin", "mysql.auth_plugin", + FT_STRINGZ, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + { &hf_mysql_thread_id, { "Thread ID", "mysql.thread_id", FT_UINT32, BASE_DEC, NULL, 0x0, |