From f74a594e988590d80e43082ec85d40ac64e0291d Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Mon, 28 Nov 2022 09:23:45 -0500 Subject: [PATCH 1/2] fix typos in comments and strings --- java/jni/ZT_jnilookup.cpp | 2 +- java/jni/ZT_jniutils.cpp | 2 +- java/jni/com_zerotierone_sdk_Node.cpp | 4 ++-- java/src/com/zerotier/sdk/NativeUtils.java | 2 +- java/src/com/zerotier/sdk/Node.java | 4 ++-- node/Bond.cpp | 2 +- node/DNS.hpp | 2 +- node/NetworkConfig.hpp | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/jni/ZT_jnilookup.cpp b/java/jni/ZT_jnilookup.cpp index 51d9c0739..4d867a35c 100644 --- a/java/jni/ZT_jnilookup.cpp +++ b/java/jni/ZT_jnilookup.cpp @@ -62,7 +62,7 @@ jclass JniLookup::findClass(const std::string &name) JNIEnv *env = NULL; if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) { - LOGE("Error retreiving JNI Environment"); + LOGE("Error retrieving JNI Environment"); return NULL; } const char *c = name.c_str(); diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index bcbd31916..bfb969abb 100644 --- a/java/jni/ZT_jniutils.cpp +++ b/java/jni/ZT_jniutils.cpp @@ -296,7 +296,7 @@ jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr) inetAddressClass, "getByAddress", "([B)Ljava/net/InetAddress;"); if(env->ExceptionCheck() || inetAddress_getByAddress == NULL) { - LOGE("Erorr finding getByAddress() static method"); + LOGE("Error finding getByAddress() static method"); return NULL; } diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 6ddc35565..50dfd22e6 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -107,7 +107,7 @@ namespace { enum ZT_VirtualNetworkConfigOperation operation, const ZT_VirtualNetworkConfig *config) { - LOGV("VritualNetworkConfigFunctionCallback"); + LOGV("VirtualNetworkConfigFunctionCallback"); JniRef *ref = (JniRef*)userData; JNIEnv *env = NULL; ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); @@ -1025,7 +1025,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket( inetAddressClass, "getAddress", "()[B"); if(getAddressMethod == NULL) { - // cant find InetAddress.getAddres() + // cant find InetAddress.getAddress() return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL); } diff --git a/java/src/com/zerotier/sdk/NativeUtils.java b/java/src/com/zerotier/sdk/NativeUtils.java index 07e1ef5bc..4932a6c71 100644 --- a/java/src/com/zerotier/sdk/NativeUtils.java +++ b/java/src/com/zerotier/sdk/NativeUtils.java @@ -43,7 +43,7 @@ public class NativeUtils { String[] parts = path.split("/"); String filename = (parts.length > 1) ? parts[parts.length - 1] : null; - // Split filename to prexif and suffix (extension) + // Split filename to prefix and suffix (extension) String prefix = ""; String suffix = null; if (filename != null) { diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java index ef6ac9d2d..1b3a4901f 100644 --- a/java/src/com/zerotier/sdk/Node.java +++ b/java/src/com/zerotier/sdk/Node.java @@ -84,7 +84,7 @@ public class Node { * * @param now Current clock in milliseconds * @param getListener User written instance of the {@link DataStoreGetListener} interface called to get objects from persistent storage. This instance must be unique per Node object. - * @param putListener User written intstance of the {@link DataStorePutListener} interface called to put objects in persistent storage. This instance must be unique per Node object. + * @param putListener User written instance of the {@link DataStorePutListener} interface called to put objects in persistent storage. This instance must be unique per Node object. * @param sender * @param eventListener User written instance of the {@link EventListener} interface to receive status updates and non-fatal error notices. This instance must be unique per Node object. * @param frameListener @@ -197,7 +197,7 @@ public class Node { * Join a network * *

This may generate calls to the port config callback before it returns, - * or these may be deffered if a netconf is not available yet.

+ * or these may be deferred if a netconf is not available yet.

* *

If we are already a member of the network, nothing is done and OK is * returned.

diff --git a/node/Bond.cpp b/node/Bond.cpp index 23c309acf..14bf95ad8 100644 --- a/node/Bond.cpp +++ b/node/Bond.cpp @@ -428,7 +428,7 @@ void Bond::recordOutgoingPacket(const SharedPtr& path, uint64_t packetId, } if (shouldRecord) { //_paths[pathIdx].expectingAckAsOf = now; - //_paths[pathIdx].totalBytesSentSinceLastAckRecieved += payloadLength; + //_paths[pathIdx].totalBytesSentSinceLastAckReceived += payloadLength; //_paths[pathIdx].unackedBytes += payloadLength; if (_paths[pathIdx].qosStatsOut.size() < ZT_QOS_MAX_PENDING_RECORDS) { _paths[pathIdx].qosStatsOut[packetId] = now; diff --git a/node/DNS.hpp b/node/DNS.hpp index a954a6406..778680ff7 100644 --- a/node/DNS.hpp +++ b/node/DNS.hpp @@ -24,7 +24,7 @@ namespace ZeroTier { /** - * DNS data serealization methods + * DNS data serialization methods */ class DNS { public: diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index 846f922da..0161b4fa9 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -177,7 +177,7 @@ namespace ZeroTier { #define ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATES_OF_OWNERSHIP "COO" // dns (binary blobs) #define ZT_NETWORKCONFIG_DICT_KEY_DNS "DNS" -// sso enabld +// sso enabled #define ZT_NETWORKCONFIG_DICT_KEY_SSO_ENABLED "ssoe" // so version #define ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION "ssov" @@ -200,7 +200,7 @@ namespace ZeroTier { // AuthInfo Version #define ZT_AUTHINFO_DICT_KEY_VERSION "aV" -// authenticaiton URL +// authentication URL #define ZT_AUTHINFO_DICT_KEY_AUTHENTICATION_URL "aU" // issuer URL #define ZT_AUTHINFO_DICT_KEY_ISSUER_URL "iU" @@ -659,7 +659,7 @@ public: bool ssoEnabled; /** - * SSO verison + * SSO version */ uint64_t ssoVersion; From 3b8c33d49a846ee71ad300d1cf6d3f5c270a8163 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Mon, 28 Nov 2022 09:23:58 -0500 Subject: [PATCH 2/2] fix typos in code --- java/src/com/zerotier/sdk/NodeStatus.java | 2 +- node/Constants.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/com/zerotier/sdk/NodeStatus.java b/java/src/com/zerotier/sdk/NodeStatus.java index 94376d85b..11e49ade1 100644 --- a/java/src/com/zerotier/sdk/NodeStatus.java +++ b/java/src/com/zerotier/sdk/NodeStatus.java @@ -38,7 +38,7 @@ public final class NodeStatus { /** * 40-bit ZeroTier address of this node */ - public final long getAddres() { + public final long getAddress() { return address; } diff --git a/node/Constants.hpp b/node/Constants.hpp index f9fa72333..e234d510f 100644 --- a/node/Constants.hpp +++ b/node/Constants.hpp @@ -517,7 +517,7 @@ #define ZT_ACK_CUTOFF_LIMIT 128 #define ZT_ACK_DRAINAGE_DIVISOR (1000 / ZT_ACK_CUTOFF_LIMIT) -#define ZT_BOND_DEFAULT_REFRCTORY_PERIOD 8000 +#define ZT_BOND_DEFAULT_REFRACTORY_PERIOD 8000 #define ZT_BOND_MAX_REFRACTORY_PERIOD 600000 /**