diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-07 18:37:58 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-07 18:37:58 +0000 |
| commit | aec6d0a7551ed14e4978e52457531c6fbb684bfd (patch) | |
| tree | 0e25c6ee4067c36b227014af07958f38bd918b51 /epan/dissectors/packet-ssh.c | |
| parent | 27a334560e849d3d649f7521f96a4abc9b33aa56 (diff) | |
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from ssl and ssh files
svn path=/trunk/; revision=48174
Diffstat (limited to 'epan/dissectors/packet-ssh.c')
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 6a623c1c05..7a72823305 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -289,9 +289,9 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation = find_or_create_conversation(pinfo); - global_data = conversation_get_proto_data(conversation,proto_ssh); + global_data = (struct ssh_flow_data *)conversation_get_proto_data(conversation,proto_ssh); if(!global_data ) { - global_data = se_alloc0(sizeof(struct ssh_flow_data)); + global_data = (struct ssh_flow_data *)se_alloc0(sizeof(struct ssh_flow_data)); global_data->version=SSH_VERSION_UNKNOWN; global_data->mac_length=-1; @@ -889,7 +889,7 @@ ssh_choose_algo(gchar *client, gchar *server, gchar **result) for (step = client_strings; *step; step++) { GSList *agreed; if ((agreed=g_slist_find_custom(server_list, *step, ssh_gslist_compare_strings))) { - *result = se_strdup(agreed->data); + *result = se_strdup((const gchar *)agreed->data); break; } } |