Current snapshot of OpenSolaris port.
Checkpoint
Checkpoint
Merge from parent.
Merge with WIDE update.
Pull from WIDE.
Pull from WIDE.
Checkpoint
Re-update.
blah
WIDE update
Update from WIDE.

@@ -230,11 +230,16 @@
          * copy ip address from ID payloads when ID type is ip address.
          * In other case, they must be null.
          */
         struct sockaddr *src_id;
         struct sockaddr *dst_id;
+#ifdef ENABLE_NATT
+        struct sockaddr *natoa_src;     /* peer's view of my address */
+        struct sockaddr *natoa_dst;     /* peer's view of his address */
+#endif
 
+
         struct sadb_request sadb_request;
 #if 0
         uint32_t spid;          /* policy id by kernel */
 #endif
         struct rcf_selector *selector;