From 00b54235d35a09e63dc3477854e3f6f61bb01f3d Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Wed, 24 Dec 2025 15:35:00 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20stacktrace=E3=81=AF=E4=B8=80?= =?UTF-8?q?=E5=A1=8A=E3=81=AE=E8=B5=A4=E6=96=87=E5=AD=97=E3=81=A8=E3=81=97?= =?UTF-8?q?=E3=81=A6=E5=87=BA=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/core/packetproxy/util/Logging.kt | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/core/packetproxy/util/Logging.kt b/src/main/kotlin/core/packetproxy/util/Logging.kt index e03f5a6c..6a1f77ea 100644 --- a/src/main/kotlin/core/packetproxy/util/Logging.kt +++ b/src/main/kotlin/core/packetproxy/util/Logging.kt @@ -30,6 +30,8 @@ import java.time.format.DateTimeFormatter import java.util.* import kotlinx.coroutines.delay import kotlinx.coroutines.yield +import org.jline.jansi.Ansi +import org.jline.jansi.Ansi.Color.RED import org.slf4j.LoggerFactory import packetproxy.gui.GUILog @@ -53,11 +55,6 @@ object Logging { logFile } - private fun formatString(format: String, vararg args: Any?): String { - val now = LocalDateTime.now() - return dtf.format(now) + " " + String.format(format, *args) - } - @JvmStatic fun init(isGulp: Boolean) { this.isGulp = isGulp @@ -110,18 +107,21 @@ object Logging { fun err(format: String, vararg args: Any?) { val fs = formatString(format, *args) - logger.error(fs) + logger.error(Ansi.ansi().fg(RED).a(fs).reset().toString()) if (!isGulp) guiLog.appendErr(fs) } + /** 別のログが挟まらないように一塊にした上で１度に出力する */ @JvmStatic @Throws(IllegalFormatException::class) fun errWithStackTrace(e: Throwable) { - err(e.toString()) - val stackTrace = e.stackTrace - for (element in stackTrace) { - err(element.toString()) + val sb = StringBuilder() + sb.append(e.toString()) + + for (element in e.stackTrace) { + sb.append("\n$element") } + err(sb.toString()) } /** logの継続出力を行う */ @@ -146,4 +146,23 @@ object Logging { println(raf.readUtf8Line()) } } + + /** 第１引数が文字列でないなどの場合はtoString()を実行する 第１引数が文字列かつ第２引数移行が正しく指定されている場合のみフォーマット指定子としての解釈を行う */ + private fun formatString(format: Any, vararg args: Any?): String { + val dateTime = dtf.format(LocalDateTime.now()) + " " + val indent = " ".repeat(dateTime.length) + + val msg = + if (format is String && args.isNotEmpty()) { + try { + format.format(*args) + } catch (e: Exception) { + format + } + } else { + format.toString() + } + + return dateTime + msg.replace("\n", "\n$indent") + } } From 3aa44989a5534add119eace199d1c23b26b66e02 Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Wed, 24 Dec 2025 15:45:04 +0900 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20Logging=E3=81=A7=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E5=BC=95=E6=95=B0=E3=81=ABAny=E3=82=92=E5=8F=96?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/core/packetproxy/util/Logging.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/core/packetproxy/util/Logging.kt b/src/main/kotlin/core/packetproxy/util/Logging.kt index 6a1f77ea..dc0b2e64 100644 --- a/src/main/kotlin/core/packetproxy/util/Logging.kt +++ b/src/main/kotlin/core/packetproxy/util/Logging.kt @@ -95,20 +95,22 @@ object Logging { @JvmStatic @Throws(IllegalFormatException::class) - fun log(format: String, vararg args: Any?) { + fun log(format: Any, vararg args: Any?) { val fs = formatString(format, *args) logger.info(fs) - if (!isGulp) guiLog.append(fs) + if (isGulp) return + guiLog.append(fs) } @JvmStatic @Throws(IllegalFormatException::class) - fun err(format: String, vararg args: Any?) { + fun err(format: Any, vararg args: Any?) { val fs = formatString(format, *args) logger.error(Ansi.ansi().fg(RED).a(fs).reset().toString()) - if (!isGulp) guiLog.appendErr(fs) + if (isGulp) return + guiLog.appendErr(fs) } /** 別のログが挟まらないように一塊にした上で１度に出力する */ From 68683f7a99d11cf6f2d7fbc632557abf45f2d03c Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Thu, 18 Dec 2025 10:12:52 +0900 Subject: [PATCH 3/7] update: System.out.println to Logging.log --- .../core/packetproxy/ListenPortManager.java | 2 +- src/main/java/core/packetproxy/ProxyHttp.java | 2 +- .../core/packetproxy/ProxyXmppSSLForward.java | 4 ++-- .../core/packetproxy/common/BinaryBuffer.java | 12 +++++----- .../core/packetproxy/common/CryptUtils.java | 20 ++++++++-------- .../core/packetproxy/common/MessagePack.java | 12 +++++----- .../core/packetproxy/common/StringUtils.java | 4 ++-- .../java/core/packetproxy/common/Utils.java | 2 +- .../packetproxy/gui/ExtendedTextPane.java | 2 +- .../java/core/packetproxy/gui/GUIHistory.java | 2 +- .../java/core/packetproxy/gui/GUIPacket.java | 2 +- .../core/packetproxy/gui/RawTextPane.java | 2 +- src/main/java/core/packetproxy/http/Http.java | 12 +++++----- .../java/core/packetproxy/http/Https.java | 2 +- .../core/packetproxy/http2/FrameManager.java | 8 +++---- .../core/packetproxy/http2/FramesBase.java | 8 +++---- .../core/packetproxy/http2/GrpcStreaming.java | 4 ++-- .../http2/frames/HeadersFrame.java | 4 ++-- .../http2/frames/SettingsFrame.java | 2 +- .../core/packetproxy/model/CAFactory.java | 16 ++++++------- .../java/core/packetproxy/model/Diff.java | 12 +++++----- .../java/core/packetproxy/model/DiffBase.java | 12 +++++----- .../core/packetproxy/model/DiffBinary.java | 12 +++++----- .../java/core/packetproxy/model/DiffJson.java | 12 +++++----- .../java/core/packetproxy/model/Filters.java | 2 +- .../packetproxy/model/InterceptOptions.java | 2 +- .../core/packetproxy/model/Modifications.java | 2 +- .../java/core/packetproxy/model/Packets.java | 2 +- .../service/handshake/ServerHandshake.java | 10 ++++---- .../java/core/packetproxy/util/SearchBox.java | 4 ++-- .../core/packetproxy/websocket/WebSocket.java | 2 +- .../packetproxy/http2/FrameManagerTest.java | 4 ++-- .../packetproxy/http2/frames/FrameTest.java | 8 +++---- .../http2/frames/HeadersFrameTest.java | 24 +++++++++---------- .../http2/frames/SettingsFrameTest.java | 2 +- .../java/packetproxy/http3/QpackTest.java | 22 ++++++++--------- .../Http3HeaderEncoderDecoderTest.java | 10 ++++---- .../http3/value/frame/SettingsFrameTest.java | 2 +- .../TransportParametersTest.java | 2 +- .../quic/value/QuicMessagesTest.java | 2 +- .../quic/value/VariableLengthIntegerTest.java | 10 ++++---- .../quic/value/frame/CryptoFrameTest.java | 2 +- .../quic/value/frame/FramesTest.java | 2 +- .../value/frame/NewConnectionIdFrameTest.java | 2 +- .../quic/value/packet/InitialPacketTest.java | 8 +++---- .../DisableActiveMigrationParameterTest.java | 2 +- 46 files changed, 148 insertions(+), 148 deletions(-) diff --git a/src/main/java/core/packetproxy/ListenPortManager.java b/src/main/java/core/packetproxy/ListenPortManager.java index a84fa60e..71f64e76 100644 --- a/src/main/java/core/packetproxy/ListenPortManager.java +++ b/src/main/java/core/packetproxy/ListenPortManager.java @@ -84,7 +84,7 @@ private void stopIfRunning() throws Exception { } if (found == false) { - // System.out.println("## close:"+p); + // Logging.log("## close:"+p); listen_map.get(p).close(); port.remove(); } diff --git a/src/main/java/core/packetproxy/ProxyHttp.java b/src/main/java/core/packetproxy/ProxyHttp.java index d4007b7b..44e44fba 100644 --- a/src/main/java/core/packetproxy/ProxyHttp.java +++ b/src/main/java/core/packetproxy/ProxyHttp.java @@ -65,7 +65,7 @@ public byte[] onChunkReceived(byte[] data) throws Exception { byte[] result = new byte[]{}; synchronized (client_loopback) { Http http = Http.create(data); - // System.out.println(String.format("%s: %s:%s", http.getMethod(), + // Logging.log(String.format("%s: %s:%s", http.getMethod(), // http.getServerName(), http.getServerPort())); if (http.getMethod().equals("CONNECT")) { diff --git a/src/main/java/core/packetproxy/ProxyXmppSSLForward.java b/src/main/java/core/packetproxy/ProxyXmppSSLForward.java index be005fd6..bf2ce0f2 100644 --- a/src/main/java/core/packetproxy/ProxyXmppSSLForward.java +++ b/src/main/java/core/packetproxy/ProxyXmppSSLForward.java @@ -93,7 +93,7 @@ private void skipDataUntilSSLConnectionStarted(Socket client, Socket server) thr return; } String body = new String(ArrayUtils.subarray(buff, 0, len)); - // System.out.println("-->" + body); + // Logging.log("-->" + body); sO.write(buff, 0, len); } sleep(1000); // wait 1s @@ -121,7 +121,7 @@ private void skipDataUntilSSLConnectionStarted(Socket client, Socket server) thr return; } String body = new String(ArrayUtils.subarray(buff, 0, len2)); - // System.out.println("<--" + body); + // Logging.log("<--" + body); if (body.contains("proceed")) { finishFlag = true; diff --git a/src/main/java/core/packetproxy/common/BinaryBuffer.java b/src/main/java/core/packetproxy/common/BinaryBuffer.java index 3fc7e950..c3be76e4 100644 --- a/src/main/java/core/packetproxy/common/BinaryBuffer.java +++ b/src/main/java/core/packetproxy/common/BinaryBuffer.java @@ -26,13 +26,13 @@ public class BinaryBuffer { * try { * BinaryBuffer a = new BinaryBuffer("hello, world".getBytes()); * a.remove(1, 1); - * System.out.println(a.toString()); + * Logging.log(a.toString()); * BinaryBuffer b = new BinaryBuffer("hello, world".getBytes()); * b.insert(1, "aa".getBytes()); - * System.out.println(b.toString()); + * Logging.log(b.toString()); * BinaryBuffer c = new BinaryBuffer("hello, world".getBytes()); * c.insert(1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".getBytes()); - * System.out.println(c.toString()); + * Logging.log(c.toString()); * } catch (Exception e) { * errWithStackTrace(e); * } @@ -90,7 +90,7 @@ public void removeAll() { } public void remove(int index, int length) { - // System.out.println(String.format("remove! length: %d", length)); + // Logging.log(String.format("remove! length: %d", length)); /* * データをUTF-8テキストとして扱いたいときは、下記を有効にすること */ @@ -120,8 +120,8 @@ public void remove(int index, int length) { } public void insert(int index, byte[] in) throws Exception { - // System.out.println("insert!"); - // System.out.println(new Binary(in).toHexString(64).toString()); + // Logging.log("insert!"); + // Logging.log(new Binary(in).toHexString(64).toString()); if (in == null) return; if (data_size + in.length > buffer_capacity) { diff --git a/src/main/java/core/packetproxy/common/CryptUtils.java b/src/main/java/core/packetproxy/common/CryptUtils.java index c13c723d..090dfa45 100644 --- a/src/main/java/core/packetproxy/common/CryptUtils.java +++ b/src/main/java/core/packetproxy/common/CryptUtils.java @@ -126,19 +126,19 @@ public static String encryptECB(String padding, byte[] key, byte[] cipherText) t public static String encryptCBCISO10126(byte [] key, byte [] iv, byte [] input) throws Exception { Cipher cipher = Cipher.getInstance("AES/CBC/ISO10126Padding"); if( iv != null) { - System.out.println("not null"); + Logging.log("not null"); }else{ iv = cipher.getIV(); } IvParameterSpec ivSpec = new IvParameterSpec(iv); - System.out.println("ivSpec="+ivSpec); + Logging.log("ivSpec="+ivSpec); SecretKeySpec keySpec = new SecretKeySpec(key, "AES"); - System.out.println("keySpec="+keySpec); + Logging.log("keySpec="+keySpec); cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); byte[] encrypted = cipher.doFinal(input); byte[] result = new byte[iv.length+encrypted.length]; System.arraycopy(iv, 0, result, 0, iv.length); - System.out.println("iv="+toHex(iv)); + Logging.log("iv="+toHex(iv)); System.arraycopy(encrypted, 0, result, iv.length, encrypted.length); return toHex(result); @@ -151,20 +151,20 @@ public static String encryptCBC(String padding, byte[] key, byte[] iv, byte[] in Cipher cipher = Cipher.getInstance(style); if (iv != null) { - // System.out.println("not null"); + // Logging.log("not null"); } else { iv = cipher.getIV(); } IvParameterSpec ivSpec = new IvParameterSpec(iv); - // System.out.println("ivSpec="+ivSpec); + // Logging.log("ivSpec="+ivSpec); SecretKeySpec keySpec = new SecretKeySpec(key, "AES"); - // System.out.println("keySpec="+keySpec); + // Logging.log("keySpec="+keySpec); cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); byte[] encrypted = cipher.doFinal(input); byte[] result = new byte[iv.length + encrypted.length]; System.arraycopy(iv, 0, result, 0, iv.length); - // System.out.println("iv="+toHex(iv)); + // Logging.log("iv="+toHex(iv)); System.arraycopy(encrypted, 0, result, iv.length, encrypted.length); return toHex(result); @@ -198,7 +198,7 @@ public static String decryptCBCISO10126(byte [] key, byte [] input) throws Excep System.arraycopy(input, 16, cipherByte, 0, input.length-16); IvParameterSpec ivSpec = new IvParameterSpec(iv); cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); - System.out.println(new String(input)); + Logging.log(new String(input)); return new String(cipher.doFinal(cipherByte),"UTF-8"); } @@ -216,7 +216,7 @@ public static String decryptCBC(String padding, byte[] key, byte[] input) throws System.arraycopy(input, 16, cipherByte, 0, input.length - 16); IvParameterSpec ivSpec = new IvParameterSpec(iv); cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); - // System.out.println(new String(input)); + // Logging.log(new String(input)); return new String(cipher.doFinal(cipherByte), "UTF-8"); } diff --git a/src/main/java/core/packetproxy/common/MessagePack.java b/src/main/java/core/packetproxy/common/MessagePack.java index 9a3e8a4c..1841de1a 100644 --- a/src/main/java/core/packetproxy/common/MessagePack.java +++ b/src/main/java/core/packetproxy/common/MessagePack.java @@ -428,8 +428,8 @@ private int getUnsignedIntegerSize(long n) { public static String decode(byte[] input_data) throws Exception { ByteArrayInputStream input = new ByteArrayInputStream(input_data); Map messages = new TreeMap<>(); - // System.out.println("Decode"); - // System.out.println(StringUtils.byteToHex(input_data)); + // Logging.log("Decode"); + // Logging.log(StringUtils.byteToHex(input_data)); decodeData(0, input, messages); // int useLength = input_data.length - input.available(); ObjectMapper mapper = new ObjectMapper(); @@ -448,7 +448,7 @@ public static boolean decodeData(int ordinary, ByteArrayInputStream input, Map messages, ByteArrayOutputStrea boolean fix = Integer.parseInt(keyval[3]) == 1; key = new Key(type, size, fix); } - // System.out.println(key); + // Logging.log(key); switch (key.type) { case Integer : { diff --git a/src/main/java/core/packetproxy/common/StringUtils.java b/src/main/java/core/packetproxy/common/StringUtils.java index 64d3171e..1d9da546 100644 --- a/src/main/java/core/packetproxy/common/StringUtils.java +++ b/src/main/java/core/packetproxy/common/StringUtils.java @@ -92,7 +92,7 @@ public static byte[] hexToByte(byte[] hexa) throws Exception { throw new Exception(I18nString.get("Length of string is not multiples of 2")); } - // System.out.println(hex); + // Logging.log(hex); byte[] bytes = new byte[hex.length() / 2]; for (int index = 0; index < bytes.length; index++) { @@ -226,7 +226,7 @@ public static byte[] binaryReplace(byte[] input, byte[] pattern, byte[] replace) int start = 0; while ((start = binaryFind(input, pattern, start)) > 0) { - // System.out.println("Replace : " + input.length + " : " + start + " : " + new + // Logging.log("Replace : " + input.length + " : " + start + " : " + new // String(byteToHex(pattern)) + " -> " + new String(byteToHex(replace))); for (int j = 0; j < replace.length; j++) { diff --git a/src/main/java/core/packetproxy/common/Utils.java b/src/main/java/core/packetproxy/common/Utils.java index 8358547c..a79d8a63 100644 --- a/src/main/java/core/packetproxy/common/Utils.java +++ b/src/main/java/core/packetproxy/common/Utils.java @@ -177,7 +177,7 @@ private static String[] addRubyPath(String... args) { cmd_array.add(s); // System.out.print(s+ " "); } - // System.out.println(""); + // Logging.log(""); return cmd_array.toArray(new String[0]); } diff --git a/src/main/java/core/packetproxy/gui/ExtendedTextPane.java b/src/main/java/core/packetproxy/gui/ExtendedTextPane.java index e5f924a6..6a136354 100644 --- a/src/main/java/core/packetproxy/gui/ExtendedTextPane.java +++ b/src/main/java/core/packetproxy/gui/ExtendedTextPane.java @@ -102,7 +102,7 @@ public void removeUpdate(DocumentEvent e) { String removed_string = prev_text_panel.substring(e.getOffset(), e.getOffset() + e.getLength()); prev_text_panel = e.getDocument().getText(0, e.getDocument().getLength()); raw_data.remove(before_removed_string.getBytes().length, removed_string.getBytes().length); - // System.out.println(String.format("remove: <%s> %d %d", removed_string, + // Logging.log(String.format("remove: <%s> %d %d", removed_string, // removed_string.getBytes().length, e.getLength())); } catch (Exception e1) { diff --git a/src/main/java/core/packetproxy/gui/GUIHistory.java b/src/main/java/core/packetproxy/gui/GUIHistory.java index a00c9fd0..c792960c 100644 --- a/src/main/java/core/packetproxy/gui/GUIHistory.java +++ b/src/main/java/core/packetproxy/gui/GUIHistory.java @@ -335,7 +335,7 @@ public void tableChanged(TableModelEvent e) { if (e.getType() == TableModelEvent.INSERT) { // List ids = searchFromRequest("google"); - // System.out.println(ids.toString()); + // Logging.log(ids.toString()); } } }); diff --git a/src/main/java/core/packetproxy/gui/GUIPacket.java b/src/main/java/core/packetproxy/gui/GUIPacket.java index ff59e709..5b35bcc9 100644 --- a/src/main/java/core/packetproxy/gui/GUIPacket.java +++ b/src/main/java/core/packetproxy/gui/GUIPacket.java @@ -43,7 +43,7 @@ public class GUIPacket { // String s = "ABgNBHJfb2sAAAJhbANtc2cAB4NoAmEMYQANCg0KeyJlbXB0eSI6N30="; // byte[] data = Base64.getDecoder().decode(s.getBytes()); // byte[] result = gui.prettyFormatJSONInRawData(data, "hoge"); - // System.out.println(new String(result)); + // Logging.log(new String(result)); // } catch (Exception e) { // errWithStackTrace(e); // } diff --git a/src/main/java/core/packetproxy/gui/RawTextPane.java b/src/main/java/core/packetproxy/gui/RawTextPane.java index 1e2f0681..640a0c7a 100644 --- a/src/main/java/core/packetproxy/gui/RawTextPane.java +++ b/src/main/java/core/packetproxy/gui/RawTextPane.java @@ -451,7 +451,7 @@ public void setData(byte[] data) throws Exception { } public byte[] getData() { - // System.out.println(raw_data.toString()); + // Logging.log(raw_data.toString()); return raw_data.toByteArray(); } diff --git a/src/main/java/core/packetproxy/http/Http.java b/src/main/java/core/packetproxy/http/Http.java index c9024938..f5b693eb 100644 --- a/src/main/java/core/packetproxy/http/Http.java +++ b/src/main/java/core/packetproxy/http/Http.java @@ -88,9 +88,9 @@ public static Http createWithoutTouchingContentLength(byte[] data) throws Except * //String test = * "GET /a/b/c.html?abc=h%20oge HTTP/1.1\r\nHost: www.example.com\r\n\r\nbody"; * String test = "HTTP/1.1 100 Continue\r\n\r\n"; - * //System.out.println(test1.length()); + * //Logging.log(test1.length()); * //test1 += "POST /aaa/bbb HTTP/1.1"; - * //System.out.println(test1.length()); + * //Logging.log(test1.length()); * Http http = new Http(test1.getBytes()); * byte[] body = http.getBody(); * util.packetProxyLog(new String(body)); @@ -106,10 +106,10 @@ public static Http createWithoutTouchingContentLength(byte[] data) throws Except * * http.getBodyParamsOrder().stream().forEach(s -> * util.packetProxyLog((map.get(s).toString()))); - * // System.out.println("-----"); - * // System.out.println(new String(http.toByteArray())); - * // System.out.println(parseHttpDelimiter(test1.getBytes())); - * // System.out.println(new String(http.toByteArray())); + * // Logging.log("-----"); + * // Logging.log(new String(http.toByteArray())); + * // Logging.log(parseHttpDelimiter(test1.getBytes())); + * // Logging.log(new String(http.toByteArray())); * * } catch (Exception e) { * errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/http/Https.java b/src/main/java/core/packetproxy/http/Https.java index 41c986e8..20c0951a 100644 --- a/src/main/java/core/packetproxy/http/Https.java +++ b/src/main/java/core/packetproxy/http/Https.java @@ -148,7 +148,7 @@ public static SSLSocket[] createBothSideSSLSockets(Socket clientSocket, InputStr /* case: ALPN is not supported */ if (serverSSLSocket[0] == null) { - // System.out.println("ALPN is not supported: " + serverName); + // Logging.log("ALPN is not supported: " + serverName); Socket serverSocket; if (proxyAddr != null) { diff --git a/src/main/java/core/packetproxy/http2/FrameManager.java b/src/main/java/core/packetproxy/http2/FrameManager.java index e2f3acdb..54d64d3a 100644 --- a/src/main/java/core/packetproxy/http2/FrameManager.java +++ b/src/main/java/core/packetproxy/http2/FrameManager.java @@ -73,12 +73,12 @@ private void analyzeFrame(Frame frame) throws Exception { HeadersFrame headersFrame = (HeadersFrame) frame; headersDataFrames.add(headersFrame); - // System.out.println("HeadersFrame: " + headersFrame); + // Logging.log("HeadersFrame: " + headersFrame); } else if (frame instanceof DataFrame) { DataFrame dataFrame = (DataFrame) frame; headersDataFrames.add(dataFrame); - // System.out.println("DataFrame: " + dataFrame); + // Logging.log("DataFrame: " + dataFrame); } else if (frame instanceof SettingsFrame) { SettingsFrame settingsFrame = (SettingsFrame) frame; @@ -96,7 +96,7 @@ private void analyzeFrame(Frame frame) throws Exception { flag_send_end_settings = true; } } - // System.out.println("SettingsFrame: " + settingsFrame); + // Logging.log("SettingsFrame: " + settingsFrame); // System.out.flush(); } else if (frame instanceof GoawayFrame) { @@ -120,7 +120,7 @@ private void analyzeFrame(Frame frame) throws Exception { PingFrame pingFrame = (PingFrame) frame; controlFrames.add(pingFrame); - // System.out.println("Ping:" + pingFrame); + // Logging.log("Ping:" + pingFrame); // System.out.flush(); } else { diff --git a/src/main/java/core/packetproxy/http2/FramesBase.java b/src/main/java/core/packetproxy/http2/FramesBase.java index 18557ccd..4d990d9a 100644 --- a/src/main/java/core/packetproxy/http2/FramesBase.java +++ b/src/main/java/core/packetproxy/http2/FramesBase.java @@ -85,13 +85,13 @@ public byte[] passThroughServerResponse() throws Exception { public byte[] clientRequestAvailable() throws Exception { List frames = clientFrameManager.readHeadersDataFrames(); - // frames.stream().forEach(frame -> System.out.println("--> * " + frame)); + // frames.stream().forEach(frame -> Logging.log("--> * " + frame)); return passFramesToDecodeClientRequest(frames); } public byte[] serverResponseAvailable() throws Exception { List frames = serverFrameManager.readHeadersDataFrames(); - // frames.stream().forEach(frame -> System.out.println(" * <-- " + frame)); + // frames.stream().forEach(frame -> Logging.log(" * <-- " + frame)); return passFramesToDecodeServerResponse(frames); } @@ -101,7 +101,7 @@ public byte[] decodeClientRequest(byte[] frames) throws Exception { public byte[] encodeClientRequest(byte[] data) throws Exception { byte[] frames = encodeClientRequestToFrames(data); - // FrameUtils.parseFrames(frames).stream().forEach(frame -> System.out.println(" + // FrameUtils.parseFrames(frames).stream().forEach(frame -> Logging.log(" // * --> " + frame)); return frames; } @@ -113,7 +113,7 @@ public byte[] decodeServerResponse(byte[] frames) throws Exception { public byte[] encodeServerResponse(byte[] data) throws Exception { byte[] frames = encodeServerResponseToFrames(data); // FrameUtils.parseFrames(frames).stream().forEach(frame -> - // System.out.println("<-- * " + frame)); + // Logging.log("<-- * " + frame)); return frames; } diff --git a/src/main/java/core/packetproxy/http2/GrpcStreaming.java b/src/main/java/core/packetproxy/http2/GrpcStreaming.java index 1319286e..b2446241 100644 --- a/src/main/java/core/packetproxy/http2/GrpcStreaming.java +++ b/src/main/java/core/packetproxy/http2/GrpcStreaming.java @@ -175,7 +175,7 @@ private byte[] encodeToFrames(byte[] data, HpackEncoder encoder) throws Exceptio boolean isDataFrame = false; for (HeaderField field : http.getHeader().getFields()) { - // System.out.println("header: " + field.getName()); + // Logging.log("header: " + field.getName()); if (field.getName().startsWith("x-trailer-")) { unusedHeaders.add(field.getName()); @@ -192,7 +192,7 @@ private byte[] encodeToFrames(byte[] data, HpackEncoder encoder) throws Exceptio http.removeHeader(name); } - // System.out.println("isDataFrame: " + isDataFrame); + // Logging.log("isDataFrame: " + isDataFrame); if (!isTrailerHeaderFrame && !isDataFrame) { diff --git a/src/main/java/core/packetproxy/http2/frames/HeadersFrame.java b/src/main/java/core/packetproxy/http2/frames/HeadersFrame.java index 6a8b3269..41969aca 100644 --- a/src/main/java/core/packetproxy/http2/frames/HeadersFrame.java +++ b/src/main/java/core/packetproxy/http2/frames/HeadersFrame.java @@ -232,7 +232,7 @@ private void decodeToHttp(HpackDecoder decoder) throws Exception { if (meta instanceof Request) { - // System.out.println("# meta.request: " + meta); + // Logging.log("# meta.request: " + meta); bRequest = true; Request req = (Request) meta; method = req.getMethod(); @@ -246,7 +246,7 @@ private void decodeToHttp(HpackDecoder decoder) throws Exception { } else if (meta instanceof Response) { - // System.out.println("# meta.response: " + meta); + // Logging.log("# meta.response: " + meta); bResponse = true; Response res = (Response) meta; status = res.getStatus(); diff --git a/src/main/java/core/packetproxy/http2/frames/SettingsFrame.java b/src/main/java/core/packetproxy/http2/frames/SettingsFrame.java index 97f4432a..35045e86 100644 --- a/src/main/java/core/packetproxy/http2/frames/SettingsFrame.java +++ b/src/main/java/core/packetproxy/http2/frames/SettingsFrame.java @@ -55,7 +55,7 @@ private void parsePayload() throws Exception { int data = bb.getInt(); values.put(type, data); } - // System.out.println(String.format("%s: %d", type, data)); + // Logging.log(String.format("%s: %d", type, data)); } } diff --git a/src/main/java/core/packetproxy/model/CAFactory.java b/src/main/java/core/packetproxy/model/CAFactory.java index 0d3cfc90..365d79e5 100644 --- a/src/main/java/core/packetproxy/model/CAFactory.java +++ b/src/main/java/core/packetproxy/model/CAFactory.java @@ -36,17 +36,17 @@ public class CAFactory { // public static void main(String[] args) { - // CAFactory.queryAll().stream().forEach(ca -> System.out.println(ca)); - // System.out.println("----"); - // CAFactory.find("PacketProxy CA").ifPresent(ca -> System.out.println(ca)); - // CAFactory.find("PacketProxy CA2").ifPresent(ca -> System.out.println(ca)); - // System.out.println("----"); + // CAFactory.queryAll().stream().forEach(ca -> Logging.log(ca)); + // Logging.log("----"); + // CAFactory.find("PacketProxy CA").ifPresent(ca -> Logging.log(ca)); + // CAFactory.find("PacketProxy CA2").ifPresent(ca -> Logging.log(ca)); + // Logging.log("----"); // CA a = CAFactory.find("PacketProxy CA").get(); // CA b = CAFactory.find("PacketProxy CA").get(); - // System.out.println(a == b); + // Logging.log(a == b); // String c = CAFactory.find("PacketProxy CA2").map(s -> { - // System.out.println(s); return "ok";}).orElse("Error"); - // System.out.println(c); + // Logging.log(s); return "ok";}).orElse("Error"); + // Logging.log(c); // } private static final Class ca_class = packetproxy.model.CAs.CA.class; diff --git a/src/main/java/core/packetproxy/model/Diff.java b/src/main/java/core/packetproxy/model/Diff.java index 8636cb9a..d42728ab 100644 --- a/src/main/java/core/packetproxy/model/Diff.java +++ b/src/main/java/core/packetproxy/model/Diff.java @@ -32,18 +32,18 @@ public class Diff extends DiffBase { // diff.markAsTarget("hello\nworld\nhoge".getBytes()); // diff.diff(new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig DEL: %d %d", pos, length)); } + // Logging.log(String.format("Orig DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig INS: %d %d", pos, length)); } + // Logging.log(String.format("Orig INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig CHG: %d %d", pos, length)); } + // Logging.log(String.format("Orig CHG: %d %d", pos, length)); } // }, new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ DEL: %d %d", pos, length)); } + // Logging.log(String.format("Targ DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ INS: %d %d", pos, length)); } + // Logging.log(String.format("Targ INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ CHG: %d %d", pos, length)); } + // Logging.log(String.format("Targ CHG: %d %d", pos, length)); } // }); // } catch (Exception e) { // errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/model/DiffBase.java b/src/main/java/core/packetproxy/model/DiffBase.java index 19b60fb0..aaf0da1d 100644 --- a/src/main/java/core/packetproxy/model/DiffBase.java +++ b/src/main/java/core/packetproxy/model/DiffBase.java @@ -28,18 +28,18 @@ public abstract class DiffBase { // diff.markAsTarget("hello\nworld\nhoge".getBytes()); // diff.diff(new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig DEL: %d %d", pos, length)); } + // Logging.log(String.format("Orig DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig INS: %d %d", pos, length)); } + // Logging.log(String.format("Orig INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig CHG: %d %d", pos, length)); } + // Logging.log(String.format("Orig CHG: %d %d", pos, length)); } // }, new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ DEL: %d %d", pos, length)); } + // Logging.log(String.format("Targ DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ INS: %d %d", pos, length)); } + // Logging.log(String.format("Targ INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ CHG: %d %d", pos, length)); } + // Logging.log(String.format("Targ CHG: %d %d", pos, length)); } // }); // } catch (Exception e) { // errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/model/DiffBinary.java b/src/main/java/core/packetproxy/model/DiffBinary.java index 38e3c7ec..1a3d590d 100644 --- a/src/main/java/core/packetproxy/model/DiffBinary.java +++ b/src/main/java/core/packetproxy/model/DiffBinary.java @@ -32,18 +32,18 @@ public class DiffBinary extends DiffBase { // diff.markAsTarget("hello\nworld\nhoge".getBytes()); // diff.diff(new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig DEL: %d %d", pos, length)); } + // Logging.log(String.format("Orig DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig INS: %d %d", pos, length)); } + // Logging.log(String.format("Orig INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig CHG: %d %d", pos, length)); } + // Logging.log(String.format("Orig CHG: %d %d", pos, length)); } // }, new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ DEL: %d %d", pos, length)); } + // Logging.log(String.format("Targ DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ INS: %d %d", pos, length)); } + // Logging.log(String.format("Targ INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ CHG: %d %d", pos, length)); } + // Logging.log(String.format("Targ CHG: %d %d", pos, length)); } // }); // } catch (Exception e) { // errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/model/DiffJson.java b/src/main/java/core/packetproxy/model/DiffJson.java index c091f191..eb7a9642 100644 --- a/src/main/java/core/packetproxy/model/DiffJson.java +++ b/src/main/java/core/packetproxy/model/DiffJson.java @@ -32,18 +32,18 @@ public class DiffJson extends DiffBase { // diff.markAsTarget("hello\nworld\nhoge".getBytes()); // diff.diff(new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig DEL: %d %d", pos, length)); } + // Logging.log(String.format("Orig DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig INS: %d %d", pos, length)); } + // Logging.log(String.format("Orig INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Orig CHG: %d %d", pos, length)); } + // Logging.log(String.format("Orig CHG: %d %d", pos, length)); } // }, new DiffEventAdapter() { // @Override public void foundDelDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ DEL: %d %d", pos, length)); } + // Logging.log(String.format("Targ DEL: %d %d", pos, length)); } // @Override public void foundInsDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ INS: %d %d", pos, length)); } + // Logging.log(String.format("Targ INS: %d %d", pos, length)); } // @Override public void foundChgDelta(int pos, int length) throws Exception { - // System.out.println(String.format("Targ CHG: %d %d", pos, length)); } + // Logging.log(String.format("Targ CHG: %d %d", pos, length)); } // }); // } catch (Exception e) { // errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/model/Filters.java b/src/main/java/core/packetproxy/model/Filters.java index f7051631..04cf19a3 100644 --- a/src/main/java/core/packetproxy/model/Filters.java +++ b/src/main/java/core/packetproxy/model/Filters.java @@ -139,7 +139,7 @@ public void propertyChange(PropertyChangeEvent evt) { private boolean isLatestVersion() throws Exception { String result = dao.queryRaw("SELECT sql FROM sqlite_master WHERE name='filters'").getFirstResult()[0]; - // System.out.println(result); + // Logging.log(result); return result.equals( "CREATE TABLE `filters` (`id` INTEGER PRIMARY KEY AUTOINCREMENT , `name` VARCHAR , `filter` VARCHAR , UNIQUE (`name`))"); } diff --git a/src/main/java/core/packetproxy/model/InterceptOptions.java b/src/main/java/core/packetproxy/model/InterceptOptions.java index 892d3eab..283e3395 100644 --- a/src/main/java/core/packetproxy/model/InterceptOptions.java +++ b/src/main/java/core/packetproxy/model/InterceptOptions.java @@ -335,7 +335,7 @@ public void propertyChange(PropertyChangeEvent evt) { private boolean isLatestVersion() throws Exception { String result = dao.queryRaw("SELECT sql FROM sqlite_master WHERE name='interceptOptions'").getFirstResult()[0]; - // System.out.println(result); + // Logging.log(result); return result.equals( "CREATE TABLE `interceptOptions` (`id` INTEGER PRIMARY KEY AUTOINCREMENT , `enabled` BOOLEAN , `direction` VARCHAR , `type` VARCHAR , `relationship` VARCHAR , `method` VARCHAR , `pattern` VARCHAR , `server_id` INTEGER , UNIQUE (`direction`,`type`,`relationship`,`method`,`pattern`,`server_id`) )"); } diff --git a/src/main/java/core/packetproxy/model/Modifications.java b/src/main/java/core/packetproxy/model/Modifications.java index a7f82ae4..7faa7a26 100644 --- a/src/main/java/core/packetproxy/model/Modifications.java +++ b/src/main/java/core/packetproxy/model/Modifications.java @@ -204,7 +204,7 @@ public void propertyChange(PropertyChangeEvent evt) { private boolean isLatestVersion() throws Exception { String result = dao.queryRaw("SELECT sql FROM sqlite_master WHERE name='modifications'").getFirstResult()[0]; - // System.out.println(result); + // Logging.log(result); return result.equals( "CREATE TABLE `modifications` (`id` INTEGER PRIMARY KEY AUTOINCREMENT , `enabled` BOOLEAN , `server_id` INTEGER , `direction` VARCHAR , `pattern` VARCHAR , `method` VARCHAR , `replaced` VARCHAR , UNIQUE (`server_id`,`direction`,`pattern`,`method`) )"); } diff --git a/src/main/java/core/packetproxy/model/Packets.java b/src/main/java/core/packetproxy/model/Packets.java index b68f713b..3da16152 100644 --- a/src/main/java/core/packetproxy/model/Packets.java +++ b/src/main/java/core/packetproxy/model/Packets.java @@ -244,7 +244,7 @@ public void handleDatabaseMessage(DatabaseMessage message) { private boolean isLatestVersion() throws Exception { String result = dao.queryRaw("SELECT sql FROM sqlite_master WHERE name='packets'").getFirstResult()[0]; - // System.out.println(result); + // Logging.log(result); return result.equals( "CREATE TABLE `packets` (`id` INTEGER PRIMARY KEY AUTOINCREMENT , `direction` VARCHAR , `decoded_data` BLOB , `modified_data` BLOB , `sent_data` BLOB , `received_data` BLOB , `listen_port` INTEGER , `client_ip` VARCHAR , `client_port` INTEGER , `server_ip` VARCHAR , `server_name` VARCHAR , `server_port` INTEGER , `use_ssl` BOOLEAN , `content_type` VARCHAR , `encoder_name` VARCHAR , `alpn` VARCHAR , `modified` BOOLEAN , `resend` BOOLEAN , `date` BIGINT , `conn` INTEGER , `group` BIGINT , `color` VARCHAR )"); } diff --git a/src/main/java/core/packetproxy/quic/service/handshake/ServerHandshake.java b/src/main/java/core/packetproxy/quic/service/handshake/ServerHandshake.java index ba1e9cb1..f53ffbc0 100644 --- a/src/main/java/core/packetproxy/quic/service/handshake/ServerHandshake.java +++ b/src/main/java/core/packetproxy/quic/service/handshake/ServerHandshake.java @@ -180,20 +180,20 @@ class MyTlsStatusEventHandler implements TlsStatusEventHandler { @Override public void earlySecretsKnown() { - // System.out.println("earlySecretsKnown"); + // Logging.log("earlySecretsKnown"); conn.getKeys().computeZeroRttKey(engine.getClientEarlyTrafficSecret()); } @Override public void handshakeSecretsKnown() { - // System.out.println("handshakeSecretsKnown"); + // Logging.log("handshakeSecretsKnown"); conn.getKeys().computeHandshakeKey(engine.getClientHandshakeTrafficSecret(), engine.getServerHandshakeTrafficSecret()); } @Override public void handshakeFinished() { - // System.out.println("handshakeFinished"); + // Logging.log("handshakeFinished"); conn.getKeys().computeApplicationKey(engine.getClientApplicationTrafficSecret(), engine.getServerApplicationTrafficSecret()); conn.getKeys().discardInitialKey(); @@ -204,7 +204,7 @@ public void handshakeFinished() { @Override public void newSessionTicketReceived(NewSessionTicket ticket) { - // System.out.println("newSessionTicketReceived"); + // Logging.log("newSessionTicketReceived"); } @Override @@ -236,7 +236,7 @@ public void extensionsReceived(List extensions) throws TlsProtocolExc @Override public boolean isEarlyDataAccepted() { - // System.out.println("isEarlyDataAccepted"); + // Logging.log("isEarlyDataAccepted"); return false; } } diff --git a/src/main/java/core/packetproxy/util/SearchBox.java b/src/main/java/core/packetproxy/util/SearchBox.java index 8d32a93d..5b1858b5 100644 --- a/src/main/java/core/packetproxy/util/SearchBox.java +++ b/src/main/java/core/packetproxy/util/SearchBox.java @@ -222,8 +222,8 @@ public void coloringHTTPText() { document.setCharacterAttributes(key_start, key.length(), attributes, false); javax.swing.text.StyleConstants.setForeground(attributes, java.awt.Color.red); document.setCharacterAttributes(value_start, value.length(), attributes, false); - // System.out.println("key = " + key); - // System.out.println("value = " + value); + // Logging.log("key = " + key); + // Logging.log("value = " + value); } } diff --git a/src/main/java/core/packetproxy/websocket/WebSocket.java b/src/main/java/core/packetproxy/websocket/WebSocket.java index 75e4504f..d4dc5191 100644 --- a/src/main/java/core/packetproxy/websocket/WebSocket.java +++ b/src/main/java/core/packetproxy/websocket/WebSocket.java @@ -46,7 +46,7 @@ public byte[] passThroughFrame() throws Exception { if (frame.getOpcode() != OpCode.Text && frame.getOpcode() != OpCode.Binary) { passBytes.write(frame.getBytes()); - // System.out.println("pass through: " + frame); + // Logging.log("pass through: " + frame); return false; } return true; diff --git a/src/test/java/packetproxy/http2/FrameManagerTest.java b/src/test/java/packetproxy/http2/FrameManagerTest.java index 0329f850..cd061807 100644 --- a/src/test/java/packetproxy/http2/FrameManagerTest.java +++ b/src/test/java/packetproxy/http2/FrameManagerTest.java @@ -42,7 +42,7 @@ public void parseRequestFramesTest() throws Exception { h2.write(settingsFrame); for (Frame frame : FrameUtils.parseFrames(requestFrames)) { - System.out.println(frame.toString()); + Logging.log(frame.toString()); } } @@ -52,7 +52,7 @@ public void parseResponseFramesTest() throws Exception { h2.write(settingsFrame); for (Frame frame : FrameUtils.parseFrames(responseFrames)) { - System.out.println(frame.toString()); + Logging.log(frame.toString()); } } diff --git a/src/test/java/packetproxy/http2/frames/FrameTest.java b/src/test/java/packetproxy/http2/frames/FrameTest.java index d73b1741..9c46e229 100644 --- a/src/test/java/packetproxy/http2/frames/FrameTest.java +++ b/src/test/java/packetproxy/http2/frames/FrameTest.java @@ -25,7 +25,7 @@ public void extraTest() throws Exception { byte[] frameData = Hex.decodeHex("00000e0148000000010000000541414141414242424242".toCharArray()); Frame frame = new Frame(frameData); byte[] bbbbb = frame.getExtra(); - System.out.println(new String(bbbbb)); + Logging.log(new String(bbbbb)); } @Test @@ -33,7 +33,7 @@ public void removeExtraTest() throws Exception { byte[] frameData = Hex.decodeHex("00000e0148000000010000000541414141414242424242".toCharArray()); Frame frame = new Frame(frameData); frame.removeExtra(); - System.out.println(new String(Hex.encodeHex(frame.toByteArray()))); + Logging.log(new String(Hex.encodeHex(frame.toByteArray()))); } @Test @@ -42,7 +42,7 @@ public void saveExtraTest() throws Exception { Frame frame = new Frame(frameData); frame.removeExtra(); frame.saveExtra("0123456789".getBytes()); - System.out.println(new String(Hex.encodeHex(frame.toByteArray()))); + Logging.log(new String(Hex.encodeHex(frame.toByteArray()))); } @Test @@ -51,6 +51,6 @@ public void toByteArrayWithExtraDataTest() throws Exception { Frame frame = new Frame(frameData); frame.removeExtra(); frame.saveExtra("0123456789".getBytes()); - System.out.println(new String(Hex.encodeHex(frame.toByteArrayWithoutExtra()))); + Logging.log(new String(Hex.encodeHex(frame.toByteArrayWithoutExtra()))); } } diff --git a/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java b/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java index e63d22a4..e6d51b9a 100644 --- a/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java +++ b/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java @@ -38,7 +38,7 @@ public void test() throws Exception { byte[] frame = Hex .decodeHex("00001B010500000001828487418798E79A82AE43D37A8825B650C3ABB6D2E053032A2F2A".toCharArray()); HeadersFrame fb = new HeadersFrame(frame, decoder); - System.out.println(fb.toString()); + Logging.log(fb.toString()); } @Test @@ -46,7 +46,7 @@ public void toHttp1Test() throws Exception { byte[] frame = Hex .decodeHex("00001B010500000001828487418798E79A82AE43D37A8825B650C3ABB6D2E053032A2F2A".toCharArray()); HeadersFrame fb = new HeadersFrame(frame, decoder); - System.out.println(new String(fb.getHttp())); + Logging.log(new String(fb.getHttp())); } @Test @@ -57,8 +57,8 @@ public void constructorHttpTest() throws Exception { byte[] b = fb.getHttp(); Http http = Http.create(b); HeadersFrame fb2 = new HeadersFrame(http); - System.out.println(fb); - System.out.println(fb2); + Logging.log(fb); + Logging.log(fb2); } @Test @@ -70,11 +70,11 @@ public void constructorHttpTest2() throws Exception { byte[] b = fb.getHttp(); Http http = Http.create(b); HeadersFrame fb2 = new HeadersFrame(http); - System.out.println(frame.length); - System.out.println(fb); - System.out.println(fb2); - System.out.println(new String(Hex.encodeHex(fb2.toByteArray()))); - System.out.println(new String(Hex.encodeHex(fb2.toByteArrayWithoutExtra(encoder)))); + Logging.log(frame.length); + Logging.log(fb); + Logging.log(fb2); + Logging.log(new String(Hex.encodeHex(fb2.toByteArray()))); + Logging.log(new String(Hex.encodeHex(fb2.toByteArrayWithoutExtra(encoder)))); } @Test @@ -87,7 +87,7 @@ public void bigData() throws Exception { bb.put(a); bb.flip(); MetaData m = decoder.decode(bb); - System.out.println(m); + Logging.log(m); } @Test @@ -97,7 +97,7 @@ public void extraDataTest() throws Exception { .toCharArray()); HpackDecoder decoder = new HpackDecoder(65535, 65535); HeadersFrame headerFrame = new HeadersFrame(frameData, decoder); - System.out.println(new String(headerFrame.getExtra())); + Logging.log(new String(headerFrame.getExtra())); } @Test @@ -107,6 +107,6 @@ public void initHttpTest() throws Exception { .toCharArray()); HpackDecoder decoder = new HpackDecoder(65535, 65535); HeadersFrame headerFrame = new HeadersFrame(frameData, decoder); - System.out.println(new String(headerFrame.getExtra())); + Logging.log(new String(headerFrame.getExtra())); } } diff --git a/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java b/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java index 7d1a3554..cfe499b1 100644 --- a/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java +++ b/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java @@ -24,6 +24,6 @@ public class SettingsFrameTest { public void smoke() throws Exception { byte[] data = Hex.decodeHex("000012040000000000000300000064000400100000000600004000".toCharArray()); SettingsFrame sf = new SettingsFrame(data); - System.out.println(sf); + Logging.log(sf); } } diff --git a/src/test/java/packetproxy/http3/QpackTest.java b/src/test/java/packetproxy/http3/QpackTest.java index a38e9d28..416a869c 100644 --- a/src/test/java/packetproxy/http3/QpackTest.java +++ b/src/test/java/packetproxy/http3/QpackTest.java @@ -41,18 +41,18 @@ public void smoke() throws Exception { ByteBuffer buffer = ByteBuffer.allocate(1024); encoder.encode(buffer, 0x0, new MetaData(HttpVersion.HTTP_3, httpFields)); buffer.flip(); - System.out.println(new Binary(SimpleBytes.parse(buffer, buffer.remaining()).getBytes()).toHexString()); + Logging.log(new Binary(SimpleBytes.parse(buffer, buffer.remaining()).getBytes()).toHexString()); buffer.clear(); encoder.encode(buffer, 0xb, new MetaData(HttpVersion.HTTP_3, httpFields)); buffer.flip(); - System.out.println(new Binary(SimpleBytes.parse(buffer, buffer.remaining()).getBytes()).toHexString()); + Logging.log(new Binary(SimpleBytes.parse(buffer, buffer.remaining()).getBytes()).toHexString()); ByteArrayOutputStream encoderInsts = new ByteArrayOutputStream(); lease.getByteBuffers().forEach(rethrow(inst -> { encoderInsts.write(SimpleBytes.parse(inst, inst.remaining()).getBytes()); })); - System.out.println("send: QpackEncoder Instructions: " + Hex.encodeHexString(encoderInsts.toByteArray())); + Logging.log("send: QpackEncoder Instructions: " + Hex.encodeHexString(encoderInsts.toByteArray())); } @Test @@ -86,26 +86,26 @@ public void smoke() throws Exception { lease.getByteBuffers().forEach(rethrow(inst -> { encoderInsts.write(SimpleBytes.parse(inst, inst.remaining()).getBytes()); })); - System.out.println("send: QpackEncoder Instructions: " + Hex.encodeHexString(encoderInsts.toByteArray())); - System.out.println("send: HEADERS frame data: " + Hex.encodeHexString(HeadersBytes)); + Logging.log("send: QpackEncoder Instructions: " + Hex.encodeHexString(encoderInsts.toByteArray())); + Logging.log("send: HEADERS frame data: " + Hex.encodeHexString(HeadersBytes)); /* processing by Decoder */ decoder.parseInstructions(ByteBuffer.wrap(encoderInsts.toByteArray())); decoder.decode(0, ByteBuffer.wrap(HeadersBytes), (streamId, metadata) -> { - System.out.println("streamId: " + streamId + ", meta: " + metadata); + Logging.log("streamId: " + streamId + ", meta: " + metadata); assertThat(httpFields.asImmutable()).isEqualTo(metadata.getFields()); }); ByteArrayOutputStream decoderInsts = new ByteArrayOutputStream(); lease2.getByteBuffers().forEach(rethrow(inst -> { decoderInsts.write(SimpleBytes.parse(inst, inst.remaining()).getBytes()); })); - System.out.println("resp: QpackDecoder Instructions: " + Hex.encodeHexString(decoderInsts.toByteArray())); + Logging.log("resp: QpackDecoder Instructions: " + Hex.encodeHexString(decoderInsts.toByteArray())); /* comparing internal contexts in Encoder and Decoder */ - System.out.println("encoder before: " + encoder.dump()); + Logging.log("encoder before: " + encoder.dump()); encoder.parseInstructions(ByteBuffer.wrap(decoderInsts.toByteArray())); - System.out.println("encoder after: " + encoder.dump()); - System.out.println("decoder: " + decoder.dump()); + Logging.log("encoder after: " + encoder.dump()); + Logging.log("decoder: " + decoder.dump()); } @Test @@ -122,6 +122,6 @@ public void MetaDataTest() throws Exception { MetaData md = new MetaData.Request(http.getMethod(), HttpURI.from("https://localhost/"), HttpVersion.HTTP_3, jettyHttpFields); - System.out.println(md); + Logging.log(md); } } diff --git a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java index e71d5355..c0a4baac 100644 --- a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java +++ b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java @@ -39,7 +39,7 @@ class Http3HeaderEncoderDecoderTest { decoder.putInstructions(headerInsts); decoder.decode(0, headerEncoded).forEach(outputHeader -> { HttpFields fields = outputHeader.getFields(); - System.out.println(fields); + Logging.log(fields); }); byte[] headerInstsFromDecoder = decoder.getInstructions(); @@ -57,10 +57,10 @@ class Http3HeaderEncoderDecoderTest { @Test public void capacityのデバッグ() { - System.out.println(Hex.encodeHexString(new Http3HeaderEncoder(0).getInstructions())); - System.out.println(Hex.encodeHexString(new Http3HeaderEncoder(1).getInstructions())); - System.out.println(Hex.encodeHexString(new Http3HeaderEncoder(10).getInstructions())); - System.out.println(Hex.encodeHexString(new Http3HeaderEncoder(1000).getInstructions())); + Logging.log(Hex.encodeHexString(new Http3HeaderEncoder(0).getInstructions())); + Logging.log(Hex.encodeHexString(new Http3HeaderEncoder(1).getInstructions())); + Logging.log(Hex.encodeHexString(new Http3HeaderEncoder(10).getInstructions())); + Logging.log(Hex.encodeHexString(new Http3HeaderEncoder(1000).getInstructions())); } @Test diff --git a/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java b/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java index b2ae18d1..3f67cdcf 100644 --- a/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java +++ b/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java @@ -62,6 +62,6 @@ class SettingsFrameTest { assertThat(frames.size()).isEqualTo(2); assertThat(frames.get(0)).isInstanceOf(SettingsFrame.class); assertThat(frames.get(1)).isInstanceOf(GreaseFrame.class); - System.out.println(frames); + Logging.log(frames); } } diff --git a/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java b/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java index d7a57499..71bdc1b6 100644 --- a/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java +++ b/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java @@ -30,7 +30,7 @@ public void smoke() throws Exception { "0039005505048020000004048010000008024201010480007530030245a00902420106048001006307048000ffff0e01080b010a0f087c67f19599d5b680537b0480004fb0c0000000ff02de1a0243e88000715801036ab200" .toCharArray()); TransportParameters params = new TransportParameters(Constants.Role.CLIENT, test); - System.out.println(params); + Logging.log(params); assertEquals(2097152, params.getInitMaxStreamDataBidiLocal()); assertEquals(1048576, params.getInitMaxData()); } diff --git a/src/test/java/packetproxy/quic/value/QuicMessagesTest.java b/src/test/java/packetproxy/quic/value/QuicMessagesTest.java index cffbbacd..8b34ac21 100644 --- a/src/test/java/packetproxy/quic/value/QuicMessagesTest.java +++ b/src/test/java/packetproxy/quic/value/QuicMessagesTest.java @@ -52,7 +52,7 @@ void before() { @Test void forEachが動作すること() { this.msgs.forEach(msg -> { - System.out.println(msg); + Logging.log(msg); }); } diff --git a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java index eac00419..6957ed68 100644 --- a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java +++ b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java @@ -84,11 +84,11 @@ void parseEightBytes() throws Exception { @Test void parseExampleBytes() throws Exception { - System.out.println(VariableLengthInteger.parse(Hex.decodeHex("80200000".toCharArray()))); /* 2MB */ - System.out.println(VariableLengthInteger.parse(Hex.decodeHex("80100000".toCharArray()))); /* 1MB */ - System.out.println(VariableLengthInteger.parse(Hex.decodeHex("4201".toCharArray()))); /* 513 */ - System.out.println(VariableLengthInteger.parse(Hex.decodeHex("4077".toCharArray()))); /* 119 */ - System.out.println(VariableLengthInteger.parse(Hex.decodeHex("58cb".toCharArray()))); /* 6347 */ + Logging.log(VariableLengthInteger.parse(Hex.decodeHex("80200000".toCharArray()))); /* 2MB */ + Logging.log(VariableLengthInteger.parse(Hex.decodeHex("80100000".toCharArray()))); /* 1MB */ + Logging.log(VariableLengthInteger.parse(Hex.decodeHex("4201".toCharArray()))); /* 513 */ + Logging.log(VariableLengthInteger.parse(Hex.decodeHex("4077".toCharArray()))); /* 119 */ + Logging.log(VariableLengthInteger.parse(Hex.decodeHex("58cb".toCharArray()))); /* 6347 */ System.out.printf("%x\n", VariableLengthInteger.parse(Hex.decodeHex("f684f228323451e8".toCharArray())) .getValue()); /* 3684f228323451e8 */ System.out.printf("%x\n", VariableLengthInteger.parse(Hex.decodeHex("00".toCharArray())).getValue()); /* 0 */ diff --git a/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java b/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java index 4d3988f0..00f0f1c5 100644 --- a/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java +++ b/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java @@ -30,7 +30,7 @@ class CryptoFrameTest { "060040f1010000ed0303ebf8fa56f12939b9584a3896472ec40bb863cfd3e86804fe3a47f06a2b69484c00000413011302010000c000000010000e00000b6578616d706c652e636f6dff01000100000a00080006001d0017001800100007000504616c706e000500050100000000003300260024001d00209370b2c9caa47fbabaf4559fedba753de171fa71f50f1ce15d43e994ec74d748002b0003020304000d0010000e0403050306030203080408050806002d00020101001c00024001003900320408ffffffffffffffff05048000ffff07048000ffff0801100104800075300901100f088394c8f03e51570806048000ffff" .toCharArray()); CryptoFrame cryptoFrame = CryptoFrame.parse(testData); - System.out.println(cryptoFrame); + Logging.log(cryptoFrame); assertArrayEquals(testData, cryptoFrame.getBytes()); } diff --git a/src/test/java/packetproxy/quic/value/frame/FramesTest.java b/src/test/java/packetproxy/quic/value/frame/FramesTest.java index e2e10ddd..9f4aebf8 100644 --- a/src/test/java/packetproxy/quic/value/frame/FramesTest.java +++ b/src/test/java/packetproxy/quic/value/frame/FramesTest.java @@ -48,7 +48,7 @@ public void serverHelloSample() throws Exception { assertTrue(frames.get(2) instanceof PaddingFrame); for (Frame frame : frames) { - System.out.println(frame.toString()); + Logging.log(frame.toString()); } } } diff --git a/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java b/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java index d3e74eaa..41713fe0 100644 --- a/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java +++ b/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java @@ -32,7 +32,7 @@ public void smoke() throws Exception { byte[] data = frame.getBytes(); NewConnectionIdFrame frame2 = NewConnectionIdFrame.parse(data); - System.out.println(frame2); + Logging.log(frame2); assertThat(frame).isEqualTo(frame2); } } diff --git a/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java b/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java index eb3a42d9..66686715 100644 --- a/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java +++ b/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java @@ -46,7 +46,7 @@ class InitialPacketTest { InitialKey serverInitialKey = InitialKey.of(Role.SERVER, LongHeaderPacket.getDestConnId(clientReqBuffer)); InitialPacket ipCli = new InitialPacket(ByteBuffer.wrap(clientReq), clientInitialKey, PacketNumber.Infinite); - System.out.println(ipCli); + Logging.log(ipCli); InitialPacket ipServ = new InitialPacket(ByteBuffer.wrap(serverRes), serverInitialKey, PacketNumber.Infinite); assertTrue(ipCli.getPayload().length > 0); @@ -69,8 +69,8 @@ class InitialPacketTest { InitialPacket ipCli = new InitialPacket(ByteBuffer.wrap(clientReq), clientInitialKey, PacketNumber.Infinite); InitialPacket ipServ = new InitialPacket(ByteBuffer.wrap(serverRes), serverInitialKey, PacketNumber.Infinite); - System.out.println(ipCli); - System.out.println(ipServ); + Logging.log(ipCli); + Logging.log(ipServ); assertTrue(ipCli.getPayload().length > 0); assertTrue(ipServ.getPayload().length > 0); @@ -86,7 +86,7 @@ class InitialPacketTest { InitialKey clientInitialKey = InitialKey.of(Role.CLIENT, LongHeaderPacket.getDestConnId(clientReqBuffer)); InitialPacket ipCli = new InitialPacket(ByteBuffer.wrap(clientReq), clientInitialKey, PacketNumber.Infinite); - System.out.println(ipCli); + Logging.log(ipCli); assertTrue(ipCli.getPayload().length > 0); } diff --git a/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java b/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java index 2ee9adad..384d8baa 100644 --- a/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java +++ b/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java @@ -8,6 +8,6 @@ class DisableActiveMigrationParameterTest { @Test public void smoke() { DisableActiveMigrationParameter param = new DisableActiveMigrationParameter(); - System.out.println(Hex.encodeHexString(param.getBytes())); + Logging.log(Hex.encodeHexString(param.getBytes())); } } From e130768073ba9d2e6bb32f3addda784eac943991 Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Thu, 18 Dec 2025 10:14:12 +0900 Subject: [PATCH 4/7] update: System.err.println to Logging.err --- src/main/java/core/packetproxy/Simplex.java | 8 ++++---- src/main/java/core/packetproxy/common/StringUtils.java | 8 ++++---- src/main/java/core/packetproxy/gui/GUIHistoryBinary.java | 2 +- src/main/java/core/packetproxy/util/SearchBox.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/core/packetproxy/Simplex.java b/src/main/java/core/packetproxy/Simplex.java index 5c00294b..07de3a38 100644 --- a/src/main/java/core/packetproxy/Simplex.java +++ b/src/main/java/core/packetproxy/Simplex.java @@ -208,11 +208,11 @@ public Integer call() throws Exception { ret = in.read(input_data); } catch (SSLException e) { - // System.err.println(String.format("SSLException: %s", e.getMessage())); + // Logging.err(String.format("SSLException: %s", e.getMessage())); ret = -1; // should be finished } catch (SocketException e) { - // System.err.println(String.format("SocketException: %s", e.getMessage())); + // Logging.err(String.format("SocketException: %s", e.getMessage())); ret = -1; // should be finished } return ret; @@ -279,10 +279,10 @@ public Integer call() throws Exception { } } catch (SSLException e) { - // System.err.println(String.format("SSLException: %s", e.getMessage())); + // Logging.err(String.format("SSLException: %s", e.getMessage())); } catch (SocketException e) { - // System.err.println(String.format("SocketException: %s", e.getMessage())); + // Logging.err(String.format("SocketException: %s", e.getMessage())); } catch (Exception e) { errWithStackTrace(e); diff --git a/src/main/java/core/packetproxy/common/StringUtils.java b/src/main/java/core/packetproxy/common/StringUtils.java index 1d9da546..9bec0ada 100644 --- a/src/main/java/core/packetproxy/common/StringUtils.java +++ b/src/main/java/core/packetproxy/common/StringUtils.java @@ -169,7 +169,7 @@ public static byte[] pseudoBinaryPatternReplace(byte[] input, String regex, Stri String matched = matcher.group(0); int from = pseudoString.indexOf(matched); - // System.err.println("Match! : " + pseudoString.length() + " : " + from + " : " + // Logging.err("Match! : " + pseudoString.length() + " : " + from + " : " // + regex + " : " + pseudoString); byte[] tmp_result = new byte[matched.length()]; for (int i = 0; i < matched.length(); ++i) { @@ -177,11 +177,11 @@ public static byte[] pseudoBinaryPatternReplace(byte[] input, String regex, Stri tmp_result[i] = input[from + i]; } result.write(input, 0, from); - // System.err.println(result); + // Logging.err(result); result.write(replace.getBytes(), 0, replace.getBytes().length); - // System.err.println(result); + // Logging.err(result); result.write(input, from + matched.length(), input.length - (from + matched.length())); - // System.err.println(result); + // Logging.err(result); } return result.toByteArray(); } diff --git a/src/main/java/core/packetproxy/gui/GUIHistoryBinary.java b/src/main/java/core/packetproxy/gui/GUIHistoryBinary.java index 13b4f8cc..a6e8161c 100644 --- a/src/main/java/core/packetproxy/gui/GUIHistoryBinary.java +++ b/src/main/java/core/packetproxy/gui/GUIHistoryBinary.java @@ -252,7 +252,7 @@ public int coloringSearchBinary() { String str = hex_text.getText(); if (str.length() > 1000000) { - // System.err.println("[Warning] coloringSearchBinary: too long string. Skipping + // Logging.err("[Warning] coloringSearchBinary: too long string. Skipping // Highlight"); return -1; } diff --git a/src/main/java/core/packetproxy/util/SearchBox.java b/src/main/java/core/packetproxy/util/SearchBox.java index 5b1858b5..f2081139 100644 --- a/src/main/java/core/packetproxy/util/SearchBox.java +++ b/src/main/java/core/packetproxy/util/SearchBox.java @@ -140,7 +140,7 @@ public int coloringSearchText() { String search_string = search_text.getText(); if (str.length() > 1000000) { - // System.err.println("[Warning] coloringSearchText: too long string. Skipping + // Logging.err("[Warning] coloringSearchText: too long string. Skipping // Highlight"); return -1; } @@ -202,7 +202,7 @@ public void coloringHTTPText() { String str = baseText.getText(); if (str.length() > 1000000) { - // System.err.println("[Warning] coloringHTTPText: too long string. Skipping + // Logging.err("[Warning] coloringHTTPText: too long string. Skipping // Highlight"); return; } From 83cf335bcaae4ef72c3dc8470940c79fb7db445d Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Thu, 18 Dec 2025 10:18:45 +0900 Subject: [PATCH 5/7] update: printf to Logging --- src/main/java/core/packetproxy/common/Utils.java | 2 +- src/main/java/core/packetproxy/http2/FlowControl.java | 6 +++--- .../core/packetproxy/http2/FlowControlManager.java | 10 +++++----- .../http3/service/Http3HeaderEncoderDecoderTest.java | 7 +++---- .../quic/value/VariableLengthIntegerTest.java | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/core/packetproxy/common/Utils.java b/src/main/java/core/packetproxy/common/Utils.java index a79d8a63..67883507 100644 --- a/src/main/java/core/packetproxy/common/Utils.java +++ b/src/main/java/core/packetproxy/common/Utils.java @@ -175,7 +175,7 @@ private static String[] addRubyPath(String... args) { for (String s : args) { cmd_array.add(s); - // System.out.print(s+ " "); + // Logging.log(s+ " "); } // Logging.log(""); return cmd_array.toArray(new String[0]); diff --git a/src/main/java/core/packetproxy/http2/FlowControl.java b/src/main/java/core/packetproxy/http2/FlowControl.java index d610604d..68c9027a 100644 --- a/src/main/java/core/packetproxy/http2/FlowControl.java +++ b/src/main/java/core/packetproxy/http2/FlowControl.java @@ -84,7 +84,7 @@ public synchronized Stream dequeue(int connectionWindowSize) throws Exception { // 最初にheadersFrameを送信する if (!this.headersFrameSent && this.headersFrame != null) { - // System.out.printf("[%d] HeadersFrame sent!\n", streamId); + // Logging.log("[%d] HeadersFrame sent!\n", streamId); stream.write(this.headersFrame); this.headersFrameSent = true; return stream; @@ -94,7 +94,7 @@ public synchronized Stream dequeue(int connectionWindowSize) throws Exception { if (this.headersFrameSent && (this.dataFrameSent || queue.size() == 0) && !this.grpcHeadersFrameSent && this.grpcHeaderFrame != null) { - // System.out.printf("[%d] gRPC HeadersFrame sent!\n", streamId); + // Logging.log("[%d] gRPC HeadersFrame sent!\n", streamId); stream.write(this.grpcHeaderFrame); this.grpcHeadersFrameSent = true; return stream; @@ -165,7 +165,7 @@ public synchronized Stream dequeue(int connectionWindowSize) throws Exception { // データの送信が終わっていたら、grpcヘッダを送信する if (this.headersFrameSent && this.dataFrameSent && !this.grpcHeadersFrameSent && this.grpcHeaderFrame != null) { - // System.out.printf("[%d] gRPC HeadersFrame sent!\n", streamId); + // Logging.log("[%d] gRPC HeadersFrame sent!\n", streamId); stream.write(this.grpcHeaderFrame); this.grpcHeadersFrameSent = true; } diff --git a/src/main/java/core/packetproxy/http2/FlowControlManager.java b/src/main/java/core/packetproxy/http2/FlowControlManager.java index 4dbcfa18..1a484189 100644 --- a/src/main/java/core/packetproxy/http2/FlowControlManager.java +++ b/src/main/java/core/packetproxy/http2/FlowControlManager.java @@ -59,7 +59,7 @@ private synchronized void writeData(FlowControl flow) throws Exception { if (stream != null) { this.connectionWindowSize -= stream.payloadSize(); - // System.out.printf("[%d] sent: %d (remain: %d), WindowSize: %d, + // Logging.log("[%d] sent: %d (remain: %d), WindowSize: %d, // ConnectionWindowSize: %d\n", flow.getStreamId(), stream.payloadSize(), // flow.size(), flow.getWindowSize(), this.connectionWindowSize); // System.out.flush(); @@ -97,7 +97,7 @@ public synchronized void appendWindowSize(WindowUpdateFrame frame) throws Except if (streamId == 0) { connectionWindowSize += windowSize; - // System.err.printf("ConnectionWindowSize: +%d\n", connectionWindowSize); + // Logging.err("ConnectionWindowSize: +%d\n", connectionWindowSize); // System.err.flush(); for (FlowControl flow : flows.values()) { @@ -107,7 +107,7 @@ public synchronized void appendWindowSize(WindowUpdateFrame frame) throws Except FlowControl flow = getFlow(streamId); flow.appendWindowSize(windowSize); - // System.err.printf("[%d] WindowSize: +%d\n", streamId, flow.getWindowSize()); + // Logging.err("[%d] WindowSize: +%d\n", streamId, flow.getWindowSize()); // System.err.flush(); writeData(flow); } @@ -117,14 +117,14 @@ public synchronized void write(Frame frame) throws Exception { /* TODO: maximum concurrent streams is not implemented yet */ if (frame.getType() == Frame.Type.HEADERS) { - // System.out.printf("[%d] sent HeadersFrame %02x\n", frame.getStreamId(), + // Logging.log("[%d] sent HeadersFrame %02x\n", frame.getStreamId(), // frame.getFlags()); FlowControl flow = getFlow(frame.getStreamId()); flow.pushHeadersFrame(frame); writeData(flow); } else if (frame.getType() == Frame.Type.DATA) { - // System.out.printf("[%d] sent DataFrame %02x\n", frame.getStreamId(), + // Logging.log("[%d] sent DataFrame %02x\n", frame.getStreamId(), // frame.getFlags()); FlowControl flow = getFlow(frame.getStreamId()); flow.enqueue(frame); diff --git a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java index c0a4baac..e7a947b2 100644 --- a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java +++ b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java @@ -73,11 +73,10 @@ class Http3HeaderEncoderDecoderTest { if (outputHeader.isRequest()) { MetaData.Request request = (MetaData.Request) outputHeader; - System.out.printf("%s %s %s%n", request.getMethod(), request.getURI().getPath(), - request.getHttpVersion()); - System.out.printf("host: %s%n", request.getURI().getHost()); + Logging.log("%s %s %s%n", request.getMethod(), request.getURI().getPath(), request.getHttpVersion()); + Logging.log("host: %s%n", request.getURI().getHost()); request.getFields().forEach(field -> { - System.out.printf("%s: %s%n", field.getName(), field.getValue()); + Logging.log("%s: %s%n", field.getName(), field.getValue()); }); } }); diff --git a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java index 6957ed68..719f2218 100644 --- a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java +++ b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java @@ -89,8 +89,8 @@ void parseExampleBytes() throws Exception { Logging.log(VariableLengthInteger.parse(Hex.decodeHex("4201".toCharArray()))); /* 513 */ Logging.log(VariableLengthInteger.parse(Hex.decodeHex("4077".toCharArray()))); /* 119 */ Logging.log(VariableLengthInteger.parse(Hex.decodeHex("58cb".toCharArray()))); /* 6347 */ - System.out.printf("%x\n", VariableLengthInteger.parse(Hex.decodeHex("f684f228323451e8".toCharArray())) + Logging.log("%x\n", VariableLengthInteger.parse(Hex.decodeHex("f684f228323451e8".toCharArray())) .getValue()); /* 3684f228323451e8 */ - System.out.printf("%x\n", VariableLengthInteger.parse(Hex.decodeHex("00".toCharArray())).getValue()); /* 0 */ + Logging.log("%x\n", VariableLengthInteger.parse(Hex.decodeHex("00".toCharArray())).getValue()); /* 0 */ } } From f464f29d11e3c2f5752d7805527fd0e5bfbd1767 Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Wed, 24 Dec 2025 15:51:54 +0900 Subject: [PATCH 6/7] update: import Logging --- src/test/java/packetproxy/http2/FrameManagerTest.java | 1 + src/test/java/packetproxy/http2/frames/FrameTest.java | 1 + src/test/java/packetproxy/http2/frames/HeadersFrameTest.java | 1 + src/test/java/packetproxy/http2/frames/SettingsFrameTest.java | 1 + src/test/java/packetproxy/http3/QpackTest.java | 1 + .../packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java | 1 + .../java/packetproxy/http3/value/frame/SettingsFrameTest.java | 1 + .../quic/service/transportparameter/TransportParametersTest.java | 1 + src/test/java/packetproxy/quic/value/QuicMessagesTest.java | 1 + .../java/packetproxy/quic/value/VariableLengthIntegerTest.java | 1 + src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java | 1 + src/test/java/packetproxy/quic/value/frame/FramesTest.java | 1 + .../packetproxy/quic/value/frame/NewConnectionIdFrameTest.java | 1 + .../java/packetproxy/quic/value/packet/InitialPacketTest.java | 1 + .../bool/DisableActiveMigrationParameterTest.java | 1 + 15 files changed, 15 insertions(+) diff --git a/src/test/java/packetproxy/http2/FrameManagerTest.java b/src/test/java/packetproxy/http2/FrameManagerTest.java index cd061807..33d2c62b 100644 --- a/src/test/java/packetproxy/http2/FrameManagerTest.java +++ b/src/test/java/packetproxy/http2/FrameManagerTest.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; import packetproxy.http2.frames.Frame; import packetproxy.http2.frames.FrameUtils; +import packetproxy.util.Logging; public class FrameManagerTest { diff --git a/src/test/java/packetproxy/http2/frames/FrameTest.java b/src/test/java/packetproxy/http2/frames/FrameTest.java index 9c46e229..3d7bbe3c 100644 --- a/src/test/java/packetproxy/http2/frames/FrameTest.java +++ b/src/test/java/packetproxy/http2/frames/FrameTest.java @@ -17,6 +17,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; public class FrameTest { diff --git a/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java b/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java index e6d51b9a..7b8c3a73 100644 --- a/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java +++ b/src/test/java/packetproxy/http2/frames/HeadersFrameTest.java @@ -22,6 +22,7 @@ import org.eclipse.jetty.http2.hpack.HpackEncoder; import org.junit.jupiter.api.Test; import packetproxy.http.Http; +import packetproxy.util.Logging; public class HeadersFrameTest { diff --git a/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java b/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java index cfe499b1..3f2d3000 100644 --- a/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java +++ b/src/test/java/packetproxy/http2/frames/SettingsFrameTest.java @@ -17,6 +17,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; public class SettingsFrameTest { diff --git a/src/test/java/packetproxy/http3/QpackTest.java b/src/test/java/packetproxy/http3/QpackTest.java index 416a869c..ec4b87f5 100644 --- a/src/test/java/packetproxy/http3/QpackTest.java +++ b/src/test/java/packetproxy/http3/QpackTest.java @@ -21,6 +21,7 @@ import packetproxy.http.Http; import packetproxy.http.HttpHeader; import packetproxy.quic.value.SimpleBytes; +import packetproxy.util.Logging; public class QpackTest { diff --git a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java index e7a947b2..de386d93 100644 --- a/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java +++ b/src/test/java/packetproxy/http3/service/Http3HeaderEncoderDecoderTest.java @@ -23,6 +23,7 @@ import org.eclipse.jetty.http.MetaData; import org.junit.jupiter.api.Test; import packetproxy.http3.helper.Http3TestHelper; +import packetproxy.util.Logging; class Http3HeaderEncoderDecoderTest { diff --git a/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java b/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java index 3f67cdcf..f4b7e980 100644 --- a/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java +++ b/src/test/java/packetproxy/http3/value/frame/SettingsFrameTest.java @@ -22,6 +22,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; import packetproxy.http3.service.frame.FrameParser; +import packetproxy.util.Logging; class SettingsFrameTest { diff --git a/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java b/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java index 71bdc1b6..88b8a36a 100644 --- a/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java +++ b/src/test/java/packetproxy/quic/service/transportparameter/TransportParametersTest.java @@ -21,6 +21,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; import packetproxy.quic.utils.Constants; +import packetproxy.util.Logging; class TransportParametersTest { diff --git a/src/test/java/packetproxy/quic/value/QuicMessagesTest.java b/src/test/java/packetproxy/quic/value/QuicMessagesTest.java index 8b34ac21..04a9d85f 100644 --- a/src/test/java/packetproxy/quic/value/QuicMessagesTest.java +++ b/src/test/java/packetproxy/quic/value/QuicMessagesTest.java @@ -21,6 +21,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; class QuicMessagesTest { diff --git a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java index 719f2218..f1b47081 100644 --- a/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java +++ b/src/test/java/packetproxy/quic/value/VariableLengthIntegerTest.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; /* https://tools.ietf.org/html/draft-ietf-quic-transport-19#section-16 */ class VariableLengthIntegerTest { diff --git a/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java b/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java index 00f0f1c5..760d81d9 100644 --- a/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java +++ b/src/test/java/packetproxy/quic/value/frame/CryptoFrameTest.java @@ -21,6 +21,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; class CryptoFrameTest { diff --git a/src/test/java/packetproxy/quic/value/frame/FramesTest.java b/src/test/java/packetproxy/quic/value/frame/FramesTest.java index 9f4aebf8..9a1b7a39 100644 --- a/src/test/java/packetproxy/quic/value/frame/FramesTest.java +++ b/src/test/java/packetproxy/quic/value/frame/FramesTest.java @@ -23,6 +23,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; import packetproxy.quic.service.frame.Frames; +import packetproxy.util.Logging; class FramesTest { diff --git a/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java b/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java index 41713fe0..93db356e 100644 --- a/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java +++ b/src/test/java/packetproxy/quic/value/frame/NewConnectionIdFrameTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; import packetproxy.quic.value.ConnectionId; import packetproxy.quic.value.Token; +import packetproxy.util.Logging; class NewConnectionIdFrameTest { diff --git a/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java b/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java index 66686715..07ad77be 100644 --- a/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java +++ b/src/test/java/packetproxy/quic/value/packet/InitialPacketTest.java @@ -27,6 +27,7 @@ import packetproxy.quic.value.key.level.InitialKey; import packetproxy.quic.value.packet.longheader.LongHeaderPacket; import packetproxy.quic.value.packet.longheader.pnspace.InitialPacket; +import packetproxy.util.Logging; class InitialPacketTest { diff --git a/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java b/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java index 384d8baa..1eeaf8c3 100644 --- a/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java +++ b/src/test/java/packetproxy/quic/value/transportparameter/bool/DisableActiveMigrationParameterTest.java @@ -2,6 +2,7 @@ import org.apache.commons.codec.binary.Hex; import org.junit.jupiter.api.Test; +import packetproxy.util.Logging; class DisableActiveMigrationParameterTest { From e6ea1b95f6eb7aa05df311c2dfbde91c7e3d697e Mon Sep 17 00:00:00 2001 From: "ryosuke.a.tanaka" Date: Tue, 20 Jan 2026 17:42:17 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E3=81=AE=E3=83=AC=E3=83=99=E3=83=AB=E3=82=92WARN=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E3=81=AB=E9=99=90=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/core/packetproxy/util/Logging.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/core/packetproxy/util/Logging.kt b/src/main/kotlin/core/packetproxy/util/Logging.kt index dc0b2e64..9b9ce0b2 100644 --- a/src/main/kotlin/core/packetproxy/util/Logging.kt +++ b/src/main/kotlin/core/packetproxy/util/Logging.kt @@ -90,7 +90,8 @@ object Logging { val rootLogger = context.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME) rootLogger.addAppender(appender) - rootLogger.level = Level.INFO + // ormliteなどのdebugログを抑制するため、WARN未満は出力しない + rootLogger.level = Level.WARN } @JvmStatic @@ -98,7 +99,8 @@ object Logging { fun log(format: Any, vararg args: Any?) { val fs = formatString(format, *args) - logger.info(fs) + // WARN未満は出力されないためwarnで出力する + logger.warn(fs) if (isGulp) return guiLog.append(fs) }