Add the packet number to the packet_info structure, and use it.

That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index d0f6237be4..fefbd40169 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -371,9 +371,9 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
     while(tvb_reported_length_remaining(tvb, offset)> 0) {
         gboolean after_version_start = (peer_data->frame_version_start == 0 ||
-            pinfo->fd->num >= peer_data->frame_version_start);
+            pinfo->num >= peer_data->frame_version_start);
         gboolean before_version_end = (peer_data->frame_version_end == 0 ||
-            pinfo->fd->num <= peer_data->frame_version_end);
+            pinfo->num <= peer_data->frame_version_end);
 
         need_desegmentation = FALSE;
         last_offset = offset;
@@ -383,7 +383,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
         if (after_version_start && before_version_end &&
               (tvb_strncaseeql(tvb, offset, "SSH-", 4) == 0)) {
             if (peer_data->frame_version_start == 0)
-                peer_data->frame_version_start = pinfo->fd->num;
+                peer_data->frame_version_start = pinfo->num;
 
             offset = ssh_dissect_protocol(tvb, pinfo,
                     global_data,
@@ -391,7 +391,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
                     &version, &need_desegmentation);
 
             if (!need_desegmentation) {
-                peer_data->frame_version_end = pinfo->fd->num;
+                peer_data->frame_version_end = pinfo->num;
                 global_data->version = version;
             }
         } else {
@@ -463,8 +463,8 @@ ssh_dissect_ssh2(tvbuff_t *tvb, packet_info *pinfo,
     }
 
     if ((peer_data->frame_key_start == 0) ||
-        ((peer_data->frame_key_start <= pinfo->fd->num) &&
-        ((peer_data->frame_key_end == 0) || (pinfo->fd->num <= peer_data->frame_key_end)))) {
+        ((peer_data->frame_key_start <= pinfo->num) &&
+        ((peer_data->frame_key_end == 0) || (pinfo->num <= peer_data->frame_key_end)))) {
         offset = ssh_dissect_key_exchange(tvb, pinfo, global_data,
             offset, ssh2_tree, is_response,
             need_desegmentation);
@@ -555,7 +555,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo,
 
     /* msg_code */
     if ((peer_data->frame_key_start == 0) ||
-        ((peer_data->frame_key_start >= pinfo->fd->num) && (pinfo->fd->num <= peer_data->frame_key_end))) {
+        ((peer_data->frame_key_start >= pinfo->num) && (pinfo->num <= peer_data->frame_key_end))) {
         msg_code = tvb_get_guint8(tvb, offset);
 
         proto_tree_add_item(ssh1_tree, hf_ssh_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -565,8 +565,8 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo,
         len = plen -1;
         if (!pinfo->fd->flags.visited) {
             if (peer_data->frame_key_start == 0)
-                peer_data->frame_key_start = pinfo->fd->num;
-            peer_data->frame_key_end = pinfo->fd->num;
+                peer_data->frame_key_start = pinfo->num;
+            peer_data->frame_key_end = pinfo->num;
         }
     } else {
         len = plen;
@@ -700,14 +700,14 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
         switch(msg_code)
         {
         case SSH_MSG_KEXINIT:
-            if ((peer_data->frame_key_start == 0) || (peer_data->frame_key_start == pinfo->fd->num)) {
+            if ((peer_data->frame_key_start == 0) || (peer_data->frame_key_start == pinfo->num)) {
                 offset = ssh_dissect_key_init(tvb, offset, key_ex_tree, is_response, global_data);
-                peer_data->frame_key_start = pinfo->fd->num;
+                peer_data->frame_key_start = pinfo->num;
             }
             break;
         case SSH_MSG_NEWKEYS:
             if (peer_data->frame_key_end == 0) {
-                peer_data->frame_key_end = pinfo->fd->num;
+                peer_data->frame_key_end = pinfo->num;
                 ssh_choose_algo(global_data->peer_data[CLIENT_PEER_DATA].enc_proposals[is_response],
                                 global_data->peer_data[SERVER_PEER_DATA].enc_proposals[is_response],
                                 &peer_data->enc);