diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-06-28 16:19:09 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-06-28 16:19:09 +0800 |
| commit | 57db8e639f512e5607eef3becd60510ad8f10251 (patch) | |
| tree | fdc176460ec71430ef891e7d1d36090ffd31e0d7 | |
| parent | 13824614f8d934f3dd9f90fbdcd69c313005e3a4 (diff) | |
| download | fastalg-nfqueue-57db8e639f512e5607eef3becd60510ad8f10251.tar.gz fastalg-nfqueue-57db8e639f512e5607eef3becd60510ad8f10251.tar.zst fastalg-nfqueue-57db8e639f512e5607eef3becd60510ad8f10251.zip | |
Move all casting macros to falgnfq-private.h
| -rw-r--r-- | src/falgnfq-config.c | 5 | ||||
| -rw-r--r-- | src/falgnfq-loop.c | 6 | ||||
| -rw-r--r-- | src/falgnfq-private.h | 11 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/falgnfq-config.c b/src/falgnfq-config.c index 8a81fd4..0811309 100644 --- a/src/falgnfq-config.c +++ b/src/falgnfq-config.c @@ -15,11 +15,6 @@ #include <sys/types.h> #include <sys/socket.h> -// Casting macros -#define SOCKADDR(x) ((struct sockaddr*)(x)) -#define SOCKADDR_IN(x) ((struct sockaddr_in*)(x)) -#define SOCKADDR_IN6(x) ((struct sockaddr_in6*)(x)) - #define set_error(...) \ if (error != NULL) { \ char* g_error = g_strdup_printf (__VA_ARGS__); \ diff --git a/src/falgnfq-loop.c b/src/falgnfq-loop.c index 40a3fae..628a29b 100644 --- a/src/falgnfq-loop.c +++ b/src/falgnfq-loop.c @@ -45,12 +45,6 @@ # define nfq_ip_snprintf ip_snprintf #endif // LIBNETFILTER_QUEUE_IS_VERY_BUGGY -// Casting macros -#define IPHDR(x) ((struct iphdr*)(x)) -#define IP6_HDR(x) ((struct ip6_hdr*)(x)) -#define TCPHDR ((struct tcphdr*)(x)) -#define UDPHDR ((struct udphdr*)(x)) - struct proto_info { FalgprotoTransport transport; diff --git a/src/falgnfq-private.h b/src/falgnfq-private.h index 9bcf1ce..6515903 100644 --- a/src/falgnfq-private.h +++ b/src/falgnfq-private.h @@ -39,6 +39,17 @@ extern unsigned int falgnfq_debug; extern volatile sig_atomic_t falgnfq_exit; +// Casting macros + +#define IPHDR(x) ((struct iphdr*)(x)) +#define IP6_HDR(x) ((struct ip6_hdr*)(x)) +#define TCPHDR ((struct tcphdr*)(x)) +#define UDPHDR ((struct udphdr*)(x)) +#define SOCKADDR(x) ((struct sockaddr*)(x)) +#define SOCKADDR_IN(x) ((struct sockaddr_in*)(x)) +#define SOCKADDR_IN6(x) ((struct sockaddr_in6*)(x)) + + // Error message (thread-safe) #define ERRMSG_INIT char errbuf[256]; size_t errlen = sizeof (errbuf) |