K&R style braces

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 1ab4c2c..ca30ec4 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: netutl.c,v 1.12.4.53 2003/08/22 11:18:42 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -34,8 +34,7 @@ bool hostnames = false;
   Turn a string into a struct addrinfo.
   Return NULL on failure.
 */
-struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
-{
+struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
        struct addrinfo *ai, hint = {0};
        int err;
 
@@ -55,8 +54,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
        return ai;
 }
 
-sockaddr_t str2sockaddr(const char *address, const char *port)
-{
+sockaddr_t str2sockaddr(const char *address, const char *port) {
        struct addrinfo *ai, hint = {0};
        sockaddr_t result;
        int err;
@@ -78,14 +76,13 @@ sockaddr_t str2sockaddr(const char *address, const char *port)
                return result;
        }
 
-       result = *(sockaddr_t *) ai->ai_addr;
+       memcpy(&result, ai->ai_addr, ai->ai_addrlen);
        freeaddrinfo(ai);
 
        return result;
 }
 
-void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
-{
+void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        char address[NI_MAXHOST];
        char port[NI_MAXSERV];
        char *scopeid;
@@ -118,8 +115,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
        *portstr = xstrdup(port);
 }
 
-char *sockaddr2hostname(const sockaddr_t *sa)
-{
+char *sockaddr2hostname(const sockaddr_t *sa) {
        char *str;
        char address[NI_MAXHOST] = "unknown";
        char port[NI_MAXSERV] = "unknown";
@@ -144,8 +140,7 @@ char *sockaddr2hostname(const sockaddr_t *sa)
        return str;
 }
 
-int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
-{
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
        int result;
 
        cp();
@@ -193,6 +188,8 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
 }
 
 void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
+       cp();
+
        if(b->sa.sa_family != AF_UNKNOWN) {
                *a = *b;
        } else {
@@ -203,14 +200,17 @@ void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
 }
 
 void sockaddrfree(sockaddr_t *a) {
+       cp();
+
        if(a->sa.sa_family == AF_UNKNOWN) {
                free(a->unknown.address);
                free(a->unknown.port);
        }
 }
        
-void sockaddrunmap(sockaddr_t *sa)
-{
+void sockaddrunmap(sockaddr_t *sa) {
+       cp();
+
        if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
                sa->in.sin_addr.s_addr = ((uint32_t *) & sa->in6.sin6_addr)[3];
                sa->in.sin_family = AF_INET;
@@ -219,8 +219,7 @@ void sockaddrunmap(sockaddr_t *sa)
 
 /* Subnet mask handling */
 
-int maskcmp(const void *va, const void *vb, int masklen, int len)
-{
+int maskcmp(const void *va, const void *vb, int masklen) {
        int i, m, result;
        const char *a = va;
        const char *b = vb;
@@ -240,8 +239,7 @@ int maskcmp(const void *va, const void *vb, int masklen, int len)
        return 0;
 }
 
-void mask(void *va, int masklen, int len)
-{
+void mask(void *va, int masklen, int len) {
        int i;
        char *a = va;
 
@@ -251,14 +249,13 @@ void mask(void *va, int masklen, int len)
        masklen %= 8;
 
        if(masklen)
-               a[i++] &= (0x100 - (1 << masklen));
+               a[i++] &= (0x100 - (1 << (8 - masklen)));
 
        for(; i < len; i++)
                a[i] = 0;
 }
 
-void maskcpy(void *va, const void *vb, int masklen, int len)
-{
+void maskcpy(void *va, const void *vb, int masklen, int len) {
        int i, m;
        char *a = va;
        const char *b = vb;
@@ -269,7 +266,7 @@ void maskcpy(void *va, const void *vb, int masklen, int len)
                a[i] = b[i];
 
        if(m) {
-               a[i] = b[i] & (0x100 - (1 << m));
+               a[i] = b[i] & (0x100 - (1 << (8 - m)));
                i++;
        }
 
@@ -277,8 +274,7 @@ void maskcpy(void *va, const void *vb, int masklen, int len)
                a[i] = 0;
 }
 
-bool maskcheck(const void *va, int masklen, int len)
-{
+bool maskcheck(const void *va, int masklen, int len) {
        int i;
        const char *a = va;