Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
diconnecting -> disconnecting.
  • Loading branch information
willscott committed May 1, 2012
1 parent 1bc034b commit 9631601
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 15 deletions.
61 changes: 47 additions & 14 deletions az_src/jsocks/net/sourceforge/jsocks/SocksEcho.java
@@ -1,11 +1,35 @@
package net.sourceforge.jsocks; package net.sourceforge.jsocks;


import java.awt.*; import java.awt.Button;
import java.awt.event.*; import java.awt.Component;
import java.net.*; import java.awt.Container;
import java.io.*; import java.awt.Font;
import net.sourceforge.jsocks.socks.*; import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Label;
import java.awt.SystemColor;
import java.awt.TextArea;
import java.awt.TextField;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowListener;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.DatagramPacket;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;

import net.sourceforge.jsocks.socks.Proxy; import net.sourceforge.jsocks.socks.Proxy;
import net.sourceforge.jsocks.socks.Socks5DatagramSocket;
import net.sourceforge.jsocks.socks.Socks5Proxy;
import net.sourceforge.jsocks.socks.SocksDialog;
import net.sourceforge.jsocks.socks.SocksServerSocket;
import net.sourceforge.jsocks.socks.SocksSocket;


public class SocksEcho extends Frame public class SocksEcho extends Frame
implements ActionListener, implements ActionListener,
Expand Down Expand Up @@ -82,7 +106,8 @@ else if(component[i] instanceof TextField)


//ActionListener interface //ActionListener interface
/////////////////////////// ///////////////////////////
public void actionPerformed(ActionEvent ae){ @Override
public void actionPerformed(ActionEvent ae){
Object source = ae.getSource(); Object source = ae.getSource();


if(source == proxy_button) if(source == proxy_button)
Expand All @@ -105,6 +130,7 @@ else if(source == clear_button)
//Runnable interface //Runnable interface
/////////////////////////////// ///////////////////////////////


@Override
public void run(){ public void run(){
boolean finished_OK = true; boolean finished_OK = true;
try{ try{
Expand Down Expand Up @@ -153,7 +179,7 @@ public void run(){


private void onConnect(){ private void onConnect(){
if(mode == CONNECT_MODE){ if(mode == CONNECT_MODE){
status("Diconnecting..."); status("Disconnecting...");
abort_connection(); abort_connection();
return; return;
}else if(mode != COMMAND_MODE) }else if(mode != COMMAND_MODE)
Expand Down Expand Up @@ -578,22 +604,29 @@ void guiInit(){


// WindowListener Interface // WindowListener Interface
///////////////////////////////// /////////////////////////////////
public void windowActivated(java.awt.event.WindowEvent e){ @Override
public void windowActivated(java.awt.event.WindowEvent e){
} }
public void windowDeactivated(java.awt.event.WindowEvent e){ @Override
public void windowDeactivated(java.awt.event.WindowEvent e){
} }
public void windowOpened(java.awt.event.WindowEvent e){ @Override
public void windowOpened(java.awt.event.WindowEvent e){
} }
public void windowClosing(java.awt.event.WindowEvent e){ @Override
public void windowClosing(java.awt.event.WindowEvent e){
if(e.getWindow() == this) onQuit(); if(e.getWindow() == this) onQuit();
else else
e.getWindow().dispose(); e.getWindow().dispose();
} }
public void windowClosed(java.awt.event.WindowEvent e){ @Override
public void windowClosed(java.awt.event.WindowEvent e){
} }
public void windowIconified(java.awt.event.WindowEvent e){ @Override
public void windowIconified(java.awt.event.WindowEvent e){
} }
public void windowDeiconified(java.awt.event.WindowEvent e){ @Override
public void windowDeiconified(java.awt.event.WindowEvent e){
} }




Expand Down
Expand Up @@ -412,7 +412,7 @@ public void connectionRouted(NetworkConnection connection, Object routing_data)
.getNotionalAddress().getAddress().getHostAddress(), remotePub); .getNotionalAddress().getAddress().getHostAddress(), remotePub);
connection.close(); connection.close();
} else if (f.isBlocked()) { } else if (f.isBlocked()) {
logger.warning("connection from blocked user: " + f.getNick() + ", diconnecting"); logger.warning("connection from blocked user: " + f.getNick() + ", disconnecting");
connection.close(); connection.close();
} else { } else {
logger.finer("connection from: " + f.getNick()); logger.finer("connection from: " + f.getNick());
Expand Down

0 comments on commit 9631601

Please sign in to comment.