gnh1201/caterpillar
1
0
Fork 0
mirror of https://github.com/gnh1201/caterpillar.git synced 2025-11-27 18:10:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Namhyeon Go 2024-03-07 15:38:10 +09:00
parent 1ae1947c0f
commit 759dba418c
1 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
assets/java/app/src/com/catswords/caterpillar/Worker.java
View File

@ -78,26 +78,37 @@ public class Worker {
JspWriter jspWriterOut = (out instanceof JspWriter ? (JspWriter) _out : null); JspWriter jspWriterOut = (out instanceof JspWriter ? (JspWriter) _out : null);
Socket conn = (out instanceof Socket ? (Socket) _out : null); Socket conn = (out instanceof Socket ? (Socket) _out : null);
char[] buffer = new char[bufferSize];
int bytesRead;
try { try {
// connect to the remote server // connect to the remote server
Socket sock = new Socket(); Socket sock = new Socket();
sock.connect(new InetSocketAddress(remoteAddress, remotePort)); sock.connect(new InetSocketAddress(remoteAddress, remotePort));
DataOutputStream outToServer = new DataOutputStream(sock.getOutputStream()); DataOutputStream outRemote = new DataOutputStream(sock.getOutputStream());
BufferedReader inFromServer = new BufferedReader(new InputStreamReader(sock.getInputStream())); BufferedReader inRemote = new BufferedReader(new InputStreamReader(sock.getInputStream()));
DataOutputStream outClient = new DataOutputStream(conn.getOutputStream());
BufferedReader inClient = new BufferedReader(new InputStreamReader(conn.getInputStream()));
// send data to the remote server // send data to the remote server
outToServer.write(requestData, 0, requestData.length); if (jspWriterOut != null) {
outRemote.write(requestData, 0, requestData.length);
} else if (conn != null) {
while ((bytesRead = inClient.read(buffer, 0, bufferSize)) != -1) {
char[] outBuffer = new char[bytesRead];
System.arraycopy(buffer, 0, outBuffer, 0, bytesRead);
outRemote.write(outBuffer);
}
}
// receive a response and forward to the client // receive a response and forward to the client
char[] buffer = new char[bufferSize]; while ((bytesRead = inRemote.read(buffer, 0, bufferSize)) != -1) {
int bytesRead;
while ((bytesRead = inFromServer.read(buffer, 0, bufferSize)) != -1) {
if (jspWriterOut != null) { if (jspWriterOut != null) {
out.write(buffer, 0, bytesRead); out.write(buffer, 0, bytesRead);
} else if (conn != null) { } else if (conn != null) {
char[] outBuffer = new char[bytesRead]; char[] outBuffer = new char[bytesRead];
System.arraycopy(buffer, 0, outBuffer, 0, bytesRead); System.arraycopy(buffer, 0, outBuffer, 0, bytesRead);
conn.getOutputStream().write(outBuffer); outClient.write(outBuffer);
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -143,17 +154,42 @@ public class Worker {
default: default:
readFromRemoteServer(remoteAddress, remotePort, scheme, requestData, out, bufferSize, id); readFromRemoteServer(remoteAddress, remotePort, scheme, requestData, out, bufferSize, id);
} }
} }
// Stateful mode (Servlet only) // Stateful mode (Servlet + Socket combination)
public static void relayConenct(Map<String, Object> params, String id, JspWriter out) { public static void relayConenct(Map<String, Object> params, String id, JspWriter out) {
throw new UnsupportedOperationException("This method is not yet implemented."); int bufferSize = Integer.parseInt((String) params.get("buffer_size"));
} String clientAddress = (String) params.get("client_address");
int clientPort = Integer.parseInt((String) params.get("client_port"));
String clientEncoding = (String) params.get("client_encoding");
String remoteAddress = (String) params.get("remote_address");
int remotePort = Integer.parseInt((String) params.get("remote_port"));
String scheme = (String) params.get("scheme");
String datetime = (String) params.get("datetime");
// Stateful mode (Socket only) long startTime = System.currentTimeMillis();
public static void relayConenct(Map<String, Object> params, String id, Socket connection) { try {
throw new UnsupportedOperationException("This method is not yet implemented."); Socket conn = new Socket(clientAddress, clientPort);
}
long stopTime = System.currentTimeMillis();
long connectionSpeed = stopTime - startTime;
JSONObject data = new JSONObject();
data.put("success", true);
data.put("connection_speed", connectionSpeed);
String jsonData = jsonrpc2Encode("relay_accept", data, id);
DataOutputStream outToClient = new DataOutputStream(conn.getOutputStream());
outToClient.writeBytes(jsonData + "\r\n\r\n");
readFromRemoteServer(remoteAddress, remotePort, scheme, null, conn, bufferSize, id);
conn.close();
} catch (Exception e) {
JSONObject error = new JSONObject();
error.put("status", 502);
error.put("code", e.getMessage());
error.put("message", e.getMessage());
error.put("_params", params);
out.println(new JsonRpc2.Error(error, id)).toString();
}
}
} }