diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-03-30 17:48:58 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-03-31 00:50:09 +0000 |
| commit | fb97e82cbe1f177034e8129c9bb48f5b30270003 (patch) | |
| tree | 00b88bed3132f1d1054a70b3fd251320e5a266c5 /epan/dissectors/packet-arp.c | |
| parent | 0ea51ad82256f833a0d93efb16aa4e749c80eb5b (diff) | |
Distinguish between the two flavors of ITU-T AFIs.
As ISO 8348/X.213 Annex A says:
A.5.2.1.2 Format and allocation of the IDI
A specific combination of IDI format and DSP abstract syntax is
associated with each allocated AFI value, as summarized for use in
individual addresses in Table A.4 (the corresponding AFI values for use
in group addresses is found via Table A.2). Two AFI values are
associated with each combination that involves a variable-length IDI
format. In each case, both of the AFI values identify the same
combination of IDI format and DSP abstract syntax. The numerically
lower AFI value is used when the first significant digit in the IDI is
non-zero. The numerically greater AFI value is used when the first
significant digit in the IDI is zero.
and A.5.3 talks further about this.
Change-Id: I3fdad04064451b3c891731dc8f107bc57586eb84
Reviewed-on: https://code.wireshark.org/review/20802
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-arp.c')
| -rw-r--r-- | epan/dissectors/packet-arp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 25fe890423..4a83c98dd8 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -557,8 +557,8 @@ static const value_string atm_nsap_afi_vals[] = { { NSAP_IDI_ISO_DCC_DEC_GROUP, "DCC ATM group format"}, { NSAP_IDI_ISO_6523_ICD_BIN, "ICD ATM format"}, { NSAP_IDI_ISO_6523_ICD_BIN_GROUP, "ICD ATM group format"}, - { NSAP_IDI_E_164_BIN, "E.164 ATM format"}, - { NSAP_IDI_E_164_BIN_GROUP, "E.164 ATM group format"}, + { NSAP_IDI_E_164_BIN_FSD_NZ, "E.164 ATM format"}, + { NSAP_IDI_E_164_BIN_FSD_NZ_GROUP, "E.164 ATM group format"}, { 0, NULL} }; @@ -595,9 +595,9 @@ dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t proto_tree_add_item(tree, hf_atmarp_src_atm_selector, tvb, offset + 19, 1, ENC_BIG_ENDIAN); break; - case NSAP_IDI_E_164_BIN: /* E.164 ATM format */ - case NSAP_IDI_E_164_BIN_GROUP: /* E.164 ATM group format */ - proto_tree_add_item(tree, (afi == NSAP_IDI_E_164_BIN_GROUP) ? hf_atmarp_src_atm_e_164_isdn_group : hf_atmarp_src_atm_e_164_isdn, + case NSAP_IDI_E_164_BIN_FSD_NZ: /* E.164 ATM format */ + case NSAP_IDI_E_164_BIN_FSD_NZ_GROUP: /* E.164 ATM group format */ + proto_tree_add_item(tree, (afi == NSAP_IDI_E_164_BIN_FSD_NZ_GROUP) ? hf_atmarp_src_atm_e_164_isdn_group : hf_atmarp_src_atm_e_164_isdn, tvb, offset + 1, 8, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_high_order_dsp, tvb, offset + 9, 4, ENC_NA); proto_tree_add_item(tree, hf_atmarp_src_atm_end_system_identifier, tvb, offset + 13, 6, ENC_NA); |