diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-23 11:40:42 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-23 16:58:42 +0000 |
| commit | c6efada1b4739dbcb67bc30966980d864a29b0bd (patch) | |
| tree | a84e62131924181c3b54e71a5c4109cea35c67d4 | |
| parent | 39e8dcc94acfaab34f5b1a8b8aa9a6d4fce1c481 (diff) | |
| download | wireshark-c6efada1b4739dbcb67bc30966980d864a29b0bd.tar.gz | |
HiSLIP: remove a DISSECTOR_ASSERT
It should not be used for request/response tracking
Change-Id: Ic93884cad5bcea40e082081097575908011871c8
Ping-Bug: 11752
Reviewed-on: https://code.wireshark.org/review/12063
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 8fa938d27b7388e6b5881718d45abd3315a0583c)
Conflicts:
epan/dissectors/packet-hislip.c
Reviewed-on: https://code.wireshark.org/review/12072
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-hislip.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index 1d4af1031a..e887452961 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -778,12 +778,8 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,void case HISLIP_ASYNCLOCKINFO: /*Request*/ - hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32( hislip_info->pdus, pinfo->fd->num); - - if(!hislip_trans) + if(!PINFO_FD_VISITED(pinfo)) { - DISSECTOR_ASSERT_HINT(!pinfo->fd->flags.visited, "Missing 'Request' Info"); - /* This is a new request */ hislip_trans = (hislip_transaction_t *)wmem_alloc(wmem_file_scope(),sizeof( hislip_transaction_t)); hislip_trans->req_frame = pinfo->fd->num; @@ -791,9 +787,12 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,void hislip_trans->messagetype=hislip_data.messagetype; hislip_trans->controltype=hislip_data.controlcode; wmem_tree_insert32(hislip_info->pdus, pinfo->fd->num , (void *)hislip_trans); - } - if(hislip_trans->rep_frame != 0) + else + { + hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32(hislip_info->pdus, pinfo->fd->num); + } + if(hislip_trans && hislip_trans->rep_frame != 0) { it = proto_tree_add_uint( hislip_tree, hf_hislip_response, tvb, 0, 0, hislip_trans->rep_frame); PROTO_ITEM_SET_GENERATED(it); |