Clarity improvements from code review

DBOI7453 · Jul 31, 2019 · 89bc335 · 89bc335
1 parent 0727443
commit 89bc335
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Android/app/src/main/java/app/intra/net/socks/OverrideSocksHandler.java b/Android/app/src/main/java/app/intra/net/socks/OverrideSocksHandler.java
@@ -144,7 +144,7 @@ public void doConnect(Session session, CommandMessage commandMessage) throws IOE
     StatsListener listener = null;
     try {
       if (alwaysSplitHttps && remoteServerPort == HTTPS_PORT) {
-        listener = splitDirect(upload, download, sessionUpload, socketUpload);
+        listener = runWithImmediateSplit(upload, download, sessionUpload, socketUpload);
       } else {
         listener = runPipes(upload, download, remoteServerPort, httpsTimeoutMs(tcpHandshakeMs));
         // We consider a termination event as a potentially recoverable failure if
@@ -479,7 +479,7 @@ private StatsListener splitRetry(final Pipe upload, final Pipe download, final O
    * @throws InterruptedException if this thread is interrupted.
    * @throws IOException if the first upstream transfer failed.
    */
-  private StatsListener splitDirect(final Pipe upload, final Pipe download,
+  private StatsListener runWithImmediateSplit(final Pipe upload, final Pipe download,
       final InputStream client, final OutputStream server)
       throws InterruptedException, IOException {
     byte[] buf = new byte[chooseLimit()];

diff --git a/Android/app/src/main/java/app/intra/net/socks/SocksServer.java b/Android/app/src/main/java/app/intra/net/socks/SocksServer.java
@@ -42,6 +42,8 @@ class SocksServer extends BasicSocksProxyServer {
 
   private final Context context;
 
+  // Whether to attempt to fix connectivity on networks with broken TLS behavior.
+  // If true, we tell the SocksHandler to use first-segment splitting for all HTTPS connections.
   private boolean useTlsWorkaround = false;
   void enableTlsWorkaround(boolean v) {
     useTlsWorkaround = v;