4596 Callers of ip_srcid_find_id() need to be more careful (mismerge)