Added a METHOD() macro to define methods with both public and private signatures

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index ebc67db004005fdbd1f2bf907721803571c782bc..f07e8358246e2acd42b6806c349c78f23a28611f 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -114,6 +114,19 @@
 #define INIT(this, ...) { (this) = malloc(sizeof(*this)); \
                                                  *(this) = (typeof(*this)){ __VA_ARGS__ }; }
 
+/**
+ * Method declaration/definition macro, providing private and public interface.
+ *
+ * Defines a method name with this as first parameter and a return value ret,
+ * and an alias for this method with a _ prefix, having the this argument
+ * safely casted to the public interface iface.
+ * _name is provided a function pointer, but will get optimized out by GCC.
+ */
+#define METHOD(iface, name, ret, this, ...) \
+       static ret name(union {iface *_public; this;} __attribute__((transparent_union)), ##__VA_ARGS__); \
+       const static typeof(name) *_##name = (const typeof(name)*)name; \
+       static ret name(this, ##__VA_ARGS__)
+
 /**
  * Macro to allocate a sized type.
  */