Support device in addition to source IP address Use enum for source types; don't convert between index and name unnecessarily. Bugzilla Id: 54874