mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 09:58:08 +00:00
Code Issues Releases Wiki Activity

Set socket options before binding to a port and not after

Browse Source 
By passing a port the implementation of DatagramSocket already binds to
it, making it fail if the port was already in use even if we did
setReuseAddress because that happened after binding.
This commit is contained in:
Albert Vaca Cintora 2023-06-11 19:15:00 +02:00
parent cfe4559d60
commit d63f2cfb67
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
View File

@ -53,6 +53,7 @@ import kotlin.text.Charsets;
*/
public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDisconnectedCallback {
private final static int UDP_PORT = 1716;
private final static int MIN_PORT = 1716;
private final static int MAX_PORT = 1764;
final static int PAYLOAD_TRANSFER_MIN_PORT = 1739;
@ -279,14 +280,21 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
private void setupUdpListener() {
try {
udpServer = new DatagramSocket(MIN_PORT);
udpServer = new DatagramSocket(null);
udpServer.setReuseAddress(true);
udpServer.setBroadcast(true);
} catch (SocketException e) {
Log.e("LanLinkProvider", "Error creating udp server", e);
throw new RuntimeException(e);
}
try {
udpServer.bind(new InetSocketAddress(UDP_PORT));
} catch (SocketException e) {
// We ignore this exception and continue without being able to receive broadcasts instead of crashing the app.
Log.e("LanLinkProvider", "Error binding udp server. We can send udp broadcasts but not receive them", e);
}
ThreadHelper.execute(() -> {
Log.i("UdpListener", "Starting UDP listener");
while (listening) {
final int bufferSize = 1024 * 512;
byte[] data = new byte[bufferSize];