Changeset 11ff89f


Ignore:
Timestamp:
Mar 26, 2012 2:07:38 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
97f2328
Parents:
764a7f2
Message:
  • Try again to fix console on Windows w/o IPv6 (ticket # 621)
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r764a7f2 r11ff89f  
    88import java.net.InetAddress;
    99import java.net.Inet4Address;
     10import java.net.InetSocketAddress;
    1011import java.net.ServerSocket;
    1112import java.security.KeyStore;
     
    312313                        // connectors are bad
    313314                        InetAddress test = InetAddress.getByName(host);
    314                         ServerSocket testSock = null;
    315315                        if ((!hasIPV6) && (!(test instanceof Inet4Address)))
    316316                            throw new IOException("IPv6 addresses unsupported");
    317317                        if ((!hasIPV4) && (test instanceof Inet4Address))
    318318                            throw new IOException("IPv4 addresses unsupported");
     319                        ServerSocket testSock = null;
    319320                        try {
    320                             testSock = new ServerSocket(0, 0, test);
     321                            // On Windows, this was passing and Jetty was still failing,
     322                            // possibly due to %scope_id ???
     323                            // https://issues.apache.org/jira/browse/ZOOKEEPER-667
     324                            //testSock = new ServerSocket(0, 0, test);
     325                            // so do exactly what Jetty does in SelectChannelConnector.open()
     326                            testSock = new ServerSocket();
     327                            InetSocketAddress isa = new InetSocketAddress(host, 0);
     328                            testSock.bind(isa);
    321329                        } finally {
    322330                            if (testSock != null) try { testSock.close(); } catch (IOException ioe) {}
     
    370378                            ServerSocket testSock = null;
    371379                            try {
    372                                 testSock = new ServerSocket(0, 0, test);
     380                                // see comments above
     381                                //testSock = new ServerSocket(0, 0, test);
     382                                testSock = new ServerSocket();
     383                                InetSocketAddress isa = new InetSocketAddress(host, 0);
     384                                testSock.bind(isa);
    373385                            } finally {
    374386                                if (testSock != null) try { testSock.close(); } catch (IOException ioe) {}
  • history.txt

    r764a7f2 r11ff89f  
     12012-03-26 zzz
     2  * Code cleanups:
     3    - Remove unused imports
     4    - Remove unused local variables
     5    - Remove unused private fields
     6    - Remove unnecessary casts
     7  * Console:
     8    - Try again to fix console on Windows w/o IPv6 (ticket # 621)
     9    - Move oldconsole rendering from Router to OldConsoleHelper
     10
    1112012-03-24 zzz
    212  * GarlicConfig: Remove more unused methods
  • router/java/src/net/i2p/router/RouterVersion.java

    r764a7f2 r11ff89f  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 21;
     21    public final static long BUILD = 22;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.