zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* SSU: Fix 100% CPU after socket failure

Browse Source 
* UPnP: Catch reported error on FreeBSD
This commit is contained in:
zzz
2014-09-22 13:22:35 +00:00
parent 98062f830a
commit 0e48557b48
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
history.txt
View File

@@ -1,3 +1,7 @@
2014-09-22 zzz
* SSU: Fix 100% CPU after socket failure
* UPnP: Catch reported error on FreeBSD
* 2014-09-20 0.9.15 released * 2014-09-20 0.9.15 released
2014-09-17 kytv 2014-09-17 kytv

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 0; public final static long BUILD = 1;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

2
router/java/src/net/i2p/router/transport/udp/UDPReceiver.java
View File

@@ -281,6 +281,8 @@ class UDPReceiver {
_log.warn("Error receiving", ioe); _log.warn("Error receiving", ioe);
//} //}
packet.release(); packet.release();
// TODO count consecutive errors, give up after too many?
try { Thread.sleep(100); } catch (InterruptedException ie) {}
} }
} }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))

2
router/java/src/org/cybergarage/xml/parser/JaxpParser.java
View File

@@ -124,6 +124,7 @@ public class JaxpParser extends Parser
factory.setValidating(false); factory.setValidating(false);
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
factory.setExpandEntityReferences(false); factory.setExpandEntityReferences(false);
try {
try { try {
factory.setFeature("http://xml.org/sax/features/external-general-entities", false); factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
} catch (ParserConfigurationException pce) {} } catch (ParserConfigurationException pce) {}
@@ -136,6 +137,7 @@ public class JaxpParser extends Parser
try { try {
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
} catch (ParserConfigurationException pce) {} } catch (ParserConfigurationException pce) {}
} catch (AbstractMethodError ame) {} // FreeBSD
DocumentBuilder builder = factory.newDocumentBuilder(); DocumentBuilder builder = factory.newDocumentBuilder();
builder.setEntityResolver(new BlankingResolver()); builder.setEntityResolver(new BlankingResolver());
InputSource inSrc = new InputSource(new NullFilterInputStream(inStream)); InputSource inSrc = new InputSource(new NullFilterInputStream(inStream));