Changeset 8b664fe


Ignore:
Timestamp:
Jan 14, 2011 12:28:32 PM (10 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
8b8a3a4
Parents:
4dd78ed (diff), 50a6a81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '0c3129e1443b3c155a4e5e06e008fa40a89776a3'

and 'fe23acdcae4f7bace1f6ceb4823a13271fe37207'

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/data/PrivateKey.java

    r4dd78ed r8b664fe  
    1616 * A private key is 256byte Integer. The private key represents only the
    1717 * exponent, not the primes, which are constant and defined in the crypto spec.
     18 *
     19 * Note that we use short exponents, so all but the last 28.25 bytes are zero.
     20 * See http://www.i2p2.i2p/how_cryptography for details.
    1821 *
    1922 * @author jrandom
     
    5154    }
    5255
     56    /**
     57     * We assume the data has enough randomness in it, so use the last 4 bytes for speed.
     58     * Overridden since we use short exponents, so the first 227 bytes are all zero.
     59     * Not that we are storing PrivateKeys in any Sets or Maps anywhere.
     60     */
     61    @Override
     62    public int hashCode() {
     63        if (_data == null)
     64            return 0;
     65        int rv = _data[KEYSIZE_BYTES - 4];
     66        for (int i = 1; i < 4; i++)
     67            rv ^= (_data[i + (KEYSIZE_BYTES - 4)] << (i*8));
     68        return rv;
     69    }
     70
     71    @Override
     72    public boolean equals(Object obj) {
     73        if ((obj == null) || !(obj instanceof PrivateKey)) return false;
     74        return DataHelper.eq(_data, ((PrivateKey) obj)._data);
     75    }
    5376}
  • core/java/src/net/i2p/util/LogManager.java

    r4dd78ed r8b664fe  
    153153            return;
    154154        _writer = new LogWriter(this);
    155         Thread t = new I2PThread(_writer, "LogWriter", true);
     155        // NOT an I2PThread, as it contains logging and we end up with problems
     156        Thread t = new Thread(_writer, "LogWriter");
     157        t.setDaemon(true);
    156158        t.start();
    157159    }
  • installer/resources/readme/readme.html

    r4dd78ed r8b664fe  
    1616<ul class="links"><li class="tidylist"><b>Starting Up&hellip;</b><br>If you've just started I2P, the number of <i>Active Peers</i> indicated under the <i>Peers</i> section in the side panel on the left should start to grow over the next few minutes and you'll also see a <i>Local Destination</i> named <i>Shared Clients</i> listed there, and possibly other clients and servers depending on how I2P is configured (if not, see the troubleshooting section <a href="#trouble">below</a>). These <i>Local Destinations</i> provide connections on different ports (and sometimes protocols) to the I2P network, enabling your bittorrent, e-mail, web proxy and other services to function. Your <a href="/netdb">Network Database</a> indicates all known peers on the network. Additionally, you can monitor existing <a href="/peers">Peer Connections</a>, and view existing <a href="/tunnels">Tunnels</a> and their status. More information is available on the <a href="/help">help page</a>.</li>
    1717
    18 <li class="tidylist"><b>Network integration</b><br> The first time you start I2P it may take a few minutes to bootstrap (integrate) you into the network and find additional peers to optimize your integration, so please be patient. Once green stars are indicated next to your <i>Local Destinations</i>, there is a wide variety of things you can do with I2P, and below we introduce you to some of them.</li></ul>
     18<li class="tidylist"><b>Network integration</b><br> The first time you start I2P it may take a few minutes to bootstrap (integrate) you into the network and find additional peers to optimize your integration, so please be patient. When I2P starts up, and during normal operation, I2P's tunnel build readiness indicator (immediately above the <i>Local Destinations</i> section in the sidepanel) may tell you that I2P is "Rejecting Tunnels"; this is normal behavior and should be of no cause for concern! Once green stars are indicated next to your <i>Local Destinations</i>, there is a wide variety of things you can do with I2P, and below we introduce you to some of them.</li></ul>
    1919 
    2020<h3>Services on I2P</h3>
  • installer/resources/themes/console/classic/console.css

    r4dd78ed r8b664fe  
    409409
    410410div.news h3 {
    411      text-align: left !important;
     411     background: none !important;
     412     text-align: left;
     413     border: none !important;
     414     border-bottom: 1px dotted !important;
     415     -moz-box-shadow: none;
     416     -hktml-box-shadow: none;
     417     box-shadow: none;
     418     font-size: 10pt !important;
     419     letter-spacing: 0.05em;
     420     text-transform: capitalize !important;
     421     text-shadow: none !important;
     422     padding: 5px 10px 3px;
     423     margin: 10px 10px -7px !important;
    412424}
    413425
  • installer/resources/themes/console/dark/console.css

    r4dd78ed r8b664fe  
    328328     background: #000 url("images/news.png")no-repeat scroll bottom right;
    329329     color: #7b7;
    330 /*     border-radius: 4px 4px 0 0;
    331      -moz-border-radius: 4px 4px 0 0;
    332      -khtml-border-radius: 4px 4px 0 0;*/
    333330     font-size: 7.5pt;
    334331     text-align: right;
     
    336333     -khtml-box-shadow: 0 1px 5px #000;
    337334     box-shadow: 0 1px 5px #000;
    338      min-width: 580px;
    339 /*     height: 164px;
    340      overflow-y: auto;*/
     335     min-width: 590px;
    341336}
    342337
     
    358353
    359354div.news h3 {
    360      text-align: left !important;
     355     background: none;
     356     text-align: left;
     357     border: none;
     358     padding-left: 0;
     359     padding-top: 2px;
     360     border-bottom: 1px dotted;
    361361}
    362362
     
    866866}
    867867
    868 input[type=text], input[type=password] {
     868input[type=text] {
    869869     background: #000;
    870870     color: #EE9;
     
    882882}
    883883
    884 input[type=text]:active, input[type=text]:hover, input[type=password]:active, input[type=password]:hover {
     884input[type=text]:active, input[type=text]:hover {
    885885     background: #000;
    886886}
  • installer/resources/themes/console/light/console.css

    r4dd78ed r8b664fe  
    106106*/     
    107107     -moz-box-shadow: inset 0px 0px 1px 1px #bbf;
     108     -khtml-box-shadow: inset 0px 0px 1px 1px #bbf;
     109     box-shadow: inset 0px 0px 1px 1px #bbf;
    108110}
    109111
     
    140142     border-radius: 3px;
    141143     -moz-box-shadow: 0px 1px 5px #bbf;
     144     text-shadow: 0px 1px 1px #77f;
     145     -moz-box-shadow: outset 0px 0px 2px 1px #bbf;
     146     -khtml-box-shadow: outset 0px 0px 2px 1px #bbf;
     147     box-shadow: outset 0px 0px 2px 1px #bbf;
    142148}
    143149
     
    149155     background: #ffa url('images/header.png') center center repeat-x !important;
    150156     text-shadow: 0 0 0;
     157     -moz-box-shadow: inset 0px 0px 2px 1px #ffa;
     158     -khtml-box-shadow: inset 0px 0px 2px 1px #ffa;
     159     box-shadow: inset 0px 0px 2px 1px #ffa;
    151160}
    152161
     
    325334     border-radius: 4px;
    326335     -moz-box-shadow: inset 0px 0px 1px 1px #bbf;
     336     -khtml-box-shadow: inset 0px 0px 1px 1px #bbf;
     337     box-shadow: inset 0px 0px 1px 1px #bbf;
    327338     background: #ffe url('images/magic.png') center bottom;}
    328339
     
    356367     font-size: 7.5pt;
    357368     line-height: 140%;
    358      -moz-box-shadow: inset 0px 0px 1px 0px #410;
     369     -moz-box-shadow: inset 0px 0px 1px 1px #bbf;
     370     -khtml-box-shadow: inset 0px 0px 1px 1px #bbf;
     371     box-shadow: inset 0px 0px 1px 1px #bbf;
    359372     background: #ffe url('images/magic.png') center bottom;
    360      min-width: 480px;
     373     min-width: 490px;
    361374}
    362375
     
    367380     margin-top: -7px;
    368381     padding: 0 15px;
    369 }
    370 
    371 div.news h3 {
    372      text-align: left !important;
    373382}
    374383
     
    427436}
    428437
     438div.news h3 {
     439     background: none !important;
     440     text-align: left;
     441     border: none !important;
     442     padding-left: 0;
     443     padding-top: 0px;
     444     border-bottom: 1px dotted #225 !important;
     445     -moz-box-shadow: none;
     446     -khtml-box-shadow: none;
     447     box-shadow: none;
     448     font-size: 10pt !important;
     449     letter-spacing: 0.05em;
     450     text-transform: capitalize !important;
     451     text-shadow: 0px 0px 0px #77f;
     452}
     453
     454div.news i {
     455     font-style: normal;
     456}
     457
    429458/*
    430459div.news  h4 a{
     
    632661
    633662div.main li b {
    634      color: #514!important;
     663     color: #514 !important;
     664     color: #003 !important;
    635665     letter-spacing: 0.01em;
    636666     font-size: 9.5pt;
     
    658688     color: #910;
    659689     padding: 2px 3px;
    660      background: #fff;
    661      font-weight: bold;
    662      background: #ffb url('images/magic.png') center bottom;
     690     font-weight: bold;
     691/*     background: #ffb url('images/magic.png') center bottom;*/
    663692}
    664693
     
    741770h1 {
    742771     text-align: left;
    743      color: #000;
     772     color: #003;
    744773     padding: 10px 15px;
    745774     margin: 0 10px 10px 207px;
     
    747776     letter-spacing: 0.15em;
    748777     text-transform: uppercase;
    749      text-shadow: 0px 0px 1px #77f;
     778     text-shadow: 0px 1px 1px #77f;
    750779     -moz-box-shadow: inset 0px 0px 1px 1px #bbf;
     780     -khtml-box-shadow: inset 0px 0px 1px 1px #bbf;
     781     box-shadow: inset 0px 0px 1px 1px #bbf;
    751782     white-space: normal;
    752783     background: #ffe url('images/header.png') center center repeat-x;
     
    760791h2 {
    761792     font-size: 13pt;
    762      color: #000;
    763      letter-spacing: 0.05em;
     793     color: #003;
     794     letter-spacing: 0.07em;
    764795     background: #ffe url('images/header.png') center center repeat-x;
    765      text-shadow: 0px 0px 1px rgba(0, 0, 64, 0.5);
    766      padding: 10px 10px;
     796     text-shadow: 0px 1px 1px #77f;
     797     padding: 10px;
    767798     wordwrap: none;
    768      border: 1px solid #113;
     799     border: 1px solid #447;
    769800     border-radius: 4px;
    770801     -moz-border-radius: 4px;
    771802     -khtml-border-radius: 4px;
    772803     margin: 15px 0px 15px 0 !important;
    773      -moz-box-shadow: 0 1px 1px 1px rgba(176, 176, 216, 0.4);
     804     -moz-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
     805     -khtml-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
     806     box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
    774807     word-wrap: break-word;
     808     text-transform: uppercase;
    775809     opacity: 1;
    776810}
     
    787821
    788822h3 {
    789      border: 1px solid #113;
    790      border-left: 5px solid #113;
    791      padding: 5px 5px 5px 5px;
     823     border: 1px solid #447;
     824     border-left: 5px solid #447;
     825     padding: 5px 5px 5px 10px;
    792826     margin: 12px 0 15px 0;
    793827     border-radius: 0 4px 4px 0;
     
    795829     -khtml-border-radius: 0 4px 4px 0;
    796830     background: #ffe url('images/header.png') center center repeat-x !important;
     831     text-transform: uppercase;
     832     text-shadow: 0px 1px 1px #77f;
    797833     font-size: 11pt;
    798      color: #000;
    799      -moz-box-shadow: 0 1px 1px 1px rgba(176, 176, 216, 0.4);
     834     color: #003;
     835     -moz-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
     836     -khtml-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
     837     box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
    800838     opacity: 1;
     839     letter-spacing: 0.07em;
    801840}
    802841
     
    867906
    868907.langbox img {
    869      opacity: 0.8 !important;
     908     opacity: 0.7 !important;
    870909     -moz-box-shadow: 0 0 1px #447;
    871910}
     
    922961}
    923962
    924 input[type=text], input[type=password] {
     963input[type=text] {
    925964     background: #ffe;
    926965     color: #001;
  • installer/resources/themes/console/light/default.css

    r4dd78ed r8b664fe  
     1/* I2P Tunnel Manager Theme: Light */
     2/* Description: Light blue highlights. */
     3/* Author: dr|z3d */
     4   
    15body {
    26     margin: 0px;
     
    4852     padding: 5px 10px;
    4953     background: #eef url(images/header.png) repeat-x center center;
     54     text-transform: uppercase;
    5055     letter-spacing: 0.08em;
    5156     -moz-box-shadow: inset 0px 0px 4px 0px #bbf;
     
    360365
    361366a:link{
    362      color: #613;
     367     color: #359;
    363368     text-decoration: none;
    364369     font-weight: bold;
     
    367372
    368373a:visited{
    369      color: #606;
     374     color: #218;
    370375     text-decoration: none;
    371376     font-weight: bold;
  • installer/resources/themes/console/midnight/console.css

    r4dd78ed r8b664fe  
    330330     text-align: left;
    331331     color: #eef;
    332      min-width: 570px;
     332     min-width: 590px;
    333333/*     -moz-border-radius: 0 0 3px 3px;
    334334     -khtml-border-radius: 0 0 3px 3px;
     
    433433
    434434div.news h3 {
    435      text-align: left !important;
     435     background: none !important;
     436     text-align: left;
     437     border: none !important;
     438     padding-left: 0;
     439     padding-top: 0px;
     440     border-bottom: 1px dotted !important;
     441     -moz-box-shadow: none;
     442     -hktml-box-shadow: none;
     443     box-shadow: none;
     444     font-size: 10pt !important;
     445     letter-spacing: 0.05em;
     446     text-transform: uppercase !important;
     447     margin: 15px 10px -5px;
     448     padding: 5px 0 5px;
    436449}
    437450
     
    440453     font-size: 9pt;
    441454     margin-bottom: -10px;
     455     margin-top: 10px;
    442456}
    443457/*
     
    756770}
    757771
    758 input[type=text], input[type=password] {
     772input[type=text] {
    759773     margin: 3px 5px 3px 5px;
    760774     vertical-align: middle;
     
    766780}
    767781
    768 input[type=text], input[type=password] select {
     782input[type=text], select {
    769783     background: #001;
    770784     color: #eef;
Note: See TracChangeset for help on using the changeset viewer.