Zero-pad packets, use correct discovery RID