["Greg Morris" <gmorris@xxxxxxxxxx>]

Change to display NCP connection for each conversation.

 

Please apply,

 

Greg

Index: conversations_ncp.c
===================================================================
--- conversations_ncp.c	(revision 17420)
+++ conversations_ncp.c	(working copy)
@@ -49,9 +49,10 @@
     guint32 connection;
 
     connection = (ncph->conn_high * 256)+ncph->conn_low;
+    if (connection < 65535) {
+        add_conversation_table_data((conversations_table *)pct, &pinfo->src, &pinfo->dst, connection, connection, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NCP);
+    }
 
-	add_conversation_table_data((conversations_table *)pct, &pinfo->src, &pinfo->dst, connection, connection, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NCP);
-
 	return 1;
 }
 
@@ -66,7 +67,7 @@
 		filter=NULL;
 	}
 
-	init_conversation_table(TRUE, "NCP", "ncp_hdr", filter, ncp_conversation_packet);
+	init_conversation_table(FALSE, "NCP", "ncp_hdr", filter, ncp_conversation_packet);
 }
 
 
@@ -85,5 +86,5 @@
 	register_stat_menu_item("NCP", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    ncp_endpoints_cb, NULL, NULL, NULL);
 
-	register_conversation_table(TRUE, "NCP", "ncp_hdr", NULL /*filter*/, ncp_conversation_packet);
+	register_conversation_table(FALSE, "NCP", "ncp_hdr", NULL /*filter*/, ncp_conversation_packet);
 }

Index: conversations_table.c
===================================================================
--- conversations_table.c	(revision 17420)
+++ conversations_table.c	(working copy)
@@ -1209,6 +1209,10 @@
     conversations->default_titles[7]="Bytes A->B";
     conversations->default_titles[8]="Packets A<-B";
     conversations->default_titles[9]="Bytes A<-B";
+    if (strcmp(table_name, "NCP")==0) {
+        conversations->default_titles[1]="Connection A";
+        conversations->default_titles[3]="Connection B";
+    }
 
     g_snprintf(title, 255, "%s Conversations", table_name);
     label=gtk_label_new(title);