Patch for review: Improving readability and maintainability

[smithrachael]

From d18e629808836a8ca53f8bf0032389c5937338f4 Mon Sep 17 00:00:00 2001 From: Smith Rachael smith.rachael.76@gmail.com Date: Fri, 6 Apr 2012 20:33:32 -0300 Subject: [PATCH] Little modifications to improve readability and maintainability.

---

.../src/net/tsu/TCPort/Broadcast/Broadcast.java | 8 + jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java | 200 ++++++----- .../net/tsu/TCPort/FileTransfer/FileTransfer.java | 40 ++- jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java | 91 +++--- .../data/src/net/tsu/TCPort/TorLoader.java | 378 ++++++++++---------- 5 files changed, 372 insertions(+), 345 deletions(-)

diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java index a375cde..6302a6c 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java
+++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java
@@ -163,6 +163,7 @@ public class Broadcast {

private static class Listener implements APIListener, CommandListener {

• @Override
  public void onCommand(Buddy b, String s) {
    if (s.startsWith("broadcast ")) {
        String tag = s.split(" ")[1];

  @@ -269,6 +270,7 @@ public class Broadcast { } }

• @Override
  public void onStatusChange(Buddy buddy, byte newStatus, byte oldStatus) {
    if (myTags == null)
        return;

  @@ -281,11 +283,17 @@ public class Broadcast { } }

• @Override
  public void onProfileNameChange(Buddy buddy, String newName, String oldName) {}

• @Override public void onProfileTextChange(Buddy buddy, String newText, String oldText) {}
• @Override public void onAddMe(Buddy buddy) {}
• @Override public void onMessage(Buddy buddy, String s) {}
• @Override public void onNewBuddy(Buddy buddy) {}
• @Override public void onBuddyRemoved(Buddy buddy) {} }

diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java index f29704c..3626edf 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java
+++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java
@@ -7,10 +7,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Properties;

import net.tsu.TCPort.util.Regex; import net.tsu.TCPort.util.Util; -import net.tsu.TCPort.language;

public class Config { @@ -62,66 +60,66 @@ public class Config { public static String Torbinary; public static String controlfile = "controlfile";

public static String answer="";

-// Linux only -public static String Torclose="torclose.sh"; -public static String torpid=Integer.toString(Util.myRandom(1000, 9999)); -// Only Windows -public static String TorWintorrc="torrc.txt"; -public static String TorWintorrcobf="torrcobf.txt"; -public static String Tortorrc; +

• // Linux only
• public static String Torclose="torclose.sh";
• public static String torpid=Integer.toString(Util.myRandom(1000, 9999));
• // Only Windows
• public static String TorWintorrc="torrc.txt";
• public static String TorWintorrcobf="torrcobf.txt";
• public static String Tortorrc;

-public static int image_size; -public static int icon_size; -public static int icon_space; -public static String icon_folder;

• public static int image_size;
• public static int icon_size;
• public static int icon_space;

• public static String icon_folder;

  static {

-if (TCPort.base_pwd != null ) -{ -BASE_DIR = TCPort.base_pwd; -} -else

• {
• String x = System.getProperty("java.class.path");
• for (String s : x.split(";")) // prioritize finding the jar
• if (Regex.match(".?[/\]{0,1}jtorchat.?.jar", s.toLowerCase())) {
• BASE_DIR = new File(s).isDirectory() ? new File(s).getPath() : new File(s).getParent();
• break;
• }
• if (BASE_DIR == null || BASE_DIR.length() == 0)
• for (String s : x.split(";"))
• if (!Regex.match("bin(?!.)", s.toLowerCase())) { // dodgy ~
• BASE_DIR = new File(s).isDirectory() ? new File(s).getParent() : new File(s).getParent();
• break;
• } else if (!Regex.match("build(?!.)", s.toLowerCase())) { // dodgy ~
• BASE_DIR = new File(s).isDirectory() ? new File(s).getParent() : new File(s).getParent();
• if (TCPort.base_pwd != null )
• {
• BASE_DIR = TCPort.base_pwd;
• }
• else
• {
• String x = System.getProperty("java.class.path");
• for (String s : x.split(";")) // prioritize finding the jar
• if (Regex.match(".?[/\]{0,1}jtorchat.?.jar", s.toLowerCase())) {
• BASE_DIR = new File(s).isDirectory() ? new File(s).getPath() : new File(s).getParent(); break; }
• if (BASE_DIR == null)
• BASE_DIR = "";
• if (BASE_DIR.length() > 0) {
• if (!BASE_DIR.endsWith("/") && !BASE_DIR.endsWith("\"))
• BASE_DIR += "/";
• if (BASE_DIR == null || BASE_DIR.length() == 0)
• for (String s : x.split(";"))
• if (!Regex.match("bin(?!.)", s.toLowerCase())) { // dodgy ~
• BASE_DIR = new File(s).isDirectory() ? new File(s).getParent() : new File(s).getParent();
• break;
• } else if (!Regex.match("build(?!.)", s.toLowerCase())) { // dodgy ~
• BASE_DIR = new File(s).isDirectory() ? new File(s).getParent() : new File(s).getParent();
• break;
• }
• if (BASE_DIR == null)
• BASE_DIR = "";
• if (BASE_DIR.length() > 0) {
• if (!BASE_DIR.endsWith("/") && !BASE_DIR.endsWith("\"))
• BASE_DIR += "/";
• } }

  - }

• Logger.log(Logger.NOTICE, "Config", "Using " + BASE_DIR + " as BASE_DIR");

•  String os = System.getProperty("os.name").toLowerCase(); // Operating System details as a CASE INSENSTIVE string

• DATA_DIR = "data/";
• Logger.log(Logger.NOTICE, "Config", "Using " + BASE_DIR + " as BASE_DIR");
• String os = System.getProperty("os.name").toLowerCase(); // Operating System details as a CASE INSENSTIVE string + +
• DATA_DIR = "data/"; CONFIG_DIR = Config.BASE_DIR + Config.DATA_DIR + "config/"; DOWNLOAD_DIR = Config.BASE_DIR + Config.DATA_DIR + "downloads/"; LOG_DIR = Config.BASE_DIR + Config.DATA_DIR + "log/"; MESSAGE_DIR = Config.BASE_DIR + Config.DATA_DIR + "offlinemsgs/"; PAGE_DIR = Config.BASE_DIR + Config.DATA_DIR + "page/"; TOR_DIR = Config.BASE_DIR + Config.DATA_DIR + "Tor/";
• LANG_DIR = Config.BASE_DIR + Config.DATA_DIR + "lang/";

• LANG_DIR = Config.BASE_DIR + Config.DATA_DIR + "lang/";
  //Create all important dir
  new File(CONFIG_DIR).mkdirs();
  new File(DOWNLOAD_DIR).mkdirs();

  @@ -140,20 +138,20 @@ else Logger.log(Logger.NOTICE, "Config", "Using " + LANG_DIR + " as LANG_DIR");

  prop = new Properties();

• try {
• prop.load(new FileInputStream(CONFIG_DIR + "settings.ini"));
• } catch (FileNotFoundException e) { -// e.printStackTrace();
• } catch (IOException e) { -// e.printStackTrace();
• File settingsFile = new File(CONFIG_DIR + "settings.ini");
• if (settingsFile.exists() && settingsFile.isFile() && settingsFile.canRead()) {
• try {
• prop.load(new FileInputStream(settingsFile));
• } catch (IOException e) {
• // Do nothing
• } }

  - us = assign("ourId", null, prop);

• SOCKS_PORT = assignInt("SOCKS_PORT", 11160, prop);
• LOCAL_PORT = assignInt("LOCAL_PORT", 8978, prop); +
• us = assign("ourId", null, prop); +
• SOCKS_PORT = assignInt("SOCKS_PORT", 11160, prop);

• LOCAL_PORT = assignInt("LOCAL_PORT", 8978, prop);
  
  TCPort.profile_name = assign("profile_name", null, prop);

  @@ -178,50 +176,50 @@ else Config.icon_space = assignInt("icon_space", 2, prop);
  Config.icon_folder = assign("ICON", "orginal", prop);

• + Config.ICON_DIR = Config.BASE_DIR + Config.DATA_DIR + "icon/" + icon_folder; if(!new File(ICON_DIR).exists()) {
• Config.ICON_DIR = Config.BASE_DIR + Config.DATA_DIR + "icon/" + "orginal";
• Config.ICON_DIR = Config.BASE_DIR + Config.DATA_DIR + "icon/" + "orginal"; }
  Logger.log(Logger.NOTICE, "Config", "Using " + ICON_DIR + " as ICON_DIR");

• + if (Config.buddyStart == 1 & Config.offlineMod == 0) {

• nowstart=sync;
• nowstart=sync; }

• + if (Config.updateStart == 1 & Config.offlineMod == 0) {

• nowstartupdate=update;

•     nowstartupdate=update;
  }

• + if (os.indexOf("win") >= 0) {
• if(obfsproxy == 0)
• {
• Torbinary=TorWin;
• Tortorrc=TorWintorrc;
• }
• else
• {
• Torbinary=TorWinobf;
• Tortorrc=TorWintorrcobf;
• }
• if(obfsproxy == 0)
• {
• Torbinary=TorWin;
• Tortorrc=TorWintorrc;
• }
• else
• {
• Torbinary=TorWinobf;
• Tortorrc=TorWintorrcobf;
• } } else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
• if(obfsproxy == 0)
• {
• Torbinary=TorLin;
• }
• else
• {
• Torbinary=TorLinobf;
• }
• if(obfsproxy == 0)
• {
• Torbinary=TorLin;
• }
• else
• {
• Torbinary=TorLinobf;
• } } answer = language.loadlang(); Logger.log(Logger.INFO, "Config", "Using " + SOCKS_PORT + " as socks port and " + LOCAL_PORT + " as local port."); }

• + public static void reloadSettings() { // reloads almost all settings

  new File(CONFIG_DIR).mkdirs();

  @@ -233,13 +231,13 @@ else } catch (IOException e) { System.err.println(e.getLocalizedMessage()); }

• + + SOCKS_PORT = assignInt("SOCKS_PORT", 11160, prop); LOCAL_PORT = assignInt("LOCAL_PORT", 8978, prop);

• us = assign("ourId", null, prop);

• us = assign("ourId", null, prop);

  +

• TCPort.profile_name = assign("profile_name", null, prop);
  TCPort.profile_text = assign("profile_text", null, prop);
  Config.lang = assign("lang", dlang, prop);

  @@ -261,17 +259,17 @@ else Config.icon_size = assignInt("icon_size", 20, prop); Config.icon_space = assignInt("icon_space", 2, prop); Config.icon_folder = assign("ICON", "orginal", prop);

• + if (Config.buddyStart == 1) {

• nowstart=sync;
• nowstart=sync; }

• + if (Config.updateStart == 1) {

• nowstartupdate=update;
• nowstartupdate=update; }

• + Logger.log(Logger.INFO, "Config", "Using " + SOCKS_PORT + " as socks port and " + LOCAL_PORT + " as local port."); }

@@ -280,31 +278,35 @@ else public static final int KEEPALIVE_INTERVAL = (int) (Math.random()*120); //120; public static final int MAX_UNANSWERED_PINGS = 4;

public static final int CONNECT_TIMEOUT = 70;

+

public static final String CLIENT = "JTC [T2]";

+ private static int assignInt(String string, int def, Properties prop) { String x = (String) prop.get(string); int i = def;

• if (x != null)
• if (x != null) { try { i = Integer.parseInt(x); } catch (NumberFormatException nfe) { System.err.println(nfe.getLocalizedMessage()); }
• if (i == def)
• }
• if (i == def) { Logger.log(Logger.NOTICE, "Config", string + " not defined using " + def);

• }
  return i;

  }

  public static String assign(String string, String s, Properties prop) { String x = (String) prop.get(string); String ret = s;

• if (x != null)
• if (x != null) { ret = x;
• if (ret == null && s == null || s != null && ret != null && ret.equals(s))
• }
• if (ret == null && s == null || s != null && ret != null && ret.equals(s)) { Logger.log(Logger.NOTICE, "Config", string + " not defined using " + s);
• } return ret; }

• + } diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java index b225695..929daaa 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java +++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java @@ -16,8 +16,8 @@ import net.tsu.TCPort.util.Util;

  public class FileTransfer {

• public static HashMap<String, FileSender> senders = new HashMap<String, FileSender>();
• public static HashMap<String, FileReceiver> receivers = new HashMap<String, FileReceiver>();
• private static HashMap<String, FileSender> senders = new HashMap<String, FileSender>();

• private static HashMap<String, FileReceiver> receivers = new HashMap<String, FileReceiver>();

  private static Listener lis;

@@ -26,7 +26,8 @@ public class FileTransfer { // wth return; }

• APIManager.incomingCmdListeners.put("filename", (lis = new Listener()));
• lis = new Listener();

• APIManager.incomingCmdListeners.put("filename", lis);
  APIManager.incomingCmdListeners.put("filedata", lis);
  APIManager.cmdListeners.put("filedata_ok", lis);
  APIManager.cmdListeners.put("filedata_error", lis);

  @@ -36,6 +37,8 @@ public class FileTransfer {

  private static class Listener implements IncomingCommandListener, CommandListener {

• private static final String COMMAND_SEPARATOR = " ";

  + // Util.readTillLinebreak(is) @Override public void onCommand(Buddy buddy, String command, InputStream is) { @@ -44,7 +47,7 @@ public class FileTransfer { //Logger.oldOut.println("ft: " + command); try { if (command.startsWith("filename")) {

• String[] spl = Util.readStringTillChar(is, '\n').split(" ", 4);

•         String[] spl = Util.readStringTillChar(is, '\n').split(COMMAND_SEPARATOR, 4);
        String id = spl[0];
        long fileSize = Long.valueOf(spl[1]);
        int blockSize = Integer.valueOf(spl[2]);

  @@ -88,7 +91,7 @@ public class FileTransfer { String hash = Util.readStringTillChar(is, ' '); byte[] data = Util.unescape(Util.readBytesTillChar(is, '\n'));

•         FileReceiver receiver = receivers.get(buddy.getAddress() + " " + id);

• FileReceiver receiver = receivers.get(buddy.getAddress() + COMMAND_SEPARATOR + id); if (receiver != null) { //int amountExpected = (int) ((receiver.fileSize - start) > receiver.blockSize ? receiver.blockSize : receiver.fileSize - start); // ByteBuffer dataBuf = ByteBuffer.allocate(amountExpected); @@ -115,7 +118,7 @@ public class FileTransfer { } } } catch (IOException ioe) {
• Logger.log(Logger.NOTICE, "FileTransfer", "IOException on " + buddy.toString(true) + " " + ioe.getLocalizedMessage());

•         Logger.log(Logger.NOTICE, "FileTransfer", "IOException on " + buddy.toString(true) + COMMAND_SEPARATOR + ioe.getLocalizedMessage());
        try {
            buddy.disconnect();
        } catch (IOException e) {

  @@ -134,11 +137,11 @@ public class FileTransfer { public void onCommand(Buddy buddy, String s) {

     if (s.startsWith("filedata_ok ")) {

• String[] spl = s.split(" ", 3);

•             String[] spl = s.split(COMMAND_SEPARATOR, 3);
            String id = spl[1];
            long start = Long.valueOf(spl[2]);

•             FileSender sender = senders.get(buddy.getAddress() + " " + id);

• FileSender sender = senders.get(buddy.getAddress() + COMMAND_SEPARATOR + id); if (sender != null) sender.recievedOk(start); else @@ -153,11 +156,11 @@ public class FileTransfer { } } } else if (s.startsWith("filedata_error ")) {
• String[] spl = s.split(" ", 3);

•             String[] spl = s.split(COMMAND_SEPARATOR, 3);
            String id = spl[1];
            long start = Long.valueOf(spl[2]);

•             FileSender sender = senders.get(buddy.getAddress() + " " + id);

• FileSender sender = senders.get(buddy.getAddress() + COMMAND_SEPARATOR + id); if (sender != null) sender.restart(start); else @@ -172,17 +175,26 @@ public class FileTransfer { } } } else if (s.startsWith("file_stop_sending ")) {
• String id = s.split(" ", 2)[1]; // NOTE - in pytorchat this is done by self.id = self.blob doesnt make sense

•             String id = s.split(COMMAND_SEPARATOR, 2)[1]; // NOTE - in pytorchat this is done by self.id = self.blob doesnt make sense

•             FileSender sender = senders.get(buddy.getAddress() + " " + id);

• FileSender sender = senders.get(buddy.getAddress() + COMMAND_SEPARATOR + id); if (sender != null) sender.close(); } else if (s.startsWith("file_stop_receiving ")) {
• String id = s.split(" ", 2)[1]; // NOTE - in pytorchat this is done by self.id = self.blob doesnt make sense
• FileReceiver receiver = receivers.get(buddy.getAddress() + " " + id);
• String id = s.split(COMMAND_SEPARATOR, 2)[1]; // NOTE - in pytorchat this is done by self.id = self.blob doesnt make sense

•             FileReceiver receiver = receivers.get(buddy.getAddress() + COMMAND_SEPARATOR + id);
            if (receiver != null)
                receiver.close();
        }

  }}

• public static HashMap<String, FileSender> getSenders() {
• return senders;
• } +
• public static HashMap<String, FileReceiver> getReceivers() {
• return receivers;
• } + } diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java index 077f00f..704eeb5 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java
  +++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java
  @@ -1,5 +1,6 @@ package net.tsu.TCPort;

+import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.reflect.Field; @@ -12,7 +13,7 @@ import javax.swing.JTextField;

public class TCPort {

• public static String base_pwd = null;
• public static String base_pwd = ""; public static String profile_name; // = "JTCDev-Tsu"; public static String profile_text; // = "JTCDev-Text"; public static String status = "available"; // available away xa @@ -20,25 +21,29 @@ public class TCPort { @SuppressWarnings("unused") private static boolean halted;

• + + public static void main(String[] args) {

• // Set Base-Path by Problem
• if (args.length > 0)
• {
• base_pwd = args[0]+"/";

  - }

• + try {

• if (getLogInstance() != null) +
• // Set Base-Path by Problem
• if (args.length > 0) {
• if(Config.visiblelog == 1) {getLogInstance().setVisible(true);}
• base_pwd = args[0]; }
• base_pwd = new File(base_pwd).getCanonicalPath() + "/"; + +
• final JFrame logInstance = getLogInstance();
• if (logInstance != null)
• {
• if(Config.visiblelog == 1) {
• logInstance.setVisible(true);
• }

•     }

  + Runtime.getRuntime().addShutdownHook(new Thread() {

        @Override

  @@ -62,14 +67,14 @@ public class TCPort { } } });

  -TorLoader.loadTor();

• // new Gui().init(); + + +
• TorLoader.loadTor(); + + +
• // new Gui().init(); runInit("net.tsu.TCPort.Gui.Gui"); launched = true; try { @@ -92,9 +97,9 @@ TorLoader.loadTor(); runStaticInit("net.tsu.TCPort.Broadcast.Broadcast"); runStaticInit("net.tsu.TCPort.FileTransfer.FileTransfer"); // FileTransfer.init(); // doesnt work atm

• + + + if (!BuddyList.buds.containsKey(Config.us)) { new Buddy(Config.us, null).connect(); } @@ -119,7 +124,7 @@ TorLoader.loadTor(); } else if (l.startsWith("raw ")) { // send raw messaage to a buddy BuddyList.buds.get(l.split(" ")[1]).sendRaw(l.split(" ", 3)[2]);

•                     }}

• }} } catch (Exception e) { e.printStackTrace(); } @@ -127,8 +132,8 @@ TorLoader.loadTor(); e.printStackTrace(); } }

• + + }, "Starting console.", "Console thread"); ThreadManager.registerWork(ThreadManager.DAEMON, new Runnable() {

@@ -136,7 +141,7 @@ TorLoader.loadTor(); public void run() { while (true) {

try {

+ if (Config.nowstart != "") { BuddyList.loadBuddiesRemote(Config.nowstart); @@ -145,21 +150,21 @@ TorLoader.loadTor(); if (Config.nowstartupdate != "") {

Config.LastCheck = Update.loadUpdate(Config.nowstartupdate);

• + + if (Config.LastCheck != "close") {

• JTextField jtf = new JTextField();
• jtf.setEditable(false);
• jtf.setText(Config.LastCheck);
• JOptionPane.showMessageDialog(null, jtf, "Update Check", JOptionPane.PLAIN_MESSAGE);
• JTextField jtf = new JTextField();
• jtf.setEditable(false);
• jtf.setText(Config.LastCheck);
• JOptionPane.showMessageDialog(null, jtf, "Update Check", JOptionPane.PLAIN_MESSAGE);
  }

• Config.nowstartupdate = ""; + +

•                         Config.nowstartupdate = "";
                    }

• + for (Buddy b : BuddyList.buds.values()) { if (b.getConnectTime() != -1 && System.currentTimeMillis() - b.getConnectTime() > Config.CONNECT_TIMEOUT * 1000) { // checks if buddy hasnt finished connecting within CONNECT_TIMEOUT seconds @@ -174,7 +179,7 @@ TorLoader.loadTor(); b.connect(); Logger.log(Logger.INFO, "Status Thread", "Connection reset for " + b.getAddress()); }

• + if (b.getStatus() >= Buddy.ONLINE && (b.ourSock == null || b.theirSock == null || b.ourSock.isClosed() || b.theirSock.isClosed())) { if (b.ourSock != null) b.ourSock.close(); @@ -198,7 +203,7 @@ TorLoader.loadTor(); } if (b.ourSock != null && b.theirSock != null && b.recievedPong && b.getTimeSinceLastStatus() > (Config.KEEPALIVE_INTERVAL - 20) * 1000) b.sendStatus(); // Sends status every 100 seconds supposed to be every

• // KEEPALIVE_INTERVAL but 20 seconds shorter just incase :\

•                         // KEEPALIVE_INTERVAL but 20 seconds shorter just incase :\
                        if (b.ourSock != null && b.ourSockOut != null && !b.recievedPong && (System.currentTimeMillis() - b.lastPing) > (Config.KEEPALIVE_INTERVAL / 4) * 1000)
                            b.sendPing(); //
                        if (b.reconnectAt != -1 && System.currentTimeMillis() - b.reconnectAt > 0) {

  diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java index e498dc4..7c94ded 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java +++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java @@ -9,6 +9,7 @@ import java.util.Scanner;

  public class TorLoader {

• private static final String CLASS_NAME = TorLoader.class.getName(); private static Process process; private static Object loadLock = new Object();

@@ -20,227 +21,226 @@ public class TorLoader {

        @Override
        public void run() {

• boolean exists = (new File(Config.BASE_DIR+Config.DATA_DIR+Config.controlfile)).exists(); // check base dir +
• final String controlFilePath = Config.BASE_DIR+Config.DATA_DIR+Config.controlfile;
• boolean exists = (new File(controlFilePath)).exists(); // check base dir if (!exists) {
• Logger.log(Logger.FATAL, "TorLoader", "Wrong base dir, the controlfile is not find:"+Config.BASE_DIR+Config.DATA_DIR+Config.controlfile);

•             Logger.log(Logger.FATAL, CLASS_NAME, "Wrong base dir, the controlfile is not find:" + controlFilePath);
            TCPort.getLogInstance().setVisible(true);
            tl.getProgressBar1().setValue(0);
            tl.getProgressBar1().setIndeterminate(false);
            tl.gettextArea1().setText("Wrong base dir, the controlfile is not find!");
        } else {

•         if (Config.answer!=null) // if a language file found

• {
• Logger.log(Logger.FATAL, "TorLoader", Config.answer);
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(Config.answer);
• }

  - else {

• if (Config.offlineMod == 0)
• if (Config.answer!=null) // if a language file found {
• if (Config.loadTor == 1) // only load portable tor if not testing
• {
• ProcessBuilder pb=null;
• String os = System.getProperty("os.name").toLowerCase(); // Operating System details as a CASE INSENSTIVE string
• Logger.log(Logger.NOTICE, "TorLoader ", "Checking OS: "+os);
• // PROCESSBUILDER settings for WINDOWS
• if (os.indexOf("win") >= 0) {
• Logger.log(Logger.NOTICE, "TorLoader",
• "Start portable tor in windows");// if so, then start tor.exe with torrc.txt
• pb = new ProcessBuilder(
• new String[] { Config.TOR_DIR + Config.Torbinary,
• "-f", Config.TOR_DIR + Config.Tortorrc });
• // PROCESSBUILDER settings for LINUX and UNIX
• } else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
• Logger.log(Logger.NOTICE, "TorLoader",

  - "Start portable tor in *nix or linux");

• pb = new ProcessBuilder(
• new String[] { Config.TOR_DIR + Config.Torbinary, Config.torpid, Config.TOR_DIR
• });
• Logger.log(Logger.FATAL, CLASS_NAME, Config.answer);
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(Config.answer);
• }

•             else {

•         }

• else {
• Logger.log(Logger.NOTICE, "TorLoader","Can't detect OS type, using system tor (need system tor to work)");
• pb = new ProcessBuilder(new
• String[] { "tor", "-f", Config.TOR_DIR + Config.Tortorrc
• });

  - }

• pb.directory(new File(Config.TOR_DIR)
• .getAbsoluteFile());
• System.out.println(new File(Config.TOR_DIR)
• .getAbsolutePath());
• pb.redirectErrorStream(true);
• try {
• process = pb.start();
• Scanner s = new Scanner(process.getInputStream());
• while (s.hasNextLine()) {
• String l = s.nextLine();

  - Logger.log(Logger.INFO, "Tor", l);

• // New progress function (obfsproxy has more then three progress messages)
• if (l.contains("Bootstrapped ")) {
• String[] starting = l.split("%");
• if (starting.length == 2)
• {
• starting = starting[0].split(" ");
• if (starting.length == 6)
• {
• int starting3 = Integer.parseInt(starting[5]);
• if (starting3 <= 100 || starting3 > 0)
• if (Config.offlineMod == 0)
• {
• if (Config.loadTor == 1) // only load portable tor if not testing {
• tl.getProgressBar1().setValue(Integer.parseInt(starting[5]));
• tl.gettextArea1().setText("Everything works until now.");
• tl.getProgressBar1().setIndeterminate(false);
• if(starting3 == 100)
• {
• synchronized(loadLock) {
• Config.us = new Scanner(new FileInputStream(Config.TOR_DIR + "hidden_service/hostname")).nextLine().replace(".onion", "");
• Logger.log(Logger.NOTICE, "TorLoader", "Set 'us' to " + Config.us);
• loadLock.notifyAll();
• tl.dispose();

  - }}}}}}

• if (l.contains("Is Tor already running?")) {

  - try { // testing other tor

  - new Socket("127.0.0.1", Config.SOCKS_PORT);

• synchronized(loadLock) {
• Logger.log(Logger.SEVERE, "TorLoader", language.langtext[46]);
• Config.us = new Scanner(new FileInputStream("Config.TOR_DIR + hidden_service/hostname")).nextLine().replace(".onion", "");
• Logger.log(Logger.NOTICE, "TorLoader", "Set 'us' to " + Config.us);
• loadLock.notifyAll();
• tl.dispose();

  - }

• } catch (Exception e) {
• // other tor not on our SOCKS_PORT
• Logger.log(Logger.FATAL, "TorLoader", "Tor exited with " + l + ", failed to use it.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[47]);
• ProcessBuilder pb=null;
• pb = instantiateProcessBuilder(); +
• pb.directory(new File(Config.TOR_DIR).getAbsoluteFile());
• System.out.println(new File(Config.TOR_DIR).getAbsolutePath());
• pb.redirectErrorStream(true); +
• try {
• process = pb.start();
• Scanner s = new Scanner(process.getInputStream());
• while (s.hasNextLine()) {
• String l = s.nextLine();
• Logger.log(Logger.INFO, "Tor", l); + + +
• // New progress function (obfsproxy has more then three progress messages)
• if (l.contains("Bootstrapped ")) {
• String[] starting = l.split("%");
• if (starting.length == 2)
• {
• starting = starting[0].split(" ");
• if (starting.length == 6)
• {
• int starting3 = Integer.parseInt(starting[5]);
• if (starting3 <= 100 || starting3 > 0)
• {
• tl.getProgressBar1().setValue(Integer.parseInt(starting[5]));
• tl.gettextArea1().setText("Everything works until now.");
• tl.getProgressBar1().setIndeterminate(false);
• if(starting3 == 100)
• {
• synchronized(loadLock) {
• Config.us = new Scanner(new FileInputStream(Config.TOR_DIR + "hidden_service/hostname")).nextLine().replace(".onion", "");
• Logger.log(Logger.NOTICE, CLASS_NAME, "Set 'us' to " + Config.us);
• loadLock.notifyAll();
• tl.dispose();
• }}}}}} + +
• if (l.contains("Is Tor already running?")) {
• try { // testing other tor +
• new Socket("127.0.0.1", Config.SOCKS_PORT); +
• synchronized(loadLock) {
• Logger.log(Logger.SEVERE, CLASS_NAME, language.langtext[46]);
• Config.us = new Scanner(new FileInputStream("Config.TOR_DIR + hidden_service/hostname")).nextLine().replace(".onion", "");
• Logger.log(Logger.NOTICE, CLASS_NAME, "Set 'us' to " + Config.us);
• loadLock.notifyAll();
• tl.dispose();
• } + + +
• } catch (Exception e) {
• // other tor not on our SOCKS_PORT
• Logger.log(Logger.FATAL, CLASS_NAME, "Tor exited with " + l + ", failed to use it.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[47]);
• }
• } + + +
• if (l.contains("Failed to bind one of the listener")) {
• Logger.log(Logger.FATAL, CLASS_NAME, "The listener Port is in use.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[48]);
• } + +
• if (l.contains("Network is unreachable")) {
• Logger.log(Logger.FATAL, CLASS_NAME, "Network is unreachable.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText("Network is unreachable.");
• } + +
• if (l.contains("broken state. Dying.")) {
• Logger.log(Logger.FATAL, CLASS_NAME, "Tor has died apparently, Ja.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[49]);
• }
• }
• } catch (IOException e) {
• Logger.log(Logger.SEVERE, CLASS_NAME, e.getLocalizedMessage());
• if (e.getLocalizedMessage().contains("Cannot"))
• {
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[50]); +
• }
• } } + + + + + }

• if (l.contains("Failed to bind one of the listener")) {
• Logger.log(Logger.FATAL, "TorLoader", "The listener Port is in use.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[48]);

  - }

• if (l.contains("Network is unreachable")) {
• Logger.log(Logger.FATAL, "TorLoader", "Network is unreachable.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText("Network is unreachable.");

  - }

• if (l.contains("broken state. Dying.")) {
• Logger.log(Logger.FATAL, "TorLoader", "Tor has died apparently, Ja.");
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[49]);
• else
• {
• tl.dispose(); + } }
• } catch (IOException e) {
• Logger.log(Logger.SEVERE, "TorLoader", e.getLocalizedMessage());
• if (e.getLocalizedMessage().contains("Cannot"))
• {
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(language.langtext[50]);

•         }}

  + + +

•             }

• }

  - }

• }
• else
• {

  - tl.dispose();

• }
• }

  - }}

• }, "Starting Tor.", "Tor Monitor Thread");

• if (Config.offlineMod == 0 & Config.loadTor == 1)
• {
• try {
• synchronized(loadLock) {
• loadLock.wait(); +
• if (Config.offlineMod == 0 & Config.loadTor == 1)
• {
• try {
• synchronized(loadLock) {
• loadLock.wait();
• }
• } catch (InterruptedException e) { }
• } catch (InterruptedException e) { }
• }
• String error = TCServ.init();
• if (error != null)
• {
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(error);
• }
• else
• {
• tl.dispose();
• }
• String error = TCServ.init();
• if (error != null)
• {
• TCPort.getLogInstance().setVisible(true);
• tl.getProgressBar1().setValue(0);
• tl.getProgressBar1().setIndeterminate(false);
• tl.gettextArea1().setText(error);
• }
• else
• {
• tl.dispose();

• }

  }

  public static void cleanUp() { synchronized(loadLock) { loadLock.notifyAll(); }

• Logger.log(Logger.INFO, "TorLoader", "ACleaning up.");
• Logger.log(Logger.INFO, CLASS_NAME, "ACleaning up."); String os = System.getProperty("os.name").toLowerCase(); if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
• try {
• ProcessBuilder torclose = new ProcessBuilder(
• new String[] { Config.TOR_DIR + Config.Torclose, Config.torpid, Config.TOR_DIR});
• Logger.log(Logger.INFO, "TorLoader", "Kill Tor with "+Config.TOR_DIR + Config.Torclose);
• torclose.start();
• } catch (IOException e) {
• // TODO Auto-generated catch block
• e.printStackTrace();
• }
• try {
• ProcessBuilder torclose = new ProcessBuilder(
• new String[] { Config.TOR_DIR + Config.Torclose, Config.torpid, Config.TOR_DIR});
• Logger.log(Logger.INFO, CLASS_NAME, "Kill Tor with "+Config.TOR_DIR + Config.Torclose);
• torclose.start();
• } catch (IOException e) {
• // TODO Auto-generated catch block
• e.printStackTrace();
• } } if (process != null) {
• Logger.log(Logger.INFO, "TorLoader", "Cleaning up.");

•     Logger.log(Logger.INFO, CLASS_NAME, "Cleaning up.");
    process.destroy();
  }

  }

• private static ProcessBuilder instantiateProcessBuilder() {
• ProcessBuilder pb;
• String os = System.getProperty("os.name").toLowerCase(); // Operating System details as a CASE INSENSTIVE string
• Logger.log(Logger.NOTICE, "TorLoader ", "Checking OS: "+os);
• // PROCESSBUILDER settings for WINDOWS
• if (os.contains("win")) { +
• // if so, then start tor.exe with torrc.txt
• Logger.log(Logger.NOTICE, CLASS_NAME, "Start portable tor in windows");
• pb = new ProcessBuilder(new String[] { Config.TOR_DIR + Config.Torbinary, "-f", Config.TOR_DIR + Config.Tortorrc }); +
• } else if (os.contains("nix") || os.contains("nux")) { +
• // PROCESSBUILDER settings for LINUX and UNIX
• Logger.log(Logger.NOTICE, CLASS_NAME, "Start portable tor in *nix or linux");
• pb = new ProcessBuilder(new String[] { Config.TOR_DIR + Config.Torbinary, Config.torpid, Config.TOR_DIR}); +
• }
• else {
• Logger.log(Logger.NOTICE, CLASS_NAME,"Can't detect OS type, using system tor (need system tor to work)");
• pb = new ProcessBuilder(new String[] { "tor", "-f", Config.TOR_DIR + Config.Tortorrc });
• }
• return pb;
• } + }

1.7.5.4

[smithrachael]

I am still trying to find a way to send our patches to Github's site. I could not find one though.

[zerotamaitsu]

I don't think there is a web interface. Just commit it the standard way... maybe... github will support patch uploading in the future

[zerotamaitsu]

How about forking the repo, and doing a pull request?