diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-12-26 18:26:24 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-12-27 04:34:29 +0000 |
| commit | 7eb3e47fa49806ea2cf59f0fa009240fae049a2b (patch) | |
| tree | d668ff9ceae57934fe33582457fc5169f6e764ba | |
| parent | c3a7986b86f5355e6bd1791f70b78c91bcdac247 (diff) | |
Try to squeeze some bytes out of the frame_data structure.
Make the time stamp precision a 4-bit bitfield, so, when combined with
the other bitfields, we have 32 bits. That means we put the flags at
the same structure level as the time stamp precision, so they can be
combined; that gets rid of an extra "flags." for references to the flags.
Put the two pointers next to each other, and after a multiple of 8 bytes
worth of other fields, so that there's no padding before or between them.
It's still not down to 64 bytes, which is the next lower power of 2, so
there's more work to do.
Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe
Reviewed-on: https://code.wireshark.org/review/31213
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
212 files changed, 819 insertions, 807 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index ca0117f151..e0f779d346 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -308,7 +308,7 @@ col_clear(column_info *cinfo, const gint el) } #define COL_CHECK_REF_TIME(fd, buf) \ - if (fd->flags.ref_time) { \ + if (fd->ref_time) { \ g_strlcpy(buf, "*REF*", COL_MAX_LEN ); \ return; \ } @@ -456,7 +456,7 @@ void col_append_frame_number(packet_info *pinfo, const gint col, const gchar *fmt_str, guint frame_num) { col_append_fstr(pinfo->cinfo, col, fmt_str, frame_num); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { col_data_changed_ = TRUE; } } @@ -879,7 +879,7 @@ set_abs_ymd_time(const frame_data *fd, gchar *buf, char *decimal_point, gboolean time_t then; int tsprecision; - if (fd->flags.has_ts) { + if (fd->has_ts) { then = fd->abs_ts.secs; if (local) tmp = localtime(&then); @@ -1013,7 +1013,7 @@ set_abs_ydoy_time(const frame_data *fd, gchar *buf, char *decimal_point, gboolea time_t then; int tsprecision; - if (fd->flags.has_ts) { + if (fd->has_ts) { then = fd->abs_ts.secs; if (local) tmp = localtime(&then); @@ -1385,7 +1385,7 @@ col_set_rel_time(const frame_data *fd, column_info *cinfo, const int col) { nstime_t del_rel_ts; - if (!fd->flags.has_ts) { + if (!fd->has_ts) { cinfo->columns[col].col_buf[0] = '\0'; return; } @@ -1439,7 +1439,7 @@ col_set_delta_time_dis(const frame_data *fd, column_info *cinfo, const int col) { nstime_t del_dis_ts; - if (!fd->flags.has_ts) { + if (!fd->has_ts) { cinfo->columns[col].col_buf[0] = '\0'; return; } @@ -1471,7 +1471,7 @@ set_abs_time(const frame_data *fd, gchar *buf, char *decimal_point, gboolean loc time_t then; int tsprecision; - if (fd->flags.has_ts) { + if (fd->has_ts) { then = fd->abs_ts.secs; if (local) tmp = localtime(&then); @@ -1586,7 +1586,7 @@ set_epoch_time(const frame_data *fd, gchar *buf) { int tsprecision; - if (!fd->flags.has_ts) { + if (!fd->has_ts) { buf[0] = '\0'; return FALSE; } @@ -1674,7 +1674,7 @@ set_fd_time(const epan_t *epan, frame_data *fd, gchar *buf) break; case TS_RELATIVE: - if (fd->flags.has_ts) { + if (fd->has_ts) { nstime_t del_rel_ts; frame_delta_abs_time(epan, fd, fd->frame_ref_num, &del_rel_ts); @@ -1695,7 +1695,7 @@ set_fd_time(const epan_t *epan, frame_data *fd, gchar *buf) break; case TS_DELTA: - if (fd->flags.has_ts) { + if (fd->has_ts) { nstime_t del_cap_ts; frame_delta_abs_time(epan, fd, fd->num - 1, &del_cap_ts); @@ -1716,7 +1716,7 @@ set_fd_time(const epan_t *epan, frame_data *fd, gchar *buf) break; case TS_DELTA_DIS: - if (fd->flags.has_ts) { + if (fd->has_ts) { nstime_t del_dis_ts; frame_delta_abs_time(epan, fd, fd->prev_dis_num, &del_dis_ts); @@ -1883,7 +1883,7 @@ col_set_time(column_info *cinfo, const gint el, const nstime_t *ts, const char * if (!CHECK_COL(cinfo, el)) return; - /** @todo TODO: We don't respect fd->flags.ref_time (no way to access 'fd') + /** @todo TODO: We don't respect fd->ref_time (no way to access 'fd') COL_CHECK_REF_TIME(fd, buf); */ diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c index ea2919ed30..68b260f77f 100644 --- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c +++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c @@ -391,7 +391,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat dst_str = address_to_str(wmem_packet_scope(), dst); /* Data from the TCAP dissector */ - if ((!pinfo->fd->flags.visited)&&(p_private_tcap->TransactionID_str)){ + if ((!pinfo->fd->visited)&&(p_private_tcap->TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ /* The hash string needs to contain src and dest to distiguish differnt flows */ switch(ansi_map_response_matching_type){ diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index 9a8dd442b4..e3040053f9 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -144,7 +144,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ src = address_to_str(wmem_packet_scope(), &(pinfo->src)); dst = address_to_str(wmem_packet_scope(), &(pinfo->dst)); - if ((!pinfo->fd->flags.visited)&&(ansi_tcap_private.TransactionID_str)){ + if ((!pinfo->fd->visited)&&(ansi_tcap_private.TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ /* The hash string needs to contain src and dest to distiguish differnt flows */ diff --git a/epan/dissectors/asn1/h225/h225.cnf b/epan/dissectors/asn1/h225/h225.cnf index d9a9cfe2a6..244f3fe7e6 100644 --- a/epan/dissectors/asn1/h225/h225.cnf +++ b/epan/dissectors/asn1/h225/h225.cnf @@ -569,7 +569,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber h225_pi->h245_address = ipv4_address; h225_pi->h245_port = ip_port; } - if ( !actx->pinfo->fd->flags.visited && h245_handle && ip_port!=0 ) { + if ( !actx->pinfo->fd->visited && h245_handle && ip_port!=0 ) { address src_addr; conversation_t *conv=NULL; diff --git a/epan/dissectors/asn1/h245/h245.cnf b/epan/dissectors/asn1/h245/h245.cnf index e4425a83de..92f41e04a6 100644 --- a/epan/dissectors/asn1/h245/h245.cnf +++ b/epan/dissectors/asn1/h245/h245.cnf @@ -128,7 +128,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format #.FN_BODY OpenLogicalChannel gint32 temp; - upcoming_olc = (!actx->pinfo->fd->flags.visited) ? wmem_new0(wmem_file_scope(), olc_info_t) : NULL; + upcoming_olc = (!actx->pinfo->fd->visited) ? wmem_new0(wmem_file_scope(), olc_info_t) : NULL; h223_fw_lc_num = 0; h223_lc_params_temp = NULL; @@ -221,7 +221,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format const gchar *olc_key; olc_info_t *olc_req; - upcoming_olc = (!actx->pinfo->fd->flags.visited) ? wmem_new0(wmem_packet_scope(), olc_info_t) : NULL; + upcoming_olc = (!actx->pinfo->fd->visited) ? wmem_new0(wmem_packet_scope(), olc_info_t) : NULL; h223_fw_lc_num = 0; h223_rev_lc_num = 0; diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c index ca3a9c7e43..870c7401f6 100644 --- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c +++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c @@ -266,7 +266,7 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k { enc_key_t *new_key; - if(pinfo->fd->flags.visited){ + if(pinfo->fd->visited){ return; } @@ -610,7 +610,7 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k { service_key_t *new_key; - if(pinfo->fd->flags.visited){ + if(pinfo->fd->visited){ return; } diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf index 67a2d4a7ba..2473baaa63 100644 --- a/epan/dissectors/asn1/ldap/ldap.cnf +++ b/epan/dissectors/asn1/ldap/ldap.cnf @@ -121,7 +121,7 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" switch(ProtocolOp) { case LDAP_RES_SEARCH_ENTRY: - if (!actx->pinfo->fd->flags.visited) + if (!actx->pinfo->fd->visited) ldap_info->num_results++; proto_item_append_text(tree, " [%d result%s]", @@ -172,7 +172,7 @@ char *mechanism = NULL; * type and mechanism, if you can unbind and rebind with a * different type and/or mechanism. */ - if(!actx->pinfo->fd->flags.visited) { + if(!actx->pinfo->fd->visited) { mechanism = tvb_get_string_enc(wmem_file_scope(), parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb,0), ENC_UTF_8|ENC_NA); ldap_info->first_auth_frame = 0; /* not known until we see the bind reply */ /* diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index ceab67ea8e..80eb0c02b5 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -1845,7 +1845,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) /* Track whether systemInfoValue has changed since last seen, indicating new SI config TODO: add link back to previous config and (if known) time since previous config was first seen */ - if (!actx->pinfo->fd->flags.visited) { + if (!actx->pinfo->fd->visited) { if (system_info_value_current_set && (value != system_info_value_current)) { /* Add entry to the hash table. Offset by one to distinguish 0 from lookup failure */ wmem_map_insert(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->num), diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf index cba0bea86f..7148e4e9dd 100644 --- a/epan/dissectors/asn1/ranap/ranap.cnf +++ b/epan/dissectors/asn1/ranap/ranap.cnf @@ -418,7 +418,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") %(DEFAULT_BODY)s transportLayerAddress_ipv4 = private_data_get_transportLayerAddress_ipv4(actx); binding_id = private_data_get_binding_id_port(actx); - if (actx->pinfo->fd->flags.visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ + if (actx->pinfo->fd->visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ return offset; } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -435,7 +435,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") %(DEFAULT_BODY)s transportLayerAddress_ipv4 = private_data_get_transportLayerAddress_ipv4(actx); binding_id = private_data_get_binding_id_port(actx); - if (actx->pinfo->fd->flags.visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ + if (actx->pinfo->fd->visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ return offset; } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); diff --git a/epan/dissectors/asn1/spnego/packet-spnego-template.c b/epan/dissectors/asn1/spnego/packet-spnego-template.c index 3dedd22a9c..cab23fea23 100644 --- a/epan/dissectors/asn1/spnego/packet-spnego-template.c +++ b/epan/dissectors/asn1/spnego/packet-spnego-template.c @@ -1264,7 +1264,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* * negotiation in a conversation. */ next_level_value = (gssapi_oid_value *)p_get_proto_data(wmem_file_scope(), pinfo, proto_spnego, 0); - if (!next_level_value && !pinfo->fd->flags.visited) { + if (!next_level_value && !pinfo->fd->visited) { /* * No handle attached to this frame, but it's the first * pass, so it'd be attached to the conversation. diff --git a/epan/dissectors/asn1/t38/packet-t38-template.c b/epan/dissectors/asn1/t38/packet-t38-template.c index 54fe8ac669..16e0055f72 100644 --- a/epan/dissectors/asn1/t38/packet-t38-template.c +++ b/epan/dissectors/asn1/t38/packet-t38-template.c @@ -200,7 +200,7 @@ void t38_add_address(packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if ((pinfo->fd->flags.visited) || (t38_udp_handle == NULL)) + if ((pinfo->fd->visited) || (t38_udp_handle == NULL)) { return; } @@ -280,7 +280,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) fd_head = fragment_get(table, pinfo, id, NULL); /* have we already seen this frame ?*/ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { if (fd_head != NULL && fd_head->flags & FD_DEFRAGMENTED) { return fd_head; } else { diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index dcc8ff399d..25979287ef 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -118,10 +118,10 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, 0, 0, frame_len, "Record Length: %u byte%s (%u bits)", frame_len, frame_plurality, frame_len * 8); - ti = proto_tree_add_boolean(fh_tree, hf_file_marked, tvb, 0, 0,pinfo->fd->flags.marked); + ti = proto_tree_add_boolean(fh_tree, hf_file_marked, tvb, 0, 0,pinfo->fd->marked); PROTO_ITEM_SET_GENERATED(ti); - ti = proto_tree_add_boolean(fh_tree, hf_file_ignored, tvb, 0, 0,pinfo->fd->flags.ignored); + ti = proto_tree_add_boolean(fh_tree, hf_file_ignored, tvb, 0, 0,pinfo->fd->ignored); PROTO_ITEM_SET_GENERATED(ti); if(pinfo->fd->pfd != 0){ @@ -146,7 +146,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, #endif } - if (pinfo->fd->flags.ignored) { + if (pinfo->fd->ignored) { /* Ignored package, stop handling here */ col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>"); proto_tree_add_boolean_format(tree, hf_file_ignored, tvb, 0, -1, TRUE, "This record is marked as ignored"); @@ -272,10 +272,10 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } /* Attempt to (re-)calculate color filters (if any). */ - if (pinfo->fd->flags.need_colorize) { + if (pinfo->fd->need_colorize) { color_filter = color_filters_colorize_packet(file_data->color_edt); pinfo->fd->color_filter = color_filter; - pinfo->fd->flags.need_colorize = 0; + pinfo->fd->need_colorize = 0; } else { color_filter = pinfo->fd->color_filter; } diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 2885a08102..aa46443ec2 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -1084,7 +1084,7 @@ static void conv_set_fid_nocopy(packet_info *pinfo, guint32 fid, const char *pat { struct _9p_hashval *val; - if (pinfo->fd->flags.visited || fid == _9P_NOFID) + if (pinfo->fd->visited || fid == _9P_NOFID) return; /* get or create&insert fid tree */ @@ -1104,7 +1104,7 @@ static void conv_set_fid(packet_info *pinfo, guint32 fid, const gchar *path, gsi { char *str; - if (pinfo->fd->flags.visited || fid == _9P_NOFID || len == 0) + if (pinfo->fd->visited || fid == _9P_NOFID || len == 0) return; str = (char*)wmem_alloc(wmem_file_scope(), len); @@ -1138,7 +1138,7 @@ static void conv_set_tag(packet_info *pinfo, guint16 tag, enum _9p_msg_t msgtype struct _9p_hashval *val; struct _9p_taginfo *taginfo; - if (pinfo->fd->flags.visited || tag == _9P_NOTAG) + if (pinfo->fd->visited || tag == _9P_NOTAG) return; val = _9p_hash_new_val(sizeof(struct _9p_taginfo)); @@ -1161,7 +1161,7 @@ static inline struct _9p_taginfo *conv_get_tag(packet_info *pinfo, guint16 tag) struct _9p_hashval *val; /* get tag only makes sense on first pass, as tree isn't built like fid */ - if (pinfo->fd->flags.visited || tag == _9P_NOTAG) + if (pinfo->fd->visited || tag == _9P_NOTAG) return NULL; /* check that length matches? */ @@ -1172,7 +1172,7 @@ static inline struct _9p_taginfo *conv_get_tag(packet_info *pinfo, guint16 tag) static inline void conv_free_tag(packet_info *pinfo, guint16 tag) { - if (pinfo->fd->flags.visited || tag == _9P_NOTAG) + if (pinfo->fd->visited || tag == _9P_NOTAG) return; _9p_hash_free(pinfo, tag, _9P_NOFID); @@ -1246,7 +1246,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_item(ninep_tree, hf_9P_maxsize, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tvb_s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, _9p_len, ENC_UTF_8|ENC_NA); @@ -1316,7 +1316,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += _9p_dissect_string(tvb, ninep_tree, offset, hf_9P_uname, ett_9P_uname); - if(!pinfo->fd->flags.visited) { + if(!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tvb_s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, _9p_len, ENC_UTF_8|ENC_NA); conv_set_fid(pinfo, fid, tvb_s, _9p_len+1); @@ -1336,7 +1336,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre ti = proto_tree_add_item(ninep_tree, hf_9P_fid, tvb, offset, 4, ENC_LITTLE_ENDIAN); fid_path = conv_get_fid(pinfo, fid); proto_item_append_text(ti, " (%s)", fid_path); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, fid_path); } @@ -1351,7 +1351,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += 2; for(i = 0 ; i < u16; i++) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tvb_s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, _9p_len, ENC_UTF_8|ENC_NA); wmem_strbuf_append_c(tmppath, '/'); @@ -1369,7 +1369,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre expert_add_info(pinfo, ti, &ei_9P_first_250); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { conv_set_fid(pinfo, fid, wmem_strbuf_get_str(tmppath), wmem_strbuf_get_len(tmppath)+1); } @@ -1428,7 +1428,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_item_append_text(ti, " (%s)", fid_path); offset += 4; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, fid_path); @@ -1461,7 +1461,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_item_append_text(ti, " (%s)", fid_path); offset += 4; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, fid_path); @@ -1806,7 +1806,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_item_append_text(ti, " (%s)", fid_path); offset += 4; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { _9p_len = tvb_get_letohs(tvb, offset); tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, conv_get_fid(pinfo, dfid)); diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index cf2515282f..a1dbdebdaa 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -454,7 +454,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { command_data = wmem_new(wmem_file_scope(), command_data_t); command_data->bus_id = bus_id; command_data->device_address = device_address; @@ -484,7 +484,7 @@ dissect_acr122(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command = command_data->command; command_frame_number = command_data->command_frame_number; - if (!pinfo->fd->flags.visited && command_data->response_frame_number == 0) { + if (!pinfo->fd->visited && command_data->response_frame_number == 0) { command_data->response_frame_number = pinfo->num; } } diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index 91442f5ab3..494541e340 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -570,12 +570,12 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_expert(expert_tree, pinfo, &ei_invalid_magic, tvb, offset, 4); } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) save_command(command, arg0, arg1, data_length, crc32, service_data, proto, data, pinfo, &service_data, &command_data); offset += 4; } - if (!pinfo->fd->flags.visited && command_data) { + if (!pinfo->fd->visited && command_data) { if (command_data->command_in_frame != frame_number) { is_command = FALSE; is_next_fragment = TRUE; @@ -619,7 +619,7 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* First pass: store message payload (usually a single packet, but * potentially multiple fragments). */ - if (!pinfo->fd->flags.visited && command_data && command_data->reassemble_data_length < command_data->data_length) { + if (!pinfo->fd->visited && command_data && command_data->reassemble_data_length < command_data->data_length) { guint chunklen = tvb_captured_length_remaining(tvb, offset); if (chunklen > command_data->data_length - command_data->reassemble_data_length) { chunklen = command_data->data_length - command_data->reassemble_data_length; @@ -641,7 +641,7 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_expert(main_tree, pinfo, &ei_invalid_data, tvb, offset, -1); } - if ((!pinfo->fd->flags.visited && command_data && command_data->reassemble_data_length < command_data->data_length) || data_length > (guint32) tvb_captured_length_remaining(tvb, offset)) { /* need reassemble */ + if ((!pinfo->fd->visited && command_data && command_data->reassemble_data_length < command_data->data_length) || data_length > (guint32) tvb_captured_length_remaining(tvb, offset)) { /* need reassemble */ proto_tree_add_item(main_tree, hf_data_fragment, tvb, offset, -1, ENC_NA); col_append_str(pinfo->cinfo, COL_INFO, "Data Fragment"); offset = tvb_captured_length(tvb); @@ -684,7 +684,7 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (is_service) { proto_tree_add_item(main_tree, hf_service, tvb, offset, -1, ENC_ASCII | ENC_NA); - if (!pinfo->fd->flags.visited && service_data) { + if (!pinfo->fd->visited && service_data) { service_data->service = tvb_get_stringz_enc(wmem_file_scope(), tvb, offset, NULL, ENC_ASCII); } col_append_fstr(pinfo->cinfo, COL_INFO, "Service: %s", tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, NULL, ENC_ASCII)); diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index f295c24496..4de0cba0d7 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -169,7 +169,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ return tvb_captured_length(tvb); } - if (!pinfo->fd->flags.visited && length > 0) { /* save Length to client_requests */ + if (!pinfo->fd->visited && length > 0) { /* save Length to client_requests */ if (pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID) wireshark_interface_id = pinfo->rec->rec_header.packet_header.interface_id; @@ -195,7 +195,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ wmem_tree_insert32_array(client_requests, key, client_request); } - if (!pinfo->fd->flags.visited && (length == -1 || (client_request && client_request->service_in == -1 && tvb_reported_length_remaining(tvb, offset) > 0))) { /* save Service to client_requests */ + if (!pinfo->fd->visited && (length == -1 || (client_request && client_request->service_in == -1 && tvb_reported_length_remaining(tvb, offset) > 0))) { /* save Service to client_requests */ if (!client_request) { if (pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID) wireshark_interface_id = pinfo->rec->rec_header.packet_header.interface_id; @@ -296,7 +296,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ length = -1; } - if (!pinfo->fd->flags.visited && client_request) { + if (!pinfo->fd->visited && client_request) { client_request->response_frame = pinfo->num; client_request->status = status; client_request->data_length = length; diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index dd54810eed..25970e98aa 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -179,7 +179,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if (!continuation_data || (continuation_data && continuation_data->length_in_frame == pinfo->num)) offset = dissect_ascii_uint32(main_tree, hf_hex_ascii_length, ett_length, hf_length, tvb, offset, &data_length); - if (!pinfo->fd->flags.visited && !continuation_data && tvb_reported_length_remaining(tvb, offset) < 4) { + if (!pinfo->fd->visited && !continuation_data && tvb_reported_length_remaining(tvb, offset) < 4) { key[i_key].length = 1; key[i_key++].key = &pinfo->num; key[i_key].length = 0; @@ -196,7 +196,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if (tvb_reported_length_remaining(tvb, offset) >= 4 || (continuation_data && continuation_data->completed_in_frame == pinfo->num)) { - if (!pinfo->fd->flags.visited && continuation_data) { + if (!pinfo->fd->visited && continuation_data) { continuation_data->completed_in_frame = pinfo->num; } offset = dissect_ascii_uint32(main_tree, hf_hex_ascii_version, ett_version, hf_version, tvb, offset, &version); @@ -244,7 +244,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if (framebuffer_data && framebuffer_data->completed_in_frame < pinfo->num) framebuffer_data = NULL; - if (!pinfo->fd->flags.visited && !framebuffer_data) { + if (!pinfo->fd->visited && !framebuffer_data) { key[i_key].length = 1; key[i_key++].key = &pinfo->num; key[i_key].length = 0; @@ -312,7 +312,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d sub_item = proto_tree_add_item(main_tree, hf_data, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(sub_item, ett_data); - if (!pinfo->fd->flags.visited && framebuffer_data) { + if (!pinfo->fd->visited && framebuffer_data) { framebuffer_data->current_size += tvb_captured_length_remaining(tvb, offset); if (framebuffer_data->current_size >= framebuffer_data->size) framebuffer_data->completed_in_frame = pinfo->num; @@ -419,7 +419,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d subtree = (wmem_tree_t *) wmem_tree_lookup32_array(fragments, key); fragment = (subtree) ? (fragment_t *) wmem_tree_lookup32_le(subtree, pinfo->num - 1) : NULL; if (fragment) { - if (!pinfo->fd->flags.visited && fragment->reassembled_in_frame == -1) + if (!pinfo->fd->visited && fragment->reassembled_in_frame == -1) fragment->reassembled_in_frame = pinfo->num; if (fragment->reassembled_in_frame == pinfo->num) { @@ -495,7 +495,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d i_offset += logcat_length; } else { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { DISSECTOR_ASSERT_HINT(adb_service_data->session_key_length + 2 <= sizeof(key) / sizeof(key[0]), "Tree session key is too small"); for (i_key = 0; i_key < adb_service_data->session_key_length; i_key += 1) { key[i_key].length = 1; diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 32fca9f975..0692564d83 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -528,7 +528,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo, conversation_add_proto_data(conversation, proto_adwin, adwin_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (direction == ADWIN_REQUEST) { /* This is a request */ adwin_trans = wmem_new(wmem_file_scope(), adwin_transaction_t); diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 4e51fd3c23..dc25fdff02 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -2747,7 +2747,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* only allocate a new hash element when it's a request */ opcode = 0; - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if ( !request_val && !reply) { new_request_key = wmem_new(wmem_file_scope(), struct afs_request_key); *new_request_key = request_key; diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 0593298b5d..b7933f8a6e 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -1179,7 +1179,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat dst_str = address_to_str(wmem_packet_scope(), dst); /* Data from the TCAP dissector */ - if ((!pinfo->fd->flags.visited)&&(p_private_tcap->TransactionID_str)){ + if ((!pinfo->fd->visited)&&(p_private_tcap->TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ /* The hash string needs to contain src and dest to distiguish differnt flows */ switch(ansi_map_response_matching_type){ diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 602989aa2a..ed3cf3442f 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -235,7 +235,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ src = address_to_str(wmem_packet_scope(), &(pinfo->src)); dst = address_to_str(wmem_packet_scope(), &(pinfo->dst)); - if ((!pinfo->fd->flags.visited)&&(ansi_tcap_private.TransactionID_str)){ + if ((!pinfo->fd->visited)&&(ansi_tcap_private.TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ /* The hash string needs to contain src and dest to distiguish differnt flows */ diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 47fce6954b..ae462d0a8c 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -207,7 +207,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, /* only create a conversation for ATA commands */ conversation = find_or_create_conversation(pinfo); - if( !(pinfo->fd->flags.visited) ){ + if( !(pinfo->fd->visited) ){ if(!response){ ata_info_t *tmp_ata_info; /* first time we see this request so add a struct for request/response diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 7ba607773e..de795d8137 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -645,7 +645,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree, duplicate_result_key result_key = {pinfo->num, ip}; /* Look up existing result */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { result = (address_hash_value *)wmem_map_lookup(duplicate_result_hash_table, &result_key); } diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 68b9067706..c89997a467 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -2735,7 +2735,7 @@ save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset, packet_info *pinf gchar *name; localhost_name_entry_t *localhost_name_entry; - if (!(!pinfo->fd->flags.visited && bluetooth_data)) return; + if (!(!pinfo->fd->visited && bluetooth_data)) return; while (i < size) { length = tvb_get_guint8(tvb, offset + i); diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 623bf08a0e..b99d30b6f1 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -224,7 +224,7 @@ dissect_brdwlk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ 2, pkt_cnt); } dropped_packets = FALSE; - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* * This isn't the first pass, so we can't use the global * "packet_count" variable to determine whether there were diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 15e881a539..2b24f54924 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -4320,7 +4320,7 @@ save_handle(packet_info *pinfo, bluetooth_uuid_t uuid, guint32 handle, tap_queue_packet(btatt_tap_handles, pinfo, tap_handles); } - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { wmem_tree_key_t key[5]; guint32 frame_number; handle_data_t *handle_data; @@ -10835,7 +10835,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_btatt_client_rx_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.mtu.mtu = tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN); @@ -10848,7 +10848,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x03: /* Exchange MTU Response */ col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Rx MTU: %u", tvb_get_letohs(tvb, offset)); proto_tree_add_item(main_tree, hf_btatt_server_rx_mtu, tvb, offset, 2, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && request_data && bluetooth_data) { + if (!pinfo->fd->visited && request_data && bluetooth_data) { guint new_mtu; new_mtu = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); @@ -10868,7 +10868,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_btatt_ending_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.find_information.starting_handle = tvb_get_guint16(tvb, offset - 4, ENC_LITTLE_ENDIAN); @@ -10950,7 +10950,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset), 0, uuid, &att_data); - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_by_type.starting_handle = tvb_get_guint16(tvb, offset - 6, ENC_LITTLE_ENDIAN); @@ -11000,7 +11000,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_by_type.starting_handle = tvb_get_guint16(tvb, offset - 6, ENC_LITTLE_ENDIAN); @@ -11015,7 +11015,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) &bluetooth_uuid_vals_ext, "<unknown>")); offset += 16; - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_by_type.starting_handle = tvb_get_guint16(tvb, offset - 20, ENC_LITTLE_ENDIAN); @@ -11081,7 +11081,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_append_info_by_handle(pinfo, handle, bluetooth_data); - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_write.handle = handle; @@ -11103,7 +11103,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (is_long_attribute_value(uuid) && tvb_captured_length(tvb) >= mtu) { sub_item = proto_tree_add_item(main_tree, hf_btatt_value, tvb, offset, -1, ENC_NA); - if (!pinfo->fd->flags.visited && request_data && bluetooth_data) + if (!pinfo->fd->visited && request_data && bluetooth_data) save_value_fragment(pinfo, tvb, offset, request_data->parameters.read_write.handle, 0, bluetooth_data); offset = tvb_captured_length(tvb); @@ -11131,7 +11131,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, 0, handle, uuid, &att_data); - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_write.handle = handle; @@ -11150,7 +11150,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (request_data->parameters.read_write.offset == 0 && !is_long_attribute_value(uuid)) { offset = dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset), request_data->parameters.read_write.handle, uuid, &att_data); } else { - if (!pinfo->fd->flags.visited && bluetooth_data) + if (!pinfo->fd->visited && bluetooth_data) save_value_fragment(pinfo, tvb, offset, request_data->parameters.read_write.handle, request_data->parameters.read_write.offset, bluetooth_data); if (tvb_captured_length(tvb) < mtu) { @@ -11197,7 +11197,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, 0, handle, uuid, &att_data); } - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; request_parameters.read_multiple.number_of_handles = (tvb_captured_length(tvb) - 1) / 2; @@ -11272,7 +11272,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset = dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset), tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN), uuid, &att_data); - if (!pinfo->fd->flags.visited && bluetooth_data && (opcode == 0x12 || opcode == 0x1d)) { + if (!pinfo->fd->visited && bluetooth_data && (opcode == 0x12 || opcode == 0x1d)) { union request_parameters_union request_parameters; request_parameters.read_write.handle = handle; @@ -11306,14 +11306,14 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_btatt_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited && bluetooth_data && opcode == 0x16) { + if (!pinfo->fd->visited && bluetooth_data && opcode == 0x16) { union request_parameters_union request_parameters; request_parameters.data = NULL; save_request(pinfo, opcode, request_parameters, bluetooth_data); } - if (!pinfo->fd->flags.visited && request_data && bluetooth_data && opcode == 0x16) + if (!pinfo->fd->visited && request_data && bluetooth_data && opcode == 0x16) save_value_fragment(pinfo, tvb, offset, tvb_get_guint16(tvb, offset - 4, ENC_LITTLE_ENDIAN), tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN), @@ -11349,7 +11349,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_btatt_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { union request_parameters_union request_parameters; /* NOTE: Enable request-response tracking using empty data*/ @@ -11404,7 +11404,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) PROTO_ITEM_SET_GENERATED(sub_item); } - if (!pinfo->fd->flags.visited && request_data->response_in_frame == 0 && + if (!pinfo->fd->visited && request_data->response_in_frame == 0 && pinfo->num > request_data->request_in_frame) request_data->response_in_frame = pinfo->num; diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 9d2662236c..c85ff4196c 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -242,7 +242,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) key[5].key = NULL; if (packet_type == PACKET_TYPE_START) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { fragment = wmem_new(wmem_file_scope(), fragment_t); fragment->length = length; fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); @@ -282,7 +282,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragments->psm == psm)) fragments = NULL; - if (!pinfo->fd->flags.visited && fragments != NULL) { + if (!pinfo->fd->visited && fragments != NULL) { fragment = wmem_new(wmem_file_scope(), fragment_t); fragment->length = length; fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); @@ -325,7 +325,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragments->psm == psm)) fragments = NULL; - if (!pinfo->fd->flags.visited && fragments != NULL) { + if (!pinfo->fd->visited && fragments != NULL) { fragment = wmem_new(wmem_file_scope(), fragment_t); fragment->length = length; fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 7ddae559d5..179ba239bf 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -728,7 +728,7 @@ dissect_sep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_tree_add_item(sep_tree, hf_btavdtp_sep_type , tvb, offset, 1, ENC_NA); proto_tree_add_item(sep_tree, hf_btavdtp_sep_rfa1 , tvb, offset, 1, ENC_NA); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { sep_entry_t *sep_data; wmem_tree_key_t key[7]; guint32 frame_number = pinfo->num; @@ -1473,7 +1473,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) channels_info->adapter_disconnect_in_frame = l2cap_data->adapter_disconnect_in_frame; channels_info->sep = NULL; - if (!pinfo->fd->flags.visited || ( + if (!pinfo->fd->visited || ( *channels_info->adapter_disconnect_in_frame == 0 || *channels_info->hci_disconnect_in_frame == 0 || *channels_info->l2cap_disconnect_in_frame == 0 || @@ -1502,7 +1502,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) (l2cap_data->local_cid == channels_info->media_local_cid && l2cap_data->remote_cid == channels_info->media_remote_cid))) { - if (!pinfo->fd->flags.visited && channels_info->media_local_cid == BTL2CAP_UNKNOWN_CID) { + if (!pinfo->fd->visited && channels_info->media_local_cid == BTL2CAP_UNKNOWN_CID) { channels_info->media_local_cid = l2cap_data->local_cid; channels_info->media_remote_cid = l2cap_data->remote_cid; } @@ -1551,7 +1551,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (media_stream_number_value->stream_start_in_frame == 0) media_stream_number_value->stream_start_in_frame = pinfo->num; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) media_stream_number_value->stream_end_in_frame = pinfo->num; sep_data.stream_start_in_frame = media_stream_number_value->stream_start_in_frame; @@ -1579,7 +1579,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (song_position_data && (song_position_data->used_in_frame == 0 || song_position_data->used_in_frame == frame_number)) { avrcp_song_position = song_position_data->song_position; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) song_position_data->used_in_frame = frame_number; } @@ -1609,7 +1609,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) sep_data.previous_media_packet_info->stream_number = sep_data.stream_number; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key[5].length = 1; key[5].key = &frame_number; key[6].length = 0; @@ -1765,7 +1765,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) &codec, &content_protection_type, &vendor_id, &vendor_codec, &configuration_offset, &configuration_length); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; @@ -1851,7 +1851,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) &codec, &content_protection_type, &vendor_id, &vendor_codec, &configuration_offset, &configuration_length); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; @@ -1897,7 +1897,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) SEID_ACP, 0, &seid, interface_id, adapter_id, chandle, frame_number); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; @@ -1931,7 +1931,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 1; break; } - if (message_type == MESSAGE_TYPE_ACCEPT && !pinfo->fd->flags.visited) { + if (message_type == MESSAGE_TYPE_ACCEPT && !pinfo->fd->visited) { key[0].length = 1; key[0].key = &interface_id; @@ -1970,7 +1970,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; } - if (message_type == MESSAGE_TYPE_ACCEPT && !pinfo->fd->flags.visited) { + if (message_type == MESSAGE_TYPE_ACCEPT && !pinfo->fd->visited) { media_stream_number_value_t *media_stream_number_value; guint32 stream_number = 0; @@ -2020,7 +2020,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 1; break; } - if (!pinfo->fd->flags.visited && message_type == MESSAGE_TYPE_ACCEPT && + if (!pinfo->fd->visited && message_type == MESSAGE_TYPE_ACCEPT && channels_info->disconnect_in_frame > pinfo->num) { channels_info->disconnect_in_frame = pinfo->num; } @@ -2057,7 +2057,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 1; break; } - if (!pinfo->fd->flags.visited && message_type == MESSAGE_TYPE_ACCEPT && + if (!pinfo->fd->visited && message_type == MESSAGE_TYPE_ACCEPT && channels_info->disconnect_in_frame > pinfo->num) { channels_info->disconnect_in_frame = pinfo->num; } @@ -3046,7 +3046,7 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pitem = proto_tree_add_double(aptx_tree, hf_aptx_delta_time_from_the_beginning, tvb, 0, 0, nstime_to_msec(&delta)); PROTO_ITEM_SET_GENERATED(pitem); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; pitem = proto_tree_add_double(aptx_tree, hf_aptx_cumulative_duration, tvb, 0, 0, info->previous_media_packet_info->cumulative_frame_duration); diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 490077638c..dbe436aa1c 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -1061,7 +1061,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, length = tvb_reported_length_remaining(tvb, offset); if (packet_type == PACKET_TYPE_START) { - if (pinfo->fd->flags.visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) { + if (pinfo->fd->visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) { k_op = pdu_id | (company_id << 8); frame_number = pinfo->num; @@ -1107,7 +1107,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_str(pinfo->cinfo, COL_INFO, " [start]"); return offset; } else if (packet_type == PACKET_TYPE_CONTINUE) { - if (pinfo->fd->flags.visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) { + if (pinfo->fd->visited == 0 && tvb_captured_length_remaining(tvb, offset) == length) { k_op = pdu_id | (company_id << 8); frame_number = pinfo->num; @@ -1178,7 +1178,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fragment->op == (pdu_id | (company_id << 8))) { - if (fragment->state == 1 && pinfo->fd->flags.visited == 0) { + if (fragment->state == 1 && pinfo->fd->visited == 0) { fragment->end_frame_number = pinfo->num; fragment->count += 1; fragment->state = 2; @@ -1566,7 +1566,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (song_position == 0xFFFFFFFF) { proto_item_append_text(pitem, " (NOT SELECTED)"); col_append_str(pinfo->cinfo, COL_INFO, " (NOT SELECTED)"); - } else if (!pinfo->fd->flags.visited) { + } else if (!pinfo->fd->visited) { btavrcp_song_position_data_t *song_position_data; frame_number = pinfo->num; @@ -1661,7 +1661,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str_const(tvb_get_guint8(tvb, offset), pdu_id_vals, "Unknown opcode")); offset += 1; - if (pinfo->fd->flags.visited == 0) { + if (pinfo->fd->visited == 0) { k_op = continuing_op; frame_number = pinfo->num; @@ -1706,7 +1706,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str_const(tvb_get_guint8(tvb, offset), pdu_id_vals, "Unknown opcode")); offset += 1; - if (pinfo->fd->flags.visited == 0) { + if (pinfo->fd->visited == 0) { k_op = continuing_op; frame_number = pinfo->num; @@ -2168,7 +2168,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) key[8].length = 0; key[8].key = NULL; - if (pinfo->fd->flags.visited == 0) { + if (pinfo->fd->visited == 0) { if (is_command) { if (ctype == 0x00) { /* MTC is for CONTROL */ max_response_time = 200; diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 5ad56ae5f9..4b62b49722 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -360,7 +360,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat subtree = (wmem_tree_t *) wmem_tree_lookup32_array(chandle_tree, key); chandle_data = (subtree) ? (chandle_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL; - if (!pinfo->fd->flags.visited && !chandle_data) { + if (!pinfo->fd->visited && !chandle_data) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; @@ -378,7 +378,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat chandle_data->start_fragments = wmem_tree_new(wmem_file_scope()); wmem_tree_insert32_array(chandle_tree, key, chandle_data); - } else if (pinfo->fd->flags.visited && !chandle_data) { + } else if (pinfo->fd->visited && !chandle_data) { DISSECTOR_ASSERT_HINT(0, "Impossible: no previously session saved"); } @@ -426,7 +426,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat gint len; if (!(pb_flag & 0x01)) { /* first fragment */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { mfp = (multi_fragment_pdu_t *) wmem_new(wmem_file_scope(), multi_fragment_pdu_t); mfp->first_frame = pinfo->num; mfp->last_frame = 0; @@ -451,7 +451,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } if (pb_flag == 0x01) { /* continuation fragment */ mfp = (multi_fragment_pdu_t *)wmem_tree_lookup32_le(chandle_data->start_fragments, pinfo->num); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { len = tvb_captured_length_remaining(tvb, offset); if (mfp != NULL && !mfp->last_frame && (mfp->tot_len >= mfp->cur_off + len)) { tvb_memcpy(tvb, (guint8 *) mfp->reassembled + mfp->cur_off, offset, len); @@ -503,7 +503,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat expert_add_info(pinfo, bthci_acl_item, &ei_invalid_session); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index c9e33a46ad..fb0b59ca14 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2378,7 +2378,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_cmd_allow_role_switch, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint32 interface_id; guint32 adapter_id; guint32 bd_addr_oui; @@ -2443,7 +2443,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_cmd_acr_role, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint32 interface_id; guint32 adapter_id; guint32 bd_addr_oui; @@ -3217,7 +3217,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0013: /* Change Local Name */ proto_tree_add_item(tree, hf_bthci_cmd_device_name, tvb, offset, 248, ENC_UTF_8 | ENC_NA); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, 248, ENC_UTF_8); } offset += 248; @@ -3238,7 +3238,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin } else { proto_item_append_text(item, " Illegal Page Timeout"); } - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.page_timeout = timeout; } offset+=2; @@ -3247,7 +3247,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x001a: /* Write Scan Enable */ proto_tree_add_item(tree, hf_bthci_cmd_scan_enable, tvb, offset, 1, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.scan = tvb_get_guint8(tvb, offset); } offset++; @@ -3256,7 +3256,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0020: /* Write Authentication Enable */ proto_tree_add_item(tree, hf_bthci_cmd_authentication_enable, tvb, offset, 1, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.authentication = tvb_get_guint8(tvb, offset); } offset++; @@ -3264,7 +3264,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0022: /* Write Encryption Mode */ proto_tree_add_item(tree, hf_bthci_cmd_encrypt_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.encryption = tvb_get_guint8(tvb, offset); } offset++; @@ -3272,7 +3272,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0024: /* Write Class of Device */ call_dissector(btcommon_cod_handle, tvb_new_subset_length(tvb, offset, 3), pinfo, tree); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.class_of_device = tvb_get_guint24(tvb, offset, ENC_LITTLE_ENDIAN); } offset += 3; @@ -3291,7 +3291,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_bthci_cmd_air_coding_format, tvb, offset, 2, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.voice_setting = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); } offset+=2; @@ -3361,7 +3361,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.mtus.acl_mtu = tvb_get_guint16(tvb, offset - 7, ENC_LITTLE_ENDIAN); bthci_cmd_data->data.mtus.sco_mtu = tvb_get_guint8(tvb, offset - 5); bthci_cmd_data->data.mtus.acl_packets = tvb_get_guint16(tvb, offset - 4, ENC_LITTLE_ENDIAN); @@ -3453,7 +3453,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0045: /* Write Inquiry Mode */ proto_tree_add_item(tree, hf_bthci_cmd_inq_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.inquiry_mode = tvb_get_guint8(tvb, offset); } offset++; @@ -3495,7 +3495,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0056: /* Write Simple Pairing Mode */ proto_tree_add_item(tree, hf_bthci_cmd_simple_pairing_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN); - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { bthci_cmd_data->data.simple_pairing_mode = tvb_get_guint8(tvb, offset); } offset++; @@ -4767,7 +4767,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat set_address(&pinfo->net_dst, AT_STRINGZ, 11, "controller"); set_address(&pinfo->dl_src, AT_STRINGZ, 5, "host"); set_address(&pinfo->dl_dst, AT_STRINGZ, 11, "controller"); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -4806,7 +4806,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat tap_queue_packet(bluetooth_hci_summary_tap, pinfo, tap_hci_summary); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { bthci_cmd_data = (bthci_cmd_data_t *) wmem_new(wmem_file_scope(), bthci_cmd_data_t); bthci_cmd_data->opcode = opcode; bthci_cmd_data->command_in_frame = frame_number; @@ -4915,7 +4915,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } } - if (!pinfo->fd->flags.visited && bthci_cmd_data) { + if (!pinfo->fd->visited && bthci_cmd_data) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index aa13e4ad54..63b1e391d3 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -1063,7 +1063,7 @@ save_remote_device_name(tvbuff_t *tvb, gint offset, packet_info *pinfo, gchar *name; device_name_t *device_name; - if (!(!pinfo->fd->flags.visited && bd_addr)) return; + if (!(!pinfo->fd->visited && bd_addr)) return; interface_id = bluetooth_data->interface_id; adapter_id = bluetooth_data->adapter_id; @@ -1194,7 +1194,7 @@ dissect_bthci_evt_connect_complete(tvbuff_t *tvb, int offset, packet_info *pinfo offset += 2; offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, FALSE, bluetooth_data->interface_id, bluetooth_data->adapter_id, bd_addr); - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { wmem_tree_key_t key[5]; guint32 k_interface_id; guint32 k_adapter_id; @@ -1284,7 +1284,7 @@ dissect_bthci_evt_disconnect_complete(tvbuff_t *tvb, int offset, packet_info *pi send_hci_summary_reason_tap(tvb_get_guint8(tvb, offset), pinfo, bluetooth_data); offset += 1; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { wmem_tree_key_t key[4]; guint32 interface_id; guint32 adapter_id; @@ -1542,7 +1542,7 @@ dissect_bthci_evt_remote_name_req_complete(tvbuff_t *tvb, int offset, offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, FALSE, bluetooth_data->interface_id, bluetooth_data->adapter_id, bd_addr); proto_tree_add_item(tree, hf_bthci_evt_remote_name, tvb, offset, 248, ENC_UTF_8|ENC_NA); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { wmem_tree_key_t key[6]; guint32 interface_id; guint32 adapter_id; @@ -1728,7 +1728,7 @@ dissect_bthci_evt_mode_change(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_append_text(handle_item, " Baseband slots (%f msec)", tvb_get_letohs(tvb, offset)*0.625); offset += 2; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { wmem_tree_key_t key[5]; guint32 interface_id; guint32 adapter_id; @@ -1779,7 +1779,7 @@ dissect_bthci_evt_role_change(tvbuff_t *tvb, int offset, packet_info *pinfo, role = tvb_get_guint8(tvb, offset); offset += 1; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { guint32 interface_id; guint32 adapter_id; guint32 bd_addr_oui; @@ -2305,7 +2305,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_evt_le_master_clock_accuracy, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { wmem_tree_key_t key[5]; guint32 k_interface_id; guint32 k_adapter_id; @@ -2515,7 +2515,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_evt_le_master_clock_accuracy, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { wmem_tree_key_t key[5]; guint32 k_interface_id; guint32 k_adapter_id; @@ -3215,7 +3215,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, offset += 1; offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, local_addr, bluetooth_data->interface_id, bluetooth_data->adapter_id, bd_addr); - if (!pinfo->fd->flags.visited && local_addr) { + if (!pinfo->fd->visited && local_addr) { localhost_bdaddr_entry_t *localhost_bdaddr_entry; interface_id = bluetooth_data->interface_id; @@ -3475,7 +3475,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, offset += 1; proto_tree_add_item(tree, hf_bthci_evt_device_name, tvb, offset, 248, ENC_UTF_8|ENC_NA); - if (status == STATUS_SUCCESS && !pinfo->fd->flags.visited) { + if (status == STATUS_SUCCESS && !pinfo->fd->visited) { gchar *name; localhost_name_entry_t *localhost_name_entry; @@ -4055,7 +4055,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, } } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { hci_vendor_data_t *new_hci_vendor_data; @@ -5113,7 +5113,7 @@ dissect_bthci_evt_sync_connection_complete(tvbuff_t *tvb, int offset, adapter_id = bluetooth_data->adapter_id; frame_number = pinfo->num; - if (!pinfo->fd->flags.visited && status == STATUS_SUCCESS) { + if (!pinfo->fd->visited && status == STATUS_SUCCESS) { remote_bdaddr_t *remote_bdaddr; chandle_session_t *chandle_session; bthci_sco_stream_number_t *sco_stream_number; @@ -5383,7 +5383,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat set_address(&pinfo->net_dst, AT_STRINGZ, 5, "host"); set_address(&pinfo->dl_src, AT_STRINGZ, 11, "controller"); set_address(&pinfo->dl_dst, AT_STRINGZ, 5, "host"); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -6007,7 +6007,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat tap_device->data.name = lastest_bthci_cmd_data->data.name; tap_queue_packet(bluetooth_device_tap, pinfo, tap_device); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { localhost_name_entry_t *localhost_name_entry; wmem_tree_key_t key[4]; guint32 interface_id; @@ -6192,19 +6192,19 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } } - if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_PENDING && + if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_PENDING && lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) { lastest_bthci_cmd_data->pending_in_frame = frame_number; lastest_bthci_cmd_data->pending_abs_ts = pinfo->abs_ts; } - if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_NORMAL && + if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_NORMAL && lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame) { lastest_bthci_cmd_data->response_in_frame = frame_number; lastest_bthci_cmd_data->response_abs_ts = pinfo->abs_ts; } - if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_RESULT && + if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_RESULT && lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame && lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) { lastest_bthci_cmd_data->response_in_frame = frame_number; diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index a77d6223fd..8da0cf14f8 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -448,7 +448,7 @@ dissect_bthci_vendor_broadcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* TODO: This is command, but in respose (event Command Complete) there is a status for that, so write bdaddr can fail, but we store bdaddr as valid for now... */ - if (!pinfo->fd->flags.visited && bluetooth_data) { + if (!pinfo->fd->visited && bluetooth_data) { wmem_tree_key_t key[4]; guint32 frame_number; localhost_bdaddr_entry_t *localhost_bdaddr_entry; diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index d2c387f17c..856cacf4e9 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -2214,7 +2214,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } /* save fragments */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { frame_number = pinfo->num - 1; key[0].length = 1; diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index ace0fc7109..5acbb1aafe 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -486,7 +486,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* TODO: Save bthsp.at_cmd, bthsp.at_cmd.type, frame_time and frame_num here in - if (role == ROLE_HS && pinfo->fd->flags.visited == 0) { + if (role == ROLE_HS && pinfo->fd->visited == 0) { at_cmd_db = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); @@ -763,7 +763,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } /* save fragments */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { frame_number = pinfo->num - 1; key[0].length = 1; diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index d34a7e7124..04afe3a7a7 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -682,7 +682,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 1; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { wmem_tree_key_t key[6]; guint32 k_interface_id; guint32 k_adapter_id; @@ -836,7 +836,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf proto_tree_add_item(command_tree, hf_btl2cap_initial_credits, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { wmem_tree_key_t key[6]; guint32 k_interface_id; guint32 k_adapter_id; @@ -982,7 +982,7 @@ dissect_le_credit_based_connresponse(tvbuff_t *tvb, int offset, packet_info *pin offset += 2; - if (pinfo->fd->flags.visited == 0) { + if (pinfo->fd->visited == 0) { psm_data_t *psm_data; wmem_tree_key_t key[6]; guint32 k_interface_id; @@ -1532,7 +1532,7 @@ dissect_connresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, val_to_str_const(result, result_vals, "Unknown"), scid); } - if (pinfo->fd->flags.visited == 0) { + if (pinfo->fd->visited == 0) { psm_data_t *psm_data; wmem_tree_key_t key[6]; guint32 k_interface_id; @@ -1732,7 +1732,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(command_tree, hf_btl2cap_scid, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { psm_data_t *psm_data; wmem_tree_key_t key[6]; guint32 k_interface_id; @@ -2008,7 +2008,7 @@ dissect_le_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, btl2cap_frame_data_t *btl2cap_frame_data = NULL; fragment_head *frag_btl2cap_le_sdu = NULL; - if ((!pinfo->fd->flags.visited) && (config_data) && !is_retransmit) { + if ((!pinfo->fd->visited) && (config_data) && !is_retransmit) { btl2cap_frame_data = wmem_new0(wmem_file_scope(), btl2cap_frame_data_t); if (config_data->segmentation_started == 1) { config_data->segment_len_rem = config_data->segment_len_rem - length; @@ -2205,7 +2205,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "SDU length less than length of first packet (%u < %u)", sdulen, length); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { mfp = wmem_new(wmem_file_scope(), sdu_reassembly_t); mfp->first_frame = pinfo->num; mfp->last_frame = 0; @@ -2233,7 +2233,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (segment == 0x02 || segment == 0x03) { mfp = (sdu_reassembly_t *)wmem_tree_lookup32_le(config_data->start_fragments, pinfo->num); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (mfp != NULL && !mfp->last_frame && (mfp->tot_len>=mfp->cur_off + length)) { tvb_memcpy(tvb, mfp->reassembled + mfp->cur_off, offset, length); mfp->cur_off += length; diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index b7c2315f59..729d89008e 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -639,7 +639,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -674,7 +674,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -699,7 +699,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -723,7 +723,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -761,7 +761,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address)); @@ -812,7 +812,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_sleep_clock_accuracy, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key[0].length = 1; key[0].key = &interface_id; key[1].length = 1; @@ -915,7 +915,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(str_addr_dst)+1, str_addr_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { address *addr; btle_frame_info = wmem_new0(wmem_file_scope(), btle_frame_info_t); @@ -997,7 +997,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pinfo->fragmented = TRUE; if (connection_info && !retransmit) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (connection_info->direction_info[direction].segmentation_started == 1) { if (connection_info->direction_info[direction].segment_len_rem >= length) { connection_info->direction_info[direction].segment_len_rem = connection_info->direction_info[direction].segment_len_rem - length; @@ -1087,7 +1087,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (le_frame_len > length) { pinfo->fragmented = TRUE; if (connection_info && !retransmit) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { connection_info->direction_info[direction].segmentation_started = 1; /* The first two octets in the L2CAP PDU contain the length of the entire * L2CAP PDU in octets, excluding the Length and CID fields(4 octets). @@ -1124,7 +1124,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bthci_acl_data_t *acl_data; if (connection_info) { /* Add a L2CAP index for completeness */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { btle_frame_info->l2cap_index = l2cap_index; l2cap_index++; } diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 7f018ee5b5..d7956c4bdd 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -650,7 +650,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data key[4].length = 1; key[4].key = &k_dlci; - if (!pinfo->fd->flags.visited && frame_type == FRAME_TYPE_SABM) { + if (!pinfo->fd->visited && frame_type == FRAME_TYPE_SABM) { key[5].length = 0; key[5].key = NULL; diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 84021347c3..1251cf47d8 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1523,7 +1523,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo, } else if (length == 1 && tvb_get_guint8(tvb, offset) == 0x00) { if (is_continued) *is_continued = FALSE; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (is_request) { tid_request = (tid_request_t *) wmem_new(wmem_file_scope(), tid_request_t); tid_request->interface_id = interface_id; @@ -1677,7 +1677,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo, continuation_state_buffer = tvb_bytes_to_str(wmem_file_scope(), tvb, offset, continuation_state_length); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (is_request) { tid_request = (tid_request_t *) wmem_new(wmem_file_scope(), tid_request_t); tid_request->interface_id = interface_id; @@ -2017,7 +2017,7 @@ dissect_protocol_descriptor_list(proto_tree *next_tree, tvbuff_t *tvb, proto_item_append_text(feature_item, ", PSM: %u", value); proto_item_append_text(entry_item, ", PSM: %u", value); proto_tree_add_item(sub_tree, hf_sdp_protocol_psm, tvb, entry_offset, 2, ENC_BIG_ENDIAN); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) record = save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, value, *protocol_order, service_info); *protocol_order += 1; } else if (uuid.bt_uuid == BTSDP_RFCOMM_PROTOCOL_UUID) { @@ -2025,7 +2025,7 @@ dissect_protocol_descriptor_list(proto_tree *next_tree, tvbuff_t *tvb, proto_item_append_text(feature_item, ", RFCOMM Channel: %u", value); proto_item_append_text(entry_item, ", RFCOMM Channel: %u", value); proto_tree_add_item(sub_tree, hf_sdp_protocol_channel, tvb, entry_offset, 1, ENC_BIG_ENDIAN); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) record = save_channel(pinfo, BTSDP_RFCOMM_PROTOCOL_UUID, value, *protocol_order, service_info); *protocol_order += 1; } else if (uuid.bt_uuid == BTSDP_ATT_PROTOCOL_UUID) { @@ -2369,7 +2369,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_pbap_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x314: @@ -2433,7 +2433,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_ftp_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; default: @@ -2447,7 +2447,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_map_mas_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x315: @@ -2491,7 +2491,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_map_mns_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x317: @@ -2724,7 +2724,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_opp_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x303: @@ -2966,7 +2966,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_bip_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x310: @@ -3061,7 +3061,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_bip_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited && service_info) + if (!pinfo->fd->visited && service_info) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x312: @@ -3085,7 +3085,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(next_tree, hf_bip_goep_l2cap_psm, tvb, offset, 2, ENC_BIG_ENDIAN); psm = tvb_get_ntohs(tvb, offset); wmem_strbuf_append_printf(info_buf, "%u (0x%02x)", psm, psm); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) save_channel(pinfo, BTSDP_L2CAP_PROTOCOL_UUID, psm, -1, service_info); break; case 0x312: @@ -3928,7 +3928,7 @@ dissect_sdp_service_attribute_list(proto_tree *tree, tvbuff_t *tvb, gint offset, if (uuid.size == 0 && service_uuid) uuid = *service_uuid; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { service_info = (service_info_t *) wmem_new(wmem_file_scope(), service_info_t); service_info->interface_id = l2cap_data->interface_id; service_info->adapter_id = l2cap_data->adapter_id; @@ -3959,7 +3959,7 @@ dissect_sdp_service_attribute_list(proto_tree *tree, tvbuff_t *tvb, gint offset, uuid, service_offset, service_info, number_of_attributes, FALSE); } - if (!pinfo->fd->flags.visited && service_info) { + if (!pinfo->fd->visited && service_info) { k_interface_id = l2cap_data->interface_id; k_adapter_id = l2cap_data->adapter_id; k_sdp_psm = l2cap_data->psm; @@ -4058,7 +4058,7 @@ dissect_sdp_service_search_request(proto_tree *tree, tvbuff_t *tvb, gint offset, start_offset = offset; memset(&empty_uuid, 0, sizeof(bluetooth_uuid_t)); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) uuid_array = wmem_array_new(wmem_file_scope(), sizeof(bluetooth_uuid_t)); ti = proto_tree_add_item(tree, hf_service_search_pattern, tvb, offset, 0, ENC_NA); @@ -4128,7 +4128,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb, current_count * 4, "Service Record Handle List [count = %u]", current_count); st = proto_item_add_subtree(ti, ett_btsdp_ssr); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) record_handle_array = wmem_array_new(wmem_packet_scope(), sizeof(guint32)); while (current_count > 0) { @@ -4152,7 +4152,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb, if (is_continued) col_append_str(pinfo->cinfo, COL_INFO, "(fragment)"); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { record_handle_service_t *record_handle_service; wmem_tree_key_t key[7]; guint32 k_interface_id; @@ -4350,7 +4350,7 @@ dissect_sdp_service_search_attribute_request(proto_tree *tree, tvbuff_t *tvb, bluetooth_uuid_t uuid; memset(&empty_uuid, 0, sizeof(bluetooth_uuid_t)); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) uuid_array = wmem_array_new(wmem_file_scope(), sizeof(bluetooth_uuid_t)); else uuid_array = wmem_array_new(wmem_packet_scope(), sizeof(bluetooth_uuid_t)); diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 44cbb60c2d..913557b8fc 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -1513,7 +1513,7 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off) d->conv = find_or_create_conversation(pinfo); DISSECTOR_ASSERT_HINT(d->conv, "find_or_create_conversation() returned NULL"); - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { /* Retrieve the saved state. */ d->convd = (c_conv_data*)p_get_proto_data(wmem_file_scope(), pinfo, @@ -1573,7 +1573,7 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off) static void c_pkt_data_save(c_pkt_data *d, packet_info *pinfo, guint off) { - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { /* Save a copy of the state for next time we dissect this packet. diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 1cde118bba..30e56eb06e 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -6368,7 +6368,7 @@ dissect_cip_cm_fwd_open_req(cip_req_info_t *preq_info, proto_tree *cmd_tree, tvb epath_tree = proto_tree_add_subtree(cmd_tree, tvb, offset+26+net_param_offset+6, conn_path_size, ett_path, &pi, "Connection Path: "); dissect_epath( tvb, pinfo, epath_tree, pi, offset+26+net_param_offset+6, conn_path_size, FALSE, FALSE, &connection_path, &safety_fwdopen, DISPLAY_CONNECTION_PATH, NULL, FALSE); - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { /* "Connection" is created during ForwardOpen reply (which will be after ForwardOpen request), so ForwardOpen request can only be marked after the first pass */ @@ -6489,7 +6489,7 @@ dissect_cip_cm_fwd_open_rsp_success(cip_req_info_t *preq_info, proto_tree *tree, /* See if we've captured the ForwardOpen request. If so some of the conversation data has already been populated and we just need to update it. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return parsed_len + app_rep_size; if ((preq_info != NULL) && (preq_info->connInfo != NULL)) @@ -6584,7 +6584,7 @@ static void dissect_cip_cm_fwd_close_req(proto_tree* cmd_data_tree, tvbuff_t* tv hf_cip_cm_conn_serial_num, hf_cip_cm_vendor, hf_cip_cm_orig_serial_num, &conn_triad); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) enip_mark_connection_triad(pinfo, &conn_triad); /* Add the path size */ diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 2c8c65ee62..26edf197c3 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -1760,7 +1760,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int if (compute_crc) { /* Determine if packet timestamp results in rollover count increment */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if ((timestamp != 0) && (timestamp < safety_info->eip_conn_info->safety.running_timestamp_value)) { @@ -1849,7 +1849,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int if (compute_crc) { /* Determine if packet timestamp results in rollover count increment */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if ((timestamp != 0) && (timestamp < safety_info->eip_conn_info->safety.running_timestamp_value)) { diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 5447ed588a..4596f60d00 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -274,7 +274,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d conversation_add_proto_data(conversation, proto_classicstun, classicstun_info); } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if (((msg_type & CLASS_MASK) >> 4) == REQUEST) { /* This is a request */ classicstun_trans=wmem_new(wmem_file_scope(), classicstun_transaction_t); diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 9e1486d9b0..9efb971721 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1034,7 +1034,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data wmem_map_insert(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value), pdus_array); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * XXX - yes, we're setting all the fields in this * structure, but there's padding between op_code @@ -1084,7 +1084,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (pdus_array == NULL) /* There's no request with this handle value */ return offset; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 611af7d55e..4064100d69 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -971,7 +971,7 @@ dissect_cp2179_pdu(tvbuff_t *cp2179_tvb, packet_info *pinfo, proto_tree *tree, v /* set information for Information column for CP2179 */ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext_const(message_type, &cp2179_messagetype_vals_ext, "Unknown Message Type")); - if (!pinfo->fd->flags.visited){ + if (!pinfo->fd->visited){ conversation_t *conversation = NULL; cp2179_conversation *conv_data = NULL; diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index fd61223b04..1b70edc1f1 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -1041,7 +1041,7 @@ dissect_cql_tcp_pdu(tvbuff_t* raw_tvb, packet_info* pinfo, proto_tree* tree, voi offset += 4; /* Track the request/response. */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (server_to_client == 0) { /* This is a request, add it to this stream tracking */ cql_trans = cql_transaction_add_request(cql_conv, pinfo, stream, 0); diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 412c737253..229cd9eca0 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -897,7 +897,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr } /* setup request/response matching */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ wmem_tree_key_t tkey[4]; ctdb_control=wmem_new(wmem_file_scope(), ctdb_control_t); @@ -961,7 +961,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ return offset; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ ctdb_control->response_in = pinfo->num; } @@ -1087,7 +1087,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset+=datalen; /* setup request/response matching */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ wmem_tree_key_t tkey[3]; ctdb_trans=wmem_new(wmem_file_scope(), ctdb_trans_t); diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 8dd7b43096..8ec9075c9b 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -660,7 +660,7 @@ void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, packet_info *pinfo, * has been completely constructed. If we've already seen this * frame, there's nothing to do. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return; if (is_null_pol(policy_hnd)) @@ -731,7 +731,7 @@ static void dcerpc_store_polhnd_type(e_ctx_hnd *policy_hnd, packet_info *pinfo, * has been completely constructed. If we've already seen this * frame, there's nothing to do. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return; if (is_null_pol(policy_hnd)) @@ -760,7 +760,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo, * has been completely constructed. If we've already seen this * frame, there's nothing to do. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return; if (is_null_pol(policy_hnd)) @@ -1057,7 +1057,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, * actual object so just show it as <...> for the time being. */ if((param&PIDL_POLHND_OPEN) - && !pinfo->fd->flags.visited + && !pinfo->fd->visited && !di->conformant_run){ char *pol_string=NULL; const char *pol_name=NULL; @@ -1074,7 +1074,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* Track this policy handle for the response */ - if(!pinfo->fd->flags.visited + if(!pinfo->fd->visited && !di->conformant_run){ dcerpc_call_value *dcv; diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index e45c3bd0bd..2bf8cc82c7 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -771,7 +771,7 @@ SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, tvb, offset, pinfo, tree, di, drep, sizeof(guint16), hf_printerdata_value, TRUE, &value_name); /* GetPrinterData() stores the printerdata in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data && value_name){ dcv->se_data = wmem_strdup(wmem_file_scope(), value_name); } @@ -854,7 +854,7 @@ SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, hf_printerdata_value, TRUE, &value_name); /* GetPrinterDataEx() stores the key/value in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ dcv->se_data = wmem_strdup_printf(wmem_file_scope(), "%s==%s", @@ -942,7 +942,7 @@ SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, hf_printerdata_value, TRUE, &value_name); /* GetPrinterDataEx() stores the key/value in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ dcv->se_data = wmem_strdup(wmem_file_scope(), value_name?value_name:""); @@ -2465,7 +2465,7 @@ SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, name = (char *)dcv->private_data; /* OpenPrinterEx() stores the key/value in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ dcv->se_data = wmem_strdup(wmem_file_scope(), name?name:""); @@ -2538,7 +2538,7 @@ SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset, } else { pol_name = "Unknown OpenPrinterEx() handle"; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcerpc_store_polhnd_name(&policy_hnd, pinfo, pol_name); } @@ -3018,7 +3018,7 @@ SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, tvb, offset, pinfo, tree, di, drep, sizeof(guint16), hf_servername, TRUE, &name); /* ReplyOpenPrinter() stores the printername in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ if(name){ dcv->se_data = wmem_strdup(wmem_file_scope(), name); @@ -3075,7 +3075,7 @@ SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, } else { pol_name = "Unknown ReplyOpenPrinter() handle"; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcerpc_store_polhnd_name(&policy_hnd, pinfo, pol_name); } @@ -3108,7 +3108,7 @@ SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* GetPrinter() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GINT_TO_POINTER((int)level); } @@ -3441,7 +3441,7 @@ SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* EnumForms() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GINT_TO_POINTER((int)level); } @@ -3566,7 +3566,7 @@ SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { pol_name = "Unknown AddPrinterEx() handle"; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcerpc_store_polhnd_name(&policy_hnd, pinfo, pol_name); } @@ -3731,7 +3731,7 @@ SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* GetPrinter() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GINT_TO_POINTER((int)level); } @@ -3948,7 +3948,7 @@ SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level); /* AddForm() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } @@ -4114,7 +4114,7 @@ SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_form_level, &level); /* GetForm() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } @@ -4409,7 +4409,7 @@ SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* EnumJobs() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } @@ -4552,7 +4552,7 @@ SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* GetJob() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } @@ -5271,7 +5271,7 @@ SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* EnumPrinterDrivers() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } @@ -5384,7 +5384,7 @@ SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, tvb, offset, pinfo, tree, di, drep, hf_level, &level); /* GetPrinterDriver2() stores the level in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcv->se_data = GUINT_TO_POINTER((int)level); } diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 7047e212dd..ac8d7d531d 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -260,7 +260,7 @@ svcctl_dissect_OpenSCManager_rqst(tvbuff_t *tvb, int offset, dn=""; /* OpenSCManager() stores the server\database in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ dcv->se_data=wmem_strdup_printf(wmem_file_scope(), "%s\\%s",mn,dn); } @@ -302,7 +302,7 @@ svcctl_dissect_OpenSCManager_reply(tvbuff_t *tvb, int offset, } else { pol_name = "Unknown OpenSCManagerW() handle"; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcerpc_store_polhnd_name(&policy_hnd, pinfo, pol_name); } @@ -344,7 +344,7 @@ svcctl_dissect_OpenSCManagerW_rqst(tvbuff_t *tvb, int offset, dn=""; /* OpenSCManager() stores the server\database in se_data */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(!dcv->se_data){ dcv->se_data=wmem_strdup_printf(wmem_file_scope(), "%s\\%s",mn,dn); } @@ -386,7 +386,7 @@ svcctl_dissect_OpenSCManagerW_reply(tvbuff_t *tvb, int offset, } else { pol_name = "Unknown OpenSCManagerW() handle"; } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ dcerpc_store_polhnd_name(&policy_hnd, pinfo, pol_name); } diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 8c0151f54e..e9eea18ae0 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2723,7 +2723,7 @@ PIDL_dissect_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } /* Save string to dcv->private_data */ if ((param & PIDL_STR_SAVE) - && (!pinfo->fd->flags.visited)) { + && (!pinfo->fd->visited)) { dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; dcv->private_data = wmem_strdup(wmem_file_scope(), s); } @@ -3112,7 +3112,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item, value = di->call_data; if (di->ptype == PDU_REQ) { - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { if (id > value->max_ptr) { value->max_ptr = id; } @@ -4063,7 +4063,7 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, match to the interface. XXX We assume that BINDs will NEVER be fragmented. */ - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { dcerpc_bind_key *key; dcerpc_bind_value *value; @@ -4356,7 +4356,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo, and if so dissect the full pdu. then exit */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { fd_head = fragment_get_reassembled(&dcerpc_co_reassembly_table, frame); goto end_cn_stub; } @@ -4519,7 +4519,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo, dcerpc_matched_key matched_key, *new_matched_key; dcerpc_call_value *value; - /* !!! we can NOT check flags.visited here since this will interact + /* !!! we can NOT check visited here since this will interact badly with when SMB handles (i.e. calls the subdissector) and desegmented pdu's . Instead we check if this pdu is already in the matched table or not @@ -4684,7 +4684,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo, } else { dcerpc_matched_key matched_key, *new_matched_key; - /* !!! we can NOT check flags.visited here since this will interact + /* !!! we can NOT check visited here since this will interact badly with when SMB handles (i.e. calls the subdissector) and desegmented pdu's . Instead we check if this pdu is already in the matched table or not @@ -4851,7 +4851,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo, } else { dcerpc_matched_key matched_key, *new_matched_key; - /* !!! we can NOT check flags.visited here since this will interact + /* !!! we can NOT check visited here since this will interact badly with when SMB handles (i.e. calls the subdissector) and desegmented pdu's . Instead we check if this pdu is already in the matched table or not @@ -4966,7 +4966,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo, } } if (hdr->flags&PFC_FIRST_FRAG) { /* FIRST fragment */ - if ( (!pinfo->fd->flags.visited) && value->rep_frame ) { + if ( (!pinfo->fd->visited) && value->rep_frame ) { fragment_add_seq_next(&dcerpc_co_reassembly_table, stub_tvb, 0, pinfo, value->rep_frame, NULL, @@ -5011,7 +5011,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo, } } } else { /* MIDDLE fragment(s) */ - if ( (!pinfo->fd->flags.visited) && value->rep_frame ) { + if ( (!pinfo->fd->visited) && value->rep_frame ) { fragment_add_seq_next(&dcerpc_co_reassembly_table, stub_tvb, 0, pinfo, value->rep_frame, NULL, @@ -6102,7 +6102,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item *pi; proto_item *parent_pi; - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { dcerpc_call_value *call_value; dcerpc_dg_call_key *call_key; @@ -6181,7 +6181,7 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item *pi; proto_item *parent_pi; - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { dcerpc_call_value *call_value; dcerpc_dg_call_key call_key; @@ -6243,7 +6243,7 @@ dissect_dcerpc_dg_ping_ack(tvbuff_t *tvb, int offset, packet_info *pinfo, e_dce_dg_common_hdr_t *hdr, conversation_t *conv) { proto_item *parent_pi; -/* if (!(pinfo->fd->flags.visited)) {*/ +/* if (!(pinfo->fd->visited)) {*/ dcerpc_call_value *call_value; dcerpc_dg_call_key call_key; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 33a53f2c7d..ce8ea404de 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1339,7 +1339,7 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } if (pdus_tree) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (flags_bits & DIAM_FLAGS_R) { /* This is a request */ diameter_pair = wmem_new(wmem_file_scope(), diameter_req_ans_pair_t); diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index dd95560a9e..96d881a207 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -110,7 +110,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_ conversation_add_proto_data(conversation, proto_djiuav, djiuav_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (is_cmd) { djiuav_trans=wmem_new(wmem_file_scope(), djiuav_transaction_t); djiuav_trans->request_frame=pinfo->num; diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index a04e80e793..cd65cb0a09 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1355,7 +1355,7 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) dmp_key = wmem_new (wmem_file_scope(), dmp_id_key); - if (!pinfo->fd->flags.visited && + if (!pinfo->fd->visited && (dmp.msg_type == REPORT || dmp.msg_type == NOTIF)) { /* Try to match corresponding message */ @@ -1388,7 +1388,7 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) dmp_data = (dmp_id_val *) wmem_map_lookup (dmp_id_hash_table, dmp_key); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (dmp_data) { if (dmp.msg_type == ACK) { /* Only save this data if positive ack */ @@ -1481,7 +1481,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, } } else if (dmp.checksum && !dmp.id_val->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, tvb, offset, 0, ENC_NA); - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ expert_add_info(pinfo, en, &ei_analysis_ack_missing); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 8e1939e7a7..4c56316d45 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -3405,7 +3405,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* static guint al_fragment_aging = 64; /* sequence numbers only 6 bit */ fragment_head *frag_al = NULL; pinfo->fragmented = TRUE; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { frag_al = fragment_add_seq_single_aging(&al_reassembly_table, al_tvb, 0, pinfo, tr_seq, NULL, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index f619cf4add..260d439f37 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -3778,7 +3778,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, key[2].length = 0; key[2].key = NULL; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (!(flags&F_RESPONSE)) { /* This is a request */ gboolean new_transaction = FALSE; diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index 62cb432125..3fa638521e 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -5383,7 +5383,7 @@ static int dof_dissect_dpp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree { col_append_fstr(pinfo->cinfo, COL_INFO, "DNP/DPP Negotiation"); - if (pinfo->fd->flags.visited && + if (pinfo->fd->visited && api_data->transport_session->negotiation_required && ((api_data->transport_session->negotiation_complete_at == 0) || (api_data->transport_session->negotiation_complete_at_ts.secs - api_data->transport_session->session_start_ts.secs > 10))) { diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 341cbecdc3..0534cff773 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1202,7 +1202,7 @@ void proto_register_dplay(void) { "short player message", "dplay.flags.short_player_msg", FT_BOOLEAN, 32, TFS(&tfs_dplay_flag), DPLAY_FLAG_SHORT_PLAYER_MSG, "Short Player Msg", HFILL}}, { &hf_dplay_flags_ignored, - { "ignored", "dplay.flags.ignored", FT_BOOLEAN, 32, + { "ignored", "dplay.ignored", FT_BOOLEAN, 32, TFS(&tfs_dplay_flag), DPLAY_FLAG_IGNORED, NULL, HFILL}}, { &hf_dplay_flags_can_join, { "can join", "dplay.flags.can_join", FT_BOOLEAN, 32, diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 1252acd55f..9c3154ec5f 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -400,7 +400,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* try decryption only the first time we see this packet * (to keep cipher synchronized) */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) ssl_session = NULL; /* Initialize the protocol column; we'll set it later when we diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index f18e61210d..946a7e600e 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -909,7 +909,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) eap_identity_item = proto_tree_add_item(eap_tree, hf_eap_identity, tvb, offset, size, ENC_ASCII|ENC_NA); dissect_eap_identity(tvb, pinfo, eap_identity_item, offset, size); } - if(!pinfo->fd->flags.visited) { + if(!pinfo->fd->visited) { conversation_state->leap_state = 0; conversation_state->eap_tls_seq = -1; } @@ -1046,7 +1046,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* * We haven't - does this message require reassembly? */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * This is the first time we've looked at this frame, * so it wouldn't have any remembered information. @@ -1172,7 +1172,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) * We're finished reassembing this frame. * Reinitialize the reassembly state. */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) conversation_state->eap_tls_seq = -1; } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 348deb78f2..c4b416cf6b 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -831,7 +831,7 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr request_info = NULL; request_val = (enip_request_val_t *)wmem_map_lookup( enip_request_hashtable, prequest_key ); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if ( prequest_key && prequest_key->requesttype == ENIP_REQUEST_PACKET ) { @@ -1074,7 +1074,7 @@ enip_open_cip_connection( packet_info *pinfo, cip_conn_info_t* connInfo) enip_conv_info_t *enip_info; address dest_address; - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return; // Don't create connections for Null Forward Opens. @@ -1222,7 +1222,7 @@ enip_close_cip_connection(packet_info *pinfo, const cip_connection_triad_t* tria enip_conn_key_t conn_key; enip_conn_val_t *conn_val; - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) return; conn_key.triad = *triad; @@ -2758,7 +2758,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, case CONNECTION_TRANSPORT: // 2nd item for: Connected messages (both Class 0/1 and Class 3) // Save the connection info for the conversation filter - if (!pinfo->fd->flags.visited && conn_info) + if (!pinfo->fd->visited && conn_info) { p_add_proto_data(wmem_file_scope(), pinfo, proto_enip, ENIP_CONNECTION_INFO, conn_info); } diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 2f1ec93299..5e3e9456ed 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -245,7 +245,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree offset += 2 + elen; } col_append_fstr(pinfo->cinfo, COL_INFO, " %s port=%d", name, port); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, ENDPOINT_TCP, port, 0, NO_PORT2); conversation_set_dissector(conv, edp_handle); } diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 38f1432bc3..20b2cc9d5b 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -752,7 +752,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean /* Set up LUN data. OXID + LUN make up unique exchanges, but LUN is populated in subdissectors and not necessarily in every frame. Stub it here for now */ fchdr->lun = 0xFFFF; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { fchdr->lun = (guint16)GPOINTER_TO_UINT(wmem_tree_lookup32(fc_conv_data->luns, fchdr->oxid)); } @@ -1150,7 +1150,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean key) when packets are guaranteed to be parsed consecutively */ /* Set up LUN data */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { wmem_tree_insert32(fc_conv_data->luns, fchdr->oxid, GUINT_TO_POINTER((guint)fchdr->lun)); } @@ -1173,7 +1173,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean fchdr->fc_ex = fc_ex; /* populate the exchange struct */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){ fc_ex->first_exchange_frame=pinfo->num; fc_ex->fc_time = pinfo->abs_ts; diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 5505a53618..30e52cfc41 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -326,7 +326,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro lun = tvb_get_guint8(tvb, offset+1); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { proto_data = wmem_new(wmem_file_scope(), fcp_proto_data_t); proto_data->lun = lun; p_add_proto_data(wmem_file_scope(), pinfo, proto_fcp, 0, proto_data); @@ -356,7 +356,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro } /* populate the exchange struct */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){ request_data->itlq->first_exchange_frame=pinfo->num; request_data->itlq->fc_time = pinfo->abs_ts; @@ -474,7 +474,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot request_data->response_frame = pinfo->num; /* populate the exchange struct */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){ request_data->itlq->first_exchange_frame=pinfo->num; request_data->itlq->fc_time = pinfo->abs_ts; @@ -662,7 +662,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* Lun is only populated by FCP_IU_CMD, and subsequent packets assume the same lun. The only way that consistently works is to save the lun on the first pass when packets are guaranteed to be parsed consecutively */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { proto_data = wmem_new(wmem_file_scope(), fcp_proto_data_t); proto_data->lun = fchdr->lun; p_add_proto_data(wmem_file_scope(), pinfo, proto_fcp, 0, proto_data); diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 9c24767c8b..55de4126bb 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -490,7 +490,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* 0, 0, &(pinfo->rel_ts)); PROTO_ITEM_SET_GENERATED(item); - if (pinfo->fd->flags.ref_time) { + if (pinfo->fd->ref_time) { ti = proto_tree_add_item(fh_tree, hf_frame_time_reference, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(ti); } @@ -520,10 +520,10 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* PROTO_ITEM_SET_GENERATED(ti); } - ti = proto_tree_add_boolean(fh_tree, hf_frame_marked, tvb, 0, 0,pinfo->fd->flags.marked); + ti = proto_tree_add_boolean(fh_tree, hf_frame_marked, tvb, 0, 0,pinfo->fd->marked); PROTO_ITEM_SET_GENERATED(ti); - ti = proto_tree_add_boolean(fh_tree, hf_frame_ignored, tvb, 0, 0,pinfo->fd->flags.ignored); + ti = proto_tree_add_boolean(fh_tree, hf_frame_ignored, tvb, 0, 0,pinfo->fd->ignored); PROTO_ITEM_SET_GENERATED(ti); if (pinfo->rec->rec_type == REC_TYPE_PACKET) { @@ -549,7 +549,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } } - if (pinfo->fd->flags.ignored) { + if (pinfo->fd->ignored) { /* Ignored package, stop handling here */ col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>"); proto_tree_add_boolean_format(tree, hf_frame_ignored, tvb, 0, 0, TRUE, "This frame is marked as ignored"); @@ -712,10 +712,10 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } /* Attempt to (re-)calculate color filters (if any). */ - if (pinfo->fd->flags.need_colorize) { + if (pinfo->fd->need_colorize) { color_filter = color_filters_colorize_packet(fr_data->color_edt); pinfo->fd->color_filter = color_filter; - pinfo->fd->flags.need_colorize = 0; + pinfo->fd->need_colorize = 0; } else { color_filter = pinfo->fd->color_filter; } diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index eee9032d44..d16933b1ac 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -221,7 +221,7 @@ static void create_and_link_data_conversation(packet_info *pinfo, const char *method) { /* Only to do on first pass */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { return; } @@ -885,7 +885,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ftp_conversation_t *p_ftp_conv = find_or_create_ftp_conversation(pinfo); /* Store the current working directory */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { store_directory_in_packet(pinfo, p_ftp_conv); } @@ -1006,13 +1006,13 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * Responses to CWD command. */ if (code == 250) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (p_ftp_conv && p_ftp_conv->last_command) { /* Explicit Change Working Directory command */ if (strncmp(p_ftp_conv->last_command, "CWD ", 4) == 0) { process_cwd_success(p_ftp_conv, p_ftp_conv->last_command+4); /* Update path in packet */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { store_directory_in_packet(pinfo, p_ftp_conv); } } @@ -1020,7 +1020,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) else if (strncmp(p_ftp_conv->last_command, "CDUP", 4) == 0) { process_cwd_success(p_ftp_conv, ".."); /* Update path in packet */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { store_directory_in_packet(pinfo, p_ftp_conv); } } @@ -1032,13 +1032,13 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * Responses to PWD command. Overwrite whatever is stored - this is the truth! */ if (code == 257) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (p_ftp_conv && linelen >= 4) { /* Want directory name, which will be between " " */ process_pwd_success(p_ftp_conv, line+4, linelen-4, pinfo, pi); /* Update path in packet */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { store_directory_in_packet(pinfo, p_ftp_conv); } } @@ -1250,7 +1250,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } /* If this is a command resulting in an ftp-data stream, show details */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* Look up what has been stored for this frame */ ftp_data_conversation_t *ftp_data = (ftp_data_conversation_t *)g_hash_table_lookup(ftp_command_to_data_hash, GUINT_TO_POINTER(pinfo->num)); @@ -1349,7 +1349,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (p_ftp_data_conv) { /* First time around, update info. */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (!p_ftp_data_conv->first_frame_num) { p_ftp_data_conv->first_frame_num = pinfo->num; p_ftp_data_conv->first_frame_time = pinfo->abs_ts; diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c index 21bc18702f..ada3dee2d1 100644 --- a/epan/dissectors/packet-geonw.c +++ b/epan/dissectors/packet-geonw.c @@ -2412,7 +2412,7 @@ dissect_geonw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U // XXX Is it possible to "follow" a station when updating its GN_ADDR? - if(geonw_analyze_seq && !(pinfo->fd->flags.visited)) { + if(geonw_analyze_seq && !(pinfo->fd->visited)) { // Duplication detection uses SN and TST or only TST (see Annex A of ETSI EN 302 636-4-1) // We rely on address type and hashtable as this shall be done on a per station basis (i.e. not over a conversation) // We do not try to consider GN_ADDR updates (due to duplicate address detection or anonymous setting) diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 59410b51b4..61b8a487d1 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -240,7 +240,7 @@ * So, how do I differentiate between the initial processing of incoming * packets, and a user clickin on one ? Good question. * - * I leverage the pinfo_fd->flags.visited on a per frame + * I leverage the pinfo_fd->visited on a per frame * basis. * * To quote from the ever helpful development list @@ -2012,7 +2012,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p /* look it up directly, later ie: FN -> MFN -> giop_sub_handle_t and repoid */ /* but only if user not clicking */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) add_sub_handle_repoid_to_comp_req_list(pinfo->num, subdiss, repoid); @@ -4159,7 +4159,7 @@ static void dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree * Save FN and MFN in complete_reply_hash, only if user is NOT clicking */ - if (! pinfo->fd->flags.visited) { + if (! pinfo->fd->visited) { mfn = get_mfn_from_fn_and_reqid(pinfo->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ if (mfn != pinfo->num) { /* if mfn is not fn, good */ insert_in_complete_reply_hash(pinfo->num, mfn); @@ -4225,7 +4225,7 @@ static void dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, * Save FN and MFN in complete_reply_hash, only if user is NOT clicking */ - if (! pinfo->fd->flags.visited) { + if (! pinfo->fd->visited) { mfn = get_mfn_from_fn_and_reqid(pinfo->num, request_id, &pinfo->dst, pinfo->destport); /* find MFN for this FN */ if (mfn != pinfo->num) { /* if mfn is not fn, good */ insert_in_complete_reply_hash(pinfo->num, mfn); @@ -4388,7 +4388,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, * Save FN, reqid, and operation for later. Add sub_handle later. * But only if user is NOT clicking. */ - if (! pinfo->fd->flags.visited) + if (! pinfo->fd->visited) giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->num, request_id, operation, NULL, &pinfo->src, pinfo->srcport); @@ -4511,7 +4511,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, * But only if user is NOT clicking. */ - if (! pinfo->fd->flags.visited) + if (! pinfo->fd->visited) giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list, pinfo->num, request_id, operation, NULL, &pinfo->src, pinfo->srcport); @@ -4977,7 +4977,7 @@ dissect_giop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * we've already done this work, so we don't need to do it * again. */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { conversation = find_or_create_conversation(pinfo); @@ -5779,7 +5779,7 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (repo_id_buf) { if (pinfo) { - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) insert_in_objkey_hash(giop_objkey_hash, objkey, seqlen, repo_id_buf, ior_src_req_res); } else { diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 450c65933a..74af3f1834 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -3693,7 +3693,7 @@ be_aoip_trans_lay_add(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint break; } - if ((!pinfo->fd->flags.visited) && rtp_port != 0) { + if ((!pinfo->fd->visited) && rtp_port != 0) { rtp_add_address(pinfo, PT_UDP, &rtp_dst_addr, rtp_port, 0, "BSS MAP", pinfo->num, FALSE, 0); rtcp_add_address(pinfo, &rtp_dst_addr, rtp_port+1, 0, "BSS MAP", pinfo->num); } diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 0aaf59e071..e605ade305 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -232,7 +232,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* First of all, if it's the first time we see this packet * then check whether we are in the middle of reassembly or not */ - if( (!pinfo->fd->flags.visited) + if( (!pinfo->fd->visited) && (gss_info->do_reassembly) && (gssapi_reassembly) ){ fi=(gssapi_frag_info_t *)wmem_tree_lookup32(gss_info->frags, gss_info->first_frame); @@ -261,7 +261,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* We have seen this packet before. * Is this blob part of reassembly or a normal blob ? */ - if( (pinfo->fd->flags.visited) + if( (pinfo->fd->visited) && (gssapi_reassembly) ){ fi=(gssapi_frag_info_t *)wmem_tree_lookup32(gss_info->frags, pinfo->num); if(fi){ @@ -352,7 +352,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * doesn't dereference it or free what it points to.) */ oidvalue = (gssapi_oid_value *)p_get_proto_data(wmem_file_scope(), pinfo, proto_gssapi, 0); - if (!oidvalue && !pinfo->fd->flags.visited) + if (!oidvalue && !pinfo->fd->visited) { /* No handle attached to this frame, but it's the first */ /* pass, so it'd be attached to the conversation. */ @@ -401,7 +401,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * instead for simplicity we assume there will not be several * such authentication at once on a single tcp session */ - if( (!pinfo->fd->flags.visited) + if( (!pinfo->fd->visited) && (oidvalue) && (tvb_captured_length(gss_tvb)==tvb_reported_length(gss_tvb)) && (len1>(guint32)tvb_captured_length_remaining(gss_tvb, oid_start_offset)) diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 243747729b..b6a8502daa 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1471,7 +1471,7 @@ static void dissect_readreg_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p col_append_str(pinfo->cinfo, COL_INFO, address_string); } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { gvcp_trans->addr_list = wmem_array_new(wmem_file_scope(), sizeof(guint32)); } @@ -1491,7 +1491,7 @@ static void dissect_readreg_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p /* For block read register request, address gets re-initialized here in the for loop */ addr = tvb_get_ntohl(tvb, offset); - if (gvcp_trans && (!pinfo->fd->flags.visited)) + if (gvcp_trans && (!pinfo->fd->visited)) { wmem_array_append_one(gvcp_trans->addr_list, addr); } @@ -1662,7 +1662,7 @@ static void dissect_writemem_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, /* fill in Info column in Wireshark GUI */ col_append_fstr(pinfo->cinfo, COL_INFO, "%s: %d bytes", address_string, (length - 4)); - if (gvcp_trans && (!pinfo->fd->flags.visited)) + if (gvcp_trans && (!pinfo->fd->visited)) { gvcp_trans->addr_list = wmem_array_new(wmem_file_scope(), sizeof(guint32)); wmem_array_append_one(gvcp_trans->addr_list, addr); @@ -2337,7 +2337,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi conversation_add_proto_data(conversation, proto_gvcp, gvcp_info); } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if (key_code == 0x42) { @@ -2468,7 +2468,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi break; } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if (key_code == 0x42) { diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 2c20b93263..5d09e0acf6 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1690,7 +1690,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t h225_pi->h245_address = ipv4_address; h225_pi->h245_port = ip_port; } - if ( !actx->pinfo->fd->flags.visited && h245_handle && ip_port!=0 ) { + if ( !actx->pinfo->fd->visited && h245_handle && ip_port!=0 ) { address src_addr; conversation_t *conv=NULL; diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 90f1e3f881..8a024e6de4 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -8734,7 +8734,7 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a #line 129 "./asn1/h245/h245.cnf" gint32 temp; - upcoming_olc = (!actx->pinfo->fd->flags.visited) ? wmem_new0(wmem_file_scope(), olc_info_t) : NULL; + upcoming_olc = (!actx->pinfo->fd->visited) ? wmem_new0(wmem_file_scope(), olc_info_t) : NULL; h223_fw_lc_num = 0; h223_lc_params_temp = NULL; @@ -11081,7 +11081,7 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t const gchar *olc_key; olc_info_t *olc_req; - upcoming_olc = (!actx->pinfo->fd->flags.visited) ? wmem_new0(wmem_packet_scope(), olc_info_t) : NULL; + upcoming_olc = (!actx->pinfo->fd->visited) ? wmem_new0(wmem_packet_scope(), olc_info_t) : NULL; h223_fw_lc_num = 0; h223_rev_lc_num = 0; diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 0900ac8836..5a47d3af21 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -1230,7 +1230,7 @@ hartip_set_conversation(packet_info *pinfo) { conversation_t *conversation = NULL; - if (!pinfo->fd->flags.visited && (pinfo->ptype == PT_UDP)) { + if (!pinfo->fd->visited && (pinfo->ptype == PT_UDP)) { /* * This function is called for a session initiate send over UDP. * The session initiate is sent to the server on port HARTIP_PORT. diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index ad23d86353..c6bce208cd 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -148,7 +148,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) key[1].length = 1; key[1].key = &k_adapter_id; - if (!pinfo->fd->flags.visited && opcode == 0x01) { /* Delete Index */ + if (!pinfo->fd->visited && opcode == 0x01) { /* Delete Index */ guint32 *disconnect_in_frame; key[2].length = 1; diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 0425a3608d..923ad27c49 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -161,7 +161,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bluetooth_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; next_tvb = tvb_new_subset_remaining(tvb, offset); - if (!pinfo->fd->flags.visited && usb_conv_info->endpoint <= 0x02 && + if (!pinfo->fd->visited && usb_conv_info->endpoint <= 0x02 && tvb_captured_length(tvb) == tvb_reported_length(tvb)) { fragment_info_t *fragment_info; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index a36dbeb3a4..95251ddb89 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -2349,7 +2349,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]); - if ((!pinfo->fd->flags.visited && (dirdata->current_frag_bytes > 0)) || + if ((!pinfo->fd->visited && (dirdata->current_frag_bytes > 0)) || ((value = g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->num))) != NULL)) { /* then we are continuing an already-started pdu */ @@ -2358,11 +2358,11 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr gboolean complete; #ifdef DEBUG_DESEGMENT - g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->flags.visited?1:0, + g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->visited?1:0, dirdata->current_frag_bytes, pinfo->num, dirdata->current_frag_id); #endif - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint32 tot_len; fid = dirdata->current_frag_id; tot_len = dirdata->current_frag_minlen; @@ -2377,7 +2377,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr #endif } else { fid = GPOINTER_TO_UINT(value); - /* these values are unused by fragment_add if pinfo->fd->flags.visited */ + /* these values are unused by fragment_add if pinfo->fd->visited */ dirdata->current_frag_bytes = 0; complete = FALSE; } diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index d78eaa5135..7e0252581e 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -485,7 +485,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* this is the first time we are looking at this frame during a * capture dissection, so we know the dissection is done in * frame order (subsequent dissections may be random access) */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { wlan_radio_info = wmem_new0(wmem_file_scope(), struct wlan_radio); p_add_proto_data(wmem_file_scope(), pinfo, proto_wlan_radio, 0, wlan_radio_info); @@ -1114,7 +1114,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } } - if (!pinfo->fd->flags.visited && have_duration && phdr->has_tsf_timestamp) { + if (!pinfo->fd->visited && have_duration && phdr->has_tsf_timestamp) { if (current_aggregate) { current_aggregate->duration = agg_preamble + prior_duration + duration; if (previous_frame.radio_info && previous_frame.radio_info->aggregate == current_aggregate) @@ -1223,7 +1223,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, tap_queue_packet(wlan_radio_timeline_tap, pinfo, wlan_radio_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { previous_frame.radio_info = wlan_radio_info; } } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 088d6c88f9..854847a5b4 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -24298,7 +24298,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, * data: last seq_control seen and frame number */ retransmitted = FALSE; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { retransmit_key key; retransmit_key *result; @@ -24344,7 +24344,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, } } - if (enable_decryption && !pinfo->fd->flags.visited && (len == reported_len)) { + if (enable_decryption && !pinfo->fd->visited && (len == reported_len)) { /* The processing will take care of 4-way handshake sessions for WPA and WPA2 decryption */ next_tvb = try_decrypt(tvb, pinfo, hdr_len, reported_len, TRUE, &algorithm, &sec_header, &sec_trailer, &used_key); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 1902845515..48408cb61c 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1812,7 +1812,7 @@ ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* Get the address. */ packet->src16 = tvb_get_letohs(tvb, offset); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* If we know our extended source address from previous packets, * provide a pointer to it in a hint for upper layers */ addr16.addr = packet->src16; @@ -3401,7 +3401,7 @@ dissect_ieee802154_disassoc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* switch */ } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Update the address tables */ if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT ) { ieee802154_long_addr_invalidate(packet->dst64, pinfo->num); diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index 81af816cea..3ca886728a 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -120,7 +120,7 @@ imap_match_request(packet_info *pinfo, proto_tree *tree, imap_request_key_t *req request_info = NULL; request_val = (imap_request_val_t *)wmem_map_lookup(imap_requests, request_key); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if (is_request) { diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index e0b8cc7a1d..cce5a8845f 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -3317,7 +3317,7 @@ static void save_conversation_info(packet_info *pinfo, guint8 *local_gid, guint8 { /* the following saves information about the conversation this packet defines, so there's no point in doing it more than once per packet */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { connection_context *connection; conversation_infiniband_data *proto_data; @@ -3630,7 +3630,7 @@ static void update_conversation_info(packet_info *pinfo, { /* the following saves information about the conversation this packet defines, so there's no point in doing it more than once per packet */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* get the previously saved context for this connection */ connection_context *connection; diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 142b64e8fd..7374a5150c 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1359,7 +1359,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* Sequence number analysis */ if (g_esp_do_sequence_analysis) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { check_esp_sequence_info(spi, sequence_number, pinfo); } show_esp_sequence_info(spi, sequence_number, diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index ca6bbfffc7..13aee9abce 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -692,7 +692,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* * Not a system packet - check for retransmissions. */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, ENDPOINT_NCP, pinfo->srcport, pinfo->srcport, 0); diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index f1aa7b2641..8fb19cb4d5 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -4368,7 +4368,7 @@ dissect_ikev2_fragmentation(tvbuff_t *tvb, int offset, proto_tree *tree, } /* During the first pass, store in the conversation the next_payload */ - if (!pinfo->fd->flags.visited && (fragment_number == 1)) { + if (!pinfo->fd->visited && (fragment_number == 1)) { /* Create/update conversation with message_id -> next_payload */ conversation_t* p_conv = find_or_create_conversation(pinfo); ikev2_fragmentation_state_t *p_state = wmem_new0(wmem_file_scope(), ikev2_fragmentation_state_t); @@ -4394,7 +4394,7 @@ dissect_ikev2_fragmentation(tvbuff_t *tvb, int offset, proto_tree *tree, /* If this is the last fragment, need to know what the payload type for the reassembled message is, which was included in the first fragment */ if (fragment_number == total_fragments) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* On first pass, get it from the conversation info */ conversation_t *p_conv = find_conversation_pinfo(pinfo, 0); if (p_conv != NULL) { diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index ef69f310aa..2ce24abb12 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -572,7 +572,7 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, tvbuff_t* tvb, proto_tree *tree, /* attach a conversation dissector to this address/port tuple */ - if (addr && !pinfo->fd->flags.visited) { + if (addr && !pinfo->fd->visited) { conversation_t *conv; conv = conversation_new(pinfo->num, addr, addr, ENDPOINT_TCP, port, port, NO_ADDR2|NO_PORT2); @@ -2487,7 +2487,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean chec in the middle of a large PDU transfer being misdissected as a PDU. */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(pduLen>(guint32)tvb_reported_length_remaining(tvb, offset)){ pinfo->want_pdu_tracking=2; pinfo->bytes_until_next_pdu=pduLen-tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-iso15765.c b/epan/dissectors/packet-iso15765.c index efec79f6d5..2ccc0d444f 100644 --- a/epan/dissectors/packet-iso15765.c +++ b/epan/dissectors/packet-iso15765.c @@ -215,7 +215,7 @@ dissect_iso15765(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data fragmented = TRUE; /* Save information */ - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { iso15765_frame_t *iso15765_frame = wmem_new0(wmem_file_scope(), iso15765_frame_t); iso15765_frame->seq = iso15765_info->seq = ++msg_seqid; iso15765_frame->len = full_len; @@ -236,7 +236,7 @@ dissect_iso15765(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data fragmented = TRUE; /* Save information */ - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { iso15765_info->seq = msg_seqid; } @@ -284,7 +284,7 @@ dissect_iso15765(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (iso15765_frame != NULL) { - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { frag_id += ((iso15765_frame->frag_id_high[frag_id]++) * 16); /* Save the frag_id for subsequent dissection */ iso15765_info->frag_id = frag_id; @@ -302,7 +302,7 @@ dissect_iso15765(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data fragment_head *frag_msg; /* Check if it's the last packet */ - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { /* Update the last_frag_id */ if (frag_id > iso15765_frame->last_frag_id) { iso15765_frame->last_frag_id = frag_id; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 4f351aa490..546570abcf 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -567,7 +567,7 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k { enc_key_t *new_key; - if(pinfo->fd->flags.visited){ + if(pinfo->fd->visited){ return; } @@ -911,7 +911,7 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k { service_key_t *new_key; - if(pinfo->fd->flags.visited){ + if(pinfo->fd->visited){ return; } diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index a1e7437ee6..654b94369f 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -11222,7 +11222,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr tcp_address_valid = FALSE; } /* Note: it *is* possible for a TCP SID to appear in an LBTTCP non-transport (UIM) message. */ - if ((pinfo->fd->flags.visited == 0) && (tcp_sid_info.set) && lbm_channel_is_unknown_transport_lbttcp(channel) && tcp_address_valid) + if ((pinfo->fd->visited == 0) && (tcp_sid_info.set) && lbm_channel_is_unknown_transport_lbttcp(channel) && tcp_address_valid) { lbttcp_transport_sid_add(&tcp_addr, tcp_port, pinfo->num, tcp_sid_info.session_id); } diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c index 6b42e506f4..d052fa5865 100644 --- a/epan/dissectors/packet-lbmpdm.c +++ b/epan/dissectors/packet-lbmpdm.c @@ -881,7 +881,7 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo, lbmpdm_definition_field_t * last_fixed_required_field = NULL; seglen = lbmpdm_get_segment_length(tvb, offset, encoding, &remaining_datalen); - if (pinfo->fd->flags.visited == 0) + if (pinfo->fd->visited == 0) { add_definition = TRUE; } diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 95428bac9c..4a7b007ef0 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1279,7 +1279,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if (lbtrm_sequence_analysis) { - if (pinfo->fd->flags.visited == 0) + if (pinfo->fd->visited == 0) { if (transport != NULL) { diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index b3df03c85e..60c6f85a63 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1406,7 +1406,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, copy_address_shallow(&receiver_address, &(pinfo->src)); receiver_port = pinfo->srcport; } - if (pinfo->fd->flags.visited == 0) + if (pinfo->fd->visited == 0) { transport = lbtru_transport_add(&source_address, source_port, session_id, pinfo->num); } @@ -1416,7 +1416,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } if (transport != NULL) { - if (pinfo->fd->flags.visited == 0) + if (pinfo->fd->visited == 0) { client = lbtru_client_transport_add(transport, &receiver_address, receiver_port, pinfo->num); if (client != NULL) diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 099b7a3f23..d7105914a9 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1306,7 +1306,7 @@ char *mechanism = NULL; * type and mechanism, if you can unbind and rebind with a * different type and/or mechanism. */ - if(!actx->pinfo->fd->flags.visited) { + if(!actx->pinfo->fd->visited) { mechanism = tvb_get_string_enc(wmem_file_scope(), parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb,0), ENC_UTF_8|ENC_NA); ldap_info->first_auth_frame = 0; /* not known until we see the bind reply */ /* @@ -3200,7 +3200,7 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset switch(ProtocolOp) { case LDAP_RES_SEARCH_ENTRY: - if (!actx->pinfo->fd->flags.visited) + if (!actx->pinfo->fd->visited) ldap_info->num_results++; proto_item_append_text(tree, " [%d result%s]", diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 0285ef31a8..9ae16064aa 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -37446,7 +37446,7 @@ dissect_lte_rrc_T_systemInfoValueTag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx /* Track whether systemInfoValue has changed since last seen, indicating new SI config TODO: add link back to previous config and (if known) time since previous config was first seen */ - if (!actx->pinfo->fd->flags.visited) { + if (!actx->pinfo->fd->visited) { if (system_info_value_current_set && (value != system_info_value_current)) { /* Add entry to the hash table. Offset by one to distinguish 0 from lookup failure */ wmem_map_insert(lte_rrc_system_info_value_changed_hash, GUINT_TO_POINTER(actx->pinfo->num), diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index c142fecb3b..94d7a0a508 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -1536,7 +1536,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(modbus_tree, hf_modbus_functioncode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Conversation support */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { conversation_t *conversation = NULL; modbus_conversation *modbus_conv_data = NULL; diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index f168d112ec..6f9506ed33 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -146,7 +146,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, packet_info *pinfo, const char *mountpoint=NULL; int offset = 0; - if((!pinfo->fd->flags.visited) && nfs_file_name_snooping){ + if((!pinfo->fd->visited) && nfs_file_name_snooping){ rpc_call_info_value *civ=(rpc_call_info_value *)data; if(civ->request && (civ->proc==1)){ diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 08865d1ea9..c5bd38d158 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -277,7 +277,7 @@ typedef struct mp2t_analysis_data { /* When detecting a CC drop, store that information for the * given frame. This info is needed, when clicking around in * wireshark, as the pid table data only makes sense during - * sequential processing. The flag pinfo->fd->flags.visited is + * sequential processing. The flag pinfo->fd->visited is * used to tell the difference. * */ @@ -647,7 +647,7 @@ mp2t_process_fragmented_payload(tvbuff_t *tvb, gint offset, guint remaining_len, } } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get values from our current PID analysis */ frag_cur_pos = pid_analysis->frag_cur_pos; frag_tot_len = pid_analysis->frag_tot_len; @@ -872,7 +872,7 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 skips = 0; /* The initial sequential processing stage */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* This is the sequential processing stage */ pid_data = get_pid_analysis(mp2t_data, pid); @@ -904,7 +904,7 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, } /* Save the info about the dropped packet */ - if (detected_drop && !pinfo->fd->flags.visited) { + if (detected_drop && !pinfo->fd->visited) { /* Lookup frame data, contains TS pid data objects */ frame_analysis_data_p = get_frame_analysis_data(mp2t_data, pinfo); if (!frame_analysis_data_p) @@ -922,7 +922,7 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, } /* See if we stored info about drops */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* Lookup frame data, contains TS pid data objects */ frame_analysis_data_p = get_frame_analysis_data(mp2t_data, pinfo); diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 741eb2bf83..9287e4341d 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -1104,7 +1104,7 @@ static void msmms_data_add_address(packet_info *pinfo, address *addr, endpoint_t /* If this isn't the first time this packet has been processed, * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 27a1f64969..d51e3044db 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -258,7 +258,7 @@ static void add_msproxy_conversation( packet_info *pinfo, conversation_t *conversation; redirect_entry_t *new_conv_info; - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* * We've already processed this frame once, so we * should already have done this. diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index a7c2ff29e0..22b791e9cc 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -154,7 +154,7 @@ msrp_add_address( packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } @@ -412,7 +412,7 @@ dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* * TODO Set up conversation here */ - if (pinfo->fd->flags.visited){ + if (pinfo->fd->visited){ /* Look for existing conversation */ conversation = find_or_create_conversation(pinfo); /* Set dissector */ diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index 68ade55f47..36ac83d505 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -1003,7 +1003,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* if this is the first time, do the reassemble things * else just check for reassembled data */ - if (pinfo->fd->flags.visited == FALSE) { + if (pinfo->fd->visited == FALSE) { /* if there was a flag in this tvb, the data found before the 1st flag * have to be treated differently than the data found after the last flag * this means we need to use different reass_seq_num when adding them to the reass. handler */ diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 232281e343..b82d8a47bb 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -884,7 +884,7 @@ static const int * mysql_fld_flags[] = { /* Helper function to only set state on first pass */ static void mysql_set_conn_state(packet_info *pinfo, mysql_conn_data_t *conn_data, mysql_state_t state) { - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { conn_data->state = state; } diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index aaa4b1c29a..7354c58689 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -104,7 +104,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U /* No, so just return the rest of the current packet */ return tvb_captured_length(tvb); } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ /* * Do we have a state structure for this transaction */ @@ -206,7 +206,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, conversation_add_proto_data(conversation, proto_nbd, nbd_info); } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(magic==NBD_REQUEST_MAGIC){ /* This is a request */ nbd_trans=wmem_new(wmem_file_scope(), nbd_transaction_t); diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 749b76b1b9..b52091a3cb 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -1632,7 +1632,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * so that it can attempt to find it in case it starts * somewhere in the middle of a segment. */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ /* 'Only' SMB is transported ontop of this so make sure * there is an SMB header there ... */ diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 84a674edc1..9f34b6562d 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -843,7 +843,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* First time through we will record the initial connection and task * values */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (conversation != NULL) { /* find the record telling us the * request made that caused this @@ -885,7 +885,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } } else { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (conversation != NULL) { /* find the record telling us the * request made that caused this diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 3c1938e6c9..1662a41ac6 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -6720,7 +6720,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, guint32 nw_connection, guint8 sequ return; } /* Has this already been dissected? */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Find the conversation whence the request would have come. */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, ENDPOINT_NCP, nw_connection, nw_connection, 0); @@ -6831,7 +6831,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, guint32 nw_connection, guint8 sequ /* Subsequent fragments should be offset by 16 since we do not need */ /* the additional fragment handle and size fields in our composite data */ /* Also do not add retransmitted packets, just mark and return */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { if (sequence != frags[frag_count].sequence) { fd_head = fragment_add_seq_next(&nds_reassembly_table, tvb, 16, pinfo, tid, NULL, len-16, request_value->nds_frag); @@ -6869,7 +6869,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, guint32 nw_connection, guint8 sequ tid++; } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { /* Now we need to find the original fragment number. */ /* Get the fragment flag */ @@ -7087,7 +7087,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo, } } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* This is the first time we've looked at this packet. Keep track of the address and connection whence the request came, and the address and connection to which the request @@ -7864,7 +7864,7 @@ dissect_nds_reply(tvbuff_t *tvb, packet_info *pinfo, * this EID and its associated name into our hash * so that we can resolve the name for other NDS * requests. */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if(add_eid) { request_eid_value = ncp_eid_hash_lookup(conversation, global_eid); @@ -7924,7 +7924,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo, } #endif - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Find the conversation whence the request would have come. */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, ENDPOINT_NCP, nw_connection, nw_connection, 0); @@ -8258,7 +8258,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, ENDPOINT_NCP, nw_connection, nw_connection, 0); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { request_value = ncp_hash_insert(conversation, sequence, ncp_rec, pinfo->num); request_value->req_frame_num = pinfo->num; request_value->req_frame_time=pinfo->abs_ts; @@ -9231,7 +9231,7 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS"); } - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { /* This is the first time we've looked at this packet. diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index b31f1a0e7d..5f67c4c1c3 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1255,7 +1255,7 @@ dissect_scsi_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo, hf_ndmp_scsi_device, offset, NULL); - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ /* new scsi device addressed, create a new itl structure */ get_itl_nexus(pinfo, TRUE); } @@ -1560,7 +1560,7 @@ dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_ndmp_tape_open_mode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ /* new scsi device addressed, create a new itl structure */ get_itl_nexus(pinfo, TRUE); } @@ -3063,7 +3063,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* */ if ( !(ndmp_rm & RPC_RM_LASTFRAG)) { - if ( !(pinfo->fd->flags.visited)) + if ( !(pinfo->fd->visited)) { nfi=wmem_new(wmem_file_scope(), ndmp_frag_info); nfi->first_seq = seq; @@ -3096,7 +3096,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* */ if ( !(ndmp_rm & RPC_RM_LASTFRAG)) { - if ( !(pinfo->fd->flags.visited)) + if ( !(pinfo->fd->visited)) { nfi=wmem_new(wmem_file_scope(), ndmp_frag_info); nfi->first_seq = seq; @@ -3213,7 +3213,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* ndmp_conv_data->task=NULL; switch(nh.type){ case NDMP_MESSAGE_REQUEST: - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ ndmp_conv_data->task=wmem_new(wmem_file_scope(), ndmp_task_data_t); ndmp_conv_data->task->request_frame=pinfo->num; ndmp_conv_data->task->response_frame=0; @@ -3233,7 +3233,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case NDMP_MESSAGE_REPLY: ndmp_conv_data->task=(ndmp_task_data_t *)wmem_map_lookup(ndmp_conv_data->tasks, GUINT_TO_POINTER(nh.rep_seq)); - if(ndmp_conv_data->task && !pinfo->fd->flags.visited){ + if(ndmp_conv_data->task && !pinfo->fd->visited){ ndmp_conv_data->task->response_frame=pinfo->num; if(ndmp_conv_data->task->itlq){ ndmp_conv_data->task->itlq->last_exchange_frame=pinfo->num; diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 6493256559..1b77ec0a82 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4258,7 +4258,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i return; } /* Has this already been dissected? */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { /* Lets see if this is a new conversation */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, @@ -4442,7 +4442,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g proto_tree *atree, *btree, *ctree, *dtree; proto_item *aitem, *bitem, *citem, *ditem, *expert_item; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { /* This is the first time we've looked at this packet. Keep track of the Program and connection whence the request @@ -6705,7 +6705,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int proto_item *expert_item; guint32 expert_status; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Find the conversation whence the request would have come. */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, ENDPOINT_NCP, (guint32) pinfo->destport, (guint32) pinfo->destport, 0); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 9b47eb25ef..b9cd988a56 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3787,7 +3787,7 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data observation domain id. */ if ((ver == 5) || (ver == 7) || (ver == 8) || (ver == 9) || (ver == 10)) { /* On first pass check sequence analysis */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (ver != 10) { flows_seen = pdus; /* i.e. use value from header rather than counted value */ } @@ -10543,7 +10543,7 @@ dissect_v9_v10_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p /* XXX: Is an Options template with only scope fields allowed for V9 ?? */ tmplt_p = (v9_v10_tmplt_t *)wmem_map_lookup(v9_v10_tmplt_table, &tmplt); - if (!pinfo->fd->flags.visited) { /* cache template info only during first pass */ + if (!pinfo->fd->visited) { /* cache template info only during first pass */ do { if (v9_tmplt_max_fields && ((option_scope_field_count > v9_tmplt_max_fields) @@ -10647,7 +10647,7 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut /* ToDo: expert warning if replacement (changed) and new template ignored. */ tmplt_p = (v9_v10_tmplt_t *)wmem_map_lookup(v9_v10_tmplt_table, &tmplt); - if (!pinfo->fd->flags.visited) { /* cache template info only during first pass */ + if (!pinfo->fd->visited) { /* cache template info only during first pass */ do { if ((count == 0) || (v9_tmplt_max_fields && (count > v9_tmplt_max_fields))) { diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 574283413e..5398418692 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1252,7 +1252,7 @@ nfs_name_snoop_fh(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int fh_of nfs_name_snoop_t *nns = NULL; /* if this is a new packet, see if we can register the mapping */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { key.key = 0; key.fh_length = fh_length; key.fh = (const unsigned char *)tvb_get_ptr(tvb, fh_offset, fh_length); @@ -2226,7 +2226,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * if (nfs_fhandle_reqrep_matching && (!hidden) ) { nfs_fhandle_data_t *old_fhd = NULL; - if ( !pinfo->fd->flags.visited ) { + if ( !pinfo->fd->visited ) { nfs_fhandle_data_t fhd; /* first check if we have seen this fhandle before */ @@ -2547,7 +2547,7 @@ dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, /* are we snooping fh to filenames ?*/ - if ((!pinfo->fd->flags.visited) && nfs_file_name_snooping) { + if ((!pinfo->fd->visited) && nfs_file_name_snooping) { /* NFS v2 LOOKUP, CREATE, MKDIR calls might give us a mapping*/ if ( (civ->prog == 100003) @@ -2884,7 +2884,7 @@ dissect_diropargs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre ett_nfs2_diropargs, &diropargs_item, label); /* are we snooping fh to filenames ?*/ - if ((!pinfo->fd->flags.visited) && nfs_file_name_snooping) { + if ((!pinfo->fd->visited) && nfs_file_name_snooping) { /* v2 LOOKUP, CREATE, MKDIR calls might give us a mapping*/ if ( (civ->prog == 100003) @@ -3660,7 +3660,7 @@ dissect_nfs3_fh(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, ett_nfs3_fh, NULL, name); /* are we snooping fh to filenames ?*/ - if ((!pinfo->fd->flags.visited) && nfs_file_name_snooping) { + if ((!pinfo->fd->visited) && nfs_file_name_snooping) { /* NFS v3 LOOKUP, CREATE, MKDIR, READDIRPLUS calls might give us a mapping*/ if ( ((civ->prog == 100003) @@ -4269,7 +4269,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr hf_nfs_name, name); /* are we snooping fh to filenames ?*/ - if ((!pinfo->fd->flags.visited) && nfs_file_name_snooping) { + if ((!pinfo->fd->visited) && nfs_file_name_snooping) { /* v3 LOOKUP, CREATE, MKDIR calls might give us a mapping*/ if ( (civ->prog == 100003) &&(civ->vers == 3) @@ -5533,7 +5533,7 @@ dissect_nfs3_entryplus(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_nfs3_filename(tvb, offset, entry_tree, hf_nfs3_readdirplus_entry_name, &name); /* are we snooping fh to filenames ?*/ - if ((!pinfo->fd->flags.visited) && nfs_file_name_snooping) { + if ((!pinfo->fd->visited) && nfs_file_name_snooping) { /* v3 READDIRPLUS replies will give us a mapping */ if ( (civ->prog == 100003) &&(civ->vers == 3) diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index 7e92e953b0..3d94527129 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -356,7 +356,7 @@ dissect_nlm_test(tvbuff_t *tvb, int offset, packet_info *pinfo, { if(nlm_match_msgres){ if(rpc_call->proc==6){ /* NLM_TEST_MSG */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_msg(pinfo, tvb, offset); } else { nlm_print_msgres_request(pinfo, tree, tvb); @@ -382,7 +382,7 @@ dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, { if(nlm_match_msgres){ if(rpc_call->proc==7){ /* NLM_LOCK_MSG */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_msg(pinfo, tvb, offset); } else { nlm_print_msgres_request(pinfo, tree, tvb); @@ -410,7 +410,7 @@ dissect_nlm_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo, { if(nlm_match_msgres){ if(rpc_call->proc==8){ /* NLM_CANCEL_MSG */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_msg(pinfo, tvb, offset); } else { nlm_print_msgres_request(pinfo, tree, tvb); @@ -436,7 +436,7 @@ dissect_nlm_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo, { if(nlm_match_msgres){ if(rpc_call->proc==9){ /* NLM_UNLOCK_MSG */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_msg(pinfo, tvb, offset); } else { nlm_print_msgres_request(pinfo, tree, tvb); @@ -460,7 +460,7 @@ dissect_nlm_granted(tvbuff_t *tvb, int offset, packet_info *pinfo, { if(nlm_match_msgres){ if(rpc_call->proc==10){ /* NLM_GRANTED_MSG */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_msg(pinfo, tvb, offset); } else { nlm_print_msgres_request(pinfo, tree, tvb); @@ -489,7 +489,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if(nlm_match_msgres){ if(rpc_call->proc==11){ /* NLM_TEST_RES */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_res(pinfo, tvb, offset); } else { nlm_print_msgres_reply(pinfo, tree, tvb); @@ -631,7 +631,7 @@ dissect_nlm_gen_reply(tvbuff_t *tvb, packet_info *pinfo _U_, || (rpc_call->proc==13) /* NLM_CANCEL_RES */ || (rpc_call->proc==14) /* NLM_UNLOCK_RES */ || (rpc_call->proc==15) ){ /* NLM_GRENTED_RES */ - if( (!pinfo->fd->flags.visited) ){ + if( (!pinfo->fd->visited) ){ nlm_register_unmatched_res(pinfo, tvb, offset); } else { nlm_print_msgres_reply(pinfo, tree, tvb); diff --git a/epan/dissectors/packet-nordic_ble.c b/epan/dissectors/packet-nordic_ble.c index aaf6846dea..5070017fd1 100644 --- a/epan/dissectors/packet-nordic_ble.c +++ b/epan/dissectors/packet-nordic_ble.c @@ -344,7 +344,7 @@ dissect_ble_delta_time(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tre /* end-to-start */ proto_tree_add_item_ret_uint(tree, hf_nordic_ble_delta_time, tvb, offset, 4, ENC_LITTLE_ENDIAN, &delta_time); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* First time visiting this packet, store previous BLE packet time */ p_add_proto_data(wmem_file_scope(), pinfo, proto_nordic_ble, 0, GUINT_TO_POINTER(previous_ble_packet_time)); prev_packet_time = previous_ble_packet_time; @@ -360,7 +360,7 @@ dissect_ble_delta_time(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tre } offset += 4; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Calculate packet time according to this packets PHY */ guint16 ble_payload_length = nordic_ble_context->payload_length - nordic_ble_context->event_packet_length; if (nordic_ble_context->phy == LE_1M_PHY) { diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 9747a696cb..bf816f9a8d 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -1001,7 +1001,7 @@ save_path(packet_info *pinfo, const gchar *current_path, const gchar *name, /* On Connect response sets "/" On SetPath sets what is needed */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { obex_path_data_t *obex_path_data; wmem_tree_key_t key[6]; guint32 frame_number; @@ -1795,7 +1795,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, switch (hdr_id) { case 0x01: /* Name */ proto_tree_add_item(hdr_tree, hf_name, tvb, offset, value_length, ENC_UCS_2 | ENC_BIG_ENDIAN); - if (!pinfo->fd->flags.visited && obex_last_opcode_data) { + if (!pinfo->fd->visited && obex_last_opcode_data) { if (obex_last_opcode_data->code == OBEX_CODE_VALS_SET_PATH) obex_last_opcode_data->data.set_data.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_UCS_2 | ENC_BIG_ENDIAN); else if (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT) @@ -1921,7 +1921,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, case 0x42: /* Type */ proto_tree_add_item(hdr_tree, hf_type, tvb, offset, value_length, ENC_ASCII | ENC_NA); proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_length, ENC_ASCII)); - if (!pinfo->fd->flags.visited && obex_last_opcode_data && (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)) { + if (!pinfo->fd->visited && obex_last_opcode_data && (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)) { obex_last_opcode_data->data.get_put.type = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_ASCII | ENC_NA); } if (p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE) == NULL) { @@ -1984,7 +1984,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_append_text(hdr_tree, ": %s", target_vals[i].strptr); col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", target_vals[i].strptr); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { obex_profile_data_t *obex_profile_data; wmem_tree_key_t key[6]; @@ -2428,7 +2428,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (code < OBEX_CODE_VALS_CONTINUE || code == OBEX_CODE_VALS_ABORT) { proto_tree_add_item(main_tree, hf_opcode, next_tvb, offset, 1, ENC_BIG_ENDIAN); - if (!pinfo->fd->flags.visited && + if (!pinfo->fd->visited && (pinfo->p2p_dir == P2P_DIR_SENT || pinfo->p2p_dir == P2P_DIR_RECV)) { frame_number = pinfo->num; @@ -2495,7 +2495,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) PROTO_ITEM_SET_GENERATED(sub_item); } - if (!pinfo->fd->flags.visited && obex_last_opcode_data->response_in_frame == 0 && obex_last_opcode_data->request_in_frame < pinfo->num) { + if (!pinfo->fd->visited && obex_last_opcode_data->response_in_frame == 0 && obex_last_opcode_data->request_in_frame < pinfo->num) { obex_last_opcode_data->response_in_frame = pinfo->num; } @@ -2528,7 +2528,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_set_path_flags_0, next_tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(main_tree, hf_set_path_flags_1, next_tvb, offset, 1, ENC_BIG_ENDIAN); - if (!pinfo->fd->flags.visited && obex_last_opcode_data) { + if (!pinfo->fd->visited && obex_last_opcode_data) { obex_last_opcode_data->data.set_data.go_up = tvb_get_guint8(tvb, offset) & 0x01; obex_last_opcode_data->data.set_data.name = NULL; } @@ -2560,14 +2560,14 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(main_tree, hf_max_pkt_len, next_tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) save_path(pinfo, path, "", FALSE, &obex_proto_data); } break; } dissect_headers(main_tree, next_tvb, offset, pinfo, profile, obex_last_opcode_data, &obex_proto_data); - if (!pinfo->fd->flags.visited && + if (!pinfo->fd->visited && obex_last_opcode_data && obex_last_opcode_data->data.set_data.name && obex_last_opcode_data->code == OBEX_CODE_VALS_SET_PATH && diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index f82e77cccc..1d4c2d46bc 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -367,7 +367,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin p_mul_key = wmem_new(wmem_file_scope(), p_mul_id_key); - if (!pinfo->fd->flags.visited && + if (!pinfo->fd->visited && (pdu_type == Address_PDU || pdu_type == Data_PDU || pdu_type == Discard_Message_PDU)) { /* Try to match corresponding address PDU */ @@ -422,7 +422,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin p_add_proto_data(wmem_file_scope(), pinfo, proto_p_mul, 0, pkg_list); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { p_mul_key->id = message_id; p_mul_key->seq = seq_no; if (!need_set_address) { @@ -569,7 +569,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, tvb, offset, 0, ENC_NA); - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ expert_add_info(pinfo, en, &ei_analysis_ack_missing); diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index c9b780c6d4..9bd01b144f 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -499,7 +499,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_add_proto_data(conversation, proto_pana, pana_info); } - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(flags&PANA_FLAG_R){ /* This is a request */ pana_trans=wmem_new(wmem_file_scope(), pana_transaction_t); diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 5eb493133a..ce19a0099c 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -867,7 +867,7 @@ static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, guint32 snLimit = 0; /* If find stat_report_in_frame already, use that and get out */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { p_report_in_frame = (pdcp_sequence_report_in_frame*)wmem_map_lookup(pdcp_lte_sequence_analysis_report_hash, get_report_hash_key(sequenceNumber, @@ -1829,7 +1829,7 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /***************************************/ /* UE security algorithms */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Look up current state by UEID */ current_security = (pdcp_security_info_t*)wmem_map_lookup(pdcp_security_hash, GUINT_TO_POINTER((guint)p_pdcp_info->ueid)); @@ -2348,7 +2348,7 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, data_length, ENC_NA); } - if (!pinfo->fd->flags.visited && + if (!pinfo->fd->visited && (current_security != NULL) && !current_security->seen_next_ul_pdu && p_pdcp_info->direction == DIRECTION_UPLINK) { diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c index 94905cd6ce..860f68695e 100644 --- a/epan/dissectors/packet-pdcp-nr.c +++ b/epan/dissectors/packet-pdcp-nr.c @@ -495,7 +495,7 @@ static void checkBearerSequenceInfo(packet_info *pinfo, tvbuff_t *tvb, guint32 snLimit = 0; /* If find stat_report_in_frame already, use that and get out */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { p_report_in_frame = (pdcp_sequence_report_in_frame*)wmem_map_lookup(pdcp_nr_sequence_analysis_report_hash, get_report_hash_key(sequenceNumber, diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index ff11bc0355..f200bad480 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -66,7 +66,7 @@ dissect_getport_call(tvbuff_t *tvb, packet_info *pinfo _U_, int offset = 0; /* make sure we remember protocol type until the reply packet */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ rpc_call_info_value *rpc_call=(rpc_call_info_value *)data; if(rpc_call){ proto = tvb_get_ntohl(tvb, offset+8); @@ -120,7 +120,7 @@ dissect_getport_reply(tvbuff_t *tvb, packet_info *pinfo _U_, int offset = 0; /* we might have learnt a <ipaddr><protocol><port> mapping for ONC-RPC*/ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ rpc_call_info_value *rpc_call=(rpc_call_info_value *)data; /* only do this for UDP, TCP does not need anything like this */ if(rpc_call && (GPOINTER_TO_UINT(rpc_call->private_data)==PT_UDP) ){ diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 04784c8acc..b48c1ab440 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -5722,7 +5722,7 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (tvb_reported_length_remaining(tvb, hdrlen) > 0) { pinfo->fragmented = TRUE; frag_mp = NULL; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { frag_mp = fragment_add_seq_single_aging(&mp_reassembly_table, tvb, hdrlen, pinfo, seqnum ^ (cls << 24), NULL, tvb_captured_length_remaining(tvb, hdrlen), diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 1c1012ceca..41d143dd6f 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -2964,7 +2964,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if (mode == TCP_MODE_UNEXP) { /* Add entry to tracking table for PVFS_SERV_IO request */ - if ((server_op == PVFS_SERV_IO) && !pinfo->fd->flags.visited) + if ((server_op == PVFS_SERV_IO) && !pinfo->fd->visited) val = pvfs2_io_tracking_new_with_tag(tag, pinfo->num); } else @@ -2977,7 +2977,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, val = (pvfs2_io_tracking_value_t *)wmem_map_lookup(pvfs2_io_tracking_value_table, &key); /* If this frame contains a known PVFS_SERV_IO tag, track it */ - if (val && !pinfo->fd->flags.visited) + if (val && !pinfo->fd->visited) { /* If response HAS NOT been seen, mark this frame as response */ if (val->response_frame_num == 0) diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 2bcb4090ce..a9cfcb73a6 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -10834,7 +10834,7 @@ dissect_ranap_RAB_SetupOrModifyItemFirst(tvbuff_t *tvb _U_, int offset _U_, asn1 transportLayerAddress_ipv4 = private_data_get_transportLayerAddress_ipv4(actx); binding_id = private_data_get_binding_id_port(actx); - if (actx->pinfo->fd->flags.visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ + if (actx->pinfo->fd->visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ return offset; } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -10918,7 +10918,7 @@ dissect_ranap_RAB_SetupOrModifiedItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ct transportLayerAddress_ipv4 = private_data_get_transportLayerAddress_ipv4(actx); binding_id = private_data_get_binding_id_port(actx); - if (actx->pinfo->fd->flags.visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ + if (actx->pinfo->fd->visited || transportLayerAddress_ipv4 == 0 || binding_id == 0){ return offset; } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 0ed1311d01..781a5fce95 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -223,7 +223,7 @@ void rdt_add_address(packet_info *pinfo, /* If this isn't the first time this packet has been processed, we've already done this work, so we don't need to do it again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index e680445a49..ded05f814a 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -226,7 +226,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr conversation_add_proto_data(conversation, proto_reload_framing, reload_framing_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if ((reload_frame = (reload_frame_t *) wmem_tree_lookup32_array(reload_framing_info->transaction_pdus, transaction_id_key)) == NULL) { transaction_id_key[2].key = key_save; diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 091006a3b8..ae40268612 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -4114,7 +4114,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void message_code = tvb_get_ntohs(tvb, offset); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if ((reload_trans = (reload_transaction_t *) wmem_tree_lookup32_array(reload_info->transaction_pdus, transaction_id_key)) == NULL) { diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index d5eb3e3e4f..2bb7f57f86 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -665,7 +665,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) key[4].length = 0; key[4].key = NULL; - if (!pinfo->fd->flags.visited && !(cmd & 0x01)) { + if (!pinfo->fd->visited && !(cmd & 0x01)) { command_data = wmem_new(wmem_file_scope(), command_data_t); command_data->bus_id = bus_id; command_data->device_address = device_address; @@ -707,7 +707,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (command_data && (command_data->response_frame_number == 0 || command_data->response_frame_number == pinfo->num)) { - if (!pinfo->fd->flags.visited && command_data->response_frame_number == 0) { + if (!pinfo->fd->visited && command_data->response_frame_number == 0) { command_data->response_frame_number = pinfo->num; } diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 8c11cc56f0..91c5fb7707 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -1425,7 +1425,7 @@ static sequence_analysis_state checkChannelSequenceInfo(packet_info *pinfo, tvbu guint32 snLimit = 0; /* If find stat_report_in_frame already, use that and get out */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { p_report_in_frame = (sequence_analysis_report*)wmem_map_lookup(sequence_analysis_report_hash, get_report_hash_key(sequenceNumber, pinfo->num, @@ -1842,7 +1842,7 @@ static void checkChannelRepeatedNACKInfo(packet_info *pinfo, gint n, i, j; /* If find state_report_in_frame already, use that and get out */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { p_report_in_frame = (channel_repeated_nack_report*)wmem_map_lookup(repeated_nack_report_hash, get_report_hash_key(0, pinfo->num, p_rlc_lte_info, FALSE)); @@ -1946,7 +1946,7 @@ static void checkChannelACKWindow(guint16 ack_sn, guint32 snLimit; /* If find stat_report_in_frame already, use that and get out */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { p_report_in_frame = (sequence_analysis_report*)wmem_map_lookup(sequence_analysis_report_hash, get_report_hash_key(0, pinfo->num, p_rlc_lte_info, diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index ee317ed386..8d60b59f09 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -88,7 +88,7 @@ rlogin_state_machine(rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info gint stringlen; /* Won't change state if already seen this packet */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 7954ae994a..9c0ecc53da 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -1136,7 +1136,7 @@ dissect_rohc_feedback_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint key = cid; guint32 sn; - if (!pinfo->fd->flags.visited){ + if (!pinfo->fd->visited){ rohc_cid_context = (rohc_cid_context_t*)g_hash_table_lookup(rohc_cid_hash, GUINT_TO_POINTER(key)); if(rohc_cid_context){ p_add_proto_data(wmem_file_scope(), pinfo, proto_rohc, 0, rohc_cid_context); @@ -2138,7 +2138,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * Update it if we do otherwise create it * and fill in the info. */ - if (!pinfo->fd->flags.visited){ + if (!pinfo->fd->visited){ gint key = cid; rohc_cid_context = (rohc_cid_context_t*)g_hash_table_lookup(rohc_cid_hash, GUINT_TO_POINTER(key)); if (rohc_cid_context != NULL){ @@ -2258,7 +2258,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * Update it if we do otherwise create it * and fill in the info. */ - if (!pinfo->fd->flags.visited){ + if (!pinfo->fd->visited){ gint key = cid; rohc_cid_context = (rohc_cid_context_t*)g_hash_table_lookup(rohc_cid_hash, GUINT_TO_POINTER(key)); @@ -2541,7 +2541,7 @@ start_over: return tvb_captured_length(tvb); } - if (!pinfo->fd->flags.visited){ + if (!pinfo->fd->visited){ gint key = cid; /*g_warning("Lookup CID %u",cid);*/ diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 846494b0ce..fcdf530ec8 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -3859,7 +3859,7 @@ dissect_rpc_tcp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, segment boundaries and allow it to find RPC headers that starts in the middle of a TCP segment. */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ if(len>tvb_reported_length_remaining(tvb, offset)){ pinfo->want_pdu_tracking=2; pinfo->bytes_until_next_pdu=len-tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index 5e749eeb3e..d84bca474a 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -340,7 +340,7 @@ static gint32 get_msg_num(guint32 psn, guint32 frag_size, if (psn >= p_request->psn && psn < epsn) { /* Current fragment belongs to this request */ p_rdma_conv_info->segment_info = p_segment_info; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { p_request->rbytes += frag_size; } return msg_num + psn - p_request->psn; @@ -380,7 +380,7 @@ static void add_request_info(rdma_conv_info_t *p_rdma_conv_info, packet_info *pi /* Get current segment */ p_segment_info = find_segment_info(p_rdma_conv_info, gp_infiniband_info->reth_remote_key); - if (p_segment_info && !pinfo->fd->flags.visited) { + if (p_segment_info && !pinfo->fd->visited) { /* Add request to segment */ p_request = (request_t *)wmem_alloc(wmem_file_scope(), sizeof(request_t)); p_request->psn = gp_infiniband_info->packet_seq_num; @@ -1046,7 +1046,7 @@ process_rdma_list(tvbuff_t *tvb, guint offset, wmem_array_t *p_list, if (fd_head == NULL) { if (p_segment_info == NULL) { return NULL; - } else if (p_rdma_chunk->type == RDMA_REPLY_CHUNK && !setup && !pinfo->fd->flags.visited) { + } else if (p_rdma_chunk->type == RDMA_REPLY_CHUNK && !setup && !pinfo->fd->visited) { /* * The RPC reply has no data when having a reply chunk but it needs * to reassemble all fragments (more_frags = FALSE) in this frame @@ -1316,7 +1316,7 @@ dissect_rpcrdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data */ write_size = get_rdma_list_size(rdma_lists.p_write_list, pinfo); - if (write_size > 0 && !pinfo->fd->flags.visited) { + if (write_size > 0 && !pinfo->fd->visited) { /* Initialize array of write chunk offsets */ gp_rdma_write_offsets = wmem_array_new(wmem_packet_scope(), sizeof(gint)); TRY { @@ -1333,7 +1333,7 @@ dissect_rpcrdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data g_rpcrdma_reduced = FALSE; } ENDTRY; - } else if (write_size > 0 && pinfo->fd->flags.visited) { + } else if (write_size > 0 && pinfo->fd->visited) { /* * Reassembly is done on the second pass (visited = 1) * This is done because dissecting the upper layer(s) again @@ -1346,14 +1346,14 @@ dissect_rpcrdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data * All fragments were added during the first pass, * reassembly just needs to be completed here */ - save_visited = pinfo->fd->flags.visited; - pinfo->fd->flags.visited = 0; + save_visited = pinfo->fd->visited; + pinfo->fd->visited = 0; fd_head = fragment_end_seq_next(&rpcordma_reassembly_table, pinfo, p_segment_info->msgid, NULL); if (fd_head) { /* Add the fragment head to the packet cache */ p_add_proto_data(wmem_file_scope(), pinfo, proto_rpcordma, 0, fd_head); } - pinfo->fd->flags.visited = save_visited; + pinfo->fd->visited = save_visited; } } diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index c61ae5f76f..18e551649f 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -269,7 +269,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t } rsvd_conv_data->task = NULL; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint64 *key_copy = wmem_new(wmem_file_scope(), guint64); *key_copy = request_id; diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 5619311741..905e6db54e 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -784,7 +784,7 @@ void srtcp_add_address( packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 204d6aabab..6010af7411 100644 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -530,7 +530,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p conversation_add_proto_data(conversation, proto_rtitcp, rtitcp_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (!(control_message_kind & RTITCP_FLAG_NOT_REQUEST)) { /* This is a request */ rtitcp_trans=wmem_new(wmem_file_scope(), rtitcp_transaction_t); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 304dbcaaca..5efc98ceb0 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1674,7 +1674,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); RTMPT_DEBUG("Dissect: frame=%u visited=%d len=%d tree=%p\n", - pinfo->num, pinfo->fd->flags.visited, + pinfo->num, pinfo->fd->visited, tvb_reported_length_remaining(tvb, offset), tree); /* Clear any previous data in Info column (RTMP packets are protected by a "fence") */ @@ -1877,7 +1877,7 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_ RTMPT_DEBUG("Segment: cdir=%d seq=%d-%d\n", cdir, seq, seq+remain-1); - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { /* Already done the work, so just dump the existing state */ wmem_stack_t *packets; diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 184fcf870b..c803f7544a 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -948,7 +948,7 @@ bluetooth_add_address(packet_info *pinfo, address *addr, guint32 stream_number, * we've already done this work, so we don't need to do it * again. */ - if ((pinfo->fd->flags.visited) || (rtp_handle == NULL)) + if ((pinfo->fd->visited) || (rtp_handle == NULL)) { return; } @@ -1053,7 +1053,7 @@ srtp_add_address(packet_info *pinfo, const port_type ptype, address *addr, int p * we've already done this work, so we don't need to do it * again. */ - if ((pinfo->fd->flags.visited) || (rtp_handle == NULL) || (rtp_rfc4571_handle == NULL)) + if ((pinfo->fd->visited) || (rtp_handle == NULL) || (rtp_rfc4571_handle == NULL)) { return; } @@ -1522,7 +1522,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g_debug("\tRTP Must Desegment: tvb_len=%d ds_len=%d %d frag_len=%d ds_off=%d", tvb_reported_length(newtvb), pinfo->desegment_len, - pinfo->fd->flags.visited, + pinfo->fd->visited, frag_len, deseg_offset); #endif diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 9ae07e07b3..b7bb518fdf 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -6270,7 +6270,7 @@ static gint dissect_parameter_sequence(proto_tree *tree, packet_info *pinfo, tvb gboolean dissect_return_value = FALSE; type_mapping * type_mapping_object = NULL; const gchar * param_name = NULL; - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) type_mapping_object = wmem_new(wmem_file_scope(), type_mapping); rtps_parameter_sequence_tree = proto_tree_add_subtree_format(tree, tvb, offset, size, diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index 0af522ecf6..6d67d0b098 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -249,7 +249,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pitem = proto_tree_add_double(sbc_tree, hf_sbc_delta_time_from_the_beginning, tvb, offset, 0, nstime_to_msec(&delta)); PROTO_ITEM_SET_GENERATED(pitem); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; info->current_media_packet_info->avrcp_song_position += cumulative_frame_duration; } diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index d7d5d7c53e..6e0009e606 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -3353,7 +3353,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* We must store the service action for this itlq * so we can identify what the data contains */ - if ((!pinfo->fd->flags.visited) || (!cdata->itlq->extra_data)) { + if ((!pinfo->fd->visited) || (!cdata->itlq->extra_data)) { scsi_osd_extra_data_t *extra_data; extra_data = wmem_new0(wmem_file_scope(), scsi_osd_extra_data_t); diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 933c17e255..fbf9b00629 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -1245,7 +1245,7 @@ sctp_tsn(packet_info *pinfo, tvbuff_t *tvb, proto_item *tsn_item, is_retransmission = (t->first_transmit.framenum != framenum); - if ( (! pinfo->fd->flags.visited ) && is_retransmission ) { + if ( (! pinfo->fd->visited ) && is_retransmission ) { retransmit_t **r; int i; diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 9c0715f263..9ee3ea794f 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -2347,7 +2347,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex DPRINT2(("-------------------- setup_sdp_transport -------------------")); /* Only do this once during first pass */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { DPRINT(("already visited")); return; } @@ -2543,7 +2543,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) memset(&sdp_data, 0, sizeof(sdp_data)); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { transport_info = (transport_info_t*)wmem_tree_lookup32( sdp_transport_reqs, pinfo->num ); if (transport_info == NULL) { @@ -2751,7 +2751,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* For messages not part of the Offer/Answer model, assume that the SDP is * immediately effective (apply it now). */ - if ((!pinfo->fd->flags.visited) && (transport_info == &local_transport_info)) { + if ((!pinfo->fd->visited) && (transport_info == &local_transport_info)) { /* XXX - This is a placeholder for higher layer protocols that haven't implemented the proper * OFFER/ANSWER functionality using setup_sdp_transport(). Once all of the higher layers * use setup_sdp_transport(), this should be removed diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 8df5e73c04..ba3acbb1ba 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2414,7 +2414,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d msg_type = tvb_get_ntohs(selfm_tvb, offset); /* On first pass through the packets we have 4 tasks to complete - they are each noted below */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { conversation_t *conversation; fm_conversation *fm_conv_data; diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 260b0b7705..7d1ec19f53 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -5166,7 +5166,7 @@ guint sip_is_packet_resend(packet_info *pinfo, } /* Return any answer stored from previous dissection */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { sip_frame_result = (sip_frame_result_value*)p_get_proto_data(wmem_file_scope(), pinfo, proto_sip, pinfo->curr_layer_num); if (sip_frame_result != NULL) @@ -5364,7 +5364,7 @@ guint sip_find_request(packet_info *pinfo, } /* Return any answer stored from previous dissection */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { sip_frame_result = (sip_frame_result_value*)p_get_proto_data(wmem_file_scope(), pinfo, proto_sip, pinfo->curr_layer_num); if (sip_frame_result != NULL) @@ -5478,7 +5478,7 @@ guint sip_find_invite(packet_info *pinfo, } /* Return any answer stored from previous dissection */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { sip_frame_result = (sip_frame_result_value*)p_get_proto_data(wmem_file_scope(), pinfo, proto_sip, pinfo->curr_layer_num); if (sip_frame_result != NULL) diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 244b66e294..7e8f769445 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -99,7 +99,7 @@ dissect_smb_direct_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 remaining_length) { gboolean save_fragmented = pinfo->fragmented; - int save_visited = pinfo->fd->flags.visited; + int save_visited = pinfo->fd->visited; conversation_t *conversation = NULL; fragment_head *fd_head = NULL; tvbuff_t *payload_tvb = NULL; @@ -122,7 +122,7 @@ dissect_smb_direct_payload(tvbuff_t *tvb, packet_info *pinfo, if (fd_head == NULL) { fd_head_not_cached = TRUE; - pinfo->fd->flags.visited = 0; + pinfo->fd->visited = 0; fd_head = fragment_add_seq_next(&smb_direct_reassembly_table, tvb, 0, pinfo, conversation->conv_index, @@ -176,7 +176,7 @@ dissect_payload: } done: pinfo->fragmented = save_fragmented; - pinfo->fd->flags.visited = save_visited; + pinfo->fd->visited = save_visited; return; } diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 0aaa80df79..08e1d55a75 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -108,7 +108,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, } else if(strncmp(mailslot,"MSSP",4) == 0){ trans_subcmd=MAILSLOT_MSSP; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (tri != NULL) tri->trans_subcmd = trans_subcmd; } diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 23bc1bf8cc..f714710893 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -460,7 +460,7 @@ add_detail_level(tvbuff_t *tvb, int offset, int count _U_, packet_info *pinfo, trp = (smb_transact_info_t *)smb_info->sip->extra_info; level = tvb_get_letohs(tvb, offset); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) if (trp) trp->info_level = level; /* remember this for the response */ @@ -2647,7 +2647,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, * the code parsing the reply, and initialize the detail * level to -1, meaning "unknown". */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { trp->lanman_cmd = cmd; trp->info_level = -1; trp->param_descrip=NULL; @@ -2659,7 +2659,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, param_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_param_desc, p_tvb, offset, descriptor_len, ENC_ASCII|ENC_NA); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Save the parameter descriptor for future use. */ @@ -2672,7 +2672,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_return_desc, p_tvb, offset, descriptor_len, ENC_ASCII|ENC_NA); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Save the return descriptor for future use. */ @@ -2697,7 +2697,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, aux_data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_aux_data_desc, p_tvb, offset, descriptor_len, ENC_ASCII|ENC_NA); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Save the auxiliary data descriptor for * future use. @@ -3279,7 +3279,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree pdu and if not, check if the dissector wants us to reassemble it */ - if(!pinfo->fd->flags.visited){ + if(!pinfo->fd->visited){ /* * This is the first pass. * @@ -3599,7 +3599,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, trans_subcmd=PIPE_DCERPC; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (tri == NULL) return FALSE; tri->trans_subcmd = trans_subcmd; @@ -3707,7 +3707,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, info_level = tvb_get_letohs(p_tvb, offset); proto_tree_add_uint(pipe_tree, hf_smb_pipe_getinfo_info_level, p_tvb, offset, 2, info_level); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) tri->info_level = info_level; } else { guint8 pipe_namelen; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index a3b91cf7c1..b86f90229e 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1609,7 +1609,7 @@ smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb, return NULL; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { fd_head = fragment_add(&smb_trans_reassembly_table, tvb, offset, pinfo, si->sip->frame_req, NULL, pos, count, more_frags); @@ -2675,7 +2675,7 @@ dissect_negprot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int tr = proto_tree_add_subtree(tree, tvb, offset, bc, ett_smb_dialects, NULL, "Requested Dialects"); - if (!pinfo->fd->flags.visited && si->sip) { + if (!pinfo->fd->visited && si->sip) { dialects = wmem_new(wmem_file_scope(), struct negprot_dialects); dialects->num = 0; si->sip->extra_info_type = SMB_EI_DIALECTS; @@ -2709,7 +2709,7 @@ dissect_negprot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int len, str); COUNT_BYTES(len); - if (!pinfo->fd->flags.visited && dialects && (dialects->num < MAX_DIALECTS)) { + if (!pinfo->fd->visited && dialects && (dialects->num < MAX_DIALECTS)) { dialects->name[dialects->num++] = wmem_strdup(wmem_file_scope(), str); } } @@ -3059,7 +3059,7 @@ dissect_old_dir_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int dn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &dn_len, FALSE, FALSE, &bc); - if ((!pinfo->fd->flags.visited) && si->sip) { + if ((!pinfo->fd->visited) && si->sip) { si->sip->extra_info_type = SMB_EI_FILENAME; si->sip->extra_info = wmem_strdup(wmem_file_scope(), dn); } @@ -3303,7 +3303,7 @@ dissect_smb_tid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, tr = proto_item_add_subtree(it, ett_smb_tid); offset += 2; - if ((!pinfo->fd->flags.visited) && is_created) { + if ((!pinfo->fd->visited) && is_created) { tid_info = wmem_new(wmem_file_scope(), smb_tid_info_t); tid_info->opened_in = pinfo->num; tid_info->closed_in = 0; @@ -3323,7 +3323,7 @@ dissect_smb_tid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, return offset; } - if ((!pinfo->fd->flags.visited) && is_closed) { + if ((!pinfo->fd->visited) && is_closed) { tid_info->closed_in = pinfo->num; } @@ -3659,7 +3659,7 @@ dissect_open_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* store it for the fid->name/openframe/closeframe matching in * dissect_smb_fid() called from the response. */ - if ((!pinfo->fd->flags.visited) && si->sip && fn) { + if ((!pinfo->fd->visited) && si->sip && fn) { fsi = wmem_new0(wmem_file_scope(), smb_fid_saved_info_t); fsi->filename = wmem_strdup(wmem_file_scope(), fn); @@ -3892,7 +3892,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, tr = proto_item_add_subtree(it, ett_smb_fid); col_append_fstr(pinfo->cinfo, COL_INFO, ", FID: 0x%04x", fid); - if ((!pinfo->fd->flags.visited) && is_created) { + if ((!pinfo->fd->visited) && is_created) { fid_info = wmem_new(wmem_file_scope(), smb_fid_info_t); fid_info->opened_in = pinfo->num; fid_info->closed_in = 0; @@ -3936,7 +3936,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, /* Store the fid in the transaction structure and remember if it was in the request or in the reply we saw it */ - if (sip && (!is_generated) && (!pinfo->fd->flags.visited)) { + if (sip && (!is_generated) && (!pinfo->fd->visited)) { sip->fid = fid; if (si->request) { sip->fid_seen_in_request = TRUE; @@ -3945,7 +3945,7 @@ dissect_smb_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, } } - if ((!pinfo->fd->flags.visited) && is_closed) { + if ((!pinfo->fd->visited) && is_closed) { fid_info->closed_in = pinfo->num; } @@ -4220,7 +4220,7 @@ dissect_create_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* store it for the fid->name/openframe/closeframe matching in * dissect_smb_fid() called from the response. */ - if ((!pinfo->fd->flags.visited) && si->sip && fn) { + if ((!pinfo->fd->visited) && si->sip && fn) { fsi = wmem_new0(wmem_file_scope(), smb_fid_saved_info_t); fsi->filename = wmem_strdup(wmem_file_scope(), fn); fsi->file_attributes = file_attributes; @@ -4287,7 +4287,7 @@ dissect_delete_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &fn_len, FALSE, FALSE, &bc); - if ((!pinfo->fd->flags.visited) && si->sip) { + if ((!pinfo->fd->visited) && si->sip) { si->sip->extra_info_type = SMB_EI_FILENAME; si->sip->extra_info = wmem_strdup(wmem_file_scope(), fn); } @@ -4363,7 +4363,7 @@ dissect_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, END_OF_SMB /* save the offset/len for this transaction */ - if (si->sip && !pinfo->fd->flags.visited) { + if (si->sip && !pinfo->fd->visited) { rni = (smb_rename_saved_info_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_rename_saved_info_t)); rni->old_name = wmem_strdup(wmem_file_scope(), old_name); rni->new_name = wmem_strdup(wmem_file_scope(), new_name); @@ -4590,7 +4590,7 @@ dissect_read_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset += 2; /* save the offset/len for this transaction */ - if (si->sip && !pinfo->fd->flags.visited) { + if (si->sip && !pinfo->fd->visited) { rwi = wmem_new(wmem_file_scope(), rw_info_t); rwi->offset = ofs; rwi->len = cnt; @@ -4827,7 +4827,7 @@ dissect_write_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, (cnt == 1) ? "" : "s", ofs); /* save the offset/len for this transaction */ - if (si->sip && !pinfo->fd->flags.visited) { + if (si->sip && !pinfo->fd->visited) { rwi = (rw_info_t *)wmem_alloc(wmem_file_scope(), sizeof(rw_info_t)); rwi->offset = ofs; rwi->len = cnt; @@ -6063,7 +6063,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree BYTE_COUNT; /* store the locking data for the response */ - if ((!pinfo->fd->flags.visited) && si->sip) { + if ((!pinfo->fd->visited) && si->sip) { ld = (smb_locking_saved_info_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_locking_saved_info_t)); ld->type = lt; ld->oplock_level = ol; @@ -6505,7 +6505,7 @@ dissect_open_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* Copied this portion of code from create_andx_request to guarantee that fsi and si->sip are always correctly filled out */ - if ((!pinfo->fd->flags.visited) && si->sip && fn) { + if ((!pinfo->fd->visited) && si->sip && fn) { smb_fid_saved_info_t *fsi; fsi = wmem_new0(wmem_file_scope(), smb_fid_saved_info_t); @@ -6826,7 +6826,7 @@ dissect_read_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i maxcnt, (maxcnt == 1) ? "" : "s", ofs); /* save the offset/len for this transaction */ - if (si->sip && !pinfo->fd->flags.visited) { + if (si->sip && !pinfo->fd->visited) { rwi = (rw_info_t *)wmem_alloc(wmem_file_scope(), sizeof(rw_info_t)); rwi->offset = ofs; rwi->len = maxcnt; @@ -7093,7 +7093,7 @@ dissect_write_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, datalen, (datalen == 1) ? "" : "s", ofs); /* save the offset/len for this transaction */ - if (si->sip && !pinfo->fd->flags.visited) { + if (si->sip && !pinfo->fd->visited) { rwi = (rw_info_t *)wmem_alloc(wmem_file_scope(), sizeof(rw_info_t)); rwi->offset = ofs; rwi->len = datalen; @@ -7132,7 +7132,7 @@ dissect_write_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bc -= 2; datalen -= 2; } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* In case we did not see the TreeConnect call, store this TID here as well as a IPC TID so we know that future Read/Writes to this @@ -7460,7 +7460,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /* If we have found a uid->acct_name mapping, store it */ - if (!pinfo->fd->flags.visited && si->sip) { + if (!pinfo->fd->visited && si->sip) { int idx = 0; if ((ntlmssph = (const ntlmssp_header_t *)fetch_tapped_data(ntlmssp_tap_id, idx + 1 )) != NULL) { if (ntlmssph && (ntlmssph->type == 3)) { @@ -7664,7 +7664,7 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre WORD_COUNT; - if (!pinfo->fd->flags.visited && si->sip && si->sip->extra_info && + if (!pinfo->fd->visited && si->sip && si->sip->extra_info && (si->sip->extra_info_type == SMB_EI_UID)) { smb_uid_t *smb_uid; @@ -7964,7 +7964,7 @@ dissect_tree_connect_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* store it for the tid->name/openframe/closeframe matching in * dissect_smb_tid() called from the response. */ - if ((!pinfo->fd->flags.visited) && si->sip && an) { + if ((!pinfo->fd->visited) && si->sip && an) { si->sip->extra_info_type = SMB_EI_TIDNAME; si->sip->extra_info = wmem_strdup(wmem_file_scope(), an); } @@ -8094,7 +8094,7 @@ dissect_tree_connect_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Now when we know the service type, store it so that we know it for later commands down this tree */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Remove any previous entry for this TID */ if (g_hash_table_lookup(si->ct->tid_service, GUINT_TO_POINTER(si->tid))) { g_hash_table_remove(si->ct->tid_service, GUINT_TO_POINTER(si->tid)); @@ -9214,7 +9214,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr ntd.subcmd = subcmd; if (!si->unidir && sip) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Allocate a new smb_nt_transact_info_t * structure. @@ -10428,7 +10428,7 @@ dissect_nt_create_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* store it for the fid->name/openframe/closeframe matching in * dissect_smb_fid() called from the response. */ - if ((!pinfo->fd->flags.visited) && si->sip && fn) { + if ((!pinfo->fd->visited) && si->sip && fn) { smb_fid_saved_info_t *fsi; fsi = wmem_new(wmem_file_scope(), smb_fid_saved_info_t); @@ -11057,7 +11057,7 @@ dissect_ff2_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in if ((si->sip != NULL) && (si->sip->extra_info_type == SMB_EI_T2I)) { t2i = (smb_transact2_info_t *)si->sip->extra_info; if (t2i != NULL) { - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) t2i->resume_keys = (mask & FF2_RESUME); } } @@ -11207,7 +11207,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* Find First2 information level */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_ff2_information_level, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11245,7 +11245,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* Find First2 information level */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_ff2_information_level, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11275,7 +11275,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qfsi_information_level, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11289,7 +11289,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(4); si->info_level = tvb_get_letohs(tvb, offset+2); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_sfsi_information_level, tvb, offset+2, 2, si->info_level); COUNT_BYTES_TRANS(4); @@ -11303,7 +11303,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11337,7 +11337,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_spi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11370,7 +11370,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11394,7 +11394,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* level of interest */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_spi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -11463,7 +11463,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* Find Notify information level */ CHECK_BYTE_COUNT_TRANS(2); si->info_level = tvb_get_letohs(tvb, offset); - if ((t2i != NULL) && !pinfo->fd->flags.visited) + if ((t2i != NULL) && !pinfo->fd->visited) t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_fn_information_level, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); @@ -14051,7 +14051,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Unknown (0x%02x)")); if (!si->unidir) { - if (!pinfo->fd->flags.visited && si->sip) { + if (!pinfo->fd->visited && si->sip) { /* * Allocate a new * smb_transact2_info_t @@ -14201,7 +14201,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (!si->unidir) { - if (!pinfo->fd->flags.visited && si->sip) { + if (!pinfo->fd->visited && si->sip) { /* * Allocate a new smb_transact_info_t * structure. @@ -17794,7 +17794,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da si->unidir = TRUE; /*we don't expect an answer to this one*/ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* try to find which original call we match and if we find it add us to the matched table. Don't touch anything else since we don't want this one to mess @@ -17868,7 +17868,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da } else { /* normal bidirectional request or response */ si->unidir = FALSE; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* first see if we find an unmatched smb "equal" to the current one */ @@ -18163,7 +18163,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da * having a response that means that the share was mapped and we * need to track it */ - if (!pinfo->fd->flags.visited && (si->cmd == 0x75) && !si->request) { + if (!pinfo->fd->visited && (si->cmd == 0x75) && !si->request) { offset = dissect_smb_tid(tvb, pinfo, htree, offset, (guint16)si->tid, TRUE, FALSE, si); } else { offset = dissect_smb_tid(tvb, pinfo, htree, offset, (guint16)si->tid, FALSE, FALSE, si); diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index a92ba81e13..b4e0c6453d 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -1961,7 +1961,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset switch (mode) { case FID_MODE_OPEN: offset = dissect_nt_guid_hnd(tvb, offset, pinfo, tree, &di, drep, hf_smb2_fid, &policy_hnd, &hnd_item, TRUE, FALSE); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { sfi = wmem_new(wmem_file_scope(), smb2_fid_info_t); *sfi = sfi_key; if (si->saved && si->saved->extra_info_type == SMB2_EI_FILENAME) { @@ -3097,7 +3097,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset = dissect_smb2_olb_tvb_max_offset(offset, &s_olb); /* If we have found a uid->acct_name mapping, store it */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { idx = 0; while ((ntlmssph = (const ntlmssp_header_t *)fetch_tapped_data(ntlmssp_tap_id, idx++)) != NULL) { if (ntlmssph && ntlmssph->type == NTLMSSP_AUTH) { @@ -3278,7 +3278,7 @@ dissect_smb2_session_setup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* If we have found a uid->acct_name mapping, store it */ #ifdef HAVE_KERBEROS - if (!pinfo->fd->flags.visited && si->status == 0) { + if (!pinfo->fd->visited && si->status == 0) { enc_key_t *ek; if (krb_decrypt) { @@ -3344,7 +3344,7 @@ dissect_smb2_tree_connect_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* treelen +1 is overkill here if the string is unicode, * but who ever has more than a handful of TCON in a trace anyways */ - if (!pinfo->fd->flags.visited && si->saved && buf && olb.len) { + if (!pinfo->fd->visited && si->saved && buf && olb.len) { si->saved->extra_info_type = SMB2_EI_TREENAME; si->saved->extra_info = wmem_alloc(wmem_file_scope(), olb.len+1); g_snprintf((char *)si->saved->extra_info,olb.len+1,"%s",buf); @@ -3376,7 +3376,7 @@ dissect_smb2_tree_connect_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(tree, hf_smb2_reserved, tvb, offset, 1, ENC_NA); offset += 1; - if (!pinfo->fd->flags.visited && si->saved && si->saved->extra_info_type == SMB2_EI_TREENAME && si->session) { + if (!pinfo->fd->visited && si->saved && si->saved->extra_info_type == SMB2_EI_TREENAME && si->session) { smb2_tid_info_t *tid, tid_key; tid_key.tid = si->tid; @@ -3682,7 +3682,7 @@ dissect_smb2_find_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset = dissect_smb2_olb_tvb_max_offset(offset, &olb); - if (!pinfo->fd->flags.visited && si->saved && olb.len) { + if (!pinfo->fd->visited && si->saved && olb.len) { si->saved->extra_info_type = SMB2_EI_FINDPATTERN; si->saved->extra_info = wmem_alloc(wmem_file_scope(), olb.len+1); g_snprintf((char *)si->saved->extra_info,olb.len+1,"%s",buf); @@ -4294,7 +4294,7 @@ dissect_smb2_find_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr PROTO_ITEM_SET_GENERATED(item); } - if (!pinfo->fd->flags.visited && si->saved && si->saved->extra_info_type == SMB2_EI_FINDPATTERN) { + if (!pinfo->fd->visited && si->saved && si->saved->extra_info_type == SMB2_EI_FINDPATTERN) { col_append_fstr(pinfo->cinfo, COL_INFO, " %s Pattern: %s", val_to_str(si->saved->infolevel, smb2_find_info_levels, "(Level:0x%02x)"), (const char *)si->saved->extra_info); @@ -5319,7 +5319,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t * pdu and if not, check if the dissector wants us * to reassemble it */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * This is the first pass. * @@ -7971,7 +7971,7 @@ dissect_smb2_create_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, " File: %s", fname); /* save the name if it looks sane */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (si->saved && si->saved->extra_info_type == SMB2_EI_FILENAME) { wmem_free(wmem_file_scope(), si->saved->extra_info); si->saved->extra_info = NULL; @@ -9334,7 +9334,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* see if we can find this msg_id in the unmatched table */ ssi = (smb2_saved_info_t *)g_hash_table_lookup(si->conv->unmatched, &ssi_key); diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 66c398d7e4..6ace76d644 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -2444,7 +2444,7 @@ dissect_sna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) col_clear(pinfo->cinfo, COL_INFO); /* SNA data should be printed in EBCDIC, not ASCII */ - pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; + pinfo->fd->encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; if (tree) { @@ -2480,7 +2480,7 @@ dissect_sna_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data col_clear(pinfo->cinfo, COL_INFO); /* SNA data should be printed in EBCDIC, not ASCII */ - pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; + pinfo->fd->encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; if (tree) { diff --git a/epan/dissectors/packet-snort.c b/epan/dissectors/packet-snort.c index a360aff48c..3386287e6f 100644 --- a/epan/dissectors/packet-snort.c +++ b/epan/dissectors/packet-snort.c @@ -709,7 +709,7 @@ static void snort_show_alert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo /* May need to move to reassembled frame to show there instead of here */ - if (snort_alert_in_reassembled_frame && pinfo->fd->flags.visited && (tree != NULL)) { + if (snort_alert_in_reassembled_frame && pinfo->fd->visited && (tree != NULL)) { guint reassembled_frame = get_reassembled_in_frame(tree); if (reassembled_frame && (reassembled_frame != pinfo->num)) { @@ -1143,7 +1143,7 @@ snort_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } else { /* We expect alerts from Snort. Pass frame into snort on first pass. */ - if (!pinfo->fd->flags.visited && current_session.working) { + if (!pinfo->fd->visited && current_session.working) { int write_err = 0; gchar *err_info; wtap_rec rec; diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index ef10b11ad1..594c0483df 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -897,7 +897,7 @@ server_state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, /* save server udp port and create udp conversation */ hash_info->udp_port = tvb_get_ntohs(tvb, offset); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) new_udp_conversation( hash_info, pinfo); break; @@ -1080,7 +1080,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { col_append_str(pinfo->cinfo, COL_INFO, ", Traceroute Req"); /* run state machine if needed */ - if ((!pinfo->fd->flags.visited) && + if ((!pinfo->fd->visited) && (!((hash_info->clientState == clientDone) && (hash_info->serverState == serverDone)))) { diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 99ddc5b021..99dbfecc7d 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -747,7 +747,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, next_tvb = tvb_new_subset_length(tvb, offset, frame->length); is_single_chunk = num_data_frames == 0 && (frame->flags & SPDY_FLAG_FIN) != 0; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (!is_single_chunk) { if (spdy_assemble_entity_bodies) { copied_data = (guint8 *)tvb_memdup(wmem_file_scope(),next_tvb, 0, frame->length); @@ -1322,7 +1322,7 @@ static int dissect_spdy_header_payload( * If we expect data on this stream, we need to remember the content * type and content encoding. */ - if (content_type != NULL && !pinfo->fd->flags.visited) { + if (content_type != NULL && !pinfo->fd->visited) { gchar *content_type_params = spdy_parse_content_type(content_type); spdy_save_stream_info(conv_data, stream_id, (hdr_status == NULL) ? HTTP_REQUEST : HTTP_RESPONSE, diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 6548ca7a92..6bd86695fd 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1716,7 +1716,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* * negotiation in a conversation. */ next_level_value = (gssapi_oid_value *)p_get_proto_data(wmem_file_scope(), pinfo, proto_spnego, 0); - if (!next_level_value && !pinfo->fd->flags.visited) { + if (!next_level_value && !pinfo->fd->visited) { /* * No handle attached to this frame, but it's the first * pass, so it'd be attached to the conversation. diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index c25081c26a..f8fe324608 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -759,7 +759,7 @@ void sprt_add_address(packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { return; } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index f703de4a1b..ee97f5f88f 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -605,7 +605,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, val_to_str(msg_code, ssh1_msg_vals, "Unknown (%u)")); offset += 1; len = plen -1; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (peer_data->frame_key_start == 0) peer_data->frame_key_start = pinfo->num; peer_data->frame_key_end = pinfo->num; diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index a688f3009f..b81e064fd2 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -671,7 +671,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole conversation_add_proto_data(conversation, proto_stun, stun_info); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if ((stun_trans = (stun_transaction_t *) wmem_tree_lookup32_array(stun_info->transaction_pdus, transaction_id_key)) == NULL) { diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index d40b39f4ee..e1877c0f09 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -450,7 +450,7 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds bw_key[3].key = NULL; - if ( !(assoc = (sua_assoc_info_t *)wmem_tree_lookup32_array(assocs,bw_key)) && ! pinfo->fd->flags.visited) { + if ( !(assoc = (sua_assoc_info_t *)wmem_tree_lookup32_array(assocs,bw_key)) && ! pinfo->fd->visited) { assoc = new_assoc(opck, dpck); wmem_tree_insert32_array(assocs,bw_key,assoc); assoc->has_bw_key = TRUE; @@ -503,12 +503,12 @@ got_assoc: pinfo->p2p_dir = P2P_DIR_RECV; - if ( ! pinfo->fd->flags.visited && ! assoc->has_bw_key ) { + if ( ! pinfo->fd->visited && ! assoc->has_bw_key ) { wmem_tree_insert32_array(assocs, bw_key, assoc); assoc->has_bw_key = TRUE; } - if ( ! pinfo->fd->flags.visited && ! assoc->has_fw_key ) { + if ( ! pinfo->fd->visited && ! assoc->has_fw_key ) { wmem_tree_insert32_array(assocs, fw_key, assoc); assoc->has_fw_key = TRUE; } diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 4105d3e2b3..5a8893d830 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -478,7 +478,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v * struct is saved in the conversation and is copied to the * per-packet information if a DATA frame is dissected. */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (CFG2 == frame_type && check_crc(tvb, &crc)) { conversation_t *conversation; diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 1cac3fd65b..7bfb5f6ca3 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -245,7 +245,7 @@ void t38_add_address(packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if ((pinfo->fd->flags.visited) || (t38_udp_handle == NULL)) + if ((pinfo->fd->visited) || (t38_udp_handle == NULL)) { return; } @@ -325,7 +325,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) fd_head = fragment_get(table, pinfo, id, NULL); /* have we already seen this frame ?*/ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { if (fd_head != NULL && fd_head->flags & FD_DEFRAGMENTED) { return fd_head; } else { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index a232ab1f19..6c08f7e8d3 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1646,7 +1646,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o { struct tcp_multisegment_pdu *msp=NULL; - if(!pinfo->fd->flags.visited) { + if(!pinfo->fd->visited) { msp=(struct tcp_multisegment_pdu *)wmem_tree_lookup32_le(multisegment_pdus, seq-1); if(msp) { /* If this is a continuation of a PDU started in a @@ -3691,7 +3691,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so that it can attempt to find it in case it starts * somewhere in the middle of a segment. */ - if(!pinfo->fd->flags.visited && tcp_analyze_seq) { + if(!pinfo->fd->visited && tcp_analyze_seq) { guint remaining_bytes; remaining_bytes = tvb_reported_length_remaining(tvb, offset); if(plen>remaining_bytes) { @@ -4028,7 +4028,7 @@ dissect_tcpopt_wscale(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* tcp_info_append_uint(pinfo, "WS", 1 << shift); - if(!pinfo->fd->flags.visited) { + if(!pinfo->fd->visited) { pdu_store_window_scale_option(shift, tcpd); } @@ -5800,7 +5800,7 @@ process_tcp_payload(tvbuff_t *tvb, volatile int offset, packet_info *pinfo, if(is_tcp_segment) { /* if !visited, check want_pdu_tracking and store it in table */ - if(tcpd && (!pinfo->fd->flags.visited) && + if(tcpd && (!pinfo->fd->visited) && tcp_analyze_seq && pinfo->want_pdu_tracking) { if(seq || nxtseq) { pdu_store_sequencenumber_of_next_pdu( @@ -5831,7 +5831,7 @@ process_tcp_payload(tvbuff_t *tvb, volatile int offset, packet_info *pinfo, * if !visited, check want_pdu_tracking and store it * in table */ - if(tcpd && (!pinfo->fd->flags.visited) && tcp_analyze_seq && pinfo->want_pdu_tracking) { + if(tcpd && (!pinfo->fd->visited) && tcp_analyze_seq && pinfo->want_pdu_tracking) { if(seq || nxtseq) { pdu_store_sequencenumber_of_next_pdu(pinfo, seq, @@ -6038,7 +6038,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if(tcpd && ((tcph->th_flags&(TH_SYN|TH_ACK))==TH_SYN) && (tcpd->fwd->static_flags & TCP_S_BASE_SEQ_SET) && (tcph->th_seq!=tcpd->fwd->base_seq) ) { - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { /* Reset the last frame seen in the conversation */ if (save_last_frame > 0) conv->last_frame = save_last_frame; @@ -6061,7 +6061,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if(tcpd && ((tcph->th_flags&(TH_SYN|TH_ACK))==(TH_SYN|TH_ACK)) && (tcpd->fwd->static_flags & TCP_S_BASE_SEQ_SET) && (tcph->th_seq!=tcpd->fwd->base_seq) ) { - if (!(pinfo->fd->flags.visited)) { + if (!(pinfo->fd->visited)) { /* Reset the last frame seen in the conversation */ if (save_last_frame > 0) conv->last_frame = save_last_frame; @@ -6097,7 +6097,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) * Calculate the timestamps relative to this conversation (but only on the * first run when frames are accessed sequentially) */ - if (!(pinfo->fd->flags.visited)) + if (!(pinfo->fd->visited)) tcp_calculate_timestamps(pinfo, tcpd, tcppd); } @@ -6136,7 +6136,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* handle TCP seq# analysis parse all new segments we see */ if(tcp_analyze_seq) { - if(!(pinfo->fd->flags.visited)) { + if(!(pinfo->fd->visited)) { tcp_analyze_sequence_number(pinfo, tcph->th_seq, tcph->th_ack, tcph->th_seglen, tcph->th_flags, tcph->th_win, tcpd); } if(tcpd && tcp_relative_seq) { @@ -6540,7 +6540,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } - if(!pinfo->fd->flags.visited) { + if(!pinfo->fd->visited) { if((tcph->th_flags & TH_SYN)==TH_SYN) { /* Check the validity of the window scale value */ diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 46f519dc79..332f3d04fc 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -389,7 +389,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* decide if the packet is server to client or client to server * then check its fragmentation */ - if(!(pinfo->fd->flags.visited)) + if(!(pinfo->fd->visited)) { if(conversation_data->server_port == pinfo->srcport) { diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 28632dcbd8..b457c361f9 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -59,7 +59,7 @@ * dissector versions was dissected only when a proto_tree context was * available * - * We are at Packet reception if time pinfo->fd->flags.visited == 0 + * We are at Packet reception if time pinfo->fd->visited == 0 * */ @@ -585,7 +585,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } } - ssl_debug_printf("\ndissect_ssl enter frame #%u (%s)\n", pinfo->num, (pinfo->fd->flags.visited)?"already visited":"first time"); + ssl_debug_printf("\ndissect_ssl enter frame #%u (%s)\n", pinfo->num, (pinfo->fd->visited)?"already visited":"first time"); /* Track the version using conversations to reduce the * chance that a packet that simply *looks* like a v2 or @@ -613,7 +613,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* try decryption only the first time we see this packet * (to keep cipher synchronized) */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) ssl_session = NULL; ssl_debug_printf(" conversation = %p, ssl_session = %p\n", (void *)conversation, (void *)ssl_session); @@ -789,7 +789,7 @@ dissect_tls13_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi SslSession *session; gint is_from_server; - ssl_debug_printf("\n%s enter frame #%u (%s)\n", G_STRFUNC, pinfo->num, (pinfo->fd->flags.visited)?"already visited":"first time"); + ssl_debug_printf("\n%s enter frame #%u (%s)\n", G_STRFUNC, pinfo->num, (pinfo->fd->visited)?"already visited":"first time"); conversation = find_or_create_conversation(pinfo); ssl_session = ssl_get_session(conversation, tls_handle); diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index b7bb18241c..3c6a8a1b19 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5229,7 +5229,7 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TN3270"); - pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; + pinfo->fd->encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; /* Do we have a conversation for this connection? */ conversation = find_conversation_pinfo(pinfo, 0); diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 2786b9f720..87ac1e1808 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -5117,7 +5117,7 @@ dissect_tn5250(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ if (!tn5250_info) return 0; - pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; + pinfo->fd->encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; col_set_str(pinfo->cinfo, COL_PROTOCOL, "TN5250"); diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 325459db40..81a53dde99 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1689,7 +1689,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } /* Save request info (command_data) */ - if (!pinfo->fd->flags.visited && command != 21) { + if (!pinfo->fd->visited && command != 21) { key[2].length = 1; key[2].key = &k_frame_number; key[3].length = 0; diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 10862287b5..abf7585275 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1455,7 +1455,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { break; } @@ -1487,7 +1487,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if (pinfo->fd->visited) { break; } @@ -1523,7 +1523,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* Set Source IP = own IP */ copy_address_shallow(&src_addr, &pinfo->src); } - if((!pinfo->fd->flags.visited) && RTP_UDP_port!=0){ + if((!pinfo->fd->visited) && RTP_UDP_port!=0){ rtp_add_address(pinfo, PT_UDP, &src_addr, RTP_UDP_port, 0, "UMA", pinfo->num, FALSE, 0); if ((RTP_UDP_port & 0x1) == 0){ /* Even number RTP port RTCP should follow on odd number */ @@ -1536,7 +1536,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) RTCP_UDP_port = tvb_get_ntohs(tvb,ie_offset); proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTCP_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); /* TODO find out exactly which element contains IP addr */ - if((!pinfo->fd->flags.visited) && rtcp_ipv4_address!=0 && RTCP_UDP_port!=0 && rtcp_handle){ + if((!pinfo->fd->visited) && rtcp_ipv4_address!=0 && RTCP_UDP_port!=0 && rtcp_handle){ set_address(&src_addr, AT_IPv4, 4, &rtcp_ipv4_address); rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->num); diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index 4d578f5f2f..b5f4fddd33 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -285,7 +285,7 @@ dissect_usb_dfu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } /* Save request info (command_data) */ - if (!pinfo->fd->flags.visited && command != 21) { + if (!pinfo->fd->visited && command != 21) { key[2].length = 1; key[2].key = &k_frame_number; key[3].length = 0; diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 2538a22c30..4a8cb4a5e0 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1968,7 +1968,7 @@ dissect_usb_device_qualifier_descriptor(packet_info *pinfo _U_, proto_tree *pare proto_item_append_text(nitem, " (%s)", description); offset += 1; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint k_bus_id; guint k_device_address; guint k_frame_number; @@ -2079,7 +2079,7 @@ dissect_usb_device_descriptor(packet_info *pinfo, proto_tree *parent_tree, product_id); offset += 2; - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { guint k_bus_id; guint k_device_address; guint k_frame_number; @@ -2246,7 +2246,7 @@ dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree, class_str = val_to_str_ext(usb_conv_info->interfaceClass, &usb_class_vals_ext, "unknown (0x%X)"); proto_item_append_text(item, " (%u.%u): class %s", interface_num, alt_setting, class_str); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { usb_alt_setting_t alternate_setting; /* Register conversation for this interface in case CONTROL messages are sent to it */ @@ -2409,7 +2409,7 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, * All endpoints for the same interface descriptor share the same * usb_conv_info structure. */ - if ((!pinfo->fd->flags.visited) && usb_trans_info && usb_trans_info->interface_info) { + if ((!pinfo->fd->visited) && usb_trans_info && usb_trans_info->interface_info) { if (pinfo->destport == NO_ENDPOINT) { address tmp_addr; usb_address_t *usb_addr = wmem_new0(wmem_packet_scope(), usb_address_t); @@ -4007,7 +4007,7 @@ static usb_trans_info_t } else { /* this is a response */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { usb_trans_info = (usb_trans_info_t *)wmem_tree_lookup32_array(usb_conv_info->transactions, key); } else { diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 0a79e2b6ac..5145f16db7 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -355,7 +355,7 @@ static int dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi return 2; if ( cmd == 1) { /* uncompressed data */ - if ( !pinfo->fd->flags.visited){ /* if first pass */ + if ( !pinfo->fd->visited){ /* if first pass */ wcp_save_data( tvb, pinfo); } next_tvb = tvb_new_subset_remaining(tvb, wcp_header_len); @@ -563,7 +563,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin data_cnt, data_offset+1); return NULL; } - if ( !pinfo->fd->flags.visited){ /* if first pass */ + if ( !pinfo->fd->visited){ /* if first pass */ dst = decompressed_entry(dst, data_offset, data_cnt, &len, buf_ptr); @@ -588,7 +588,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin return NULL; } - if ( !pinfo->fd->flags.visited){ + if ( !pinfo->fd->visited){ /* * This is the first pass through * the packets, so copy it to the @@ -622,7 +622,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin } } - if ( pinfo->fd->flags.visited){ /* if not first pass */ + if ( pinfo->fd->visited){ /* if not first pass */ /* get uncompressed data */ pdata_ptr = (wcp_pdata_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_wcp, 0); diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index c5731ce019..dd205a1e46 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -3506,7 +3506,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, ti = proto_tree_add_item(tree, proto_x11, tvb, 0, -1, ENC_NA); t = proto_item_add_subtree(ti, ett_x11); - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) ++state->sequencenumber; OPCODE(); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index c09a4158aa..48216d71f5 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1471,7 +1471,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PRT_ID_ISO_8073: /* ISO 8073 COTP */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); /* XXX - dissect the rest of the user data as COTP? That needs support for NCM TPDUs, etc. */ @@ -1479,7 +1479,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PRT_ID_ISO_8602: /* ISO 8602 CLTP */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); break; } @@ -1492,7 +1492,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item( userdata_tree, hf_x263_sec_protocol_id, tvb, localoffset, 1, ENC_BIG_ENDIAN); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Is there a dissector handle for this SPI? * If so, assign it to this virtual circuit. @@ -1931,7 +1931,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Did the user suggest QLLC/SNA? */ if (payload_is_qllc_sna) { /* Yes - dissect it as QLLC/SNA. */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, qllc_handle); call_dissector_with_data(qllc_handle, next_tvb, pinfo, tree, &q_bit_set); return; @@ -1944,7 +1944,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* First byte contains the length of the remaining buffer */ if ((tvb_get_guint8(tvb, localoffset+1) & 0x0F) == 0) { /* Second byte contains a valid COTP TPDU */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, ositp_handle); call_dissector(ositp_handle, next_tvb, pinfo, tree); return; @@ -1957,13 +1957,13 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case 0x45: /* Looks like an IP header */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, ip_handle); call_dissector(ip_handle, next_tvb, pinfo, tree); return; case NLPID_ISO8473_CLNP: - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) x25_hash_add_proto_start(vc, pinfo->num, clnp_handle); call_dissector(clnp_handle, next_tvb, pinfo, tree); return; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index fc350666ff..2992c9db2f 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -878,7 +878,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } /* Update transaction entry */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (xmcp_msg_type_class == XMCP_CLASS_REQUEST) { if (xmcp_trans->request_frame == 0) { xmcp_trans->request_frame = pinfo->num; diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 5406851e8d..240aa99d47 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -36,7 +36,7 @@ xmpp_iq_reqresp_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_info id = wmem_strdup(wmem_packet_scope(), attr_id->value); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { xmpp_trans = (xmpp_transaction_t *)wmem_tree_lookup_string(xmpp_info->req_resp, id, WMEM_TREE_STRING_NOCASE); if (xmpp_trans) { xmpp_trans->resp_frame = pinfo->num; @@ -66,7 +66,7 @@ xmpp_jingle_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_ jingle_packet_l = xmpp_find_element_by_name(packet,"jingle"); jingle_packet = (xmpp_element_t *)(jingle_packet_l?jingle_packet_l->data:NULL); - if (jingle_packet && !pinfo->fd->flags.visited) { + if (jingle_packet && !pinfo->fd->visited) { xmpp_attr_t *attr_id; xmpp_attr_t *attr_sid; @@ -101,7 +101,7 @@ xmpp_gtalk_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_i gtalk_packet = (xmpp_element_t *)(gtalk_packet_l?gtalk_packet_l->data:NULL); - if (gtalk_packet && !pinfo->fd->flags.visited) { + if (gtalk_packet && !pinfo->fd->visited) { xmpp_attr_t *attr_id; xmpp_attr_t *attr_sid; @@ -152,7 +152,7 @@ xmpp_ibb_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_inf ibb_packet = (xmpp_element_t *)(ibb_packet_l?ibb_packet_l->data:NULL); } - if (ibb_packet && !pinfo->fd->flags.visited) { + if (ibb_packet && !pinfo->fd->visited) { xmpp_attr_t *attr_id; xmpp_attr_t *attr_sid; diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 2092addfb5..7a18c5f6be 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -476,7 +476,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void memset(&packet, 0, sizeof(packet)); /* Set up hint structures */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Allocate frame data with hints for upper layers */ nwk_hints = wmem_new0(wmem_file_scope(), zbee_nwk_hints_t); p_add_proto_data(wmem_file_scope(), pinfo, proto_zbee_nwk, 0, nwk_hints); @@ -594,7 +594,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_tree_add_item(nwk_tree, hf_zbee_nwk_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; - if (!pinfo->fd->flags.visited && nwk_hints) { + if (!pinfo->fd->visited && nwk_hints) { /* Provide hints to upper layers */ nwk_hints->src_pan = ieee_packet->src_pan; @@ -607,7 +607,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } else { /* See if extended source info was previously sniffed */ - if (!pinfo->fd->flags.visited && nwk_hints) { + if (!pinfo->fd->visited && nwk_hints) { nwk_hints->src_pan = ieee_packet->src_pan; addr16.addr = packet.src; @@ -621,7 +621,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void map_rec = (ieee802154_map_rec *) g_hash_table_lookup(ieee_packet->short_table, &addr16); if (map_rec) nwk_hints->map_rec = map_rec; } - } /* (!pinfo->fd->flags.visited) */ + } /* (!pinfo->fd->visited) */ else { if (nwk_hints && nwk_hints->map_rec ) { /* Display inferred source address info */ @@ -642,7 +642,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } /* If ieee layer didn't know its extended source address, and nwk layer does, fill it in */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if ( (ieee_packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) && ieee_hints && !ieee_hints->map_rec ) { addr16.pan = ieee_packet->src_pan; @@ -654,7 +654,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void ieee_hints->map_rec = map_rec; } } - } /* (!pinfo->fd->flags.visited */ + } /* (!pinfo->fd->visited */ } /* (pinfo->zbee_stack_vers >= ZBEE_VERSION_2007) */ /* Add multicast control field (ZigBee 2006 and later). */ diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 553e797052..9e6016c781 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -503,7 +503,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o packet.src64 = tvb_get_letoh64(tvb, offset); proto_tree_add_item(sec_tree, hf_zbee_sec_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN); #if 1 - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { switch ( packet.key_id ) { case ZBEE_SEC_KEY_LINK: if (nwk_hints && ieee_hints) { @@ -634,7 +634,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o decrypted = FALSE; if ( packet.src64 ) { - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { if ( nwk_hints ) { /* Use previously found key */ switch ( packet.key_id ) { @@ -653,7 +653,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o break; } } - } /* ( !pinfo->fd->flags.visited ) */ + } /* ( !pinfo->fd->visited ) */ else { /* We only search for sniffed keys in the first pass, * to save time, and because decrypting with keys @@ -711,7 +711,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o } } } - } /* ( ! pinfo->fd->flags.visited ) */ + } /* ( ! pinfo->fd->visited ) */ } /* ( packet.src64 ) */ if ( decrypted ) { @@ -1218,7 +1218,7 @@ void zbee_sec_add_key_to_keyring(packet_info *pinfo, const guint8 *key) zbee_nwk_hints_t *nwk_hints; /* Update the key ring for this pan */ - if ( !pinfo->fd->flags.visited && (nwk_hints = (zbee_nwk_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, + if ( !pinfo->fd->visited && (nwk_hints = (zbee_nwk_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_get_id_by_filter_name(ZBEE_PROTOABBREV_NWK), 0))) { nwk_keyring = (GSList **)g_hash_table_lookup(zbee_table_nwk_keyring, &nwk_hints->src_pan); if ( !nwk_keyring ) { diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index fa87f55ea0..b19b4378a7 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -240,7 +240,7 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * we've already done this work, so we don't need to do it * again. */ - if (!pinfo->fd->flags.visited) + if (!pinfo->fd->visited) { conversation = find_or_create_conversation(pinfo); diff --git a/epan/frame_data.c b/epan/frame_data.c index 4cbb60f802..4ccd318b9a 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -33,8 +33,8 @@ if both packets' times are reference times, we compare the times of the packets. */ #define COMPARE_TS_REAL(time1, time2) \ - ((fdata1->flags.ref_time && !fdata2->flags.ref_time) ? -1 : \ - (!fdata1->flags.ref_time && fdata2->flags.ref_time) ? 1 : \ + ((fdata1->ref_time && !fdata2->ref_time) ? -1 : \ + (!fdata1->ref_time && fdata2->ref_time) ? 1 : \ ((time1).secs < (time2).secs) ? -1 : \ ((time1).secs > (time2).secs) ? 1 : \ ((time1).nsecs < (time2).nsecs) ? -1 :\ @@ -158,14 +158,14 @@ frame_data_init(frame_data *fdata, guint32 num, const wtap_rec *rec, fdata->num = num; fdata->file_off = offset; fdata->subnum = 0; - fdata->flags.passed_dfilter = 0; - fdata->flags.dependent_of_displayed = 0; - fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII; - fdata->flags.visited = 0; - fdata->flags.marked = 0; - fdata->flags.ref_time = 0; - fdata->flags.ignored = 0; - fdata->flags.has_ts = (rec->presence_flags & WTAP_HAS_TS) ? 1 : 0; + fdata->passed_dfilter = 0; + fdata->dependent_of_displayed = 0; + fdata->encoding = PACKET_CHAR_ENC_CHAR_ASCII; + fdata->visited = 0; + fdata->marked = 0; + fdata->ref_time = 0; + fdata->ignored = 0; + fdata->has_ts = (rec->presence_flags & WTAP_HAS_TS) ? 1 : 0; switch (rec->rec_type) { case REC_TYPE_PACKET: @@ -194,13 +194,13 @@ frame_data_init(frame_data *fdata, guint32 num, const wtap_rec *rec, break; } - /* To save some memory, we coerce it into a gint16 */ - g_assert(rec->tsprec <= G_MAXINT16); - fdata->tsprec = (gint16)rec->tsprec; + /* To save some memory, we coerce it into 4 bits */ + g_assert(rec->tsprec <= 0xF); + fdata->tsprec = (unsigned int)rec->tsprec; fdata->abs_ts = rec->ts; - fdata->flags.has_phdr_comment = (rec->opt_comment != NULL); - fdata->flags.has_user_comment = 0; - fdata->flags.need_colorize = 0; + fdata->has_phdr_comment = (rec->opt_comment != NULL); + fdata->has_user_comment = 0; + fdata->need_colorize = 0; fdata->color_filter = NULL; fdata->shift_offset.secs = 0; fdata->shift_offset.nsecs = 0; @@ -222,7 +222,7 @@ frame_data_set_before_dissect(frame_data *fdata, /* if this frames is marked as a reference time frame, set reference frame this frame */ - if(fdata->flags.ref_time) + if(fdata->ref_time) *frame_ref = fdata; /* Get the time elapsed between the first packet and this packet. */ @@ -247,7 +247,7 @@ frame_data_set_after_dissect(frame_data *fdata, /* This frame either passed the display filter list or is marked as a time reference frame. All time reference frames are displayed even if they don't pass the display filter */ - if(fdata->flags.ref_time){ + if(fdata->ref_time){ /* if this was a TIME REF frame we should reset the cul bytes field */ *cum_bytes = fdata->pkt_len; fdata->cum_bytes = *cum_bytes; @@ -261,7 +261,7 @@ frame_data_set_after_dissect(frame_data *fdata, void frame_data_reset(frame_data *fdata) { - fdata->flags.visited = 0; + fdata->visited = 0; fdata->subnum = 0; if (fdata->pfd) { diff --git a/epan/frame_data.h b/epan/frame_data.h index 4da31019f2..d4b429b596 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -24,7 +24,7 @@ extern "C" { struct _packet_info; struct epan_session; -#define PINFO_FD_VISITED(pinfo) ((pinfo)->fd->flags.visited) +#define PINFO_FD_VISITED(pinfo) ((pinfo)->fd->visited) /** @file * Low-level frame data and metadata. @@ -47,35 +47,47 @@ typedef enum { /** The frame number is the ordinal number of the frame in the capture, so it's 1-origin. In various contexts, 0 as a frame number means "frame - number unknown". */ + number unknown". + + There is one of these structures for every frame in the capture. + That means a lot of memory if we have a lot of frames. + They are packed into power-of-2 chunks, so their size is effectively + rounded up to a power of 2. + Try to keep it close to, and less than or equal to, a power of 2. + "Smaller than a power of 2" is OK for ILP32 platforms. + + XXX - shuffle the fields to try to keep the most commonly-accessed + fields within the first 16 or 32 bytes, so they all fit in a cache + line? */ struct _color_filter; /* Forward */ DIAG_OFF_PEDANTIC typedef struct _frame_data { - GSList *pfd; /**< Per frame proto data */ guint32 num; /**< Frame number */ guint32 pkt_len; /**< Packet length */ guint32 cap_len; /**< Amount actually captured */ guint32 cum_bytes; /**< Cumulative bytes into the capture */ gint64 file_off; /**< File offset */ - guint16 subnum; /**< subframe number, for protocols that require this */ - gint16 tsprec; /**< Time stamp precision */ - struct { - unsigned int passed_dfilter : 1; /**< 1 = display, 0 = no display */ - unsigned int dependent_of_displayed : 1; /**< 1 if a displayed frame depends on this frame */ - /* Do NOT use packet_char_enc enum here: MSVC compiler does not handle an enum in a bit field properly */ - unsigned int encoding : 1; /**< Character encoding (ASCII, EBCDIC...) */ - unsigned int visited : 1; /**< Has this packet been visited yet? 1=Yes,0=No*/ - unsigned int marked : 1; /**< 1 = marked by user, 0 = normal */ - unsigned int ref_time : 1; /**< 1 = marked as a reference time frame, 0 = normal */ - unsigned int ignored : 1; /**< 1 = ignore this frame, 0 = normal */ - unsigned int has_ts : 1; /**< 1 = has time stamp, 0 = no time stamp */ - unsigned int has_phdr_comment : 1; /** 1 = there's comment for this packet */ - unsigned int has_user_comment : 1; /** 1 = user set (also deleted) comment for this packet */ - unsigned int need_colorize : 1; /**< 1 = need to (re-)calculate packet color */ - } flags; - + /* These two are pointers, meaning 64-bit on LP64 (64-bit UN*X) and + LLP64 (64-bit Windows) platforms. Put them here, one after the + other, so they don't require padding between them. */ + GSList *pfd; /**< Per frame proto data */ const struct _color_filter *color_filter; /**< Per-packet matching color_filter_t object */ - + guint16 subnum; /**< subframe number, for protocols that require this */ + /* Keep the bitfields below to 16 bits, so this plus the previous field + are 32 bits. */ + unsigned int passed_dfilter : 1; /**< 1 = display, 0 = no display */ + unsigned int dependent_of_displayed : 1; /**< 1 if a displayed frame depends on this frame */ + /* Do NOT use packet_char_enc enum here: MSVC compiler does not handle an enum in a bit field properly */ + unsigned int encoding : 1; /**< Character encoding (ASCII, EBCDIC...) */ + unsigned int visited : 1; /**< Has this packet been visited yet? 1=Yes,0=No*/ + unsigned int marked : 1; /**< 1 = marked by user, 0 = normal */ + unsigned int ref_time : 1; /**< 1 = marked as a reference time frame, 0 = normal */ + unsigned int ignored : 1; /**< 1 = ignore this frame, 0 = normal */ + unsigned int has_ts : 1; /**< 1 = has time stamp, 0 = no time stamp */ + unsigned int has_phdr_comment : 1; /** 1 = there's comment for this packet */ + unsigned int has_user_comment : 1; /** 1 = user set (also deleted) comment for this packet */ + unsigned int need_colorize : 1; /**< 1 = need to (re-)calculate packet color */ + unsigned int tsprec : 4; /**< Time stamp precision -2^tsprec gives up to femtoseconds */ nstime_t abs_ts; /**< Absolute timestamp */ nstime_t shift_offset; /**< How much the abs_tm of the frame is shifted */ guint32 frame_ref_num; /**< Previous reference frame (0 if this is one) */ diff --git a/epan/frame_data_sequence.c b/epan/frame_data_sequence.c index 01af1f645f..11472dc6dc 100644 --- a/epan/frame_data_sequence.c +++ b/epan/frame_data_sequence.c @@ -320,7 +320,7 @@ find_and_mark_frame_depended_upon(gpointer data, gpointer user_data) if (dependent_frame && frames) { dependent_fd = frame_data_sequence_find(frames, dependent_frame); - dependent_fd->flags.dependent_of_displayed = 1; + dependent_fd->dependent_of_displayed = 1; } } diff --git a/epan/packet.c b/epan/packet.c index 538b93ea15..d777f55d37 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -520,7 +520,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, edt->pi.cinfo = cinfo; edt->pi.presence_flags = 0; edt->pi.num = fd->num; - if (fd->flags.has_ts) { + if (fd->has_ts) { edt->pi.presence_flags |= PINFO_HAS_TS; edt->pi.abs_ts = fd->abs_ts; } @@ -560,9 +560,9 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, frame_delta_abs_time(edt->session, fd, fd->frame_ref_num, &edt->pi.rel_ts); /* pkt comment use first user, later from rec */ - if (fd->flags.has_user_comment) + if (fd->has_user_comment) frame_dissector_data.pkt_comment = epan_get_user_comment(edt->session, fd); - else if (fd->flags.has_phdr_comment) + else if (fd->has_phdr_comment) frame_dissector_data.pkt_comment = rec->opt_comment; else frame_dissector_data.pkt_comment = NULL; @@ -589,7 +589,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, } ENDTRY; - fd->flags.visited = 1; + fd->visited = 1; } /* Creates the top-most tvbuff and calls dissect_file() */ @@ -629,9 +629,9 @@ dissect_file(epan_dissect_t *edt, wtap_rec *rec, TRY { /* pkt comment use first user, later from rec */ - if (fd->flags.has_user_comment) + if (fd->has_user_comment) file_dissector_data.pkt_comment = epan_get_user_comment(edt->session, fd); - else if (fd->flags.has_phdr_comment) + else if (fd->has_phdr_comment) file_dissector_data.pkt_comment = rec->opt_comment; else file_dissector_data.pkt_comment = NULL; @@ -657,7 +657,7 @@ dissect_file(epan_dissect_t *edt, wtap_rec *rec, } ENDTRY; - fd->flags.visited = 1; + fd->visited = 1; } /*********************** code added for sub-dissector lookup *********************/ diff --git a/epan/print.c b/epan/print.c index 473134e845..ac4ce1db57 100644 --- a/epan/print.c +++ b/epan/print.c @@ -147,7 +147,7 @@ proto_tree_print(print_dissections_e print_dissections, gboolean print_hex, data.stream = stream; data.success = TRUE; data.src_list = edt->pi.data_src; - data.encoding = (packet_char_enc)edt->pi.fd->flags.encoding; + data.encoding = (packet_char_enc)edt->pi.fd->encoding; data.print_dissections = print_dissections; /* If we're printing the entire packet in hex, don't print uninterpreted data fields in hex as well. */ @@ -1996,7 +1996,7 @@ print_hex_data(print_stream_t *stream, epan_dissect_t *edt) return TRUE; cp = tvb_get_ptr(tvb, 0, length); if (!print_hex_data_buffer(stream, cp, length, - (packet_char_enc)edt->pi.fd->flags.encoding)) + (packet_char_enc)edt->pi.fd->encoding)) return FALSE; } return TRUE; diff --git a/epan/reassemble.c b/epan/reassemble.c index b3ceef915d..26f14588f0 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1350,7 +1350,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, /* leave it here for future debugging sessions */ if(strcmp(pinfo->current_proto, "DCERPC") == 0) { printf("proto:%s num:%u id:%u offset:%u len:%u more:%u visited:%u\n", - pinfo->current_proto, pinfo->num, id, frag_offset, frag_data_len, more_frags, pinfo->fd->flags.visited); + pinfo->current_proto, pinfo->num, id, frag_offset, frag_data_len, more_frags, pinfo->fd->visited); if(fd_head != NULL) { for(fd_item=fd_head->next;fd_item;fd_item=fd_item->next){ printf("fd_frame:%u fd_offset:%u len:%u datalen:%u\n", @@ -1363,7 +1363,7 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset, /* * Is this the first pass through the capture? */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* * Yes, so we could be doing reassembly. If * "check_already_added" is true, and fd_head is non-null, @@ -1551,7 +1551,7 @@ fragment_add_check(reassembly_table *table, tvbuff_t *tvb, const int offset, * If this isn't the first pass, look for this frame in the table * of reassembled packets. */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); @@ -1947,7 +1947,7 @@ fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb, fd_head = lookup_fd_head(table, pinfo, id, data, &orig_key); /* have we already seen this frame ?*/ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { if (fd_head != NULL && fd_head->flags & FD_DEFRAGMENTED) { if (orig_keyp != NULL) *orig_keyp = orig_key; @@ -2089,7 +2089,7 @@ fragment_add_seq_check_work(reassembly_table *table, tvbuff_t *tvb, * Have we already seen this frame? * If so, look for it in the table of reassembled packets. */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); @@ -2235,7 +2235,7 @@ fragment_add_seq_single_work(reassembly_table *table, tvbuff_t *tvb, * If so, look for it in the table of reassembled packets. * Note here we store in the reassembly table by the single sequence * number rather than the sequence number of the First fragment. */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { reass_key.frame = pinfo->num; reass_key.id = id; fh = (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); @@ -2477,7 +2477,7 @@ fragment_start_seq_check(reassembly_table *table, const packet_info *pinfo, fragment_head *fd_head; /* Have we already seen this frame ?*/ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { return; } @@ -2516,7 +2516,7 @@ fragment_end_seq_next(reassembly_table *table, const packet_info *pinfo, * Have we already seen this frame? * If so, look for it in the table of reassembled packets. */ - if (pinfo->fd->flags.visited) { + if (pinfo->fd->visited) { reass_key.frame = pinfo->num; reass_key.id = id; return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index f8a9b4f8b2..2f367ba76e 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -208,14 +208,14 @@ test_simple_fragment_add_seq(void) /* adding the same fragment again should do nothing, even with different * offset etc */ - pinfo.fd->flags.visited = 1; + pinfo.fd->visited = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 0, 60, TRUE, 0); ASSERT_EQ(1,g_hash_table_size(test_reassembly_table.fragment_table)); ASSERT_EQ_POINTER(NULL,fd_head); /* start another pdu (just to confuse things) */ - pinfo.fd->flags.visited = 0; + pinfo.fd->visited = 0; pinfo.num = 2; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 15, &pinfo, 13, NULL, 0, 60, TRUE, 0); @@ -281,7 +281,7 @@ test_simple_fragment_add_seq(void) /* what happens if we revisit the packets now? */ fdh0 = fd_head; - pinfo.fd->flags.visited = 1; + pinfo.fd->visited = 1; pinfo.num = 1; fd_head=fragment_add_seq(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, 0, 50, TRUE, 0); @@ -1277,7 +1277,7 @@ test_simple_fragment_add_seq_next(void) /* adding the same fragment again should do nothing, even with different * offset etc */ - pinfo.fd->flags.visited = 1; + pinfo.fd->visited = 1; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 12, NULL, 60, TRUE); ASSERT_EQ(1,g_hash_table_size(test_reassembly_table.fragment_table)); @@ -1285,7 +1285,7 @@ test_simple_fragment_add_seq_next(void) ASSERT_EQ_POINTER(NULL,fd_head); /* start another pdu (just to confuse things) */ - pinfo.fd->flags.visited = 0; + pinfo.fd->visited = 0; pinfo.num = 2; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 15, &pinfo, 13, NULL, 60, TRUE); @@ -1380,7 +1380,7 @@ test_missing_data_fragment_add_seq_next(void) /* check what happens when we revisit the packets */ - pinfo.fd->flags.visited = TRUE; + pinfo.fd->visited = TRUE; pinfo.num = 1; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 12, NULL, @@ -1439,7 +1439,7 @@ test_missing_data_fragment_add_seq_next_2(void) ASSERT_EQ_POINTER(NULL,fd_head); /* check what happens when we revisit the packets */ - pinfo.fd->flags.visited = TRUE; + pinfo.fd->visited = TRUE; pinfo.num = 11; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 10, &pinfo, 24, NULL, @@ -1490,7 +1490,7 @@ test_missing_data_fragment_add_seq_next_3(void) ASSERT_EQ_POINTER(NULL,fd_head->next); /* revisiting the packet ought to produce the same result. */ - pinfo.fd->flags.visited = TRUE; + pinfo.fd->visited = TRUE; pinfo.num = 20; fd_head=fragment_add_seq_next(&test_reassembly_table, tvb, 5, &pinfo, 30, NULL, @@ -1555,7 +1555,7 @@ main(int argc _U_, char **argv _U_) /* other test stuff */ pinfo.fd = &fd; - fd.flags.visited = 0; + fd.visited = 0; set_address(&pinfo.src,AT_IPv4,4,src); set_address(&pinfo.dst,AT_IPv4,4,dst); @@ -1567,7 +1567,7 @@ main(int argc _U_, char **argv _U_) ASSERT(test_reassembly_table.fragment_table != NULL); ASSERT(test_reassembly_table.reassembled_table != NULL); - pinfo.fd->flags.visited = FALSE; + pinfo.fd->visited = FALSE; tests[i](); diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c index 00779d3a6f..bf9e1eaf6f 100644 --- a/epan/wslua/wslua_dumper.c +++ b/epan/wslua/wslua_dumper.c @@ -440,10 +440,10 @@ WSLUA_METHOD Dumper_dump_current(lua_State* L) { rec.rec_header.packet_header.pkt_encap = lua_pinfo->rec->rec_header.packet_header.pkt_encap; rec.rec_header.packet_header.pseudo_header = *lua_pinfo->pseudo_header; - if (lua_pinfo->fd->flags.has_user_comment) { + if (lua_pinfo->fd->has_user_comment) { rec.opt_comment = wmem_strdup(wmem_packet_scope(), epan_get_user_comment(lua_pinfo->epan, lua_pinfo->fd)); rec.has_comment_changed = TRUE; - } else if (lua_pinfo->fd->flags.has_phdr_comment) { + } else if (lua_pinfo->fd->has_phdr_comment) { rec.opt_comment = wmem_strdup(wmem_packet_scope(), lua_pinfo->rec->opt_comment); } diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index bd441770ae..d36fbc7ba7 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -203,7 +203,7 @@ lua_delta_nstime_to_sec(const Pinfo pinfo, const frame_data *fd, guint32 prev_nu /* WSLUA_ATTRIBUTE Pinfo_visited RO Whether this packet has been already visited. */ -PINFO_NAMED_BOOLEAN_GETTER(visited,fd->flags.visited); +PINFO_NAMED_BOOLEAN_GETTER(visited,fd->visited); /* WSLUA_ATTRIBUTE Pinfo_number RO The number of this packet in the current file. */ PINFO_NAMED_NUMBER_GETTER(number,num); @@ -1158,11 +1158,11 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, * TODO: actually detect that situation or maybe apply other optimizations? */ if (edt->tree && color_filters_used()) { color_filters_prime_edt(edt); - fdata->flags.need_colorize = 1; + fdata->need_colorize = 1; } #endif - if (!fdata->flags.visited) { + if (!fdata->visited) { /* This is the first pass, so prime the epan_dissect_t with the hfids postdissectors want on the first pass. */ prime_epan_dissect_with_postdissector_wanted_hfids(edt); @@ -1175,9 +1175,9 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, /* If we don't have a display filter, set "passed_dfilter" to 1. */ if (dfcode != NULL) { - fdata->flags.passed_dfilter = dfilter_apply_edt(dfcode, edt) ? 1 : 0; + fdata->passed_dfilter = dfilter_apply_edt(dfcode, edt) ? 1 : 0; - if (fdata->flags.passed_dfilter) { + if (fdata->passed_dfilter) { /* This frame passed the display filter but it may depend on other * (potentially not displayed) frames. Find those frames and mark them * as depended upon. @@ -1185,9 +1185,9 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, g_slist_foreach(edt->pi.dependent_frames, find_and_mark_frame_depended_upon, cf->provider.frames); } } else - fdata->flags.passed_dfilter = 1; + fdata->passed_dfilter = 1; - if (fdata->flags.passed_dfilter || fdata->flags.ref_time) + if (fdata->passed_dfilter || fdata->ref_time) cf->displayed_count++; if (add_to_packet_list) { @@ -1195,7 +1195,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, packet_list_append(cinfo, fdata); } - if (fdata->flags.passed_dfilter || fdata->flags.ref_time) + if (fdata->passed_dfilter || fdata->ref_time) { frame_data_set_after_dissect(fdata, &cf->cum_bytes); cf->provider.prev_dis = fdata; @@ -1810,7 +1810,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb } /* Frame dependencies from the previous dissection/filtering are no longer valid. */ - fdata->flags.dependent_of_displayed = 0; + fdata->dependent_of_displayed = 0; if (!cf_read_record(cf, fdata)) break; /* error reading the frame */ @@ -1818,7 +1818,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb /* If the previous frame is displayed, and we haven't yet seen the selected frame, remember that frame - it's the closest one we've yet seen before the selected frame. */ - if (prev_frame_num != -1 && !selected_frame_seen && prev_frame->flags.passed_dfilter) { + if (prev_frame_num != -1 && !selected_frame_seen && prev_frame->passed_dfilter) { preceding_frame_num = prev_frame_num; preceding_frame = prev_frame; } @@ -1832,13 +1832,13 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb seen displayed after the selected frame, remember this frame - it's the closest one we've yet seen at or after the selected frame. */ - if (fdata->flags.passed_dfilter && selected_frame_seen && following_frame_num == -1) { + if (fdata->passed_dfilter && selected_frame_seen && following_frame_num == -1) { following_frame_num = fdata->num; following_frame = fdata; } if (fdata == selected_frame) { selected_frame_seen = TRUE; - if (fdata->flags.passed_dfilter) + if (fdata->passed_dfilter) selected_frame_num = fdata->num; } @@ -1995,7 +1995,7 @@ ref_time_packets(capture_file *cf) cf->provider.ref = fdata; /* if this frames is marked as a reference time frame, reset firstsec and firstusec to this frame */ - if (fdata->flags.ref_time) + if (fdata->ref_time) cf->provider.ref = fdata; /* If we don't have the time stamp of the previous displayed packet, @@ -2020,7 +2020,7 @@ ref_time_packets(capture_file *cf) /* If this frame is displayed, get the time elapsed between the previous displayed packet and this packet. */ - if ( fdata->flags.passed_dfilter ) { + if ( fdata->passed_dfilter ) { fdata->prev_dis_num = cf->provider.prev_dis->num; cf->provider.prev_dis = fdata; } @@ -2028,11 +2028,11 @@ ref_time_packets(capture_file *cf) /* * Byte counts */ - if ( (fdata->flags.passed_dfilter) || (fdata->flags.ref_time) ) { + if ( (fdata->passed_dfilter) || (fdata->ref_time) ) { /* This frame either passed the display filter list or is marked as a time reference frame. All time reference frames are displayed even if they don't pass the display filter */ - if (fdata->flags.ref_time) { + if (fdata->ref_time) { /* if this was a TIME REF frame we should reset the cum_bytes field */ cf->cum_bytes = fdata->pkt_len; fdata->cum_bytes = cf->cum_bytes; @@ -3520,7 +3520,7 @@ cf_find_packet_marked(capture_file *cf, search_direction dir) static match_result match_marked(capture_file *cf _U_, frame_data *fdata, void *criterion _U_) { - return fdata->flags.marked ? MR_MATCHED : MR_NOTMATCHED; + return fdata->marked ? MR_MATCHED : MR_NOTMATCHED; } gboolean @@ -3532,7 +3532,7 @@ cf_find_packet_time_reference(capture_file *cf, search_direction dir) static match_result match_time_reference(capture_file *cf _U_, frame_data *fdata, void *criterion _U_) { - return fdata->flags.ref_time ? MR_MATCHED : MR_NOTMATCHED; + return fdata->ref_time ? MR_MATCHED : MR_NOTMATCHED; } static gboolean @@ -3653,7 +3653,7 @@ find_packet(capture_file *cf, count++; /* Is this packet in the display? */ - if (fdata && fdata->flags.passed_dfilter) { + if (fdata && fdata->passed_dfilter) { /* Yes. Does it match the search criterion? */ result = (*match_function)(cf, fdata, criterion); if (result == MR_ERROR) { @@ -3720,7 +3720,7 @@ cf_goto_frame(capture_file *cf, guint fnumber) statusbar_push_temporary_msg("There is no packet number %u.", fnumber); return FALSE; /* we failed to go to that packet */ } - if (!fdata->flags.passed_dfilter) { + if (!fdata->passed_dfilter) { /* that packet currently isn't displayed */ /* XXX - add it to the set of displayed packets? */ statusbar_push_temporary_msg("Packet number %u isn't displayed.", fnumber); @@ -3824,8 +3824,8 @@ cf_unselect_packet(capture_file *cf) void cf_mark_frame(capture_file *cf, frame_data *frame) { - if (! frame->flags.marked) { - frame->flags.marked = TRUE; + if (! frame->marked) { + frame->marked = TRUE; if (cf->count > cf->marked_count) cf->marked_count++; } @@ -3837,8 +3837,8 @@ cf_mark_frame(capture_file *cf, frame_data *frame) void cf_unmark_frame(capture_file *cf, frame_data *frame) { - if (frame->flags.marked) { - frame->flags.marked = FALSE; + if (frame->marked) { + frame->marked = FALSE; if (cf->marked_count > 0) cf->marked_count--; } @@ -3850,8 +3850,8 @@ cf_unmark_frame(capture_file *cf, frame_data *frame) void cf_ignore_frame(capture_file *cf, frame_data *frame) { - if (! frame->flags.ignored) { - frame->flags.ignored = TRUE; + if (! frame->ignored) { + frame->ignored = TRUE; if (cf->count > cf->ignored_count) cf->ignored_count++; } @@ -3863,8 +3863,8 @@ cf_ignore_frame(capture_file *cf, frame_data *frame) void cf_unignore_frame(capture_file *cf, frame_data *frame) { - if (frame->flags.ignored) { - frame->flags.ignored = FALSE; + if (frame->ignored) { + frame->ignored = FALSE; if (cf->ignored_count > 0) cf->ignored_count--; } @@ -3933,11 +3933,11 @@ cf_get_packet_comment(capture_file *cf, const frame_data *fd) char *comment; /* fetch user comment */ - if (fd->flags.has_user_comment) + if (fd->has_user_comment) return g_strdup(cap_file_provider_get_user_comment(&cf->provider, fd)); /* fetch phdr comment */ - if (fd->flags.has_phdr_comment) { + if (fd->has_phdr_comment) { wtap_rec rec; /* Record metadata */ Buffer buf; /* Record data */ @@ -4046,12 +4046,12 @@ save_record(capture_file *cf, frame_data *fdata, wtap_rec *rec, /* Make changes based on anything that the user has done but that hasn't been saved yet. */ - if (fdata->flags.has_user_comment) + if (fdata->has_user_comment) pkt_comment = cap_file_provider_get_user_comment(&cf->provider, fdata); else pkt_comment = rec->opt_comment; new_rec.opt_comment = g_strdup(pkt_comment); - new_rec.has_comment_changed = fdata->flags.has_user_comment ? TRUE : FALSE; + new_rec.has_comment_changed = fdata->has_user_comment ? TRUE : FALSE; /* XXX - what if times have been shifted? */ /* and save the packet */ @@ -4662,8 +4662,8 @@ cf_save_records(capture_file *cf, const char *fname, guint save_format, for (framenum = 1; framenum <= cf->count; framenum++) { fdata = frame_data_sequence_find(cf->provider.frames, framenum); - fdata->flags.has_phdr_comment = FALSE; - fdata->flags.has_user_comment = FALSE; + fdata->has_phdr_comment = FALSE; + fdata->has_user_comment = FALSE; } if (cf->provider.frames_user_comments) { diff --git a/file_packet_provider.c b/file_packet_provider.c index 826e275a49..8d77c3886b 100644 --- a/file_packet_provider.c +++ b/file_packet_provider.c @@ -88,5 +88,5 @@ cap_file_provider_set_user_comment(struct packet_provider_data *prov, frame_data /* insert new packet comment */ g_tree_replace(prov->frames_user_comments, fd, g_strdup(new_comment)); - fd->flags.has_user_comment = TRUE; + fd->has_user_comment = TRUE; } diff --git a/plugins/epan/ethercat/packet-esl.c b/plugins/epan/ethercat/packet-esl.c index b552ff0287..94a4dff0e1 100644 --- a/plugins/epan/ethercat/packet-esl.c +++ b/plugins/epan/ethercat/packet-esl.c @@ -220,7 +220,7 @@ static void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) ref_time_frame.num = pinfo->num; ref_time_frame.abs_ts = pinfo->abs_ts; } - else if ( !pinfo->fd->flags.visited ) + else if ( !pinfo->fd->visited ) { guint64 nsecs = tvb_get_letoh64(tvb, offset+8) - ref_time_frame.esl_ts; guint64 secs = nsecs/1000000000; @@ -256,7 +256,7 @@ dissect_esl_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data in_heur = TRUE; /*TRY */ { - if ( ref_time_frame.fd != NULL && !pinfo->fd->flags.visited && pinfo->num <= ref_time_frame.num ) + if ( ref_time_frame.fd != NULL && !pinfo->fd->visited && pinfo->num <= ref_time_frame.num ) ref_time_frame.fd = NULL; /* Check that there's enough data */ diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c index 7e65393e14..fe7bcc581b 100644 --- a/plugins/epan/profinet/packet-dcerpc-pn-io.c +++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c @@ -7683,7 +7683,7 @@ dissect_ARBlockReq_block(tvbuff_t *tvb, int offset, offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree_selector, drep, hf_pn_io_ar_arreserved, &u16ArReserved); /* When ARType==IOCARSR, then find or create conversation for this frame */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_UDP, 0, 0, 0); if (conversation == NULL) { @@ -7921,7 +7921,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset, /* Set global Variant for Number of IO Data Objects */ /* Notice: Handle Input & Output seperate!!! */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -7963,7 +7963,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset, proto_item_set_len(sub_item, offset - u32SubStart); - if (!pinfo->fd->flags.visited && station_info != NULL) { + if (!pinfo->fd->visited && station_info != NULL) { io_data_object = wmem_new0(wmem_file_scope(), ioDataObject); io_data_object->slotNr = u16SlotNr; io_data_object->subSlotNr = u16SubslotNr; @@ -8005,7 +8005,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset, hf_pn_io_number_of_iocs, &u16NumberOfIOCS); /* Set global Vairant for NumberOfIOCS */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (station_info != NULL) { station_info->iocsNr = u16NumberOfIOCS; } @@ -8032,7 +8032,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset, proto_item_set_len(sub_item, offset - u32SubStart); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { if (station_info != NULL) { if (u16IOCRType == PN_INPUT_CR) { iocs_list = station_info->iocs_data_in; @@ -8702,7 +8702,7 @@ dissect_DataDescription(tvbuff_t *tvb, int offset, proto_item_set_len(sub_item, offset - u32SubStart); /* Save new data for IO Data Objects */ - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -9229,7 +9229,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset, u16NumberOfSubmodules); - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -10692,7 +10692,7 @@ dissect_ProfiSafeParameterRequest(tvbuff_t *tvb, int offset, prm_flag1, prm_flag2, src_addr, dst_addr, wd_time, par_crc); } - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -10772,7 +10772,7 @@ dissect_RecordDataWrite(tvbuff_t *tvb, int offset, station_info = (stationInfo*)conversation_get_proto_data(conversation, proto_pn_dcp); if (station_info != NULL) { - if (!pinfo->fd->flags.visited) { + if (!pinfo->fd->visited) { /* Search within the entire existing list for current input object data */ for (frame = wmem_list_head(station_info->ioobject_data_in); frame != NULL; frame = wmem_list_frame_next(frame)) { io_data_object = (ioDataObject*)wmem_list_frame_data(frame); diff --git a/plugins/epan/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c index 4a4145734c..fb9dc3377b 100644 --- a/plugins/epan/profinet/packet-pn-dcp.c +++ b/plugins/epan/profinet/packet-pn-dcp.c @@ -540,7 +540,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_append_text(block_item, ", DeviceVendorValue: \"%s\"", typeofstation); - if (pinfo->fd->flags.visited == FALSE) { + if (pinfo->fd->visited == FALSE) { /* Create a conversation between the MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -585,7 +585,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_append_text(block_item, ", \"%s\"", nameofstation); - if (pinfo->fd->flags.visited == FALSE) { + if (pinfo->fd->visited == FALSE) { /* Create a conversation between the MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -616,7 +616,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_vendor_id, &vendor_id); offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_device_id, &device_id); - if (pinfo->fd->flags.visited == FALSE) { + if (pinfo->fd->visited == FALSE) { /* Create a conversation between the MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, ENDPOINT_NONE, 0, 0, 0); if (conversation == NULL) { @@ -544,7 +544,7 @@ sharkd_dissect_request(guint32 framenum, guint32 frame_ref_num, guint32 prev_dis if (dissect_flags & SHARKD_DISSECT_FLAG_COLOR) { color_filters_prime_edt(&edt); - fdata->flags.need_colorize = 1; + fdata->need_colorize = 1; } if (cinfo) @@ -554,7 +554,7 @@ sharkd_dissect_request(guint32 framenum, guint32 frame_ref_num, guint32 prev_dis * XXX - need to catch an OutOfMemoryError exception and * attempt to recover from it. */ - fdata->flags.ref_time = (framenum == frame_ref_num); + fdata->ref_time = (framenum == frame_ref_num); fdata->frame_ref_num = frame_ref_num; fdata->prev_dis_num = prev_dis_num; epan_dissect_run(&edt, cfile.cd_t, &rec, @@ -604,7 +604,7 @@ sharkd_dissect_columns(frame_data *fdata, guint32 frame_ref_num, guint32 prev_di if (dissect_color) { color_filters_prime_edt(&edt); - fdata->flags.need_colorize = 1; + fdata->need_colorize = 1; } if (cinfo) @@ -614,7 +614,7 @@ sharkd_dissect_columns(frame_data *fdata, guint32 frame_ref_num, guint32 prev_di * XXX - need to catch an OutOfMemoryError exception and * attempt to recover from it. */ - fdata->flags.ref_time = (fdata->num == frame_ref_num); + fdata->ref_time = (fdata->num == frame_ref_num); fdata->frame_ref_num = frame_ref_num; fdata->prev_dis_num = prev_dis_num; epan_dissect_run(&edt, cfile.cd_t, &rec, @@ -676,7 +676,7 @@ sharkd_retap(void) if (!wtap_seek_read(cfile.provider.wth, fdata->file_off, &rec, &buf, &err, &err_info)) break; - fdata->flags.ref_time = FALSE; + fdata->ref_time = FALSE; fdata->frame_ref_num = (framenum != 1) ? 1 : 0; fdata->prev_dis_num = framenum - 1; epan_dissect_run_with_taps(&edt, cfile.cd_t, &rec, @@ -745,7 +745,7 @@ sharkd_filter(const char *dftext, guint8 **result) /* frame_data_set_before_dissect */ epan_dissect_prime_with_dfilter(&edt, dfcode); - fdata->flags.ref_time = FALSE; + fdata->ref_time = FALSE; fdata->frame_ref_num = (framenum != 1) ? 1 : 0; fdata->prev_dis_num = prev_dis_num; epan_dissect_run(&edt, cfile.cd_t, &rec, diff --git a/sharkd_session.c b/sharkd_session.c index 5c84c5aa68..3c821627b9 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -1004,16 +1004,16 @@ sharkd_session_process_frames(const char *buf, const jsmntok_t *tokens, int coun sharkd_json_value_anyf(TRUE, "num", "%u", framenum); - if (fdata->flags.has_user_comment || fdata->flags.has_phdr_comment) + if (fdata->has_user_comment || fdata->has_phdr_comment) { - if (!fdata->flags.has_user_comment || sharkd_get_user_comment(fdata) != NULL) + if (!fdata->has_user_comment || sharkd_get_user_comment(fdata) != NULL) sharkd_json_value_anyf(TRUE, "ct", "true"); } - if (fdata->flags.ignored) + if (fdata->ignored) sharkd_json_value_anyf(TRUE, "i", "true"); - if (fdata->flags.marked) + if (fdata->marked) sharkd_json_value_anyf(TRUE, "m", "true"); if (fdata->color_filter) @@ -2903,9 +2903,9 @@ sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct ep sharkd_json_value_anyf(FALSE, "err", "0"); - if (fdata->flags.has_user_comment) + if (fdata->has_user_comment) pkt_comment = sharkd_get_user_comment(fdata); - else if (fdata->flags.has_phdr_comment) + else if (fdata->has_phdr_comment) pkt_comment = pi->rec->opt_comment; if (pkt_comment) @@ -2953,10 +2953,10 @@ sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct ep sharkd_json_array_close(); } - if (fdata->flags.ignored) + if (fdata->ignored) sharkd_json_value_anyf(TRUE, "i", "true"); - if (fdata->flags.marked) + if (fdata->marked) sharkd_json_value_anyf(TRUE, "m", "true"); if (fdata->color_filter) @@ -2981,7 +2981,7 @@ sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct ep { const guchar *cp = tvb_get_ptr(tvb, 0, length); - /* XXX pi.fd->flags.encoding */ + /* XXX pi.fd->encoding */ sharkd_json_value_base64(TRUE, "bytes", cp, length); } else @@ -3016,7 +3016,7 @@ sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct ep { const guchar *cp = tvb_get_ptr(tvb, 0, length); - /* XXX pi.fd->flags.encoding */ + /* XXX pi.fd->encoding */ sharkd_json_value_base64(TRUE, "bytes", cp, length); } else @@ -1176,7 +1176,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, if (edt) { epan_dissect_reset(edt); } - return passed || fdata->flags.dependent_of_displayed; + return passed || fdata->dependent_of_displayed; } static gboolean @@ -3001,7 +3001,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, if (dissect_color) { color_filters_prime_edt(edt); - fdata->flags.need_colorize = 1; + fdata->need_colorize = 1; } epan_dissect_run_with_taps(edt, cf->cd_t, rec, @@ -3039,7 +3039,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, if (edt) { epan_dissect_reset(edt); } - return passed || fdata->flags.dependent_of_displayed; + return passed || fdata->dependent_of_displayed; } static gboolean @@ -3485,7 +3485,7 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, if (dissect_color) { color_filters_prime_edt(edt); - fdata.flags.need_colorize = 1; + fdata.need_colorize = 1; } epan_dissect_run_with_taps(edt, cf->cd_t, rec, diff --git a/ui/packet_range.c b/ui/packet_range.c index a0cd7e2166..d2acdea0c1 100644 --- a/ui/packet_range.c +++ b/ui/packet_range.c @@ -82,20 +82,20 @@ static void packet_range_calc(packet_range_t *range) { if (range->cf->current_frame == packet) { range->selected_packet = framenum; } - if (packet->flags.passed_dfilter) { + if (packet->passed_dfilter) { range->displayed_cnt++; } - if (packet->flags.passed_dfilter || - packet->flags.dependent_of_displayed) { + if (packet->passed_dfilter || + packet->dependent_of_displayed) { range->displayed_plus_dependents_cnt++; } - if (packet->flags.marked) { - if (packet->flags.ignored) { + if (packet->marked) { + if (packet->ignored) { range->ignored_marked_cnt++; } - if (packet->flags.passed_dfilter) { + if (packet->passed_dfilter) { range->displayed_marked_cnt++; - if (packet->flags.ignored) { + if (packet->ignored) { range->displayed_ignored_marked_cnt++; } if (displayed_mark_low == 0) { @@ -113,9 +113,9 @@ static void packet_range_calc(packet_range_t *range) { mark_high = framenum; } } - if (packet->flags.ignored) { + if (packet->ignored) { range->ignored_cnt++; - if (packet->flags.passed_dfilter) { + if (packet->passed_dfilter) { range->displayed_ignored_cnt++; } } @@ -128,7 +128,7 @@ static void packet_range_calc(packet_range_t *range) { framenum <= mark_high) { range->mark_range_cnt++; - if (packet->flags.ignored) { + if (packet->ignored) { range->ignored_mark_range_cnt++; } } @@ -136,9 +136,9 @@ static void packet_range_calc(packet_range_t *range) { if (framenum >= displayed_mark_low && framenum <= displayed_mark_high) { - if (packet->flags.passed_dfilter) { + if (packet->passed_dfilter) { range->displayed_mark_range_cnt++; - if (packet->flags.ignored) { + if (packet->ignored) { range->displayed_ignored_mark_range_cnt++; } } @@ -197,12 +197,12 @@ static void packet_range_calc_user(packet_range_t *range) { if (value_is_in_range(range->user_range, framenum)) { range->user_range_cnt++; - if (packet->flags.ignored) { + if (packet->ignored) { range->ignored_user_range_cnt++; } - if (packet->flags.passed_dfilter) { + if (packet->passed_dfilter) { range->displayed_user_range_cnt++; - if (packet->flags.ignored) { + if (packet->ignored) { range->displayed_ignored_user_range_cnt++; } } @@ -260,7 +260,7 @@ gboolean packet_range_process_all(packet_range_t *range) { /* do we have to process this packet? */ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata) { - if (range->remove_ignored && fdata->flags.ignored) { + if (range->remove_ignored && fdata->ignored) { return range_process_next; } @@ -279,7 +279,7 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f range->selected_done = TRUE; break; case(range_process_marked): - if (fdata->flags.marked == FALSE) { + if (fdata->marked == FALSE) { return range_process_next; } break; @@ -287,14 +287,14 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f if (range->marked_range_left == 0) { return range_processing_finished; } - if (fdata->flags.marked == TRUE) { + if (fdata->marked == TRUE) { range->marked_range_active = TRUE; } if (range->marked_range_active == FALSE ) { return range_process_next; } if (!range->process_filtered || - (range->process_filtered && fdata->flags.passed_dfilter == TRUE)) + (range->process_filtered && fdata->passed_dfilter == TRUE)) { range->marked_range_left--; } @@ -312,8 +312,8 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f * Try next, but only if we're not including dependent packets and this * packet happens to be a dependency on something that is displayed. */ - if ((range->process_filtered && fdata->flags.passed_dfilter == FALSE) && - !(range->include_dependents && fdata->flags.dependent_of_displayed)) { + if ((range->process_filtered && fdata->passed_dfilter == FALSE) && + !(range->include_dependents && fdata->dependent_of_displayed)) { return range_process_next; } diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c index fd5e8aef74..18c559d485 100644 --- a/ui/proto_hier_stats.c +++ b/ui/proto_hier_stats.c @@ -172,7 +172,7 @@ process_record(capture_file *cf, frame_data *frame, column_info *cinfo, ph_stats /* Get stats from this protocol tree */ process_tree(edt.tree, ps); - if (frame->flags.has_ts) { + if (frame->has_ts) { /* Update times */ cur_time = nstime_to_sec(&frame->abs_ts); if (cur_time < ps->first_time) @@ -282,9 +282,9 @@ ph_stats_new(capture_file *cf) passed the display filter? If so, it should probably do so for other loops (see "file.c") that look only at those packets. */ - if (frame->flags.passed_dfilter) { + if (frame->passed_dfilter) { - if (frame->flags.has_ts) { + if (frame->has_ts) { if (tot_packets == 0) { double cur_time = nstime_to_sec(&frame->abs_ts); ps->first_time = cur_time; diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp index 533e128118..bb9a321e2a 100644 --- a/ui/qt/byte_view_tab.cpp +++ b/ui/qt/byte_view_tab.cpp @@ -90,7 +90,7 @@ void ByteViewTab::addTab(const char *name, tvbuff_t *tvb) { packet_char_enc encoding = PACKET_CHAR_ENC_CHAR_ASCII; if ( cap_file_ && cap_file_->current_frame ) - encoding = (packet_char_enc)cap_file_->current_frame->flags.encoding; + encoding = (packet_char_enc)cap_file_->current_frame->encoding; QByteArray data; if ( tvb ) { diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index d097891bb3..4e45127864 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -622,7 +622,7 @@ gboolean Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, str if (!iax2info) return FALSE; /* we ignore packets that are not displayed */ - if (pinfo->fd->flags.passed_dfilter == 0) + if (pinfo->fd->passed_dfilter == 0) return FALSE; /* we ignore packets that carry no data */ diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index f6305cea7d..24657869a0 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1325,7 +1325,7 @@ void LBMLBTRMTransportDialog::resetTap(void * tap_data) gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) { - if (pinfo->fd->flags.passed_dfilter == 1) + if (pinfo->fd->passed_dfilter == 1) { const lbm_lbtrm_tap_info_t * tapinfo = (const lbm_lbtrm_tap_info_t *)tap_info; LBMLBTRMTransportDialogInfo * info = (LBMLBTRMTransportDialogInfo *)tap_data; diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 3d3eefd5cf..2052318134 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1744,7 +1744,7 @@ void LBMLBTRUTransportDialog::resetTap(void * tap_data) gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) { - if (pinfo->fd->flags.passed_dfilter == 1) + if (pinfo->fd->passed_dfilter == 1) { const lbm_lbtru_tap_info_t * tapinfo = (const lbm_lbtru_tap_info_t *)tap_info; LBMLBTRUTransportDialogInfo * info = (LBMLBTRUTransportDialogInfo *)tap_data; diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index 24856e299f..732c59d393 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -401,7 +401,7 @@ void LBMStreamDialog::resetTap(void * tap_data) gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info) { - if (pinfo->fd->flags.passed_dfilter == 1) + if (pinfo->fd->passed_dfilter == 1) { const lbm_uim_stream_tap_info_t * tapinfo = (const lbm_uim_stream_tap_info_t *)stream_info; LBMStreamDialogInfo * info = (LBMStreamDialogInfo *)tap_data; diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 732352311c..17ca335aeb 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -208,7 +208,7 @@ static void plugin_if_mainwindow_get_ws_info(GHashTable * data_set) if (cf->state == FILE_READ_DONE && cf->current_frame) { ws_info->cf_framenr = cf->current_frame->num; - ws_info->frame_passed_dfilter = (cf->current_frame->flags.passed_dfilter == 1); + ws_info->frame_passed_dfilter = (cf->current_frame->passed_dfilter == 1); } else { ws_info->cf_framenr = 0; diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 9677028c42..b3bdcacf0b 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1160,12 +1160,12 @@ void MainWindow::setMenusForSelectedPacket() have_frames = capture_file_.capFile()->count > 0; have_marked = capture_file_.capFile()->marked_count > 0; another_is_marked = have_marked && - !(capture_file_.capFile()->marked_count == 1 && frame_selected && capture_file_.capFile()->current_frame->flags.marked); + !(capture_file_.capFile()->marked_count == 1 && frame_selected && capture_file_.capFile()->current_frame->marked); have_filtered = capture_file_.capFile()->displayed_count > 0 && capture_file_.capFile()->displayed_count != capture_file_.capFile()->count; have_ignored = capture_file_.capFile()->ignored_count > 0; have_time_ref = capture_file_.capFile()->ref_time_count > 0; another_is_time_ref = have_time_ref && - !(capture_file_.capFile()->ref_time_count == 1 && frame_selected && capture_file_.capFile()->current_frame->flags.ref_time); + !(capture_file_.capFile()->ref_time_count == 1 && frame_selected && capture_file_.capFile()->current_frame->ref_time); if (capture_file_.capFile()->edt) { diff --git a/ui/qt/models/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp index 9e57c146f2..0f81d093de 100644 --- a/ui/qt/models/packet_list_model.cpp +++ b/ui/qt/models/packet_list_model.cpp @@ -107,7 +107,7 @@ guint PacketListModel::recreateVisibleRows() foreach (PacketListRecord *record, physical_rows_) { frame_data *fdata = record->frameData(); - if (fdata->flags.passed_dfilter || fdata->flags.ref_time) { + if (fdata->passed_dfilter || fdata->ref_time) { visible_rows_ << record; if (number_to_row_.size() <= (int)fdata->num) { number_to_row_.resize(fdata->num + 10000); @@ -171,7 +171,7 @@ void PacketListModel::toggleFrameMark(const QModelIndex &fm_index) frame_data *fdata = record->frameData(); if (!fdata) return; - if (fdata->flags.marked) + if (fdata->marked) cf_unmark_frame(cap_file_, fdata); else cf_mark_frame(cap_file_, fdata); @@ -201,7 +201,7 @@ void PacketListModel::toggleFrameIgnore(const QModelIndex &i_index) frame_data *fdata = record->frameData(); if (!fdata) return; - if (fdata->flags.ignored) + if (fdata->ignored) cf_unignore_frame(cap_file_, fdata); else cf_ignore_frame(cap_file_, fdata); @@ -229,15 +229,15 @@ void PacketListModel::toggleFrameRefTime(const QModelIndex &rt_index) frame_data *fdata = record->frameData(); if (!fdata) return; - if (fdata->flags.ref_time) { - fdata->flags.ref_time=0; + if (fdata->ref_time) { + fdata->ref_time=0; cap_file_->ref_time_count--; } else { - fdata->flags.ref_time=1; + fdata->ref_time=1; cap_file_->ref_time_count++; } cf_reftime_packets(cap_file_); - if (!fdata->flags.ref_time && !fdata->flags.passed_dfilter) { + if (!fdata->ref_time && !fdata->passed_dfilter) { cap_file_->displayed_count--; } record->resetColumns(&cap_file_->cinfo); @@ -252,8 +252,8 @@ void PacketListModel::unsetAllFrameRefTime() foreach (PacketListRecord *record, physical_rows_) { frame_data *fdata = record->frameData(); - if (fdata->flags.ref_time) { - fdata->flags.ref_time = 0; + if (fdata->ref_time) { + fdata->ref_time = 0; } } cap_file_->ref_time_count = 0; @@ -348,7 +348,7 @@ void PacketListModel::sort(int column, Qt::SortOrder order) foreach (PacketListRecord *record, physical_rows_) { frame_data *fdata = record->frameData(); - if (fdata->flags.passed_dfilter || fdata->flags.ref_time) { + if (fdata->passed_dfilter || fdata->ref_time) { visible_rows_ << record; if (number_to_row_.size() <= (int)fdata->num) { number_to_row_.resize(fdata->num + 10000); @@ -566,9 +566,9 @@ QVariant PacketListModel::data(const QModelIndex &d_index, int role) const case Qt::BackgroundRole: const color_t *color; - if (fdata->flags.ignored) { + if (fdata->ignored) { color = &prefs.gui_ignored_bg; - } else if (fdata->flags.marked) { + } else if (fdata->marked) { color = &prefs.gui_marked_bg; } else if (fdata->color_filter && recent.packet_list_colorize) { const color_filter_t *color_filter = (const color_filter_t *) fdata->color_filter; @@ -578,9 +578,9 @@ QVariant PacketListModel::data(const QModelIndex &d_index, int role) const } return ColorUtils::fromColorT(color); case Qt::ForegroundRole: - if (fdata->flags.ignored) { + if (fdata->ignored) { color = &prefs.gui_ignored_fg; - } else if (fdata->flags.marked) { + } else if (fdata->marked) { color = &prefs.gui_marked_fg; } else if (fdata->color_filter && recent.packet_list_colorize) { const color_filter_t *color_filter = (const color_filter_t *) fdata->color_filter; @@ -708,7 +708,7 @@ gint PacketListModel::appendPacket(frame_data *fdata) physical_rows_ << record; - if (fdata->flags.passed_dfilter || fdata->flags.ref_time) { + if (fdata->passed_dfilter || fdata->ref_time) { new_visible_rows_ << record; if (new_visible_rows_.count() < 2) { // This is the first queued packet. Schedule an insertion for diff --git a/ui/qt/models/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp index 63a636c406..617af34aa2 100644 --- a/ui/qt/models/packet_list_record.cpp +++ b/ui/qt/models/packet_list_record.cpp @@ -164,7 +164,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color) /* Re-color when the coloring rules are changed via the UI. */ if (dissect_color) { color_filters_prime_edt(&edt); - fdata_->flags.need_colorize = 1; + fdata_->need_colorize = 1; } if (dissect_columns) col_custom_prime_edt(&edt, cinfo); diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 20701e153b..35a953afbd 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -1784,13 +1784,13 @@ void PacketList::drawFarOverlay() for (int row = 0; row < pl_rows; row++) { frame_data *fdata = packet_list_model_->getRowFdata(row); - if (fdata->flags.marked || fdata->flags.ref_time || fdata->flags.ignored) { + if (fdata->marked || fdata->ref_time || fdata->ignored) { int new_line = row * o_height / pl_rows; int tick_width = o_width / 3; // Marked or ignored: left side, time refs: right side. // XXX Draw ignored ticks in the middle? - int x1 = fdata->flags.ref_time ? o_width - tick_width : 1; - int x2 = fdata->flags.ref_time ? o_width - 1 : tick_width; + int x1 = fdata->ref_time ? o_width - tick_width : 1; + int x2 = fdata->ref_time ? o_width - 1 : tick_width; painter.drawLine(x1, new_line, x2, new_line); have_marked_image = true; diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp index 95588b26f1..fff31a6969 100644 --- a/ui/qt/packet_range_group_box.cpp +++ b/ui/qt/packet_range_group_box.cpp @@ -108,7 +108,7 @@ void PacketRangeGroupBox::updateCounts() { pr_ui_->selectedCapturedLabel->setEnabled(false); pr_ui_->selectedDisplayedLabel->setEnabled(false); } - if ((range_->remove_ignored && can_select && range_->cf->current_frame->flags.ignored) || selected_num < 1) { + if ((range_->remove_ignored && can_select && range_->cf->current_frame->ignored) || selected_num < 1) { pr_ui_->selectedCapturedLabel->setText("0"); pr_ui_->selectedDisplayedLabel->setText("0"); } else { @@ -222,7 +222,7 @@ void PacketRangeGroupBox::updateCounts() { displayed_ignored_cnt = range_->displayed_ignored_cnt; break; case(range_process_selected): - ignored_cnt = (can_select && range_->cf->current_frame->flags.ignored) ? 1 : 0; + ignored_cnt = (can_select && range_->cf->current_frame->ignored) ? 1 : 0; displayed_ignored_cnt = ignored_cnt; break; case(range_process_marked): diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 58050211b4..46046cf787 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -665,7 +665,7 @@ gboolean RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epa if (!rtpinfo) return FALSE; /* we ignore packets that are not displayed */ - if (pinfo->fd->flags.passed_dfilter == 0) + if (pinfo->fd->passed_dfilter == 0) return FALSE; /* also ignore RTP Version != 2 */ else if (rtpinfo->info_version != 2) diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 93148319df..d6d2c1f6e1 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -566,7 +566,7 @@ gboolean RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_ if (!rtpinfo) return FALSE; /* we ignore packets that are not displayed */ - if (pinfo->fd->flags.passed_dfilter == 0) + if (pinfo->fd->passed_dfilter == 0) return FALSE; /* also ignore RTP Version != 2 */ else if (rtpinfo->info_version != 2) diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp index 56b1deda23..baac452847 100644 --- a/ui/qt/wireless_timeline.cpp +++ b/ui/qt/wireless_timeline.cpp @@ -151,7 +151,7 @@ void WirelessTimeline::mouseReleaseEvent(QMouseEvent *event) return; frame_data *fdata = frame_data_sequence_find(cfile.provider.frames, num); - if (!fdata->flags.passed_dfilter && fdata->prev_dis_num > 0) + if (!fdata->passed_dfilter && fdata->prev_dis_num > 0) num = fdata->prev_dis_num; cf_goto_frame(&cfile, num); @@ -584,12 +584,12 @@ WirelessTimeline::paintEvent(QPaintEvent *qpe) * with all other sub pixels that fall within this * pixel */ last_x = x; - accumulate_rgb(rgb, height, fdata->flags.passed_dfilter, width, red, green, blue); + accumulate_rgb(rgb, height, fdata->passed_dfilter, width, red, green, blue); } else { /* it spans more than 1 pixel. * first accumulate the part that does fit */ float partial = ((int) x) + 1 - x; - accumulate_rgb(rgb, height, fdata->flags.passed_dfilter, partial, red, green, blue); + accumulate_rgb(rgb, height, fdata->passed_dfilter, partial, red, green, blue); /* and render it */ render_pixels(p, (int) x, 1, rgb, ratio); last_x = -1; @@ -597,14 +597,14 @@ WirelessTimeline::paintEvent(QPaintEvent *qpe) width -= partial; /* are there any whole pixels of width left to draw? */ if (width > 1.0) { - render_rectangle(p, x, width, height, fdata->flags.passed_dfilter, red, green, blue, ratio); + render_rectangle(p, x, width, height, fdata->passed_dfilter, red, green, blue, ratio); x += (int) width; width -= (int) width; } /* is there a partial pixel left */ if (width > 0.0) { last_x = x; - accumulate_rgb(rgb, height, fdata->flags.passed_dfilter, width, red, green, blue); + accumulate_rgb(rgb, height, fdata->passed_dfilter, width, red, green, blue); } } } diff --git a/ui/summary.c b/ui/summary.c index 3eb02fe755..4edd152ed4 100644 --- a/ui/summary.c +++ b/ui/summary.c @@ -33,19 +33,19 @@ tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally) double cur_time; sum_tally->bytes += cur_frame->pkt_len; - if (cur_frame->flags.passed_dfilter){ + if (cur_frame->passed_dfilter){ sum_tally->filtered_count++; sum_tally->filtered_bytes += cur_frame->pkt_len; } - if (cur_frame->flags.marked){ + if (cur_frame->marked){ sum_tally->marked_count++; sum_tally->marked_bytes += cur_frame->pkt_len; } - if (cur_frame->flags.ignored){ + if (cur_frame->ignored){ sum_tally->ignored_count++; } - if (cur_frame->flags.has_ts) { + if (cur_frame->has_ts) { /* This packet has a time stamp. */ cur_time = nstime_to_sec(&cur_frame->abs_ts); @@ -56,7 +56,7 @@ tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally) if (cur_time > sum_tally->stop_time){ sum_tally->stop_time = cur_time; } - if (cur_frame->flags.passed_dfilter){ + if (cur_frame->passed_dfilter){ sum_tally->filtered_count_ts++; /* * If we've seen one filtered packet, this is the first @@ -74,7 +74,7 @@ tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally) } } } - if (cur_frame->flags.marked){ + if (cur_frame->marked){ sum_tally->marked_count_ts++; /* * If we've seen one marked packet, this is the first diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index d3302a5aca..b5e12b2693 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -54,10 +54,10 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const rec.rec_header.packet_header.pkt_encap = exp_pdu_tap_data->pkt_encap; - if (pinfo->fd->flags.has_user_comment) { + if (pinfo->fd->has_user_comment) { rec.opt_comment = g_strdup(epan_get_user_comment(edt->session, pinfo->fd)); rec.has_comment_changed = TRUE; - } else if (pinfo->fd->flags.has_phdr_comment) { + } else if (pinfo->fd->has_phdr_comment) { rec.opt_comment = g_strdup(pinfo->rec->opt_comment); } diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 8606ee5c5f..e9c8c19eb6 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -1642,7 +1642,7 @@ range_update_dynamics(HWND dlg_hwnd, packet_range_t *range) { selected_num = (g_cf->current_frame) ? g_cf->current_frame->num : 0; cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_SEL_PKT_CAP); EnableWindow(cur_ctrl, selected_num && !filtered_active); - if (range->remove_ignored && g_cf->current_frame && g_cf->current_frame->flags.ignored) { + if (range->remove_ignored && g_cf->current_frame && g_cf->current_frame->ignored) { StringCchPrintf(static_val, STATIC_LABEL_CHARS, _T("0")); } else { StringCchPrintf(static_val, STATIC_LABEL_CHARS, _T("%d"), selected_num ? 1 : 0); @@ -1651,7 +1651,7 @@ range_update_dynamics(HWND dlg_hwnd, packet_range_t *range) { cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_SEL_PKT_DISP); EnableWindow(cur_ctrl, selected_num && filtered_active); - if (range->remove_ignored && g_cf->current_frame && g_cf->current_frame->flags.ignored) { + if (range->remove_ignored && g_cf->current_frame && g_cf->current_frame->ignored) { StringCchPrintf(static_val, STATIC_LABEL_CHARS, _T("0")); } else { StringCchPrintf(static_val, STATIC_LABEL_CHARS, _T("%d"), selected_num ? 1 : 0); @@ -1756,7 +1756,7 @@ range_update_dynamics(HWND dlg_hwnd, packet_range_t *range) { displayed_ignored_cnt = range->displayed_ignored_cnt; break; case(range_process_selected): - ignored_cnt = (g_cf->current_frame && g_cf->current_frame->flags.ignored) ? 1 : 0; + ignored_cnt = (g_cf->current_frame && g_cf->current_frame->ignored) ? 1 : 0; displayed_ignored_cnt = ignored_cnt; break; case(range_process_marked): |