Changeset 10a021f
- Timestamp:
- Mar 6, 2017 3:43:38 AM (4 years ago)
- Branches:
- master
- Children:
- d7e5aaf
- Parents:
- 20df511
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
router/java/src/net/i2p/router/Blocklist.java
r20df511 r10a021f 1018 1018 singles.addAll(_singleIPBlocklist); 1019 1019 if (!(singles.isEmpty() && _singleIPv6Blocklist.isEmpty())) { 1020 out.write("<table id=\"banneduntilrestart\"><tr><th align=\"center\" colspan=\"2\"><b>"); 1020 out.write("<table id=\"bannedips\"><tr><td>"); 1021 out.write("<table id=\"banneduntilrestart\"><tr><th align=\"center\"><b>"); 1021 1022 out.write(_t("IPs Banned Until Restart")); 1022 out.write("</b></td></tr>"); 1023 out.write("</b></th></tr>"); 1024 if (!singles.isEmpty()) { 1025 out.write("<tr id=\"ipv4\" align=\"center\"><td><b>"); 1026 out.write(_t("IPv4 Addresses")); 1027 out.write("</b></td></tr>"); 1028 } 1023 1029 // first 0 - 127 1024 1030 for (Integer ii : singles) { … … 1026 1032 if (ip < 0) 1027 1033 continue; 1028 out.write("<tr><td align=\"center\" width=\"50%\">");1034 out.write("<tr><td align=\"center\">"); 1029 1035 out.write(toStr(ip)); 1030 out.write("</td>< td width=\"50%\"> </td></tr>\n");1036 out.write("</td></tr>\n"); 1031 1037 } 1032 1038 // then 128 - 255 … … 1035 1041 if (ip >= 0) 1036 1042 break; 1037 out.write("<tr><td align=\"center\" width=\"50%\">");1043 out.write("<tr><td align=\"center\">"); 1038 1044 out.write(toStr(ip)); 1039 out.write("</td>< td width=\"50%\"> </td></tr>\n");1045 out.write("</td></tr>\n"); 1040 1046 } 1041 1047 // then IPv6 1042 1048 if (!_singleIPv6Blocklist.isEmpty()) { 1049 out.write("<tr id=\"ipv6\" align=\"center\"><td><b>"); 1050 out.write(_t("IPv6 Addresses")); 1051 out.write("</b></td></tr>"); 1043 1052 List<BigInteger> s6; 1044 1053 synchronized(_singleIPv6Blocklist) { … … 1047 1056 Collections.sort(s6); 1048 1057 for (BigInteger bi : s6) { 1049 out.write("<tr><td align=\"center\" width=\"50%\">");1058 out.write("<tr><td align=\"center\">"); 1050 1059 out.write(Addresses.toString(toIPBytes(bi))); 1051 out.write("</td>< td width=\"50%\"> </td></tr>\n");1060 out.write("</td></tr>\n"); 1052 1061 } 1053 1062 } … … 1055 1064 } 1056 1065 if (_blocklistSize > 0) { 1057 out.write("<table id=\"permabanned\"><tr><th align=\"center\" colspan=\"2\"><b>"); 1066 out.write("</td><td>"); 1067 out.write("<table id=\"permabanned\"><tr><th align=\"center\" colspan=\"3\"><b>"); 1058 1068 out.write(_t("IPs Permanently Banned")); 1059 out.write("</b></th></tr><tr><td align=\"center\" width=\" 50%\"><b>");1069 out.write("</b></th></tr><tr><td align=\"center\" width=\"49%\"><b>"); 1060 1070 out.write(_t("From")); 1061 out.write("</b></td><td align=\"center\" width=\"50%\"><b>");1071 out.write("</b></td><td></td><td align=\"center\" width=\"49%\"><b>"); 1062 1072 out.write(_t("To")); 1063 1073 out.write("</b></td></tr>"); … … 1069 1079 if (from < 0) 1070 1080 continue; 1071 out.write("<tr><td align=\"center\" width=\"50%\">"); out.write(toStr(from)); out.write("</td><td align=\"center\" width=\"50%\">"); 1081 out.write("<tr><td align=\"center\" width=\"49%\">"); 1082 out.write(toStr(from)); 1083 out.write("</td>"); 1072 1084 int to = getTo(_blocklist[i]); 1073 1085 if (to != from) { 1074 out.write(toStr(to)); out.write("</td></tr>\n"); 1086 out.write("<td align=\"center\">-</td><td align=\"center\" width=\"49%\">"); 1087 out.write(toStr(to)); 1088 out.write("</td></tr>\n"); 1075 1089 } else 1076 out.write(" </td></tr>\n");1090 out.write("<td></td><td width=\"49%\"> </td></tr>\n"); 1077 1091 displayed++; 1078 1092 } … … 1082 1096 if (from >= 0) 1083 1097 break; 1084 out.write("<tr><td align=\"center\" width=\"50%\">"); out.write(toStr(from)); out.write("</td><td align=\"center\" width=\"50%\">"); 1098 out.write("<tr><td align=\"center\" width=\"49%\">"); 1099 out.write(toStr(from)); 1100 out.write("</td>"); 1085 1101 int to = getTo(_blocklist[i]); 1086 1102 if (to != from) { 1087 out.write(toStr(to)); out.write("</td></tr>\n"); 1103 out.write("<td align=\"center\">-</td><td align=\"center\" width=\"49%\">"); 1104 out.write(toStr(to)); 1105 out.write("</td></tr>\n"); 1088 1106 } else 1089 out.write(" </td></tr>\n");1107 out.write("<td></td><td width=\"49%\"> </td></tr>\n"); 1090 1108 } 1091 1109 if (_blocklistSize > MAX_DISPLAY) … … 1094 1112 BLOCKLIST_FILE_DEFAULT + " file for the full list</th></tr>"); 1095 1113 out.write("</table>"); 1114 out.write("</td></tr></table>"); 1096 1115 } else { 1097 1116 out.write("<br><i>");
Note: See TracChangeset
for help on using the changeset viewer.