Skip to content

Commit

Permalink
Added support for more than one command.
Browse files Browse the repository at this point in the history
  • Loading branch information
0fca committed Aug 13, 2017
1 parent 20ffcab commit 7339d33
Show file tree
Hide file tree
Showing 8 changed files with 114 additions and 172 deletions.
10 changes: 0 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,20 +115,10 @@
<artifactId>xml-apis</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.8.11.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.41</version>
</dependency>
</dependencies>
</project>
4 changes: 1 addition & 3 deletions src/main/java/abstracts/LocalEnvironment.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import enums.Local;
import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.nio.file.Paths;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -21,9 +22,6 @@
* @author Obsidiam
*/
public abstract class LocalEnvironment {
private NetController NET = new NetController();


public String getLocalVar(Local l) throws NullPointerException{
String var = null;
XMLController xml = new XMLController();
Expand Down
82 changes: 0 additions & 82 deletions src/main/java/com/neology/net/ActiveIpChecker.java

This file was deleted.

24 changes: 20 additions & 4 deletions src/main/java/com/neology/net/Closed.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,44 @@
*/
package com.neology.net;

import com.neology.exceptions.TransportException;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
*
* @author obsidiam
*/
public class Closed extends TransportState{
@Override
public void closeConnection(Transport t) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
try {
if(t.isConnected()){
t.close();
}
} catch (IOException ex) {
Logger.getLogger(Closed.class.getName()).log(Level.SEVERE, null, ex);
}

}

@Override
public void haltConnection(Transport t) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
try {
t.close();
} catch (IOException ex) {
Logger.getLogger(Closed.class.getName()).log(Level.SEVERE, null, ex);
}
}

@Override
public boolean wasConnected(Transport t) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
return t.wasConnected();
}

@Override
public boolean isConnected(Transport t) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
return t.isConnected();
}
}
21 changes: 19 additions & 2 deletions src/main/java/com/neology/net/NetController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@

import com.neology.interfaces.Reachable;
import com.neology.xml.XMLController;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.net.util.SubnetUtils;
import org.xml.sax.SAXException;
Expand All @@ -23,13 +29,24 @@
* @author Obsidiam
*/
public class NetController implements Reachable{
private volatile Socket S;

public NetController(Socket s){
this.S = s;
}

public String[] getIpPool(String subnet) throws SocketException{
SubnetUtils utils = new SubnetUtils(subnet);

return utils.getInfo().getAllAddresses();
}

public String getIp() throws UnknownHostException, IOException{

return S.getLocalAddress().getHostAddress();
}

@Deprecated
public String[] prepareIpsPool() throws NullPointerException, UnknownHostException, ParserConfigurationException, SAXException, IOException{
XMLController xml = new XMLController();
String subnet = xml.parseInitFile().get(0).toString();
Expand All @@ -40,7 +57,7 @@ public String[] prepareIpsPool() throws NullPointerException, UnknownHostExcepti
System.arraycopy(pool, 0, actual, 0, pool.length);
return actual;
}

@Deprecated
public CopyOnWriteArrayList prepareActiveIpsList(CopyOnWriteArrayList<String> pool){
CopyOnWriteArrayList<String> actv_pool = new CopyOnWriteArrayList<>();

Expand All @@ -60,7 +77,7 @@ public CopyOnWriteArrayList prepareActiveIpsList(CopyOnWriteArrayList<String> po
@Override
public boolean isReachable(String ip) throws Exception {
try {
if(InetAddress.getByName(ip).isReachable(10)){
if(InetAddress.getByName(ip).isReachable(500)){
return true;
}
} catch (IOException ex) {
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/neology/net/Transport.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import java.nio.charset.Charset;

/**
* @author dime
* @author dime,obsidiam
*/
public class Transport {
public final static Charset ISO_8859_2 = Charset.forName("ISO-8859-2");
Expand All @@ -41,7 +41,7 @@ public class Transport {
InputStream origIs;
OutputStream origOs;
Socket s;
private boolean WAS_CONNECTED ,IS_CONNECTED = false;
private boolean WAS_CONNECTED = false;
private BaudrateMeter baudrateMeter;
private String IP;

Expand Down Expand Up @@ -80,6 +80,12 @@ void release() {
WAS_CONNECTED = true;
}

public void close() throws IOException{
release();
s.close();
IP = "";
}

public byte readByte() throws TransportException {
try {
if (baudrateMeter != null) baudrateMeter.count(1);
Expand Down
Loading

0 comments on commit 7339d33

Please sign in to comment.