Death to confusing extern declaration everywhere.

Author: acv

src/auth.c

@@ -48,11 +48,6 @@
 #include "client_list.h"
 #include "util.h"
 
-/* Defined in clientlist.c */
-extern	pthread_mutex_t	client_list_mutex;
-
-/* Defined in util.c */
-extern long served_this_session;
 
 /** Launches a thread that periodically checks if any of the connections has timed out
 @param arg Must contain a pointer to a string containing the IP adress of the client to check to check

src/centralserver.c

@@ -52,8 +52,6 @@
 
 #include "simple_http.h"
 
-extern pthread_mutex_t config_mutex;
-
 /** Initiates a transaction with the auth server, either to authenticate or to
  * update the traffic counters at the server
 @param authresponse Returns the information given by the central server 

src/client_list.c

@@ -1,3 +1,4 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -18,9 +19,6 @@
  *                                                                  *
  \********************************************************************/
 
-/*
- * $Id$
- */
 /** @file client_list.c
   @brief Client List Functions
   @author Copyright (C) 2004 Alexandre Carmel-Veillex <[email protected]>
@@ -44,15 +42,14 @@
 #include "conf.h"
 #include "client_list.h"
 
-/** Global mutex to protect access to the client list */
-extern pthread_mutex_t client_list_mutex;
-pthread_mutex_t client_list_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 /** @internal
  * Holds a pointer to the first element of the list 
  */ 
 static t_client         *firstclient = NULL;
 
+/** Global mutex to protect access to the client list */
+pthread_mutex_t client_list_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 /** Get a new client struct, not added to the list yet
  * @return Pointer to newly created client object not on the list yet.
  */

src/client_list.h

@@ -1,3 +1,4 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -27,6 +28,9 @@
 #ifndef _CLIENT_LIST_H_
 #define _CLIENT_LIST_H_
 
+/** Global mutex to protect access to the client list */
+extern pthread_mutex_t client_list_mutex;
+
 /** Counters struct for a client's bandwidth usage (in bytes)
  */
 typedef struct _t_counters {

src/commandline.c

@@ -1,3 +1,4 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -18,7 +19,6 @@
  *                                                                  *
 \********************************************************************/
 
-/* $Id$ */
 /** @file commandline.c
     @brief Command line argument handling
     @author Copyright (C) 2004 Philippe April <[email protected]>
@@ -33,28 +33,23 @@
 #include "debug.h"
 #include "safe.h"
 #include "conf.h"
+#include "commandline.h"
 
 #include "../config.h"
 
 /*
  * Holds an argv that could be passed to exec*() if we restart ourselves
  */
-/* Declare variable */
-extern char ** restartargv;
-/* Define variable */
 char ** restartargv = NULL;
 
-static void usage(void);
-
-void parse_commandline(int argc, char **argv);
-
-/*
+/**
  * A flag to denote whether we were restarted via a parent wifidog, or started normally
  * 0 means normally, otherwise it will be populated by the PID of the parent
  */
-extern pid_t restart_orig_pid;
 pid_t restart_orig_pid = 0;
 
+static void usage(void);
+
 /** @internal
  * @brief Print usage
  *
@@ -81,7 +76,8 @@ usage(void)
 /** Uses getopt() to parse the command line and set configuration values
  * also populates restartargv
  */
-void parse_commandline(int argc, char **argv) {
+void
+parse_commandline(int argc, char **argv) {
 	int c;
 	int skiponrestart;
 	int i;
@@ -106,7 +102,8 @@ void parse_commandline(int argc, char **argv) {
 
 			case 'c':
 				if (optarg) {
-					strncpy(config->configfile, optarg, sizeof(config->configfile));
+                    free(config->configfile);
+                    config->configfile = safe_strdup(optarg);
 				}
 				break;
 

src/commandline.h

@@ -1,3 +1,4 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -27,6 +28,17 @@
 #ifndef _COMMANDLINE_H_
 #define _COMMANDLINE_H_
 
+/*
+ * Holds an argv that could be passed to exec*() if we restart ourselves
+ */
+extern char **restartargv;
+
+/**
+ * A flag to denote whether we were restarted via a parent wifidog, or started normally
+ * 0 means normally, otherwise it will be populated by the PID of the parent
+ */
+extern pid_t restart_orig_pid;
+
 /** @brief Parses the command line and set the config accordingly */
 void parse_commandline(int, char**);
 

src/conf.c

@@ -55,7 +55,6 @@ static s_config config;
 /**
  * Mutex for the configuration file, used by the auth_servers related
  * functions. */
-extern pthread_mutex_t config_mutex;
 pthread_mutex_t config_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /** @internal
@@ -170,7 +169,7 @@ void
 config_init(void)
 {
     debug(LOG_DEBUG, "Setting default config parameters");
-    strncpy(config.configfile, DEFAULT_CONFIGFILE, sizeof(config.configfile));
+    config.configfile = safe_strdup(DEFAULT_CONFIGFILE);
     config.htmlmsgfile = safe_strdup(DEFAULT_HTMLMSGFILE);
     config.debuglevel = DEFAULT_DEBUGLEVEL;
     config.httpdmaxconn = DEFAULT_HTTPDMAXCONN;

src/conf.h

@@ -83,6 +83,11 @@
 #define FWRULESET_LOCKED_USERS "locked-users"
 /*@}*/
 
+/**
+ * Mutex for the configuration file, used by the auth_servers related
+ * functions. */
+extern pthread_mutex_t config_mutex;
+
 /**
  * Information about the authentication server
  */
@@ -147,7 +152,7 @@ typedef struct _trusted_mac_t {
  * Configuration structure
  */
 typedef struct {
-    char configfile[255];       /**< @brief name of the config file */
+    char *configfile;       /**< @brief name of the config file */
     char *htmlmsgfile;          /**< @brief name of the HTML file used for messages */
     char *wdctl_sock;           /**< @brief wdctl path to socket */
     char *internal_sock;                /**< @brief internal path to socket */

src/firewall.c

@@ -1,3 +1,4 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -18,9 +19,6 @@
  *                                                                  *
  \********************************************************************/
 
-/*
- * $Id$
- */
 /** @internal
   @file firewall.c
   @brief Firewall update functions
@@ -64,13 +62,7 @@
 #include "auth.h"
 #include "centralserver.h"
 #include "client_list.h"
-
-extern pthread_mutex_t client_list_mutex;
-
-/* from commandline.c */
-extern pid_t restart_orig_pid;
-
-
+#include "commandline.h"
 
 /**
  * Allow a client access through the firewall by adding a rule in the firewall to MARK the user's packets with the proper

src/fw_iptables.c

@@ -52,9 +52,6 @@ static int iptables_do_command(const char *format, ...);
 static char *iptables_compile(const char *, const char *, const t_firewall_rule *);
 static void iptables_load_ruleset(const char *, const char *, const char *);
 
-extern pthread_mutex_t	client_list_mutex;
-extern pthread_mutex_t	config_mutex;
-
 /**
 Used to supress the error output of the firewall during destruction */ 
 static int fw_quiet = 0;