net: Remove networking headers from para.h.

Most files don't need these, so include all headers related to
networking in each individual file.

diff --git a/acl.c b/acl.c
index e70ab9b350c4bded0395f9676bf3fe7fceef6026..7762a990d38a090ae661371cdee1066fb075c429 100644 (file)
--- a/acl.c
+++ b/acl.c
@@ -6,7 +6,12 @@
 
 /** \file acl.c Access control lists for paraslash senders. */
 
 
 /** \file acl.c Access control lists for paraslash senders. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <regex.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/afs.c b/afs.c
index 2f9df84581ee53685bbdb2282b6398a133fbf37f..135888a7fc632e6760d2aba4e1b4b2b4738af618 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -6,10 +6,15 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
 
 /** \file afs.c Paraslash's audio file selector. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
 #include <osl.h>
 #include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
 #include <osl.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "server.cmdline.h"
 #include "para.h"
 
 #include "server.cmdline.h"
 #include "para.h"

diff --git a/audioc.c b/audioc.c
index 0edab366efe6ef6fa50f99c22b9ffa3492494640..79051a98bb03b542dbb7d53a76c0d4a426a484bc 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -6,8 +6,13 @@
 
 /** \file audioc.c The client program used to connect to para_audiod. */
 
 
 /** \file audioc.c The client program used to connect to para_audiod. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 #include <stdbool.h>
 #include <signal.h>
 
 #include <stdbool.h>
 #include <signal.h>
 

diff --git a/audiod.c b/audiod.c
index 5ef5778107e22dd44e44402f2961cc0f6192a594..f12dbc1b999a0892abdcea5791692f1f5dfab3c3 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -5,8 +5,14 @@
  */
 
 /** \file audiod.c The paraslash's audio daemon. */
  */
 
 /** \file audiod.c The paraslash's audio daemon. */

+
+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 #include <signal.h>
 
 #include "para.h"
 #include <signal.h>
 
 #include "para.h"

diff --git a/audiod_command.c b/audiod_command.c
index 07b2c81c2a528d04a92b6210bd3a5b48625823d3..1ffab87c0fbd5269d6da52b05428dc44132dd922 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -6,8 +6,13 @@
 
 /** \file audiod_command.c Commands for para_audiod. */
 
 
 /** \file audiod_command.c Commands for para_audiod. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "audiod.cmdline.h"
 
 #include "para.h"
 #include "audiod.cmdline.h"

diff --git a/client_common.c b/client_common.c
index c19b71218b59f62f1e6a75c1eee43ee332a65900..6652cc35477234a9dd4a9f0621be953c5cc9ba00 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -6,8 +6,13 @@
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/command.c b/command.c
index 3d40023f119efc91f446011ae89381790567547f..93c680583056d91e5c724a44d725e46724804ae2 100644 (file)
--- a/command.c
+++ b/command.c
@@ -6,10 +6,15 @@
 
 /** \file command.c Client authentication and server commands. */
 
 
 /** \file command.c Client authentication and server commands. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <osl.h>
 #include <regex.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <osl.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/dccp_recv.c b/dccp_recv.c
index c751f2f7ce5d85464d506c8c6582556bb424aa7d..73d9999d0408617099086e7b25248af5277839db 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -11,8 +11,13 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/dccp_send.c b/dccp_send.c
index 3979982c725da1b6e83966b6ac6887cb2cfae2a6..22f2bd1ba63467c7a13eb15951b000e67ccf3a62 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -11,9 +11,14 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/http_recv.c b/http_recv.c
index 7db8ba193c1eaa2fd6046efd91011c25d37da032..9c42a1a85817f6cca6aa827e0ed349a01312949b 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -7,7 +7,12 @@
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <sys/types.h>
 #include <sys/types.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/http_send.c b/http_send.c
index 52383b06b465d14b8369badbc3606a7753ec90c5..60b877c08082ffa7e1cd7fb41617ab32bb7a465a 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -6,9 +6,14 @@
 
 /** \file http_send.c paraslash's http sender */
 
 
 /** \file http_send.c paraslash's http sender */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/net.c b/net.c
index 740dfa182d4a162f2b493ac77ecebc8140c6f0ae..07a646b72c89bb8ee442129d9e90d98919f6b94d 100644 (file)
--- a/net.c
+++ b/net.c
@@ -12,6 +12,11 @@
  */
 #define _GNU_SOURCE
 
  */
 #define _GNU_SOURCE
 

+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>

 #include <netdb.h>
 
 /* At least NetBSD needs these. */
 #include <netdb.h>
 
 /* At least NetBSD needs these. */

diff --git a/para.h b/para.h
index 29658f476e93ef53bdcb545faf46a63dd7bd8bdd..d1e266fcfb249758b633860540a4bd637cc7152a 100644 (file)
--- a/para.h
+++ b/para.h
@@ -19,13 +19,11 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <ctype.h>

-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/un.h> /* needed by create_pf_socket */

 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>

+#include <inttypes.h>
+#include <sys/uio.h>

 #include "gcc-compat.h"
 
 /** used in various contexts */
 #include "gcc-compat.h"
 
 /** used in various contexts */

diff --git a/send_common.c b/send_common.c
index 250a2a0bc5a80f8973b33d43bcb2e12e3ee723e9..a16869b07154022bfd9adf4a56250d34a2de16fb 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -6,8 +6,13 @@
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <osl.h>
 #include <regex.h>
 #include <osl.h>

+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/server.c b/server.c
index 70d9137e7073cf7e7c7e9d3e598c742a26657560..f92ef5518cd507ea5e1ef6026e03f841f4b37e37 100644 (file)
--- a/server.c
+++ b/server.c
@@ -63,9 +63,15 @@
  *     - Forward error correction: \ref fec.c.
  */
 
  *     - Forward error correction: \ref fec.c.
  */
 

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <signal.h>
 #include <regex.h>
 #include <osl.h>
 #include <signal.h>
 #include <regex.h>
 #include <osl.h>

+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/udp_recv.c b/udp_recv.c
index 436b298cb8f467a25bf10c270a11ee08c74d6937..5cd9d9dd43bdeea379953f6965d68818fc1504ef 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -5,9 +5,14 @@
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 

+#include <netinet/in.h>

 #include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>

+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

diff --git a/udp_send.c b/udp_send.c
index 7930f09234486d3448b196ba45ae3b178845d001..4580f009b3cb4b75d2f9e4c3a4e274cfc230e387 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -6,13 +6,17 @@
 
 /** \file udp_send.c Para_server's udp sender. */
 
 
 /** \file udp_send.c Para_server's udp sender. */
 

-
+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <regex.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>

+#include <arpa/inet.h>
+#include <sys/un.h>

 #include <osl.h>
 #include <osl.h>

+#include <netdb.h>

 
 #include "server.cmdline.h"
 #include "para.h"
 
 #include "server.cmdline.h"
 #include "para.h"

diff --git a/vss.c b/vss.c
index 06707d6cfee11a70089db3fd7ef230af454e1516..2349b0931cfcc22b4d54b01f6c26f6b545614e6a 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -11,8 +11,14 @@
  * senders.
  */
 
  * senders.
  */
 

+#include <sys/socket.h>
+#include <netinet/in.h>

 #include <regex.h>
 #include <osl.h>
 #include <regex.h>
 #include <osl.h>

+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"