general: proto and role are now separate pp fields

This paves the way to the addition of a third protocol. Besides the
code is slightly smaller (around 50 bytes on all archs).

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>