From f817bdaf8b45c8fb11280b572565475eeee5ed73 Mon Sep 17 00:00:00 2001 From: "S. Hameed" Date: Fri, 27 Nov 2015 18:16:59 +0900 Subject: dlt-daemon: Make IP version compile time configurable Signed-off-by: Christoph Lipka Signed-off-by: S. Hameed --- src/adaptor/dlt-adaptor-udp.c | 8 ++++++++ src/daemon/dlt_daemon_socket.c | 4 ++++ src/system/dlt-system-syslog.c | 8 ++++++++ 3 files changed, 20 insertions(+) (limited to 'src') diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index 9e4ce74..3f62033 100644 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -152,13 +152,21 @@ int main(int argc, char* argv[]) } } +#ifdef DLT_USE_IPv6 if ((sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) +#else + if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) +#endif { perror("Socket"); exit(1); } +#ifdef DLT_USE_IPv6 server_addr.sin_family = AF_INET6; +#else + server_addr.sin_family = AF_INET; +#endif server_addr.sin_port = htons(port); server_addr.sin_addr.s_addr = INADDR_ANY; bzero(&(server_addr.sin_zero), 8); diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index 1054e9a..686f4d6 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -71,7 +71,11 @@ int dlt_daemon_socket_open(int *sock, unsigned int servPort) int rv; memset(&hints, 0, sizeof hints); +#ifdef DLT_USE_IPv6 hints.ai_family = AF_INET6; // force IPv6 - will still work with IPv4 +#else + hints.ai_family = AF_INET; +#endif hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; // use my IP address diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c index aa60e55..0f498b9 100644 --- a/src/system/dlt-system-syslog.c +++ b/src/system/dlt-system-syslog.c @@ -70,7 +70,11 @@ int init_socket(SyslogOptions opts) int sock = -1; struct sockaddr_in syslog_addr; +#ifdef DLT_USE_IPv6 sock = socket(AF_INET6, SOCK_DGRAM, 0); +#else + sock = socket(AF_INET, SOCK_DGRAM, 0); +#endif if(sock < 0) { DLT_LOG(syslogContext, DLT_LOG_FATAL, @@ -78,7 +82,11 @@ int init_socket(SyslogOptions opts) return -1; } +#ifdef DLT_USE_IPv6 syslog_addr.sin_family = AF_INET6; +#else + syslog_addr.sin_family = AF_INET; +#endif syslog_addr.sin_port = htons(opts.Port); syslog_addr.sin_addr.s_addr = INADDR_ANY; bzero(&(syslog_addr.sin_zero), 8); -- cgit v1.2.1