Fix spelling errors.

Found by codespell.

diff --git a/NEWS b/NEWS
index 57b5614cf25ef7aedf9a7593c59e3f1e926452ff..1ccf4ce207932d39aa57536dfbb24bad737a347b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -571,7 +571,7 @@ Thanks to Scott Lamb for his contributions to this version of tinc.
 * Tinc will retry to connect upon startup, does not quit if it doesn't
   work the first time.
 * Hosts that are disconnected implicitly if we lose a connection get
-  deleted from the internal list, to prevent hogging eachother with
+  deleted from the internal list, to prevent hogging each other with
   add and delete requests when the connection is restored.
 
 # Version 1.0pre1              May 12 2000

diff --git a/configure.ac b/configure.ac
index 3ad2821fe75411cdd1985f5f3b116ab2d446d147..241f17286ecc519826e28d86670e9a774487c6e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -261,7 +261,7 @@ AC_ARG_ENABLE(jumbograms,
   ]
 )
 
-dnl Ensure runstatedir is set if we are using a version of autoconf that does not suppport it
+dnl Ensure runstatedir is set if we are using a version of autoconf that does not support it
 if test "x$runstatedir" = "x"; then
   AC_SUBST([runstatedir], ['${localstatedir}/run'])
 fi

diff --git a/doc/CONNECTIVITY b/doc/CONNECTIVITY
index 11123ee3e4f20ae02545c30fa14d4da8dded3808..f48373920c428d7e54f197a2cbb64f222e618a29 100644 (file)
--- a/doc/CONNECTIVITY
+++ b/doc/CONNECTIVITY
@@ -1,4 +1,4 @@
-This document describes how nodes in a VPN find and connect to eachother and
+This document describes how nodes in a VPN find and connect to each other and
 maintain a stable network.
 
    Copyright 2001-2006 Guus Sliepen <guus@tinc-vpn.org>

diff --git a/doc/tinc.texi b/doc/tinc.texi
index cca61c2e984a6dc81fd74ef37e3e6bb2f8826b28..77215f1dd1ba809da75efa4b65f76ad112aab06e 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -161,7 +161,7 @@ professional package.
 
 @cindex traditional VPNs
 @cindex scalability
-Tinc also allows more than two sites to connect to eachother and form a single VPN.
+Tinc also allows more than two sites to connect to each other and form a single VPN.
 Traditionally VPNs are created by making tunnels, which only have two endpoints.
 Larger VPNs with more sites are created by adding more tunnels.
 Tinc takes another approach: only endpoints are specified,
@@ -353,7 +353,7 @@ message, and stop.
 For all cryptography-related functions, tinc uses the functions provided
 by the LibreSSL or the OpenSSL library.
 
-If this library is not installed, you wil get an error when configuring
+If this library is not installed, you will get an error when configuring
 tinc for build.  Support for running tinc with other cryptographic libraries
 installed @emph{may} be added in the future.
 
@@ -419,7 +419,7 @@ Markus F.X.J. Oberhumer
 For the optional compression of UDP packets, tinc uses the functions provided
 by the zlib library.
 
-If this library is not installed, you wil get an error when running the
+If this library is not installed, you will get an error when running the
 configure script.  You can either install the zlib library, or disable support
 for zlib compression by using the "--disable-zlib" option when running the
 configure script. Note that if you disable support for zlib, the resulting
@@ -443,7 +443,7 @@ default).
 @cindex lzo
 Another form of compression is offered using the LZO library.
 
-If this library is not installed, you wil get an error when running the
+If this library is not installed, you will get an error when running the
 configure script.  You can either install the LZO library, or disable support
 for LZO compression by using the "--disable-lzo" option when running the
 configure script. Note that if you disable support for LZO, the resulting
@@ -467,7 +467,7 @@ default).
 @cindex libcurses
 For the "tinc top" command, tinc requires a curses library.
 
-If this library is not installed, you wil get an error when running the
+If this library is not installed, you will get an error when running the
 configure script.  You can either install a suitable curses library, or disable
 all functionality that depends on a curses library by using the
 "--disable-curses" option when running the configure script.
@@ -490,7 +490,7 @@ of this package.
 @cindex libreadline
 For the "tinc" command's shell functionality, tinc uses the readline library.
 
-If this library is not installed, you wil get an error when running the
+If this library is not installed, you will get an error when running the
 configure script.  You can either install a suitable readline library, or
 disable all functionality that depends on a readline library by using the
 "--disable-readline" option when running the configure script.
@@ -744,7 +744,7 @@ and the host configuration files are expected to be in @file{@value{sysconfdir}/
 
 When tinc starts up, it parses the command-line options and then
 reads in the configuration file tinc.conf.
-It will then start listening for incoming connection from other deamons,
+It will then start listening for incoming connection from other daemons,
 and will by default also automatically try to connect to known peers.
 By default, tinc will try to keep at least 3 working meta-connections alive at all times.
 
@@ -752,7 +752,7 @@ By default, tinc will try to keep at least 3 working meta-connections alive at a
 @cindex server
 There is no real distinction between a server and a client in tinc.
 If you wish, you can view a tinc daemon without a `ConnectTo' statement in tinc.conf and `AutoConnect = no' as a server,
-and one which does have one or more `ConnectTo' statements or `Autoconnect = yes' (which is the defualt) as a client.
+and one which does have one or more `ConnectTo' statements or `Autoconnect = yes' (which is the default) as a client.
 It does not matter if two tinc daemons have a `ConnectTo' value pointing to each other however.
 
 Connections specified using `ConnectTo' are so-called meta-connections.
@@ -783,7 +783,7 @@ The actual configuration of the daemon is done in the file
 @file{@value{sysconfdir}/tinc/@var{netname}/tinc.conf} and at least one other file in the directory
 @file{@value{sysconfdir}/tinc/@var{netname}/hosts/}.
 
-An optionnal directory @file{@value{sysconfdir}/tinc/@var{netname}/conf.d} can be added from which
+An optional directory @file{@value{sysconfdir}/tinc/@var{netname}/conf.d} can be added from which
 any .conf file will be read.
 
 These file consists of comments (lines started with a #) or assignments
@@ -1180,7 +1180,7 @@ will be inherited by the UDP packets that are sent out.
 @item PrivateKey = <@var{key}> [obsolete]
 This is the RSA private key for tinc. However, for safety reasons it is
 advised to store private keys of any kind in separate files. This prevents
-accidental eavesdropping if you are editting the configuration file.
+accidental eavesdropping if you are editing the configuration file.
 
 @cindex PrivateKeyFile
 @item PrivateKeyFile = <@var{path}> (@file{@value{sysconfdir}/tinc/@var{netname}/rsa_key.priv})
@@ -2566,7 +2566,7 @@ Intervals lower than 0.1 seconds are not allowed.
 
 @item c
 Toggle between displaying current traffic rates (in packets and bytes per second)
-and cummulative traffic (total packets and bytes since the tinc daemon started).
+and cumulative traffic (total packets and bytes since the tinc daemon started).
 
 @item n
 Sort the list of nodes by name.
@@ -3381,7 +3381,7 @@ which aims to be as strong as TLS with one of the strongest cipher suites.
 Cryptography is a hard thing to get right. We cannot make any
 guarantees. Time, review and feedback are the only things that can
 prove the security of any cryptographic product. If you wish to review
-tinc or give us feedback, you are stronly encouraged to do so.
+tinc or give us feedback, you are strongly encouraged to do so.
 
 
 @c ==================================================================

diff --git a/src/gcrypt/cipher.c b/src/gcrypt/cipher.c
index f8668da7a922f9764f6ea4c66c16cf8c313ca9cc..176b62b19e95ef258f26c704c2d291312527485f 100644 (file)
--- a/src/gcrypt/cipher.c
+++ b/src/gcrypt/cipher.c
@@ -102,7 +102,7 @@ static bool cipher_open(cipher_t *cipher, int algo, int mode) {
        }
 
        if((err = gcry_cipher_open(&cipher->handle, algo, mode, 0))) {
-               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unable to intialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unable to initialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
                return false;
        }
 

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 54e09942ce70e07df62a7e37a0ef6d535445743a..183641ba99152fc256caac622dae28425d0d4290 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -212,7 +212,7 @@ static bool setup_device(void) {
                        if(info[0] == 9 && info[1] >= 21)
                                logger(DEBUG_ALWAYS, LOG_WARNING,
                                       "You are using the newer (>= 9.0.0.21, NDIS6) series of TAP-Win32 drivers. "
-                                      "Using these drivers with tinc is not recommanded as it can result in poor performance. "
+                                      "Using these drivers with tinc is not recommended as it can result in poor performance. "
                                       "You might want to revert back to 9.0.0.9 instead.");
                }
        }

diff --git a/src/route.c b/src/route.c
index 3beb2f4137a0057532dc0f1fbae695c54215c23a..dcc6f3c6bfc32d9d2824ce342ee23027c613dec0 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -907,7 +907,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
        memcpy(DATA(packet), DATA(packet) + ETH_ALEN, ETH_ALEN); /* copy destination address */
        DATA(packet)[ETH_ALEN * 2 - 1] ^= 0xFF;                  /* mangle source address so it looks like it's not from us */
 
-       ip6.ip6_dst = ip6.ip6_src;                               /* swap destination and source protocoll address */
+       ip6.ip6_dst = ip6.ip6_src;                               /* swap destination and source protocol address */
        ip6.ip6_src = ns.nd_ns_target;
 
        if(has_opt) {

diff --git a/src/tincctl.c b/src/tincctl.c
index 93c5b320b6e963b2719c102a4f921e6c3fb00b1d..dccd49d88fd08a29449d03d579217f38190f44fa 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -2735,11 +2735,11 @@ static int cmd_fsck(int argc, char *argv[]) {
 
 static void *readfile(FILE *in, size_t *len) {
        size_t count = 0;
-       size_t alloced = 4096;
-       char *buf = xmalloc(alloced);
+       size_t bufsize = 4096;
+       char *buf = xmalloc(bufsize);
 
        while(!feof(in)) {
-               size_t read = fread(buf + count, 1, alloced - count, in);
+               size_t read = fread(buf + count, 1, bufsize - count, in);
 
                if(!read) {
                        break;
@@ -2747,9 +2747,9 @@ static void *readfile(FILE *in, size_t *len) {
 
                count += read;
 
-               if(count >= alloced) {
-                       alloced *= 2;
-                       buf = xrealloc(buf, alloced);
+               if(count >= bufsize) {
+                       bufsize *= 2;
+                       buf = xrealloc(buf, bufsize);
                }
        }
 

diff --git a/src/xalloc.h b/src/xalloc.h
index ac24ebc6b424a0b0f504de5a40525c36f217e4f2..d9877a8b08a37be1b56dcb22f513e495894146c1 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -2,7 +2,7 @@
 #define TINC_XALLOC_H
 
 /*
-   xalloc.h -- malloc and related fuctions with out of memory checking
+   xalloc.h -- malloc and related functions with out of memory checking
    Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>