diff options
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-olsr.c | 18 | ||||
| -rw-r--r-- | epan/dissectors/packet-ositp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 1 |
4 files changed, 9 insertions, 15 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index c4b69d907b..def18aeec3 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -1180,7 +1180,6 @@ dissect_v9_flowset(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pdutree, in proto_tree_add_item(pdutree, hf_cflow_flowset_length, tvb, offset, 2, FALSE); - offset += 2; } else { /* Data */ proto_tree_add_item(pdutree, (ver == 9) ? hf_cflow_data_flowset_id : hf_cflow_data_datarecord_id, tvb, diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index af418f5e7e..daf93596c0 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -595,7 +595,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *message_tree; if (packet_len - offset < 4) { - message_item = proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, packet_len - offset, + proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, packet_len - offset, tvb_get_ptr(tvb, offset, packet_len - offset), "Message too short !"); break; } @@ -651,36 +651,36 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (offset < message_end) { /* --------------Dissecting TC message--------------------- */ if (message_type == TC) { - offset = dissect_olsr_tc(tvb, pinfo, message_tree, offset, message_end); + dissect_olsr_tc(tvb, pinfo, message_tree, offset, message_end); } /* -------------Dissect HELLO message----------------------- */ else if (message_type == HELLO) { - offset = dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_rfc); + dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_rfc); } /*---------------------------------Dissect MID Message----------------------------------*/ else if (message_type == MID) { - offset = dissect_olsr_mid(tvb, pinfo, message_tree, offset, message_end); + dissect_olsr_mid(tvb, pinfo, message_tree, offset, message_end); } /*-----------------------------Dissect HNA Message--------------------------------*/ else if (message_type == HNA) { - offset = dissect_olsr_hna(tvb, pinfo, message_tree, offset, message_end); + dissect_olsr_hna(tvb, pinfo, message_tree, offset, message_end); } /*-----------------------------Dissect Olsr.org Hello Message--------------------------------*/ else if (global_olsr_olsrorg && message_type == OLSR_ORG_LQ_HELLO) { - offset = dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_olsrorg); + dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_olsrorg); } /*-----------------------------Dissect Olsr.org TC Message--------------------------------*/ else if (global_olsr_olsrorg && message_type == OLSR_ORG_LQ_TC) { - offset = dissect_olsrorg_lq_tc(tvb, pinfo, message_tree, offset, message_end); + dissect_olsrorg_lq_tc(tvb, pinfo, message_tree, offset, message_end); } /*-----------------------------Dissect Olsr.org NS Message--------------------------------*/ else if (global_olsr_olsrorg && message_type == OLSR_ORG_NAMESERVICE) { - offset = dissect_olsrorg_nameservice(tvb, pinfo, message_tree, offset, message_end); + dissect_olsrorg_nameservice(tvb, pinfo, message_tree, offset, message_end); } /*-----------------------Dissect NRL OLSR TC Message-------------------------------------*/ else if (global_olsr_nrlolsr && message_type == NRLOLSR_TC_EXTRA) { - offset = dissect_nrlolsr_tc(tvb, pinfo, message_tree, offset, message_end); + dissect_nrlolsr_tc(tvb, pinfo, message_tree, offset, message_end); } /*-----------------------------Undefined message types-----------------------------*/ diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 61815f3e44..41750e81e0 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -396,7 +396,6 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, "Residual error rate, TSDU size of interest: %u", 1<<tvb_get_guint8(tvb, offset)); offset += 1; - length -= 1; vp_length -= 1; break; @@ -435,7 +434,6 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, proto_tree_add_text(tree, tvb, offset, 2, "Transit delay, maximum acceptable, called-calling: %u ms", s4); offset += 2; - length -= 2; vp_length -= 2; break; @@ -494,7 +492,6 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, proto_tree_add_text(tree, tvb, offset, 3, "Average throughput, minimum acceptable, called-calling: %u o/s", t4); offset += 3; - length -= 3; vp_length -= 3; } break; @@ -529,7 +526,6 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, proto_tree_add_text(tree, tvb, offset, 2, "Credit: 0x%04x", tvb_get_ntohs(tvb, offset)); offset += 2; - length -= 2; vp_length -= 2; break; diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index aecbc69933..fc23011e8a 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1537,7 +1537,6 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version, switch ( version ) { case OSPF_VERSION_2: - ls_type = tvb_get_ntohl(tvb, offset); proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_LS_TYPE], tvb, offset, 4, FALSE); break; |