Changeset 328

Timestamp:

07/06/07 17:56:12 (1 year ago)

Author:

florida

Message:

Ajout mise à jour wifidog_1.3.3_rc1

Files:

• wifidog/wifidog-client/src/conf.h (modified) (1 diff)
• wifidog/wifidog-client/src/firewall.c (modified) (3 diffs)
• wifidog/wifidog-client/src/firewall.h (modified) (1 diff)
• wifidog/wifidog-client/src/fw_iptables.c (modified) (5 diffs)
• wifidog/wifidog-client/src/util.c (modified) (4 diffs)
• wifidog/wifidog-client/src/wdctl_thread.c (modified) (6 diffs)
• wifidog/wifidog-client/src/wdctl_thread.h (modified) (1 diff)

wifidog/wifidog-client/src/conf.h

@@ -30 +30 @@
-/*@{*/ 
-/** Defines */
-
+
+
-#define NUM_EXT_INTERFACE_DETECT_RETRY 120
-/** How often should we try to detect the interface with the default route
-
+(interval in seconds) 
-#define EXT_INTERFACE_DETECT_RETRY_INTERVAL 1
-

wifidog/wifidog-client/src/firewall.c

@@ -73 +73 @@
-extern pid_t restart_orig_pid;
-
-
+
-
-/**
@@ -296 +296 @@
-                            if (p1->fw_connection_state != FW_MARK_KNOWN) {
-                                debug(LOG_INFO, "%s - Access has changed to allowed, refreshing firewall and clearing counters", p1->ip);
-
+
+
+
+
+
+
+
+
+
+
-                                p1->fw_connection_state = FW_MARK_KNOWN;
-                                p1->counters.incoming = p1->counters.outgoing = 0;
-                                fw_allow(p1->ip, p1->mac, p1->fw_connection_state);
-                            }
@@ -317 +325 @@
-
-                        default:
-DEBUG
+ERR
-                            break;
-                    }

wifidog/wifidog-client/src/firewall.h

@@ -27 +27 @@
-#ifndef _FIREWALL_H_
-#define _FIREWALL_H_
+
+int icmp_fd;
-
-/** Used by fw_iptables.c */

wifidog/wifidog-client/src/fw_iptables.c

@@ -60 +60 @@
-static int fw_quiet = 0;
-
-
+
+
-static int
-iptables_do_command(char *format, ...)
@@ -225 +226 @@
-
-                        for (gwi = config->gw_interface ; gwi != NULL ; gwi = gwi->next)
-
+//this rule will be inserted before the prior one
-
-                        for (gwi = config->gw_interface ; gwi != NULL ; gwi = gwi->next)
@@ -307 +308 @@
-                                iptables_do_command("-t filter -I FORWARD -i %s -j " TABLE_WIFIDOG_WIFI_TO_INTERNET, gwi->interface);
-
-
+
-                        iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m state --state INVALID -j DROP");
-
@@ -314 +315 @@
-                         iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m state --state RELATED,ESTABLISHED -j ACCEPT");*/
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-                        iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -j " TABLE_WIFIDOG_AUTHSERVERS);
@@ -508 +505 @@
-        case FW_ACCESS_DENY:
-            iptables_do_command("-t mangle -D " TABLE_WIFIDOG_OUTGOING " -s %s -m mac --mac-source %s -j MARK --set-mark %d", ip, mac, tag);
-ACCEPT
+DROP
-            break;
-        default:

wifidog/wifidog-client/src/util.c

@@ -174 +174 @@
-
-    ip_str = (char *)inet_ntoa(in);
+    close(sockd);
-    return safe_strdup(ip_str);
-#else
@@ -223 +224 @@
-    char *device, *gw;
-    int i;
+    int keep_detecting = 1;
-    pthread_cond_t              cond = PTHREAD_COND_INITIALIZER;
-    pthread_mutex_t             cond_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -229 +231 @@
-    gw = (char *)malloc(16);
-    debug(LOG_DEBUG, "get_ext_iface(): Autodectecting the external interface from routing table");
-for (i=1; i<=NUM_EXT_INTERFACE_DETECT_RETRY; i++
+while(keep_detecting
-        input = fopen("/proc/net/route", "r");
-        while (!feof(input)) {
@@ -250 +252 @@
-        /* No longer needs to be locked */
-        pthread_mutex_unlock(&cond_mutex);
+            //for (i=1; i<=NUM_EXT_INTERFACE_DETECT_RETRY; i++) {
+            if (NUM_EXT_INTERFACE_DETECT_RETRY != 0 && i>=NUM_EXT_INTERFACE_DETECT_RETRY) {
+                keep_detecting = 0;
+            }
-    }
-    debug(LOG_ERR, "get_ext_iface(): Failed to detect the external interface after %d tries, aborting", NUM_EXT_INTERFACE_DETECT_RETRY);

wifidog/wifidog-client/src/wdctl_thread.c

@@ -71 +71 @@
-thread_wdctl(void *arg)
-{
-
-
+
-        char    *sock_name;
-        struct  sockaddr_un     sa_un;
-        int result;
-        pthread_t       tid;
-
+   
-
-        debug(LOG_DEBUG, "Starting wdctl.");
@@ -93 +92 @@
-
-        debug(LOG_DEBUG, "Creating socket");
-       sock
-
-sock
+        wdctl_socket_server
+
+wdctl_socket_server
-
-        /* If it exists, delete... Not the cleanest way to deal. */
@@ -109 +108 @@
-        
-        /* Which to use, AF_UNIX, PF_UNIX, AF_LOCAL, PF_LOCAL? */
-
+
-                                + sizeof(sa_un.sun_family))) {
-                debug(LOG_ERR, "Could not bind control socket: %s",
@@ -116 +115 @@
-        }
-
-       if (listen(sock
+        if (listen(wdctl_socket_server
-                debug(LOG_ERR, "Could not listen on control socket: %s",
-                                strerror(errno));
@@ -125 +124 @@
-                len = sizeof(sa_un);
-                memset(&sa_un, 0, len);
-               if ((fd = accept(sock
+                if ((fd = accept(wdctl_socket_server
-                        debug(LOG_ERR, "Accept failed on control socket: %s",
-                                        strerror(errno));
@@ -343 +342 @@
-        else {
-                /* Child */
+                close(wdctl_socket_server);
+                close(icmp_fd);
-                close(sock);
-                shutdown(afd, 2);

wifidog/wifidog-client/src/wdctl_thread.h

@@ -30 +30 @@
-#define DEFAULT_WDCTL_SOCK      "/tmp/wdctl.sock"
-
+int wdctl_socket_server;
+
-/** @brief Listen for WiFiDog control messages on a unix domain socket */
-void thread_wdctl(void *arg);