Wireshark-commits: [Wireshark-commits] master 91613a0: pcapng (dissector): fix 'pcapng.options.opti

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 3 Feb 2016 13:04:01 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=91613a04db4d6381df06b582b4375609f6613f0c
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

91613a0 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    
    Change-Id: I9f6e713a50e0c73d0ecc7a66b62dffe270d4a35f
    Reviewed-on: https://code.wireshark.org/review/13678
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  d8e2768   CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT8
    adds  91613a0   pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4


Summary of changes:
 epan/dissectors/file-pcapng.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)