From ca989c0c8b19901cbd7664a9d2b42aa85c9c176e Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 6 Jan 2018 20:46:22 +0100 Subject: [PATCH] Fix all spelling errors found by codespell. --- NEWS | 6 +++--- doc/CONNECTIVITY | 2 +- doc/PROTOCOL | 4 ++-- doc/SECURITY2 | 2 +- doc/tinc.8.in | 2 +- doc/tinc.conf.5.in | 2 +- doc/tinc.texi | 10 +++++----- src/ed25519/sha512.c | 2 +- src/invitation.c | 2 +- src/net_packet.c | 2 +- src/protocol_auth.c | 4 ++-- src/protocol_misc.c | 2 +- src/subnet_parse.c | 2 +- src/tincctl.c | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index ec6add6..209822c 100644 --- a/NEWS +++ b/NEWS @@ -12,7 +12,7 @@ * Support PriorityInheritance for IPv6 packets. * Fixes for Solaris tun/tap support. * Add a configurable expiration time for invitations. -* Store invitation data after a succesful join. +* Store invitation data after a successful join. * Exit gracefully when the tun/tap device is in a bad state. * Add the LogLevel option. * AutoConnect now actively tries to heal split networks. @@ -43,7 +43,7 @@ contributions to this version of tinc. * Allow tinc to be compiled without LibreSSL or OpenSSL (this drops compatibility with nodes running 1.0.x). * Added a "fsck" command to check the configuration files for problems. -* Tinc "start" now checks whether the daemon really started succesfully, and +* Tinc "start" now checks whether the daemon really started successfully, and displays error messages otherwise. * Added systemd service files. * Use the recvmmsg() function if available. @@ -378,7 +378,7 @@ their contributions to this version of tinc. * Improved default settings of tun and tap devices on BSD platforms. * Make IPv6 sockets bind only to IPv6 on Linux. * Enable path MTU discovery by default. -* Fixed a memory leak that occured when connections were closed. +* Fixed a memory leak that occurred when connections were closed. Thanks to Max Rijevski for his contributions to this version of tinc. diff --git a/doc/CONNECTIVITY b/doc/CONNECTIVITY index bf31451..11123ee 100644 --- a/doc/CONNECTIVITY +++ b/doc/CONNECTIVITY @@ -26,7 +26,7 @@ share the same information. It will also almost completely prevent information from looping, because "new" information that is already known is ignored and not forwarded any further. However, since information can also be deleted there's the possibility of a looping sequence of add/delete messages. This is -resolved by additionaly adding a unique identifier to each broadcasted message. +resolved by additionally adding a unique identifier to each broadcasted message. Messages are dropped if the same message with that identifier has already been seen. diff --git a/doc/PROTOCOL b/doc/PROTOCOL index b8d37ed..3ac9584 100644 --- a/doc/PROTOCOL +++ b/doc/PROTOCOL @@ -33,7 +33,7 @@ is pretty basic. A data packet can only be sent if the encryption key, cipher and digest are known to both parties, and the connection is activated. If the encryption key is not known, a request is sent to the destination using the meta connection to -retreive it. +retrieve it. 0 1 2 3 4 5 6 7 ... 97 98 99 100 | seqno | data | MAC | @@ -59,7 +59,7 @@ daemon and to read and write requests by hand, provided that one understands the numeric codes sent. The authentication scheme is described in the SECURITY2 file. After a -succesful authentication, the server and the client will exchange all the +successful authentication, the server and the client will exchange all the information about other tinc daemons and subnets they know of, so that both sides (and all the other tinc daemons behind them) have their information synchronised. diff --git a/doc/SECURITY2 b/doc/SECURITY2 index 62d6a07..38418f9 100644 --- a/doc/SECURITY2 +++ b/doc/SECURITY2 @@ -61,7 +61,7 @@ client CHAL_REPLY 816a86 server CHAL_REPLY 928ffe +-> 160 bits SHA1 of H1 -After the correct challenge replies are recieved, both ends have proved +After the correct challenge replies are received, both ends have proved their identity. Further information is exchanged. client ACK 655 123 0 diff --git a/doc/tinc.8.in b/doc/tinc.8.in index 041a32c..aaa3547 100644 --- a/doc/tinc.8.in +++ b/doc/tinc.8.in @@ -252,7 +252,7 @@ to allow a signature from any node whose public key is known. If no .Ar filename is given, the file is read from standard input. -If the verification is succesful, +If the verification is successful, a copy of the input with the signature removed is written to standard output, and the exit code will be zero. If the verification failed, diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index 3ab40a5..ed9709a 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -788,7 +788,7 @@ its connection to the virtual network device. .It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /invitations/ This directory contains outstanding invitations. .It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /invitation-data -After a succesful join, this file contains a copy of the invitation data received. +After a successful join, this file contains a copy of the invitation data received. .El .Sh SEE ALSO .Xr tincd 8 , diff --git a/doc/tinc.texi b/doc/tinc.texi index 545f4c4..c9bda8e 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -721,7 +721,7 @@ It is not required if you only run one tinc daemon, it doesn't even have to be the same on all the nodes of your VPN, but it is recommended that you choose one anyway. -We will asume you use a netname throughout this document. +We will assume you use a netname throughout this document. This means that you call tinc with the -n argument, which will specify the netname. @@ -1059,7 +1059,7 @@ Incoming packets using the SPTPS protocol are dropped, since they are end-to-end @item Hostnames = (no) This option selects whether IP addresses (both real and on the VPN) should be resolved. Since DNS lookups are blocking, it might affect -tinc's efficiency, even stopping the daemon for a few seconds everytime +tinc's efficiency, even stopping the daemon for a few seconds every time it does a lookup if your DNS server is not responding. This does not affect resolving hostnames to IP addresses from the @@ -1398,7 +1398,7 @@ connection with that host. @cindex Subnet @item Subnet = <@var{address}[/@var{prefixlength}[#@var{weight}]]> The subnet which this tinc daemon will serve. -Tinc tries to look up which other daemon it should send a packet to by searching the appropiate subnet. +Tinc tries to look up which other daemon it should send a packet to by searching the appropriate subnet. If the packet matches a subnet, it will be sent to the daemon who has this subnet in his host configuration file. Multiple subnet lines can be specified for each daemon. @@ -2536,7 +2536,7 @@ The @var{name} of the node must be given, or can be "." to check against the local node's public key, or "*" to allow a signature from any node whose public key is known. If no @var{filename} is given, the file is read from standard input. -If the verification is succesful, a copy of the input with the signature removed is written to standard output, and the exit code will be zero. +If the verification is successful, a copy of the input with the signature removed is written to standard output, and the exit code will be zero. If the verification failed, nothing will be written to standard output, and the exit code will be non-zero. @end table @@ -2759,7 +2759,7 @@ When an invitation is generated, the "invitation-created" script is called (if it exists) right after the invitation file is written, but before the URL has been written to stdout. This allows one to change the invitation file automatically before the invitation URL is passed to the invitee. Here is an -example shell script that aproximately recreates the default invitation file: +example shell script that approximately recreates the default invitation file: @example #!/bin/sh diff --git a/src/ed25519/sha512.c b/src/ed25519/sha512.c index 13dc843..9cdf94d 100644 --- a/src/ed25519/sha512.c +++ b/src/ed25519/sha512.c @@ -263,7 +263,7 @@ int sha512_final(sha512_context *md, void *vout) { md->curlen = 0; } - /* pad upto 120 bytes of zeroes + /* pad up to 120 bytes of zeroes * note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash * > 2^64 bits of data... :-) */ diff --git a/src/invitation.c b/src/invitation.c index 5dc8c63..c667a6e 100644 --- a/src/invitation.c +++ b/src/invitation.c @@ -1065,7 +1065,7 @@ static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint return finalize_join(); case 2: - fprintf(stderr, "Invitation succesfully accepted.\n"); + fprintf(stderr, "Invitation successfully accepted.\n"); shutdown(sock, SHUT_RDWR); success = true; break; diff --git a/src/net_packet.c b/src/net_packet.c index ce2361c..2175180 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -929,7 +929,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t if(!from->status.validkey) { from->status.validkey = true; from->status.waitingforkey = false; - logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname); + logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) successful", from->name, from->hostname); } return true; diff --git a/src/protocol_auth.c b/src/protocol_auth.c index c0a2aea..1e00f09 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -200,7 +200,7 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) fprintf(f, "Ed25519PublicKey = %s\n", data); fclose(f); - logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname); + logger(DEBUG_CONNECTIONS, LOG_INFO, "Key successfully received from %s (%s)", c->name, c->hostname); // Call invitation-accepted script environment_t env; @@ -323,7 +323,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat c->status.invitation_used = true; - logger(DEBUG_CONNECTIONS, LOG_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname); + logger(DEBUG_CONNECTIONS, LOG_INFO, "Invitation %s successfully sent to %s (%s)", cookie, c->name, c->hostname); return true; } diff --git a/src/protocol_misc.c b/src/protocol_misc.c index a78728f..d4a45e8 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -64,7 +64,7 @@ bool send_pong(connection_t *c) { bool pong_h(connection_t *c, const char *request) { c->status.pinged = false; - /* Succesful connection, reset timeout if this is an outgoing connection. */ + /* Successful connection, reset timeout if this is an outgoing connection. */ if(c->outgoing) { c->outgoing->timeout = 0; diff --git a/src/subnet_parse.c b/src/subnet_parse.c index c54d343..88513f6 100644 --- a/src/subnet_parse.c +++ b/src/subnet_parse.c @@ -252,7 +252,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) { if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx%n", &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &consumed) >= 6 && !str[consumed]) { /* Normally we should check that each part has two digits to prevent ambiguities. - However, in old tinc versions net2str() will agressively return MAC addresses with one-digit parts, + However, in old tinc versions net2str() will aggressively return MAC addresses with one-digit parts, so we have to accept them otherwise we would be unable to parse ADD_SUBNET messages. */ if(prefixlength >= 0) { diff --git a/src/tincctl.c b/src/tincctl.c index cd2d3d8..99f31b8 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1013,7 +1013,7 @@ static int cmd_start(int argc, char *argv[]) { #endif // Pass all log messages from the umbilical to stderr. - // A nul-byte right before closure means tincd started succesfully. + // A nul-byte right before closure means tincd started successfully. bool failure = true; char buf[1024]; ssize_t len; @@ -1859,7 +1859,7 @@ static int cmd_config(int argc, char *argv[]) { } } - /* Change "add" into "set" for variables that do not allow multiple occurences. + /* Change "add" into "set" for variables that do not allow multiple occurrences. Turn on warnings when it seems variables might be removed unintentionally. */ if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) { -- 2.25.1