Add support for more xfrm policy dir values
Add support for XfrmState Encapsulation
Formatting cleanup