gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove stray U+200b characters

Browse Source
This commit is contained in:
Brenton Bostick
2022-12-09 06:52:14 -05:00
parent 51af6aacd9
commit 8bd9a18a38
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bindings/java/com/zerotier/sockets/ZeroTierDatagramSocket.java
View File

@@ -165,7 +165,7 @@ public class ZeroTierDatagramSocket {
0, 0,
packet.getLength()); packet.getLength());
if ((bytesRead <= 0) | (bytesRead == -104) /* EINTR, from SO_RCVTIMEO */) { if ((bytesRead <= 0) | (bytesRead == -104) /* EINTR, from SO_RCVTIMEO */) {
throw new IOException("read​(DatagramPacket), errno=" + bytesRead); throw new IOException("read(DatagramPacket), errno=" + bytesRead);
} }
} }
@@ -277,16 +277,16 @@ public class ZeroTierDatagramSocket {
* Return whether this ZeroTierSocket is bound to a local address * Return whether this ZeroTierSocket is bound to a local address
* @return true or false * @return true or false
*/ */
public boolean isBound​() public boolean isBound()
{ {
return _socket.isBound​(); return _socket.isBound();
} }
/** /**
* Return whether this ZeroTierSocket has been closed * Return whether this ZeroTierSocket has been closed
* @return true or false * @return true or false
*/ */
public boolean isClosed​() public boolean isClosed()
{ {
return _socket.isClosed(); return _socket.isClosed();
} }
@@ -295,7 +295,7 @@ public class ZeroTierDatagramSocket {
* Return whether this ZeroTierSocket is connected to a remote address * Return whether this ZeroTierSocket is connected to a remote address
* @return true or false * @return true or false
*/ */
public boolean isConnected​() public boolean isConnected()
{ {
return _socket.isConnected(); return _socket.isConnected();
} }

26
src/bindings/java/com/zerotier/sockets/ZeroTierInputStream.java
View File

@@ -30,7 +30,7 @@ public class ZeroTierInputStream extends InputStream {
* Close the ZeroTierInputStream * Close the ZeroTierInputStream
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public void close​() throws IOException public void close() throws IOException
{ {
/* Note: this operation currently only stops RX on a socket that is shared /* Note: this operation currently only stops RX on a socket that is shared
between both I/OStreams. This means that closing this stream will only shutdown between both I/OStreams. This means that closing this stream will only shutdown
@@ -47,7 +47,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Number of bytes transferred * @return Number of bytes transferred
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public long transferTo​(OutputStream destStream) throws IOException public long transferTo(OutputStream destStream) throws IOException
{ {
Objects.requireNonNull(destStream, "destStream must not be null"); Objects.requireNonNull(destStream, "destStream must not be null");
int bytesTransferred = 0, bytesRead; int bytesTransferred = 0, bytesRead;
@@ -64,7 +64,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Single byte read * @return Single byte read
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public int read​() throws IOException public int read() throws IOException
{ {
byte[] buf = new byte[1]; byte[] buf = new byte[1];
// Unlike a native read(), if nothing is read we should return -1 // Unlike a native read(), if nothing is read we should return -1
@@ -73,7 +73,7 @@ public class ZeroTierInputStream extends InputStream {
return -1; return -1;
} }
if (retval < 0) { if (retval < 0) {
throw new IOException("read​(), errno=" + retval); throw new IOException("read(), errno=" + retval);
} }
return buf[0]; return buf[0];
} }
@@ -84,7 +84,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Number of bytes read * @return Number of bytes read
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public int read​(byte[] destBuffer) throws IOException public int read(byte[] destBuffer) throws IOException
{ {
Objects.requireNonNull(destBuffer, "input byte array must not be null"); Objects.requireNonNull(destBuffer, "input byte array must not be null");
// Unlike a native read(), if nothing is read we should return -1 // Unlike a native read(), if nothing is read we should return -1
@@ -93,7 +93,7 @@ public class ZeroTierInputStream extends InputStream {
return -1; return -1;
} }
if (retval < 0) { if (retval < 0) {
throw new IOException("read​(destBuffer), errno=" + retval); throw new IOException("read(destBuffer), errno=" + retval);
} }
return retval; return retval;
} }
@@ -106,7 +106,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Number of bytes read. * @return Number of bytes read.
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public int read​(byte[] destBuffer, int offset, int numBytes) throws IOException public int read(byte[] destBuffer, int offset, int numBytes) throws IOException
{ {
Objects.requireNonNull(destBuffer, "input byte array must not be null"); Objects.requireNonNull(destBuffer, "input byte array must not be null");
if (offset < 0) { if (offset < 0) {
@@ -127,7 +127,7 @@ public class ZeroTierInputStream extends InputStream {
return -1; return -1;
} }
if (retval < 0) { if (retval < 0) {
throw new IOException("read​(destBuffer, offset, numBytes), errno=" + retval); throw new IOException("read(destBuffer, offset, numBytes), errno=" + retval);
} }
return retval; return retval;
} }
@@ -137,7 +137,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Array of bytes * @return Array of bytes
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public byte[] readAllBytes​() throws IOException public byte[] readAllBytes() throws IOException
{ {
int pendingDataSize = ZeroTierNative.zts_get_pending_data_size(zfd); int pendingDataSize = ZeroTierNative.zts_get_pending_data_size(zfd);
byte[] buf = new byte[pendingDataSize]; byte[] buf = new byte[pendingDataSize];
@@ -146,7 +146,7 @@ public class ZeroTierInputStream extends InputStream {
// No action needed // No action needed
} }
if (retval < 0) { if (retval < 0) {
throw new IOException("readAllBytes​(), errno=" + retval); throw new IOException("readAllBytes(), errno=" + retval);
} }
return buf; return buf;
} }
@@ -159,7 +159,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Nothing. * @return Nothing.
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public int readNBytes​(byte[] destBuffer, int offset, int numBytes) throws IOException public int readNBytes(byte[] destBuffer, int offset, int numBytes) throws IOException
{ {
Objects.requireNonNull(destBuffer, "input byte array must not be null"); Objects.requireNonNull(destBuffer, "input byte array must not be null");
if (offset < 0) { if (offset < 0) {
@@ -179,7 +179,7 @@ public class ZeroTierInputStream extends InputStream {
// No action needed // No action needed
} }
if (retval < 0) { if (retval < 0) {
throw new IOException("readNBytes​(destBuffer, offset, numBytes), errno=" + retval); throw new IOException("readNBytes(destBuffer, offset, numBytes), errno=" + retval);
} }
return retval; return retval;
} }
@@ -190,7 +190,7 @@ public class ZeroTierInputStream extends InputStream {
* @return Nothing. * @return Nothing.
* @exception IOException when an I/O error occurs * @exception IOException when an I/O error occurs
*/ */
public long skip​(long numBytes) throws IOException public long skip(long numBytes) throws IOException
{ {
if (numBytes <= 0) { if (numBytes <= 0) {
return 0; return 0;

10
src/bindings/java/com/zerotier/sockets/ZeroTierSocket.java
View File

@@ -421,7 +421,7 @@ public class ZeroTierSocket {
* Return whether this ZeroTierSocket is bound to a local address * Return whether this ZeroTierSocket is bound to a local address
* @return true or false * @return true or false
*/ */
public boolean isBound​() public boolean isBound()
{ {
return _isBound; return _isBound;
} }
@@ -430,7 +430,7 @@ public class ZeroTierSocket {
* Return whether this ZeroTierSocket has been closed * Return whether this ZeroTierSocket has been closed
* @return true or false * @return true or false
*/ */
public boolean isClosed​() public boolean isClosed()
{ {
return _isClosed; return _isClosed;
} }
@@ -439,7 +439,7 @@ public class ZeroTierSocket {
* Return whether this ZeroTierSocket is connected to a remote address * Return whether this ZeroTierSocket is connected to a remote address
* @return true or false * @return true or false
*/ */
public boolean isConnected​() public boolean isConnected()
{ {
return _isConnected; return _isConnected;
} }
@@ -526,7 +526,7 @@ public class ZeroTierSocket {
* Return whether the input-aspect of the ZeroTierSocket has been disabled. * Return whether the input-aspect of the ZeroTierSocket has been disabled.
* @return true or false * @return true or false
*/ */
public boolean inputStreamHasBeenShutdown​() public boolean inputStreamHasBeenShutdown()
{ {
return _inputHasBeenShutdown; return _inputHasBeenShutdown;
} }
@@ -535,7 +535,7 @@ public class ZeroTierSocket {
* Return whether the output-aspect of the ZeroTierSocket has been disabled. * Return whether the output-aspect of the ZeroTierSocket has been disabled.
* @return true or false * @return true or false
*/ */
public boolean outputStreamHasBeenShutdown​() public boolean outputStreamHasBeenShutdown()
{ {
return _outputHasBeenShutdown; return _outputHasBeenShutdown;
} }