Fix whitespace.

[tinc] / src / mingw / device.c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index bdca842..190621b 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -50,7 +50,7 @@ static DWORD WINAPI tapreader(void *bla) {
        OVERLAPPED overlapped;
        vpn_packet_t packet;
 
-       logger(LOG_DEBUG, "Tap reader running");
+       logger(DEBUG_ALWAYS, LOG_DEBUG, "Tap reader running");
 
        /* Read from tap device and send to parent */
 
@@ -69,7 +69,7 @@ static DWORD WINAPI tapreader(void *bla) {
                                if(!GetOverlappedResult(device_handle, &overlapped, &len, FALSE))
                                        continue;
                        } else {
-                               logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
                                           device, strerror(errno));
                                return -1;
                        }
@@ -83,7 +83,7 @@ static DWORD WINAPI tapreader(void *bla) {
        }
 }
 
-bool setup_device(void) {
+static bool setup_device(void) {
        HKEY key, key2;
        int i;
 
@@ -105,7 +105,7 @@ bool setup_device(void) {
        /* Open registry and look for network adapters */
 
        if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key)) {
-               logger(LOG_ERR, "Unable to read registry: %s", winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read registry: %s", winerror(GetLastError()));
                return false;
        }
 
@@ -118,7 +118,7 @@ bool setup_device(void) {
 
                snprintf(regpath, sizeof regpath, "%s\\%s\\Connection", NETWORK_CONNECTIONS_KEY, adapterid);
 
-                if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
+               if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, regpath, 0, KEY_READ, &key2))
                        continue;
 
                len = sizeof adaptername;
@@ -156,7 +156,7 @@ bool setup_device(void) {
        RegCloseKey(key);
 
        if(!found) {
-               logger(LOG_ERR, "No Windows tap device found!");
+               logger(DEBUG_ALWAYS, LOG_ERR, "No Windows tap device found!");
                return false;
        }
 
@@ -172,16 +172,16 @@ bool setup_device(void) {
                snprintf(tapname, sizeof tapname, USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
                device_handle = CreateFile(tapname, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
        }
-       
+
        if(device_handle == INVALID_HANDLE_VALUE) {
-               logger(LOG_ERR, "%s (%s) is not a usable Windows tap device: %s", device, iface, winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "%s (%s) is not a usable Windows tap device: %s", device, iface, winerror(GetLastError()));
                return false;
        }
 
        /* Get MAC address from tap device */
 
        if(!DeviceIoControl(device_handle, TAP_IOCTL_GET_MAC, mymac.x, sizeof mymac.x, mymac.x, sizeof mymac.x, &len, 0)) {
-               logger(LOG_ERR, "Could not get MAC address from Windows tap device %s (%s): %s", device, iface, winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get MAC address from Windows tap device %s (%s): %s", device, iface, winerror(GetLastError()));
                return false;
        }
 
@@ -194,7 +194,7 @@ bool setup_device(void) {
        thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL);
 
        if(!thread) {
-               logger(LOG_ERR, "System call `%s' failed: %s", "CreateThread", winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "CreateThread", winerror(GetLastError()));
                return false;
        }
 
@@ -205,31 +205,31 @@ bool setup_device(void) {
 
        device_info = "Windows tap device";
 
-       logger(LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
+       logger(DEBUG_ALWAYS, LOG_INFO, "%s (%s) is a %s", device, iface, device_info);
 
        return true;
 }
 
-void close_device(void) {
+static void close_device(void) {
        CloseHandle(device_handle);
 
        free(device);
        free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet) {
+static bool read_packet(vpn_packet_t *packet) {
        return false;
 }
 
-bool write_packet(vpn_packet_t *packet) {
+static bool write_packet(vpn_packet_t *packet) {
        long outlen;
        OVERLAPPED overlapped = {0};
 
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
+       logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
                           packet->len, device_info);
 
        if(!WriteFile(device_handle, packet->data, packet->len, &outlen, &overlapped)) {
-               logger(LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
                return false;
        }
 
@@ -238,8 +238,16 @@ bool write_packet(vpn_packet_t *packet) {
        return true;
 }
 
-void dump_device_stats(void) {
-       logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-       logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-       logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
+static void dump_device_stats(void) {
+       logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+       logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+       logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
+
+const devops_t os_devops = {
+       .setup = setup_device,
+       .close = close_device,
+       .read = read_packet,
+       .write = write_packet,
+       .dump_stats = dump_device_stats,
+};