bz 1059417,1056892 -- Handle interface names containing "." or "-"

Thanks to Rob's comment in #111:

This updates the previous patch to also handle interface names
containing "-".