From 6b1224b23e67c86fe8a7f8ca99d560cc3386b564 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 19 Sep 2008 01:03:57 +0000
Subject: [PATCH] 2008-09-19 zzz     * Tunnels:       - Add missing message
 accounting for inbound gateways,         we were underestimating
 participating traffic because of it,         and the tunnels were classified
 "inactive"       - Add participating tunnel role on tunnels.jsp

---
 history.txt                                        |  7 +++++++
 router/java/src/net/i2p/router/RouterVersion.java  |  2 +-
 .../i2p/router/tunnel/InboundGatewayReceiver.java  |  1 +
 .../i2p/router/tunnel/pool/TunnelPoolManager.java  | 14 ++++++++++----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/history.txt b/history.txt
index 453c568b5..398eff6be 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2008-09-19 zzz
+    * Tunnels:
+      - Add missing message accounting for inbound gateways,
+        we were underestimating participating traffic because of it,
+        and the tunnels were classified "inactive"
+      - Add participating tunnel role on tunnels.jsp
+
 2008-09-18 zzz
     * Throttle:
       - Correctly check inbound and outbound total bw limits separately
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 64471fafd..15a18a6d7 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
     public final static String VERSION = "0.6.3";
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java b/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java
index ffb4c356b..1d198a0b4 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java
@@ -33,6 +33,7 @@ public class InboundGatewayReceiver implements TunnelGateway.Receiver {
             }
         }
         
+        _config.incrementProcessedMessages();
         TunnelDataMessage msg = new TunnelDataMessage(_context);
         msg.setData(encrypted);
         msg.setTunnelId(_config.getSendTunnel());
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index 1c3e4b413..342f53b2e 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -448,7 +448,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
         out.write("<h2><a name=\"participating\">Participating tunnels</a>:</h2><table border=\"1\">\n");
         out.write("<tr><td><b>Receive on</b></td><td><b>From</b></td><td>"
                   + "<b>Send on</b></td><td><b>To</b></td><td><b>Expiration</b></td>"
-                  + "<td><b>Usage</b></td></tr>\n");
+                  + "<td><b>Usage</b></td><td><b>Role</b></td></tr>\n");
         long processed = 0;
         RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount");
         if (rs != null)
@@ -468,21 +468,27 @@ public class TunnelPoolManager implements TunnelManagerFacade {
             if (cfg.getReceiveFrom() != null)
                 out.write("<td>" + cfg.getReceiveFrom().toBase64().substring(0,4) +"</td>");
             else
-                out.write("<td>n/a</td>");
+                out.write("<td>&nbsp;</td>");
             if (cfg.getSendTunnel() != null)
                 out.write("<td>" + cfg.getSendTunnel().getTunnelId() +"</td>");
             else
-                out.write("<td>n/a</td>");
+                out.write("<td>&nbsp;</td>");
             if (cfg.getSendTo() != null)
                 out.write("<td>" + cfg.getSendTo().toBase64().substring(0,4) +"</td>");
             else
-                out.write("<td>n/a</td>");
+                out.write("<td>&nbsp;</td>");
             long timeLeft = cfg.getExpiration()-_context.clock().now();
             if (timeLeft > 0)
                 out.write("<td align=right>" + DataHelper.formatDuration(timeLeft) + "</td>");
             else
                 out.write("<td align=right>(grace period)</td>");
             out.write("<td align=right>" + cfg.getProcessedMessagesCount() + "KB</td>");
+            if (cfg.getSendTo() == null)
+                out.write("<td>Outbound Endpoint</td>");
+            else if (cfg.getReceiveFrom() == null)
+                out.write("<td>Inbound Gateway</td>");
+            else
+                out.write("<td>Participant</td>");
             out.write("</tr>\n");
             processed += cfg.getProcessedMessagesCount();
         }