From a8d3ec4e04ed8a94b4d108386d114b89ef94dd60 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 7 Nov 2013 18:16:34 +0100
Subject: [SERVER] Add --bind parameter to specify bind interface (currently
 IPv4 only)

---
 src/server/server.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/server/server.c')

diff --git a/src/server/server.c b/src/server/server.c
index 51c662b..c469e72 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -77,6 +77,7 @@ void dnbd3_print_help(char *argv_0)
 	printf( "-d or --delay       Add a fake network delay of X µs\n" );
 #endif
 	printf( "-n or --nodaemon    Start server in foreground\n" );
+	printf( "-b or --bind        Local Address to bind to\n" );
 	//printf( "-r or --reload      Reload configuration file\n" );
 	//printf( "-s or --stop        Stop running dnbd3-server\n" );
 	//printf( "-i or --info        Print connected clients and used images\n" );
@@ -176,6 +177,7 @@ int main(int argc, char *argv[])
 	int opt = 0;
 	int longIndex = 0;
 	char *paramCreate = NULL;
+	char *bindAddress = NULL;
 	int64_t paramSize = -1;
 	int paramRevision = -1;
 	static const char *optString = "c:d:nrsihv?";
@@ -188,6 +190,7 @@ int main(int argc, char *argv[])
 	        { "info", no_argument, NULL, 'i' },
 	        { "help", no_argument, NULL, 'h' },
 	        { "version", no_argument, NULL, 'v' },
+	        { "bind", required_argument, NULL, 'b' },
 	        { "crc", required_argument, NULL, 'crc4' },
 	        { "assert", no_argument, NULL, 'asrt' },
 	        { "create", required_argument, NULL, 'crat' },
@@ -233,6 +236,9 @@ int main(int argc, char *argv[])
 		case 'v':
 			dnbd3_print_version();
 			break;
+		case 'b':
+			bindAddress = strdup( optarg );
+			break;
 		case 'crc4':
 			return image_generateCrcFile( optarg ) ? 0 : EXIT_FAILURE;
 		case 'asrt':
@@ -306,10 +312,10 @@ int main(int argc, char *argv[])
 	sleep( 2 );
 
 	// setup network
-	sockets[socket_count] = sock_listen_any( PF_INET, PORT );
+	sockets[socket_count] = sock_listen_any( PF_INET, PORT, bindAddress );
 	if ( sockets[socket_count] != -1 ) ++socket_count;
 #ifdef WITH_IPV6
-	sockets[socket_count] = sock_listen_any(PF_INET6, PORT);
+	sockets[socket_count] = sock_listen_any(PF_INET6, PORT, NULL);
 	if (sockets[socket_count] != -1) ++socket_count;
 #endif
 	if ( socket_count == 0 ) exit( EXIT_FAILURE );
-- 
cgit v1.2.3-55-g7522