Separating node-to-node and client traffic

See Separating node-to-node and client traffic.