mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 21:55:10 +00:00
Code Issues Releases Wiki Activity

Remove legacy UDP port support

Browse Source
This commit is contained in:
Albert Vaca
2019-02-08 12:50:48 +01:00
parent e9d16d83f9
commit dca60706a3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
public static final int MIN_VERSION_WITH_SSL_SUPPORT = 6; public static final int MIN_VERSION_WITH_SSL_SUPPORT = 6;
private static final int MIN_VERSION_WITH_NEW_PORT_SUPPORT = 7; private static final int MIN_VERSION_WITH_NEW_PORT_SUPPORT = 7;
private final static int MIN_PORT_LEGACY = 1714;
private final static int MIN_PORT = 1716; private final static int MIN_PORT = 1716;
private final static int MAX_PORT = 1764; private final static int MAX_PORT = 1764;
final static int PAYLOAD_TRANSFER_MIN_PORT = 1739; final static int PAYLOAD_TRANSFER_MIN_PORT = 1739;
@@ -80,7 +79,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
private ServerSocket tcpServer; private ServerSocket tcpServer;
private DatagramSocket udpServer; private DatagramSocket udpServer;
private DatagramSocket udpServerOldPort;
private boolean listening = false; private boolean listening = false;
@@ -412,7 +410,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
try { try {
InetAddress client = InetAddress.getByName(ipstr); InetAddress client = InetAddress.getByName(ipstr);
socket.send(new DatagramPacket(bytes, bytes.length, client, MIN_PORT)); socket.send(new DatagramPacket(bytes, bytes.length, client, MIN_PORT));
socket.send(new DatagramPacket(bytes, bytes.length, client, MIN_PORT_LEGACY));
//Log.i("KDE/LanLinkProvider","Udp identity package sent to address "+client); //Log.i("KDE/LanLinkProvider","Udp identity package sent to address "+client);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -436,7 +433,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
listening = true; listening = true;
udpServer = setupUdpListener(MIN_PORT); udpServer = setupUdpListener(MIN_PORT);
udpServerOldPort = setupUdpListener(MIN_PORT_LEGACY);
// Due to certificate request from SSL server to client, the certificate request message from device with latest android version to device with // Due to certificate request from SSL server to client, the certificate request message from device with latest android version to device with
// old android version causes a FATAL ALERT message stating that incorrect certificate request // old android version causes a FATAL ALERT message stating that incorrect certificate request
@@ -468,11 +464,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
try {
udpServerOldPort.close();
} catch (Exception e) {
e.printStackTrace();
}
} }
@Override @Override