Make path for ARP table configurable

Adds -a switch to wifidog executable.

Author: mhaas

src/commandline.c

@@ -96,7 +96,7 @@ parse_commandline(int argc, char **argv)
     i = 0;
     restartargv[i++] = safe_strdup(argv[0]);
 
-    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:"))) {
+    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:a:"))) {
 
         skiponrestart = 0;
 
@@ -158,6 +158,15 @@ parse_commandline(int argc, char **argv)
             }
             break;
 
+        case 'a':
+            if (optarg) {
+                free(config->arp_table_path);
+                config->arp_table_path = safe_strdup(optarg);
+            } else {
+                fprintf(stdout, "You must supply the path to the ARP table with -a!");
+                exit(1);
+            }
+            break;
         default:
             usage();
             exit(1);

src/conf.c

@@ -197,6 +197,7 @@ config_init(void)
     config.ssl_certs = safe_strdup(DEFAULT_AUTHSERVSSLCERTPATH);
     config.ssl_verify = DEFAULT_AUTHSERVSSLPEERVER;
     config.ssl_cipher_list = NULL;
+    config.arp_table_path = safe_strdup(DEFAULT_ARPTABLE);
 }
 
 /**

src/conf.h

@@ -71,6 +71,7 @@
 #define DEFAULT_AUTHSERVSSLCERTPATH "/etc/ssl/certs/"
 /** Note that DEFAULT_AUTHSERVSSLNOPEERVER must be 0 or 1, even if the config file syntax is yes or no */
 #define DEFAULT_AUTHSERVSSLPEERVER 1    /* 0 means: Enable peer verification */
+#define DEFAULT_ARPTABLE "/proc/net/arp"
 /*@}*/
 
 /*@{*/
@@ -185,6 +186,8 @@ typedef struct {
     char *ssl_cipher_list;  /**< @brief List of SSL ciphers allowed. Optional. */
     t_firewall_ruleset *rulesets;       /**< @brief firewall rules */
     t_trusted_mac *trustedmaclist; /**< @brief list of trusted macs */
+    char *arp_table_path; /**< @brief Path to custom ARP table, formatted
+        like /proc/net/arp */
 } s_config;
 
 /** @brief Get the current gateway configuration */

src/firewall.c

@@ -139,8 +139,8 @@ fw_set_authup(void)
 /* XXX DCY */
 /**
  * Get an IP's MAC address from the ARP cache.
- * Go through all the entries in /proc/net/arp until we find the requested
- * IP address and return the MAC address bound to it.
+ * Go through all the entries in config->arp_table_path until we find the
+ * requested IP address and return the MAC address bound to it.
  * @todo Make this function portable (using shell scripts?)
  */
 char           *
@@ -150,8 +150,9 @@ arp_get(const char *req_ip)
 	char ip[16];
 	char mac[18];
 	char * reply;
+    s_config *config = config_get_config();
 
-    if (!(proc = fopen("/proc/net/arp", "r"))) {
+    if (!(proc = fopen(config->arp_table_path, "r"))) {
         return NULL;
     }