echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for a bunch of old unused code to make it compile

Browse Source
This commit is contained in:
str4d
2016-06-05 12:57:32 +00:00
parent 34c611d340
commit f564d4dc22
9 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java
View File

@ -5,6 +5,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import net.i2p.data.DataHelper;
import net.i2p.util.Log;
public class TestCreateSessionDatagram {

1
apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java
View File

@ -5,6 +5,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import net.i2p.data.DataHelper;
import net.i2p.util.Clock;
import net.i2p.util.Log;

12
apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java
View File

@ -37,11 +37,8 @@ public class TestDatagramTransfer {
line = reader.readLine();
_log.info("Response from the lookup for ME: " + line);
_log.debug("The above should be a NAMING REPLY");
StringTokenizer tok = new StringTokenizer(line);
String maj = tok.nextToken();
String min = tok.nextToken();
Properties props = SAMUtils.parseParams(tok);
Properties props = SAMUtils.parseParams(line);
String value = props.getProperty("VALUE");
if (value == null) {
_log.error("No value for ME found! [" + line + "]");
@ -53,10 +50,7 @@ public class TestDatagramTransfer {
String send = "DATAGRAM SEND DESTINATION=" + value + " SIZE=3\nYo!";
out.write(DataHelper.getASCII(send));
line = reader.readLine();
tok = new StringTokenizer(line);
maj = tok.nextToken();
min = tok.nextToken();
props = SAMUtils.parseParams(tok);
props = SAMUtils.parseParams(line);
String size = props.getProperty("SIZE");
String from = props.getProperty("DESTINATION");
if ( (value == null) || (size == null) ||

1
apps/sam/java/test/net/i2p/sam/TestDest.java
View File

@ -5,6 +5,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import net.i2p.data.DataHelper;
import net.i2p.util.Log;
public class TestDest {

1
apps/sam/java/test/net/i2p/sam/TestNaming.java
View File

@ -5,6 +5,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import net.i2p.data.DataHelper;
import net.i2p.util.Log;
public class TestNaming {

13
apps/sam/java/test/net/i2p/sam/TestRawTransfer.java
View File

@ -7,6 +7,7 @@ import java.net.Socket;
import java.util.Properties;
import java.util.StringTokenizer;
import net.i2p.data.DataHelper;
import net.i2p.util.Log;
public class TestRawTransfer {
@ -36,11 +37,8 @@ public class TestRawTransfer {
line = reader.readLine();
_log.info("Response from the lookup for ME: " + line);
_log.debug("The above should be a NAMING REPLY");
StringTokenizer tok = new StringTokenizer(line);
String maj = tok.nextToken();
String min = tok.nextToken();
Properties props = SAMUtils.parseParams(tok);
Properties props = SAMUtils.parseParams(line);
String value = props.getProperty("VALUE");
if (value == null) {
_log.error("No value for ME found! [" + line + "]");
@ -53,10 +51,7 @@ public class TestRawTransfer {
out.write(DataHelper.getASCII(send));
line = reader.readLine();
try {
tok = new StringTokenizer(line);
maj = tok.nextToken();
min = tok.nextToken();
props = SAMUtils.parseParams(tok);
props = SAMUtils.parseParams(line);
} catch (Exception e) {
_log.error("Error parsing response line: [" + line + "]", e);
return;

17
apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java
View File

@ -75,10 +75,7 @@ public class TestStreamTransfer {
req = "NAMING LOOKUP NAME=ME\n";
out.write(DataHelper.getASCII(req));
line = reader.readLine();
StringTokenizer tok = new StringTokenizer(line);
String maj = tok.nextToken();
String min = tok.nextToken();
Properties props = SAMUtils.parseParams(tok);
Properties props = SAMUtils.parseParams(line);
String value = props.getProperty("VALUE");
if (value == null) {
_log.error("No value for ME found! [" + line + "]");
@ -124,10 +121,9 @@ public class TestStreamTransfer {
private void doRun() throws IOException, SAMException {
String line = _reader.readLine();
_log.debug("Read: " + line);
StringTokenizer tok = new StringTokenizer(line);
String maj = tok.nextToken();
String min = tok.nextToken();
Properties props = SAMUtils.parseParams(tok);
Properties props = SAMUtils.parseParams(line);
String maj = props.getProperty(SAMUtils.COMMAND);
String min = props.getProperty(SAMUtils.OPCODE);
if ( ("STREAM".equals(maj)) && ("CONNECTED".equals(min)) ) {
String dest = props.getProperty("DESTINATION");
String id = props.getProperty("ID");
@ -225,10 +221,7 @@ public class TestStreamTransfer {
out.write(DataHelper.getASCII(req));
line = reader.readLine();
_log.info("Response to the stream connect from "+sessionName+" to Alice: " + line);
StringTokenizer tok = new StringTokenizer(line);
String maj = tok.nextToken();
String min = tok.nextToken();
Properties props = SAMUtils.parseParams(tok);
Properties props = SAMUtils.parseParams(line);
_log.info("props = " + props);
String result = props.getProperty("RESULT");
if (!("OK".equals(result))) {

8
apps/sam/java/test/net/i2p/sam/TestSwarm.java
View File

@ -143,15 +143,15 @@ public class TestSwarm {
_samOut.write(DataHelper.getASCII("HELLO VERSION MIN=1.0 MAX=1.0\n"));
_samOut.flush();
_log.debug("Hello sent");
boolean ok = _eventHandler.waitForHelloReply();
_log.debug("Hello reply found: " + ok);
if (!ok)
String serverVersion = _eventHandler.waitForHelloReply();
_log.debug("Hello reply found: " + serverVersion);
if (serverVersion == null)
throw new IOException("wtf, hello failed?");
String req = "SESSION CREATE STYLE=STREAM DESTINATION=" + _destFile + " " + _conOptions + "\n";
_samOut.write(DataHelper.getUTF8(req));
_samOut.flush();
_log.debug("Session create sent");
ok = _eventHandler.waitForSessionCreateReply();
boolean ok = _eventHandler.waitForSessionCreateReply();
_log.debug("Session create reply found: " + ok);
req = "NAMING LOOKUP NAME=ME\n";