aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jxta.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
-rw-r--r--epan/dissectors/packet-jxta.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 0459532a27..ae3045aa73 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -749,19 +749,17 @@ static conversation_t *get_peer_conversation(packet_info * pinfo, jxta_stream_co
{
conversation_t * peer_conversation = NULL;
- if ((AT_NONE != tpt_conv_data->initiator_address.type) && (AT_NONE != tpt_conv_data->receiver_address.type)) {
- peer_conversation = find_conversation(pinfo->fd->num, &tpt_conv_data->initiator_address, &tpt_conv_data->receiver_address,
+ if ((AT_NONE != tpt_conv_data->initiator_address.type) && (AT_NONE != tpt_conv_data->receiver_address.type)) {
+ peer_conversation = find_conversation(pinfo->fd->num, &tpt_conv_data->initiator_address, &tpt_conv_data->receiver_address,
PT_NONE, 0, 0, NO_PORT_B);
- if (create && (NULL == peer_conversation)) {
- peer_conversation = conversation_new(pinfo->fd->num, &tpt_conv_data->initiator_address,
+ if (create && (NULL == peer_conversation)) {
+ peer_conversation = conversation_new(pinfo->fd->num, &tpt_conv_data->initiator_address,
&tpt_conv_data->receiver_address, PT_NONE, 0, 0, NO_PORT_B);
- conversation_set_dissector(peer_conversation, stream_jxta_handle);
- }
+ conversation_set_dissector(peer_conversation, stream_jxta_handle);
+ }
- } else {
- g_warning("Uninitialized peer conversation");
- }
+ }
return peer_conversation;
}