IPSEC-GRE: fixes and API update to common types.