diff options
author | Grant Limberg <grant.limberg@zerotier.com> | 2018-11-11 21:09:35 -0800 |
---|---|---|
committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-11-11 21:09:35 -0800 |
commit | f1b82b734a3207dd7c00747353103777ea922592 (patch) | |
tree | 5b61cf95b584babb1e8eced42ede474dfd9ed4cd /osdep | |
parent | 4c0e7aa8b06596c020e3b958be47fc397b490586 (diff) | |
parent | 296e4616ccb6a78b5b52fc23e54b4a09d6805883 (diff) | |
download | infinitytier-f1b82b734a3207dd7c00747353103777ea922592.tar.gz infinitytier-f1b82b734a3207dd7c00747353103777ea922592.zip |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/Binder.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index 95efb641..be9d9ca3 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -373,7 +373,7 @@ public: tcps = phy.tcpListen(reinterpret_cast<const struct sockaddr *>(&(ii->first)),(void *)0); if ((udps)&&(tcps)) { #ifdef __LINUX__ - // Bind Linux sockets to their device so routes tha we manage do not override physical routes (wish all platforms had this!) + // Bind Linux sockets to their device so routes that we manage do not override physical routes (wish all platforms had this!) if (ii->second.length() > 0) { char tmp[256]; Utils::scopy(tmp,sizeof(tmp),ii->second.c_str()); |