2004-12-16 jrandom

* Catch another oddball case for a reset connection in the streaming lib.
    * Add a dumpprofile.jsp page, called with ?peer=base64OfPeerHash, which
      dumps the current state of that peer's profile.  Instead of the full
      base64, you can pass in however many characters you have and it will
      return the first match found.

apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java

@@ -1,22 +1,37 @@
 package net.i2p.router.web;
 
+import java.util.Iterator;
+import java.util.Set;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Writer;
+
+import net.i2p.data.Hash;
+import net.i2p.router.RouterContext;
+
 /**
  * uuuugly.  dump the peer profile data if given a peer.
  *
  */
 public class StatHelper {
     private String _peer;
+    private Writer _writer;
+    
     public void setPeer(String peer) { _peer = peer; }
+    public void setWriter(Writer writer) { _writer = writer; }
+    
     public String getProfile() { 
-        net.i2p.router.RouterContext ctx = (net.i2p.router.RouterContext)net.i2p.router.RouterContext.listContexts().get(0);
-        java.util.Set peers = ctx.profileOrganizer().selectAllPeers();
-        for (java.util.Iterator iter = peers.iterator(); iter.hasNext(); ) {
-            net.i2p.data.Hash peer = (net.i2p.data.Hash)iter.next();
-            if (_peer.indexOf(peer.toBase64().substring(0,10)) >= 0) {
+        RouterContext ctx = (RouterContext)net.i2p.router.RouterContext.listContexts().get(0);
+        Set peers = ctx.profileOrganizer().selectAllPeers();
+        for (Iterator iter = peers.iterator(); iter.hasNext(); ) {
+            Hash peer = (Hash)iter.next();
+            if (peer.toBase64().startsWith(_peer)) {
                 try {
-                    java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(64*1024);
-                    ctx.profileOrganizer().exportProfile(peer, baos);
-                    return new String(baos.toByteArray());
+                    WriterOutputStream wos = new WriterOutputStream(_writer);
+                    ctx.profileOrganizer().exportProfile(peer, wos);
+                    wos.flush();
+                    _writer.flush();
+                    return "";
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

apps/routerconsole/java/src/net/i2p/router/web/WriterOutputStream.java

@@ -0,0 +1,17 @@
+package net.i2p.router.web;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * Treat a writer as an output stream. Quick 'n dirty, none
+ * of that "intarnasheeonaleyzayshun" stuff.  So we can treat
+ * the jsp's PrintWriter as an OutputStream
+ */
+public class WriterOutputStream extends OutputStream {
+    private Writer _writer;
+    
+    public WriterOutputStream(Writer writer) { _writer = writer; }
+    public void write(int b) throws IOException { _writer.write(b); }
+}

apps/routerconsole/jsp/dumpprofile.jsp

@@ -1,4 +1,5 @@
-<%@page contentType="text/plain" %>
-<jsp:useBean id="helper" class="net.i2p.router.web.StatHelper" />
-<jsp:setProperty name="helper" property="peer" value="<%=request.getParameter("peer")%>" />
-<jsp:getProperty name="helper" property="profile" />
+<%@page contentType="text/plain" 
+%><jsp:useBean id="helper" class="net.i2p.router.web.StatHelper" 
+/><jsp:setProperty name="helper" property="peer" value="<%=request.getParameter("peer")%>" 
+/><jsp:setProperty name="helper" property="writer" value="<%=out%>" 
+/><jsp:getProperty name="helper" property="profile" />

apps/streaming/java/src/net/i2p/client/streaming/Connection.java

@@ -32,6 +32,7 @@ public class Connection {
     private long _lastSendTime;
     private long _lastSendId;
     private boolean _resetReceived;
+    private boolean _resetSent;
     private boolean _connected;
     private boolean _hardDisconnected;
     private MessageInputStream _inputStream;
@@ -178,6 +179,7 @@ public class Connection {
      *
      */
     void sendReset() {
+        _resetSent = true;
         if ( (_remotePeer == null) || (_sendStreamId == null) ) return;
         PacketLocal reply = new PacketLocal(_context, _remotePeer);
         reply.setFlag(Packet.FLAG_RESET);
@@ -380,6 +382,7 @@ public class Connection {
     
     public boolean getIsConnected() { return _connected; }
     public boolean getHardDisconnected() { return _hardDisconnected; }
+    public boolean getResetSent() { return _resetSent; }
 
     void disconnect(boolean cleanDisconnect) {
         disconnect(cleanDisconnect, true);

apps/streaming/java/src/net/i2p/client/streaming/SchedulerHardDisconnected.java

@@ -34,7 +34,7 @@ class SchedulerHardDisconnected extends SchedulerImpl {
     public boolean accept(Connection con) {
         if (con == null) return false;
         long timeSinceClose = _context.clock().now() - con.getCloseSentOn();
-        boolean ok = (con.getHardDisconnected()) && 
+        boolean ok = (con.getHardDisconnected() || con.getResetSent()) && 
                      (timeSinceClose < Connection.DISCONNECT_TIMEOUT);
         return ok;
     }