diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-01-04 23:39:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-01-05 08:19:03 +0000 |
| commit | 814c57a8b53a0841f513fd83f367844243a6833e (patch) | |
| tree | e4a9d9fadab3ede851b7273095c24729de835143 /epan/dissectors/packet-atm.c | |
| parent | 40b2ba8e7b6c1b03ca2a85e4f7c5e31e36140b5d (diff) | |
Pass a structure including an atm_phdr to dissect_atm_pw_oam_cell().
This will allow the VPI and VCI to be handed to
dissect_atm_cell_payload() in
https://code.wireshark.org/review/c/31381/.
That structure also needs to include the enable_fill_columns_by_atm_dissector
flag; we remove that from the pwatm_private_data_t, which is now private
to the ATM pseudo-wire dissector, and put it in the new structure.
Change-Id: I88f4a9f4b3c4c1c94914311bb883ea38e10ca4b4
Reviewed-on: https://code.wireshark.org/review/31384
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index d48e603f58..7b5a2ef6b4 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1684,12 +1684,12 @@ dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* static int dissect_atm_pw_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - const pwatm_private_data_t *pwpd = (const pwatm_private_data_t *)data; + const struct pw_atm_phdr *pw_atm_info = (const struct pw_atm_phdr *)data; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); dissect_atm_cell_payload(tvb, 0, pinfo, tree, AAL_OAMCELL, - pwpd->enable_fill_columns_by_atm_dissector); + pw_atm_info->enable_fill_columns_by_atm_dissector); return tvb_reported_length(tvb); } |