From 52f3081a40d94b9944bb82b847be4e08eaf57c23 Mon Sep 17 00:00:00 2001 From: yangfl Date: Tue, 10 Jul 2018 17:39:21 +0800 Subject: [PATCH] fix typo --- ChangeLog | 4 ++-- build/CMakeLists.txt | 4 ++-- daemon/HTTPServer.cpp | 2 +- debian/i2pd.1 | 2 +- debian/rules | 2 +- docs/Doxyfile | 4 ++-- libi2pd/Destination.cpp | 2 +- libi2pd/NetDb.cpp | 2 +- libi2pd/Reseed.cpp | 2 +- libi2pd/Tunnel.cpp | 2 +- libi2pd_client/AddressBook.cpp | 2 +- libi2pd_client/HTTPProxy.cpp | 2 +- libi2pd_client/I2CP.cpp | 10 +++++----- libi2pd_client/SOCKS.cpp | 4 ++-- .../src/org/kde/necessitas/ministro/IMinistro.aidl | 2 +- .../org/qtproject/qt5/android/bindings/QtActivity.java | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54989d44..59a19a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,7 +68,7 @@ - NTCP soft and hard descriptors limits - Support full timestamps in logs ### Changed -- Faster implmentation of GOST R 34.11 hash +- Faster implementation of GOST R 34.11 hash - Reject routers with RSA signtures - Reload config and shudown from Windows GUI - Update tunnels address(destination) without restart @@ -168,7 +168,7 @@ - Initial iOS support ### Changed -- Reduced file descriptiors usage +- Reduced file descriptors usage - Strict reseed checks enabled by default ## Fixed diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 73e76ae0..5876a0f7 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -190,7 +190,7 @@ if (CXX11_SUPPORTED) elseif (CXX0X_SUPPORTED) # gcc 4.6 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" ) elseif (NOT MSVC) - message(SEND_ERROR "C++11 standart not seems to be supported by compiler. Too old version?") + message(SEND_ERROR "C++11 standard not seems to be supported by compiler. Too old version?") endif () if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -340,7 +340,7 @@ target_link_libraries(libi2pdclient libi2pd) find_package ( Boost COMPONENTS system filesystem program_options date_time REQUIRED ) if(NOT DEFINED Boost_INCLUDE_DIRS) - message(SEND_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!") + message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!") endif() find_package ( OpenSSL REQUIRED ) diff --git a/daemon/HTTPServer.cpp b/daemon/HTTPServer.cpp index faf386d8..3fa23dfe 100644 --- a/daemon/HTTPServer.cpp +++ b/daemon/HTTPServer.cpp @@ -862,7 +862,7 @@ namespace http { { /* deny request as it's from a non whitelisted hostname */ res.code = 403; - content = "host missmatch"; + content = "host mismatch"; SendReply(res, content); return; } diff --git a/debian/i2pd.1 b/debian/i2pd.1 index 91e3b60f..9dd44093 100644 --- a/debian/i2pd.1 +++ b/debian/i2pd.1 @@ -96,7 +96,7 @@ Router will use system folders like \fI/var/lib/i2pd\fR (\fIdisabled\fR by defau \fB\-\-family=\fR Name of a family, router belongs to. .PP -Switchs, which enabled by default (like \fB\-\-ssu\fR, \fB\-\-ntcp\fR, etc.), can be disabled in config file. +Switches, which enabled by default (like \fB\-\-ssu\fR, \fB\-\-ntcp\fR, etc.), can be disabled in config file. .RE See service-specific parameters in example config file \fI/usr/share/doc/i2pd/i2pd.conf.gz\fR .SH "FILES" diff --git a/debian/rules b/debian/rules index 8e537049..77ecd7b7 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,6 @@ DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow override_dh_strip: dh_strip --dbg-package=i2pd-dbg -## uncoment this if you have "missing info" problem when building package +## uncomment this if you have "missing info" problem when building package #override_dh_shlibdeps: # dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/docs/Doxyfile b/docs/Doxyfile index c434d2dc..275d668e 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -1094,7 +1094,7 @@ HTML_STYLESHEET = # cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. +# standard style sheet and is therefore more robust against future updates. # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra stylesheet files is of importance (e.g. the last # stylesheet in the list overrules the setting of the previous ones in the @@ -1637,7 +1637,7 @@ EXTRA_PACKAGES = # Note: Only use a user-defined header if you know what you are doing! The # following commands have a special meaning inside the header: $title, # $datetime, $date, $doxygenversion, $projectname, $projectnumber, -# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string, # for the replacement values of the other commands the user is referred to # HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp index d3632881..ad7725fc 100644 --- a/libi2pd/Destination.cpp +++ b/libi2pd/Destination.cpp @@ -64,7 +64,7 @@ namespace client { it = params->find (I2CP_PARAM_OUTBOUND_NICKNAME); if (it != params->end ()) m_Nickname = it->second; - // otherwise we set deafult nickname in Start when we know local address + // otherwise we set default nickname in Start when we know local address } } } diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp index b136dfd5..410b71e6 100644 --- a/libi2pd/NetDb.cpp +++ b/libi2pd/NetDb.cpp @@ -734,7 +734,7 @@ namespace data m_Requests.RequestComplete (ident, nullptr); } else - // no more requests for detination possible. delete it + // no more requests for destination possible. delete it m_Requests.RequestComplete (ident, nullptr); } else if(!m_FloodfillBootstrap) diff --git a/libi2pd/Reseed.cpp b/libi2pd/Reseed.cpp index 4a2f8055..eebe9b38 100644 --- a/libi2pd/Reseed.cpp +++ b/libi2pd/Reseed.cpp @@ -300,7 +300,7 @@ namespace data s.read (localFileName, fileNameLength); localFileName[fileNameLength] = 0; s.seekg (extraFieldLength, std::ios::cur); - // take care about data desriptor if presented + // take care about data descriptor if presented if (bitFlag & ZIP_BIT_FLAG_DATA_DESCRIPTOR) { size_t pos = s.tellg (); diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp index c7e1b1b4..66620717 100644 --- a/libi2pd/Tunnel.cpp +++ b/libi2pd/Tunnel.cpp @@ -511,7 +511,7 @@ namespace tunnel HandleI2NPMessage (msg->GetBuffer (), msg->GetLength ()); break; default: - LogPrint (eLogWarning, "Tunnel: unexpected messsage type ", (int) typeID); + LogPrint (eLogWarning, "Tunnel: unexpected message type ", (int) typeID); } msg = m_Queue.Get (); diff --git a/libi2pd_client/AddressBook.cpp b/libi2pd_client/AddressBook.cpp index f29ecee3..bca0e25b 100644 --- a/libi2pd_client/AddressBook.cpp +++ b/libi2pd_client/AddressBook.cpp @@ -377,7 +377,7 @@ namespace client } numAddresses++; auto it = m_Addresses.find (name); - if (it != m_Addresses.end ()) // aleady exists ? + if (it != m_Addresses.end ()) // already exists ? { if (it->second != ident->GetIdentHash ()) // address changed? { diff --git a/libi2pd_client/HTTPProxy.cpp b/libi2pd_client/HTTPProxy.cpp index ea95a6bd..f0530ac1 100644 --- a/libi2pd_client/HTTPProxy.cpp +++ b/libi2pd_client/HTTPProxy.cpp @@ -387,7 +387,7 @@ namespace proxy { LogPrint(eLogDebug, "HTTPProxy: ", m_ClientRequestURL.host); m_ClientRequestURL.schema = ""; m_ClientRequestURL.host = ""; - std::string origURI = m_ClientRequest.uri; // TODO: what do we need to chage uri for? + std::string origURI = m_ClientRequest.uri; // TODO: what do we need to change uri for? m_ClientRequest.uri = m_ClientRequestURL.to_string(); m_ClientRequest.write(m_ClientRequestBuffer); diff --git a/libi2pd_client/I2CP.cpp b/libi2pd_client/I2CP.cpp index b08fded1..7d7ce558 100644 --- a/libi2pd_client/I2CP.cpp +++ b/libi2pd_client/I2CP.cpp @@ -250,7 +250,7 @@ namespace client if (handler) (this->*handler)(m_Payload, m_PayloadLen); else - LogPrint (eLogError, "I2CP: Unknown I2CP messsage ", (int)m_Header[I2CP_HEADER_TYPE_OFFSET]); + LogPrint (eLogError, "I2CP: Unknown I2CP message ", (int)m_Header[I2CP_HEADER_TYPE_OFFSET]); } void I2CPSession::Terminate () @@ -398,7 +398,7 @@ namespace client } else { - LogPrint (eLogError, "I2CP: create session signature verification falied"); + LogPrint (eLogError, "I2CP: create session signature verification failed"); SendSessionStatusMessage (3); // invalid } } @@ -455,16 +455,16 @@ namespace client LogPrint(eLogError, "I2CP: invalid reconfigure message signature"); } else - LogPrint(eLogError, "I2CP: mapping size missmatch"); + LogPrint(eLogError, "I2CP: mapping size mismatch"); } else - LogPrint(eLogError, "I2CP: destination missmatch"); + LogPrint(eLogError, "I2CP: destination mismatch"); } else LogPrint(eLogError, "I2CP: malfromed destination"); } else - LogPrint(eLogError, "I2CP: session missmatch"); + LogPrint(eLogError, "I2CP: session mismatch"); } else LogPrint(eLogError, "I2CP: short message"); diff --git a/libi2pd_client/SOCKS.cpp b/libi2pd_client/SOCKS.cpp index ddf4bbe9..8a67901c 100644 --- a/libi2pd_client/SOCKS.cpp +++ b/libi2pd_client/SOCKS.cpp @@ -84,8 +84,8 @@ namespace proxy SOCKS5_HOST_UNREACH = 4, // Host unreachable SOCKS5_CONN_REFUSED = 5, // Connection refused by the peer SOCKS5_TTL_EXPIRED = 6, // TTL Expired - SOCKS5_CMD_UNSUP = 7, // Command unsuported - SOCKS5_ADDR_UNSUP = 8, // Address type unsuported + SOCKS5_CMD_UNSUP = 7, // Command unsupported + SOCKS5_ADDR_UNSUP = 8, // Address type unsupported SOCKS4_OK = 90, // No error for SOCKS4 SOCKS4_FAIL = 91, // Failed establishing connecting or not allowed SOCKS4_IDENTD_MISSING = 92, // Couldn't connect to the identd server diff --git a/qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl b/qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl index bbd8116d..e23cb699 100644 --- a/qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl +++ b/qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl @@ -51,7 +51,7 @@ interface IMinistro * "sources" StringArray Sources list from where Ministro will download the libs. Make sure you are using ONLY secure locations. * "repository" String Overwrites the default Ministro repository. Possible values: default, stable, testing and unstable * "required.modules" StringArray Required modules by your application -* "application.title" String Application name, used to show more informations to user +* "application.title" String Application name, used to show more information to user * "qt.provider" String Qt libs provider, currently only "necessitas" is supported. * "minimum.ministro.api" Integer Minimum Ministro API level, used to check if Ministro service compatible with your application. Current API Level is 3 ! * "minimum.qt.version" Integer Minimim Qt version (e.g. 0x040800, which means Qt 4.8.0, check http://qt-project.org/doc/qt-4.8/qtglobal.html#QT_VERSION)! diff --git a/qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java b/qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java index 677e8f46..9c607109 100644 --- a/qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -97,7 +97,7 @@ import android.view.ActionMode.Callback; public class QtActivity extends Activity { - private final static int MINISTRO_INSTALL_REQUEST_CODE = 0xf3ee; // request code used to know when Ministro instalation is finished + private final static int MINISTRO_INSTALL_REQUEST_CODE = 0xf3ee; // request code used to know when Ministro installation is finished private static final int MINISTRO_API_LEVEL = 5; // Ministro api level (check IMinistro.aidl file) private static final int NECESSITAS_API_LEVEL = 2; // Necessitas api level used by platform plugin private static final int QT_VERSION = 0x050100; // This app requires at least Qt version 5.1.0