View | Details | Raw Unified | Return to bug 229427 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	i2p
4
PORTNAME=	i2p
5
DISTVERSION=	0.9.33
5
DISTVERSION=	0.9.35
6
CATEGORIES=	security java net-p2p
6
CATEGORIES=	security java net-p2p
7
MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION} \
7
MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION} \
8
		http://download.i2p2.no/releases/${PORTVERSION}/ \
8
		http://download.i2p2.no/releases/${PORTVERSION}/ \
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1518416518
1
TIMESTAMP = 1530364987
2
SHA256 (i2psource_0.9.33.tar.bz2) = 843345a85e021408e4cbeff8ee94b3842e9c4b5295bef374d5f2026872dae114
2
SHA256 (i2psource_0.9.35.tar.bz2) = 8bb88d3db355ebfa5be65d48089db60919875ac298b7217b7f8150048ea5079e
3
SIZE (i2psource_0.9.33.tar.bz2) = 28985659
3
SIZE (i2psource_0.9.35.tar.bz2) = 29313321
(-)files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java (+19 lines)
Line 0 Link Here
1
--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java.orig	2018-06-26 11:12:11 UTC
2
+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
3
@@ -8,6 +8,7 @@ import net.i2p.client.streaming.AcceptingChannel;
4
 import net.i2p.client.streaming.I2PServerSocket;
5
 import net.i2p.client.streaming.I2PSocket;
6
 import net.i2p.client.streaming.I2PSocketManager;
7
+import net.i2p.client.streaming.RouterRestartException;
8
 
9
 /**
10
  * Bridge to allow accepting new connections
11
@@ -35,7 +36,7 @@ class I2PServerSocketFull implements I2PServerSocket {
12
      *         Not actually thrown through 0.9.16; thrown as of 0.9.17
13
      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
14
      */
15
-    public I2PSocket accept() throws I2PException, ConnectException, SocketTimeoutException {
16
+    public I2PSocket accept() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
17
         return _socketManager.receiveSocket();
18
     }
19
 
(-)files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java (+19 lines)
Line 0 Link Here
1
--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java.orig	2018-06-26 11:12:11 UTC
2
+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
3
@@ -28,6 +28,7 @@ import net.i2p.client.streaming.I2PServerSocket;
4
 import net.i2p.client.streaming.I2PSocket;
5
 import net.i2p.client.streaming.I2PSocketManager;
6
 import net.i2p.client.streaming.I2PSocketOptions;
7
+import net.i2p.client.streaming.RouterRestartException;
8
 import net.i2p.crypto.SigAlgo;
9
 import net.i2p.crypto.SigType;
10
 import net.i2p.data.Certificate;
11
@@ -354,7 +355,7 @@ public class I2PSocketManagerFull implements I2PSocket
12
      * @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it)
13
      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
14
      */
15
-    public I2PSocket receiveSocket() throws I2PException, ConnectException, SocketTimeoutException {
16
+    public I2PSocket receiveSocket() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
17
         verifySession();
18
         Connection con = _connectionManager.getConnectionHandler().accept(_connectionManager.getSoTimeout());
19
         I2PSocketFull sock = new I2PSocketFull(con, _context);

Return to bug 229427