Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix close socket #204

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix close socket #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2291c72
fix: add timeout to socket.receive so socket closes properly on annoy…
jan-bogaerts Mar 15, 2022
03ca9dd
fix: broken catch
jan-bogaerts Mar 15, 2022
ed798d4
typo
jan-bogaerts Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions android/src/main/java/com/tradle/react/UdpReceiverTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public void run() {
final String base64Data = Base64.encodeToString(packet.getData(), packet.getOffset(),
packet.getLength(), Base64.NO_WRAP);
receiverListener.didReceiveData(base64Data, address.getHostAddress(), packet.getPort());
} catch(java.net.SocketTimeoutException timeout) { // receive timed-out, needed to get out of the loop when socket gets closed
continue;
} catch (IOException ioe) {
if (receiverListener != null) {
receiverListener.didReceiveError(ioe.getMessage());
Expand Down
1 change: 1 addition & 0 deletions android/src/main/java/com/tradle/react/UdpSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public void bind(Integer port, @Nullable String address) throws IOException {

mSocket = new MulticastSocket(socketAddress);
mSocket.setReuseAddress(true);
mSocket.setSoTimeout(500);

// begin listening for data in the background
mReceiverTask = new UdpReceiverTask(mSocket, this);
Expand Down