diff options
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-h223.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 3894f29816..aaa4cb3c5f 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -806,7 +806,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* find out a dissector using server port*/ if (association && association->handle) { - ssl_debug_printf("dissect_dtls_record found association %p\n", association); + ssl_debug_printf("dissect_dtls_record found association %p\n", (void *)association); ssl_print_text_data("decrypted app data",appl_data->plain_data.data, appl_data->plain_data.data_len); call_dissector(association->handle, next_tvb, pinfo, top_tree); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 91d4986551..a96e339fee 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -744,7 +744,7 @@ static void dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, if( subcircuit == NULL ) { g_message( "Frame %d: Subcircuit id %d not found for call %p VC %d", pinfo->fd->num, - pinfo->circuit_id, call_info, vc ); + pinfo->circuit_id, (void *)call_info, vc ); } else { vc_info = circuit_get_proto_data(subcircuit, proto_h223); if( vc_info != NULL ) { diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 6f19eef373..2280c80099 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -2256,7 +2256,7 @@ void ssl_session_init(SslDecryptSession* ssl_session) { ssl_debug_printf("ssl_session_init: initializing ptr %p size %lu\n", - ssl_session, (gulong)sizeof(SslDecryptSession)); + (void *)ssl_session, (gulong)sizeof(SslDecryptSession)); ssl_session->master_secret.data = ssl_session->_master_secret; ssl_session->session_id.data = ssl_session->_session_id; @@ -2360,7 +2360,7 @@ ssl_association_add(GTree* associations, dissector_handle_t handle, guint port, assoc->from_key_list = from_key_list; ssl_debug_printf("association_add %s port %d protocol %s handle %p\n", - (assoc->tcp)?"TCP":"UDP", port, protocol, assoc->handle); + (assoc->tcp)?"TCP":"UDP", port, protocol, (void *)(assoc->handle)); if (!assoc->handle) { @@ -2385,7 +2385,7 @@ void ssl_association_remove(GTree* associations, SslAssociation *assoc) { ssl_debug_printf("ssl_association_remove removing %s %u - %s handle %p\n", - (assoc->tcp)?"TCP":"UDP", assoc->ssl_port, assoc->info, assoc->handle); + (assoc->tcp)?"TCP":"UDP", assoc->ssl_port, assoc->info, (void *)(assoc->handle)); if (assoc->handle) dissector_delete((assoc->tcp)?"tcp.port":"udp.port", assoc->ssl_port, assoc->handle); @@ -2411,7 +2411,7 @@ ssl_association_find(GTree * associations, guint port, gboolean tcp) assoc_tmp.ssl_port = port; ret = g_tree_lookup(associations, &assoc_tmp); - ssl_debug_printf("association_find: %s port %d found %p\n", (tcp)?"TCP":"UDP", port, ret); + ssl_debug_printf("association_find: %s port %d found %p\n", (tcp)?"TCP":"UDP", port, (void *)ret); return ret; } diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2e41f2ac7a..402c5dde59 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -537,7 +537,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create a new conversation */ conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - ssl_debug_printf(" new conversation = %p created\n", conversation); + ssl_debug_printf(" new conversation = %p created\n", (void *)conversation); } conv_data = conversation_get_proto_data(conversation, proto_ssl); @@ -610,7 +610,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pinfo->fd->flags.visited) ssl_session = NULL; - ssl_debug_printf(" conversation = %p, ssl_session = %p\n", conversation, ssl_session); + ssl_debug_printf(" conversation = %p, ssl_session = %p\n", (void *)conversation, (void *)ssl_session); /* Initialize the protocol column; we'll set it later when we * figure out what flavor of SSL it is (assuming we don't @@ -1221,7 +1221,7 @@ process_ssl_payload(tvbuff_t *tvb, volatile int offset, packet_info *pinfo, next_tvb = tvb_new_subset(tvb, offset, -1, -1); if (association && association->handle) { - ssl_debug_printf("dissect_ssl3_record found association %p\n", association); + ssl_debug_printf("dissect_ssl3_record found association %p\n", (void *)association); call_dissector(association->handle, next_tvb, pinfo, proto_tree_get_root(tree)); } } @@ -3499,7 +3499,7 @@ void ssl_set_master_secret(guint32 frame_num, address *addr_srv, address *addr_c if (!conversation) { /* create a new conversation */ conversation = conversation_new(frame_num, addr_srv, addr_cli, ptype, port_srv, port_cli, 0); - ssl_debug_printf(" new conversation = %p created\n", conversation); + ssl_debug_printf(" new conversation = %p created\n", (void *)conversation); } conv_data = conversation_get_proto_data(conversation, proto_ssl); @@ -3512,7 +3512,7 @@ void ssl_set_master_secret(guint32 frame_num, address *addr_srv, address *addr_c conversation_add_proto_data(conversation, proto_ssl, ssl); } - ssl_debug_printf(" conversation = %p, ssl_session = %p\n", conversation, ssl); + ssl_debug_printf(" conversation = %p, ssl_session = %p\n", (void *)conversation, (void *)ssl); /* version */ if ((ssl->version==SSL_VER_UNKNOWN) && (version!=SSL_VER_UNKNOWN)) { |