Move MAX_HOSTLEN from server.h to net.h.

This generic networking-related constant does not belong to
server.h. However, since server.h uses the constant, we have to make
sure that net.h is included before server.h.

diff --git a/afs.c b/afs.c
index c2d5e7af0f2ad638aa72cd1cac41fcc471a57a01..a5f86f9b1b4623a906fb14ad322f4e9b054b6914 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -22,8 +22,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"

diff --git a/command.c b/command.c
index cba2afb40464a5373ef2320f65b3966845ba357d..6568b789339b25125fd54fad90d03abeceb515a2 100644 (file)
--- a/command.c
+++ b/command.c
@@ -22,12 +22,12 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
+#include "net.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
 #include "vss.h"
-#include "net.h"
 #include "daemon.h"
 #include "fd.h"
 #include "ipc.h"

diff --git a/dccp_send.c b/dccp_send.c
index ac2da410b4249e6bdc9d182fcb92a04ff75c773d..69ba65f5ef864396e81a722d8e69817a0040166f 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -21,8 +21,8 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"

diff --git a/http_send.c b/http_send.c
index d692c2d2f3b741f093775bd983d84100bb741644..210f85ac63c9dd718a3f00e6a6e9790ffeeb5d96 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -16,6 +16,7 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
+#include "net.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"
@@ -23,7 +24,6 @@
 #include "sched.h"
 #include "vss.h"
 #include "close_on_fork.h"
-#include "net.h"
 #include "fd.h"
 #include "chunk_queue.h"
 #include "acl.h"

diff --git a/net.h b/net.h
index c515779975343a19b3bffb4162d6dc273eb3186b..143fb812f4c1be20368b93cbb60be26eaeb826fe 100644 (file)
--- a/net.h
+++ b/net.h
@@ -48,6 +48,9 @@
 #define DCCP_SOCKOPT_TX_CCID 14 /**< Set/get the TX CCID. */
 #endif
 
+/** The maximum length of the host component in an URL. */
+#define MAX_HOSTLEN 256
+
 /**
  * Flowopts: Transport-layer independent encapsulation of socket options
  *           that need to be registered prior to setting up a connection.

diff --git a/server.c b/server.c
index e9c1f12eeda3d4bfea1f59524ffacdad44201547..66c93ab259d1c26e26a904c312cd45916407cb2a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -45,6 +45,7 @@
 #include "afh.h"
 #include "string.h"
 #include "afs.h"
+#include "net.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
@@ -52,7 +53,6 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
-#include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"

diff --git a/server.h b/server.h
index 1852dd50962b78a72d270bb1d20e61eb0d9911c4..988a98d8e17723817907787016cf9b58e771f545 100644 (file)
--- a/server.h
+++ b/server.h
@@ -5,10 +5,6 @@
 /** Size of the selector_info and audio_file info strings of struct misc_meta_data. */
 #define MMD_INFO_SIZE 16384
 
-/** The maximum length of the host component in an URL */
-#define MAX_HOSTLEN 256
-
-
 /** Arguments for the sender command. */
 struct sender_command_data {
        /** Greater than zero indicates that a sender cmd is already queued. */

diff --git a/udp_send.c b/udp_send.c
index 49c17631487db2cabedb4acd5444bb589d602762..38d49e3e70e42bc72d9316a21a5ca5e5441106f3 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -18,13 +18,13 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
+#include "net.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
 #include "vss.h"
 #include "portable_io.h"
-#include "net.h"
 #include "fd.h"
 #include "close_on_fork.h"
 

diff --git a/vss.c b/vss.c
index f69225ea1ee5927d5d327f418db4cbf7e31cc8bc..13a8e25fd0febc7aeeb56e8e37099f7ec4747a0f 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -25,8 +25,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"