Merge branch 'main' into fxvpn-32-in-app-message

mozilla-mobile · Nov 14, 2024 · c7e3adb · c7e3adb
2 parents d685da0 + db119df
commit c7e3adb
Show file tree

Hide file tree

Showing 12 changed files with 352 additions and 118 deletions.
diff --git a/3rdparty/i18n b/3rdparty/i18n
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/extension/socks5proxy/bin/sockslogger.cpp b/extension/socks5proxy/bin/sockslogger.cpp
@@ -120,14 +120,35 @@ void SocksLogger::dataSentReceived(qint64 sent, qint64 received) {
   m_rx_bytes.addSample(received);
 }
 
+QDebug& SocksLogger::printEventStack(QDebug& msg, Socks5Connection* conn) {
+  bool first = true;
+  for (const QString& hostname : conn->hostLookupStack()) {
+    if (!first) {
+      msg << "->";
+    }
+    first = false;
+    msg << hostname;
+  }
+  return msg;
+}
+
 void SocksLogger::connectionStateChanged() {
   Socks5Connection* conn = qobject_cast<Socks5Connection*>(QObject::sender());
   if (conn->state() == Socks5Connection::Proxy) {
     auto msg = qDebug() << "Connecting" << conn->clientName() << "to";
-    for (const QString& hostname : conn->dnsLookupStack()) {
-      msg << hostname << "->";
+    printEventStack(msg, conn);
+  }
+  if (conn->state() == Socks5Connection::Closed) {
+    if (!conn->errorString().isEmpty()) {
+      // Failed connection
+      auto msg = qDebug() << "Failed";
+      printEventStack(msg, conn) << "->" << conn->errorString();
+    } else {
+      // Successful connection
+      auto msg = qDebug() << "Closed";
+      printEventStack(msg, conn) << "txbuf" << conn->sendHighWaterMark()
+                                 << "rxbuf" << conn->recvHighWaterMark();
     }
-    msg << conn->destAddress().toString();
   }
 }
 

diff --git a/extension/socks5proxy/bin/sockslogger.h b/extension/socks5proxy/bin/sockslogger.h
@@ -54,6 +54,7 @@ class SocksLogger final : public QObject {
   ~SocksLogger();
 
   static QString bytesToString(qint64 value);
+  static QDebug& printEventStack(QDebug& msg, Socks5Connection* conn);
   void printStatus();
 
   const QString& logfile() const { return m_logFileName; }