Added code to pcap-udp-gateway
Fixed merge issue