Merge udp-sink.c