Skip to content

Commit

Permalink
rpc: don't set fence on COL_PROTOCOL.
Browse files Browse the repository at this point in the history
That would prevent subsequent protocols to clear it, resulting in multiple
definitions in that column.

An example is NFS as next protocol. When contains multiple NFS operations,
COL_PROTOCOL contains NFSNFSNFS...

Bug: 15443
Change-Id: Idf9469873164160dc4795589c61c342ce019521b
Reviewed-on: https://code.wireshark.org/review/31755
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
  • Loading branch information
crondaemon committed Jan 28, 2019
1 parent 4dbb26f commit 5b22624
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions epan/dissectors/packet-rpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3842,13 +3842,12 @@ dissect_rpc_tcp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
}

/* Set fences so whatever the subdissector put in the
* Protocol and Info columns stay there. This is useful
* when the subdissector clears the column (which it
* might have to do if it runs over some other protocol
* too) and there are multiple PDUs in one frame.
/* Set fence so whatever the subdissector put in the
* Info column stay there. This is useful when the
* subdissector clears the column (which it might have
* to do if it runs over some other protocol too) and
* there are multiple PDUs in one frame.
*/
col_set_fence(pinfo->cinfo, COL_PROTOCOL);
col_set_fence(pinfo->cinfo, COL_INFO);

/* PDU tracking
Expand Down

0 comments on commit 5b22624

Please sign in to comment.