Dynamic tcp port change when bind fails

KdeConnect/src/main/java/org/kde/connect/BackgroundService.java

@@ -238,6 +238,7 @@ public class BackgroundService extends Service {
     @Override
     public void onDestroy() {
         Log.i("BackgroundService", "Destroying");
+        stopDiscovery();
         super.onDestroy();
     }
 

KdeConnect/src/main/java/org/kde/connect/ComputerLinks/NioSessionComputerLink.java

@@ -25,6 +25,11 @@ public class NioSessionComputerLink extends BaseComputerLink {
 
     private IoSession session = null;
 
+    public void disconnect() {
+        Log.e("NioSessionComputerLink","Disconnect: "+session.getRemoteAddress().toString());
+        session.close(true);
+    }
+
     public NioSessionComputerLink(IoSession session, String deviceId, BaseLinkProvider linkProvider) {
         super(deviceId, linkProvider);
         this.session = session;

KdeConnect/src/main/java/org/kde/connect/LinkProviders/BroadcastTcpLinkProvider.java

@@ -64,6 +64,10 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
             NioSessionComputerLink prevLink = nioSessions.get(session.getId());
 
             if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
+                String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
+                if (np.getString("deviceId").equals(myId)) {
+                    return;
+                }
                 NioSessionComputerLink link = new NioSessionComputerLink(session, np.getString("deviceId"), BroadcastTcpLinkProvider.this);
                 nioSessions.put(session.getId(),link);
                 addLink(np, link);
@@ -78,50 +82,7 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
         }
     };
 
-    private void addLink(NetworkPackage identityPackage, NioSessionComputerLink link) {
+    private IoHandler udpHandler = new IoHandlerAdapter() {
-        Log.e("BroadcastTcpLinkProvider","addLink to "+identityPackage.getString("deviceName"));
-        String deviceId = identityPackage.getString("deviceId");
-        BaseComputerLink oldLink = visibleComputers.get(deviceId);
-        if (oldLink != null) {
-            Log.e("BroadcastTcpLinkProvider","Removing old connection to same device");
-            connectionLost(oldLink);
-        }
-        visibleComputers.put(deviceId, link);
-        connectionAccepted(identityPackage, link);
-    }
-
-    public BroadcastTcpLinkProvider(Context context) {
-
-        this.context = context;
-
-        //This handles the case when I'm the new device in the network and somebody answers my introduction package
-        tcpAcceptor = new NioSocketAcceptor();
-        tcpAcceptor.setHandler(tcpHandler);
-        tcpAcceptor.getSessionConfig().setKeepAlive(true);
-        //TextLineCodecFactory will split incoming data delimited by the given string
-        tcpAcceptor.getFilterChain().addLast("codec",
-                new ProtocolCodecFilter(
-                        new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
-                )
-        );
-        try {
-            tcpAcceptor.getSessionConfig().setReuseAddress(true);
-            tcpAcceptor.bind(new InetSocketAddress(port));
-        } catch(Exception e) {
-            Log.e("BroadcastTcpLinkProvider", "Error: Could not bind tcp socket");
-            e.printStackTrace();
-        }
-
-
-    }
-
-    @Override
-    public void onStart() {
-
-        //This handles the case when I'm the existing device in the network and receive a "hello" UDP package
-        udpAcceptor = new NioDatagramAcceptor();
-        udpAcceptor.getSessionConfig().setReuseAddress(true);        //Share port if existing
-        udpAcceptor.setHandler(new IoHandlerAdapter() {
         @Override
         public void messageReceived(IoSession udpSession, Object message) throws Exception {
             super.messageReceived(udpSession, message);
@@ -147,13 +108,14 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
                     return;
                 } else {
                     String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
-                        if (np.getType().equals(myId)) {
+                    if (np.getString("deviceId").equals(myId)) {
                         return;
                     }
                 }
 
                 Log.e("BroadcastTcpLinkProvider", "It is an identity package, creating link");
 
+                try {
                     final InetSocketAddress address = (InetSocketAddress) udpSession.getRemoteAddress();
 
                     final NioSocketConnector connector = new NioSocketConnector();
@@ -166,7 +128,8 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
                     );
                     connector.getSessionConfig().setKeepAlive(true);
 
-                    ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), port));
+                    int tcpPort = np.getInt("tcpPort",port);
+                    ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
                     future.addListener(new IoFutureListener<IoFuture>() {
                         @Override
                         public void operationComplete(IoFuture ioFuture) {
@@ -184,16 +147,63 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
                         }
                     });
 
-                }
+                } catch (Exception e) {
+                    Log.e("BroadcastTcpLinkProvider","Exception!!");
+                    e.printStackTrace();
                 }
 
-        });
+            }
+        }
+    };
+
+        private void addLink(NetworkPackage identityPackage, NioSessionComputerLink link) {
+        Log.e("BroadcastTcpLinkProvider","addLink to "+identityPackage.getString("deviceName"));
+        String deviceId = identityPackage.getString("deviceId");
+        BaseComputerLink oldLink = visibleComputers.get(deviceId);
+        if (oldLink != null) {
+            Log.e("BroadcastTcpLinkProvider","Removing old connection to same device");
+            connectionLost(oldLink);
+        }
+        visibleComputers.put(deviceId, link);
+        connectionAccepted(identityPackage, link);
+    }
+
+    public BroadcastTcpLinkProvider(Context context) {
+
+        this.context = context;
+
+        //This handles the case when I'm the new device in the network and somebody answers my introduction package
+        tcpAcceptor = new NioSocketAcceptor();
+        tcpAcceptor.setHandler(tcpHandler);
+        tcpAcceptor.getSessionConfig().setKeepAlive(true);
+        tcpAcceptor.getSessionConfig().setReuseAddress(true);
+        tcpAcceptor.setCloseOnDeactivation(false);
+        //TextLineCodecFactory will split incoming data delimited by the given string
+        tcpAcceptor.getFilterChain().addLast("codec",
+                new ProtocolCodecFilter(
+                        new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
+                )
+        );
+
+
+        udpAcceptor = new NioDatagramAcceptor();
+        udpAcceptor.getSessionConfig().setReuseAddress(true);        //Share port if existing
         //TextLineCodecFactory will split incoming data delimited by the given string
         udpAcceptor.getFilterChain().addLast("codec",
                 new ProtocolCodecFilter(
                         new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
                 )
         );
+
+    }
+
+    @Override
+    public void onStart() {
+
+        //This handles the case when I'm the existing device in the network and receive a "hello" UDP package
+
+        udpAcceptor.setHandler(udpHandler);
+
         try {
             udpAcceptor.bind(new InetSocketAddress(port));
         } catch(Exception e) {
@@ -201,25 +211,29 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
             e.printStackTrace();
         }
 
-        onNetworkChange();
+        boolean success = false;
-
+        int tcpPort = port;
+        while(!success) {
+            try {
+                tcpAcceptor.bind(new InetSocketAddress(tcpPort));
+                success = true;
+            } catch(Exception e) {
+                tcpPort++;
+            }
         }
 
-    @Override
+        Log.e("BroadcastTcpLinkProvider","Using tcpPort "+tcpPort);
-    public void onNetworkChange() {
-
-        Log.e("BroadcastTcpLinkProvider","OnNetworkChange: " + (udpAcceptor != null));
-
-        if (udpAcceptor == null) return;
 
         //I'm on a new network, let's be polite and introduce myself
+        final int finalTcpPort = tcpPort;
         new AsyncTask<Void,Void,Void>() {
             @Override
             protected Void doInBackground(Void... voids) {
 
                 try {
-                    String s = NetworkPackage.createIdentityPackage(context).serialize();
+                    NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
-                    byte[] b = s.getBytes("UTF-8");
+                    identity.set("tcpPort",finalTcpPort);
+                    byte[] b = identity.serialize().getBytes("UTF-8");
                     DatagramPacket packet = new DatagramPacket(b, b.length, InetAddress.getByAddress(new byte[]{-1,-1,-1,-1}), port);
                     DatagramSocket socket = new DatagramSocket();
                     socket.setReuseAddress(true);
@@ -232,18 +246,28 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
                 }
 
                 return null;
+
             }
 
         }.execute();
+
+    }
+
+    @Override
+    public void onNetworkChange() {
+
+        Log.e("BroadcastTcpLinkProvider","OnNetworkChange: " + (udpAcceptor != null));
+
+        onStop();
+        onStart();
+
     }
 
     @Override
     public void onStop() {
 
-        if (udpAcceptor != null) {
         udpAcceptor.unbind();
-            udpAcceptor = null;
+        tcpAcceptor.unbind();
-        }
 
     }