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

NDT changes adapted from Vuze/BiglyBT, and changes for I2P.

Browse Source 
Vuze/Bigly is based on NDT 3.6.2b, so their changes are
manually merged here.
This rev does not compile, requires swingemu package to follow.
Changes:
- Add external start hook to Tcpbw100 from BiglyBT
- Replace all Swing/AWT classes with emulations from BiglyBT
  (included in next checkin)
- Leave classes in edu.internet2.ndt package rather than
  moving to com.vuze.plugins.mlab heirarchy as Vuze/BiglyBT did
- Change IPv6 support setting to use I2P class for detection
- Change in-progress field to an AtomicBoolean
- Change from System to I2P logging
- Change JSON library package
- Comment out some applet code
- Javadoc fixes
This commit is contained in:
zzz
2018-11-13 17:08:56 +00:00
parent 6f7881c7ea
commit e20401373c
8 changed files with 213 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
View File

@@ -1,7 +1,7 @@
package edu.internet2.ndt;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import net.minidev.json.JSONObject;
import net.minidev.json.JSONValue;
import java.util.Iterator;
import java.util.Map;
@@ -13,7 +13,7 @@ public class JSONUtils {
/**
* Function that return value from json object represented by jsontext containing a single message
* which is assigned to "msg" key.
* @param {String} JSON object
* @param jsonTxt {String} JSON object
* @return {int} obtained value from JSON object
*/
public static String getSingleMessage(String jsonTxt) {
@@ -22,8 +22,8 @@ public class JSONUtils {
/**
* Function that return value for given key from json object represented by jsontext
* @param {String} JSON object
* @param {int} key by which value should be obtained from JSON map
* @param jsonTxt {String} JSON object
* @param key {int} key by which value should be obtained from JSON map
* @return {int} obtained value from JSON map
*/
public static String getValueFromJsonObj(String jsonTxt, String key) {
@@ -41,9 +41,9 @@ public class JSONUtils {
/**
* Function that add new value to JSON map
* @param {String} JSON object
* @param {String} key by which value should be assigned to JSON map
* @param {String} value for given key
* @param jsonTxt {String} JSON object
* @param key {String} key by which value should be assigned to JSON map
* @param value {String} value for given key
* @return {String} json object with added value.
*/
public static String addValueToJsonObj(String jsonTxt, String key, String value) {
@@ -57,7 +57,7 @@ public class JSONUtils {
/**
* Function that return json object represented by jsontext and included
* single message assigned to "msg" key
* @param {byte[]} message which should be assigned to json object
* @param msg {byte[]} message which should be assigned to json object
* @return {byte[]} json object represented by jsontext and encodes into a sequence of bytes
*/
public static byte[] createJsonObj(byte[] msg) {