From a80c5ce6b5f54601bccc38094274a626bbc7f573 Mon Sep 17 00:00:00 2001
From: Alex Young <alex@bytemark.co.uk>
Date: Wed, 6 Jun 2012 10:45:07 +0100
Subject: [PATCH] Moved sockaddr_address_data to serve.c and renamed params.h
 to serve.h

---
 src/control.c             |  2 +-
 src/flexnbd.c             |  2 +-
 src/ioutil.h              |  2 +-
 src/readwrite.c           |  2 +-
 src/serve.c               | 14 +++++++++++++-
 src/{params.h => serve.h} | 13 -------------
 6 files changed, 17 insertions(+), 18 deletions(-)
 rename src/{params.h => serve.h} (87%)

diff --git a/src/control.c b/src/control.c
index 8a39f19..e8ee026 100644
--- a/src/control.c
+++ b/src/control.c
@@ -25,7 +25,7 @@
  *  client code to be found in remote.c
  */
 
-#include "params.h"
+#include "serve.h"
 #include "util.h"
 #include "ioutil.h"
 #include "parse.h"
diff --git a/src/flexnbd.c b/src/flexnbd.c
index 5d94219..3ef2d23 100644
--- a/src/flexnbd.c
+++ b/src/flexnbd.c
@@ -19,7 +19,7 @@
  *  elsewhere in the program.
  */
 
-#include "params.h"
+#include "serve.h"
 #include "util.h"
 
 #include <stdio.h>
diff --git a/src/ioutil.h b/src/ioutil.h
index 1f3c566..ef09df7 100644
--- a/src/ioutil.h
+++ b/src/ioutil.h
@@ -2,7 +2,7 @@
 #define __IOUTIL_H
 
 
-#include "params.h"
+#include "serve.h"
 
 /** Returns a bit field representing which blocks are allocated in file 
   * descriptor ''fd''.  You must supply the size, and the resolution at which
diff --git a/src/readwrite.c b/src/readwrite.c
index 36418f6..b4c142e 100644
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -1,7 +1,7 @@
 #include "nbdtypes.h"
 #include "ioutil.h"
 #include "util.h"
-#include "params.h" 
+#include "serve.h" 
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/serve.c b/src/serve.c
index 022b7d4..c5cbb6e 100644
--- a/src/serve.c
+++ b/src/serve.c
@@ -1,4 +1,4 @@
-#include "params.h"
+#include "serve.h"
 #include "nbdtypes.h"
 #include "ioutil.h"
 #include "util.h"
@@ -20,6 +20,18 @@
 
 static const int block_allocation_resolution = 4096;//128<<10;
 
+static inline void* sockaddr_address_data(struct sockaddr* sockaddr)
+{
+	struct sockaddr_in*  in  = (struct sockaddr_in*) sockaddr;
+	struct sockaddr_in6* in6 = (struct sockaddr_in6*) sockaddr;
+	
+	if (sockaddr->sa_family == AF_INET)
+		return &in->sin_addr;
+	if (sockaddr->sa_family == AF_INET6)
+		return &in6->sin6_addr;
+	return NULL;
+}
+
 static inline void dirty(struct server *serve, off64_t from, int len)
 {
 	if (serve->mirror)
diff --git a/src/params.h b/src/serve.h
similarity index 87%
rename from src/params.h
rename to src/serve.h
index 1d1f72e..ff61c4c 100644
--- a/src/params.h
+++ b/src/serve.h
@@ -97,18 +97,5 @@ struct client_params {
 	struct server* serve; /* FIXME: remove above duplication */
 };
 
-/* FIXME: wrong place */
-static inline void* sockaddr_address_data(struct sockaddr* sockaddr)
-{
-	struct sockaddr_in*  in  = (struct sockaddr_in*) sockaddr;
-	struct sockaddr_in6* in6 = (struct sockaddr_in6*) sockaddr;
-	
-	if (sockaddr->sa_family == AF_INET)
-		return &in->sin_addr;
-	if (sockaddr->sa_family == AF_INET6)
-		return &in6->sin6_addr;
-	return NULL;
-}
-
 #endif