Add conversation endpoint type

For the moment this mirrors the port_type enumeration (PT_XXX), but the
intent is to move away from using "port types", eliminating most (if not
all)

Added conversation_pt_to_endpoint_type() so that conversations deal with the
correct enumeration.  This is for dissector that use pinfo->ptype as input
to conversation APIs.  Explicit use of port types are converted to using
ENDPOINT_XXX type.

Change-Id: Ia0bf553a3943b702c921f185407e03ce93ebf0ef
Reviewed-on: https://code.wireshark.org/review/24166
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index f47b42389d..6ac1316a0a 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -6735,7 +6735,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, guint32 nw_connection, guint8 sequ
     if (!pinfo->fd->flags.visited) {
         /* Find the conversation whence the request would have come. */
         conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                         PT_NCP, nw_connection, nw_connection, 0);
+                                         ENDPOINT_NCP, nw_connection, nw_connection, 0);
         if (conversation != NULL) {
             /* find the record telling us the request made that caused
                this reply */
@@ -7109,12 +7109,12 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
            as being part of a single conversation so that we can
            let the user select that conversation to be displayed.) */
         conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                         PT_NCP, nw_connection, nw_connection, 0);
+                                         ENDPOINT_NCP, nw_connection, nw_connection, 0);
 
         if (conversation == NULL) {
             /* It's not part of any conversation - create a new one. */
             conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
-                                            PT_NCP, nw_connection, nw_connection, 0);
+                                            ENDPOINT_NCP, nw_connection, nw_connection, 0);
         }
         request_value = ncp_hash_insert(conversation, sequence, ncp_rec, pinfo->num);
         request_value->req_frame_num = pinfo->num;
@@ -7268,7 +7268,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
         if (!request_value)
         {
              conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                                 PT_NCP, nw_connection, nw_connection, 0);
+                                                 ENDPOINT_NCP, nw_connection, nw_connection, 0);
              if (conversation != NULL) {
                  /* find the record telling us the request made that caused
                     this reply */
@@ -7939,7 +7939,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
     if (!pinfo->fd->flags.visited) {
         /* Find the conversation whence the request would have come. */
         conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                         PT_NCP, nw_connection, nw_connection, 0);
+                                         ENDPOINT_NCP, nw_connection, nw_connection, 0);
         if (conversation != NULL) {
             /* find the record telling us the request made that caused
                this reply */
@@ -7959,7 +7959,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
            proper request packet. */
         else {
             conversation = find_conversation(pinfo->num,
-                                             &pinfo->src, &pinfo->dst, PT_NCP, 65535, 65535, 0);
+                                             &pinfo->src, &pinfo->dst, ENDPOINT_NCP, 65535, 65535, 0);
             if (conversation != NULL) {
                 /* find the record telling us the request made
                    that caused this reply */
@@ -7973,7 +7973,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
             }
             else {
                 conversation = find_conversation(pinfo->num,
-                                                 &pinfo->src, &pinfo->dst, PT_NCP, 0, 0, 0);
+                                                 &pinfo->src, &pinfo->dst, ENDPOINT_NCP, 0, 0, 0);
                 if (conversation != NULL) {
                     /* find the record telling us the request made
                        that caused this reply */
@@ -7993,7 +7993,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
     else {
         /*request_value = p_get_proto_data(wmem_file_scope(), pinfo, proto_ncp);*/
         conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                         PT_NCP, nw_connection, nw_connection, 0);
+                                         ENDPOINT_NCP, nw_connection, nw_connection, 0);
         if (conversation != NULL) {
 
              request_value = ncp_hash_lookup(conversation,
@@ -8263,11 +8263,11 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo,
        let the user select that conversation to be displayed.) */
 
     conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                     PT_NCP, nw_connection, nw_connection, 0);
+                                     ENDPOINT_NCP, nw_connection, nw_connection, 0);
     if (conversation == NULL) {
         /* It's not part of any conversation - create a new one. */
         conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
-                                        PT_NCP, nw_connection, nw_connection, 0);
+                                        ENDPOINT_NCP, nw_connection, nw_connection, 0);
     }
 
     if (!pinfo->fd->flags.visited) {
@@ -9256,13 +9256,13 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo,
            let the user select that conversation to be displayed.) */
 
         conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
-                                         PT_NCP, nw_connection, nw_connection, 0);
+                                         ENDPOINT_NCP, nw_connection, nw_connection, 0);
 
         if (conversation == NULL)
         {
             /* It's not part of any conversation - create a new one. */
             conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst,
-                                            PT_NCP, nw_connection, nw_connection, 0);
+                                            ENDPOINT_NCP, nw_connection, nw_connection, 0);
         }
 
         request_value = ncp_hash_insert(conversation, sequence, ncp_rec, pinfo->num);