Wireshark-commits: [Wireshark-commits] master-1.12 efe77f6: GSM MAP: Fix decoding of IPv6 addresses

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 26 Jun 2015 17:42:33 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=efe77f6bb1934671917589d794c8d47082411ae0
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

efe77f6 by Vasil Velichckov (vvvelichkov@xxxxxxxxx):

    GSM MAP: Fix decoding of IPv6 addresses
    
    From 3GPP 23.003
    
    The GSN Address is composed of the following elements:
    1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
    Address field.
    2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
    3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
    Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
    Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
    The IP v4 address structure is defined in RFC 791 [14].
    The IP v6 address structure is defined in RFC 2373 [15].
    
    Currently the Wireshark decodes IPv6 addresses as IPv4
    
    This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44
    
    Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
    Reviewed-on: https://code.wireshark.org/review/8984
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit eb2dffa56c32330a98fec4269322a9bed058c5bb)
    Reviewed-on: https://code.wireshark.org/review/9174
    

Actions performed:

    from  8be4301   mergecap: check input files time precision before exporting to pcapng format
    adds  efe77f6   GSM MAP: Fix decoding of IPv6 addresses


Summary of changes:
 asn1/gsm_map/gsm_map.cnf               |    6 +++---
 asn1/gsm_map/packet-gsm_map-template.c |    2 +-
 epan/dissectors/packet-gsm_map.c       |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)