sync with current wireshark code base