From: Andrea Shepard <andrea@torproject.org>
Date: Mon, 1 Oct 2012 08:48:52 +0000 (-0700)
Subject: Add upcasts for circuitmux_policy_data_t and circuitmux_policy_circ_data_t to circuit... 
X-Git-Tag: tor-0.2.4.4-alpha~37^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1de2f1437ffe67ee0ae74ae6ac1d432f3981542;p=thirdparty%2Ftor.git

Add upcasts for circuitmux_policy_data_t and circuitmux_policy_circ_data_t to circuitmux.h
---

diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h
index f4eb73e391..a3eacaf7d4 100644
--- a/src/or/circuitmux.h
+++ b/src/or/circuitmux.h
@@ -76,6 +76,23 @@ struct circuitmux_policy_circ_data_s {
   uint32_t magic;
 };
 
+/*
+ * Upcast #defines for the above types
+ */
+
+/**
+ * Convert a circuitmux_policy_data_t subtype to a circuitmux_policy_data_t.
+ */
+
+#define TO_CMUX_POL_DATA(x)  (&((x)->_base))
+
+/**
+ * Convert a circuitmux_policy_circ_data_t subtype to a
+ * circuitmux_policy_circ_data_t.
+ */
+
+#define TO_CMUX_POL_CIRC_DATA(x)  (&((x)->_base))
+
 /* Consistency check */
 void circuitmux_assert_okay(circuitmux_t *cmux);