-#define v4data ((u_int8_t *) &v4data6.tsp)
-#define v4tsphdr (&v4data6.tsp)
-#define v4tspcmd (v4data6.udata.data)
-#define v4hdr6 (&v4data6.udata.v6hdr)
-#define v4src6 (&v4data6.udata.v6hdr.ip6_src)
-#define v4dst6 (&v4data6.udata.v6hdr.ip6_dst)
+#define v4data ((u_int8_t *) &v4data6.udata)
+#define v4tsphdr (&v4data6.udata.cdata.tsp)
+#define v4tspcmd (v4data6.udata.cdata.cmd)
+#define v4hdr6 (&v4data6.udata.idata.v6hdr)
+#define v4src6 (&v4data6.udata.idata.v6hdr.ip6_src)
+#define v4dst6 (&v4data6.udata.idata.v6hdr.ip6_dst)