Use a macro to try using the real functions instead of wrappers.

jedisct1 · Jun 10, 2011 · 9bdc72a · 9bdc72a
1 parent 51dfda2
commit 9bdc72a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/src/common.h b/src/common.h
@@ -63,6 +63,9 @@ extern char **environ;
 
 #ifdef DEFINE_HOOK_GLOBALS
 # define HOOK_GLOBAL
+# ifndef DONT_BYPASS_HOOKS
+#  error HOOK_GLOBAL can't be defined without DONT_BYPASS_HOOKS
+# endif
 #else
 # define HOOK_GLOBAL extern
 #endif

diff --git a/src/hook-socket.c b/src/hook-socket.c
@@ -1,5 +1,6 @@
 
 #define DEFINE_HOOK_GLOBALS 1
+#define DONT_BYPASS_HOOKS   1
 
 #include "common.h"
 #include "filter.h"

diff --git a/src/hook-socket.h b/src/hook-socket.h
@@ -2,7 +2,10 @@
 #ifndef __HOOK_SOCKET_H__
 #define __HOOK_SOCKET_H__ 1
 
-HOOK_GLOBAL int (* __real_socket)(int domain, int type, int protocol);
 DLL_PUBLIC  int INTERPOSE(socket)(int domain, int type, int protocol);
+HOOK_GLOBAL int (* __real_socket)(int domain, int type, int protocol);
+#ifndef DONT_BYPASS_HOOKS
+# define socket __real_socket
+#endif
 
 #endif
diff --git a/src/interpose.c b/src/interpose.c
@@ -1,4 +1,6 @@
 
+#define DONT_BYPASS_HOOKS   1
+
 #include "common.h"
 
 #ifdef USE_INTERPOSERS