diff options
Diffstat (limited to 'epan/dissectors/packet-obex.c')
| -rw-r--r-- | epan/dissectors/packet-obex.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 && |