i2ptunnel: Fix NPE creating server tunnel

Add Red25519 sigtype option for servers
Fix if clause in editClient
This commit is contained in:
zzz
2019-04-11 14:33:38 +00:00
parent dd5f8b45ef
commit 73790e2353
3 changed files with 15 additions and 4 deletions

View File

@@ -647,8 +647,12 @@ public class GeneralHelper {
public String getFilterDefinition(int tunnel) {
TunnelController tunnelController = getController(tunnel);
String filter = tunnelController.getFilter();
return filter == null ? "" : filter;
if (tunnelController != null) {
String filter = tunnelController.getFilter();
if (filter != null)
return filter;
}
return "";
}
public String getJumpList(int tunnel) {

View File

@@ -528,11 +528,12 @@
<label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
Ed25519-SHA-512</label>
</span>
<%
} // isAvailable
%>
</td>
</tr>
<%
} // isAvailable
} // isAdvanced
if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) {

View File

@@ -741,6 +741,12 @@
<label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
Ed25519-SHA-512</label>
</span>
<% }
if (editBean.isSigTypeAvailable(11)) { %>
<span class="multiOption">
<label title="<%=intl._t("Experimental")%>"><input value="11" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==11 ? " checked=\"checked\"" : "")%> class="tickbox" />
Red25519-SHA-512</label>
</span>
<% } // isAvailable
%>
</td>