[tor-commits] [metrics-web/master] Add FTE to list of transports.

[karsten@xxxxxxxxxxxxxx]

commit fe6446b0d6493bdab2fdf90f0d41d4aad85eb205
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Fri Apr 4 08:30:03 2014 +0200

    Add FTE to list of transports.
    
    Implements #11399.
---
 .../src/org/torproject/metrics/web/graphs/GraphParameterChecker.java |    2 +-
 website/web/WEB-INF/users.jsp                                        |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
index 3e04bea..4774831 100644
--- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
+++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
@@ -59,7 +59,7 @@ public class GraphParameterChecker {
     this.knownParameterValues.put("source", "all,siv,moria,torperf");
     this.knownParameterValues.put("filesize", "50kb,1mb,5mb");
     this.knownParameterValues.put("transport",
-        "obfs2,obfs3,websocket,<OR>,<??>");
+        "obfs2,obfs3,websocket,fte,<OR>,<??>");
     this.knownParameterValues.put("version", "v4,v6");
     this.knownParameterValues.put("p", "100,99,98,97,95,91,90,80,75,70,"
         + "60,50,40,30,25,20,10,9,5,3,2,1,0");
diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp
index 556b2a1..fef32b7 100644
--- a/website/web/WEB-INF/users.jsp
+++ b/website/web/WEB-INF/users.jsp
@@ -205,6 +205,7 @@
         <option value="obfs2"<c:if test="${userstats_bridge_transport_transport[0] eq 'obfs2'}"> selected</c:if>>obfs2</option>
         <option value="obfs3"<c:if test="${userstats_bridge_transport_transport[0] eq 'obfs3'}"> selected</c:if>>obfs3</option>
         <option value="websocket"<c:if test="${userstats_bridge_transport_transport[0] eq 'websocket'}"> selected</c:if>>Flash proxy/websocket</option>
+        <option value="fte"<c:if test="${userstats_bridge_transport_transport[0] eq 'fte'}"> selected</c:if>>FTE</option>
         <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option>
       </select>
     </p><p>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits