merge conflicts
new tcpdump and libpcap
l in ntohl is not long!