Changeset 352396b for installer/java


Ignore:
Timestamp:
Aug 13, 2004 9:15:22 PM (16 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3b65107
Parents:
3c9b027
git-author:
jrandom <jrandom> (08/13/04 21:15:22)
git-committer:
zzz <zzz@…> (08/13/04 21:15:22)
Message:

Date: Fri, 13 Aug 2004 15:58:30 +1200 (NZST)
Message-ID: <1776.202.37.75.101.1092369510.squirrel@202.37.75.101>
From: adam@…
To: jrandom@…

[…]

I hereby authorize my NtpClient?.java and NtpMessage?.java code to be
redistributed under the BSD license for the purpose of integration with
the I2P project, providing that I am credited as the original author of
the code.

[…]

w00t! adam++
code migrated into core/java/src/net/i2p/time, integrated with Clock,
dropping that whole ugly pass-the-time-through-URL, and hence dropped
support for :7655/setTime.
New router.config properties to control the timestamper:

time.sntpServerList=pool.ntp.org,pool.ntp.org,pool.ntp.org
time.queryFrequencyMs=300000
time.disabled=false

So, to disable, add time.disabled=true to your router.config. It is
enabled by default.
Default router.config and startup scripts updated accordingly (since
timestamper.jar is now gone)

Location:
installer/java
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • installer/java/build.xml

    r3c9b027 r352396b  
    1111        <ant dir="../../apps/netmonitor/java/" target="build" />
    1212        <ant dir="../../apps/heartbeat/java/" target="build" />
    13         <ant dir="../../apps/time/java/" target="build" />
    1413    </target>
    1514    <target name="compile">
     
    4140            <fileset file="../../apps/heartbeat/java/build/heartbeat.jar" />
    4241            <fileset file="../../apps/netmonitor/java/build/netmonitor.jar" />
    43             <fileset file="../../apps/time/java/build/timestamper.jar" />
    4442            <fileset file="../doc/COPYING" />
    4543            <fileset file="../../readme.txt" />
     
    6563            <fileset file="../../apps/heartbeat/java/build/heartbeat.jar" />
    6664            <fileset file="../../apps/netmonitor/java/build/netmonitor.jar" />
    67             <fileset file="../../apps/time/java/build/timestamper.jar" />
    6865            <fileset file="../doc/COPYING" />
    6966            <fileset file="../../readme.txt" />
     
    8784        <ant dir="../../apps/heartbeat/java" target="cleandep" />
    8885        <ant dir="../../apps/netmonitor/java" target="cleandep" />
    89         <ant dir="../../apps/time/java" target="cleandep" />
    9086    </target>
    9187    <target name="distclean" depends="clean">
     
    9793        <ant dir="../../apps/heartbeat/java" target="distclean" />
    9894        <ant dir="../../apps/netmonitor/java" target="distclean" />
    99         <ant dir="../../apps/time/java" target="distclean" />
    10095    </target>
    10196</project>
  • installer/java/src/Install.java

    r3c9b027 r352396b  
    326326        _inBPS = ((Integer)_answers.get("inBPS")).intValue();
    327327        _outBPS = ((Integer)_answers.get("outBPS")).intValue();
    328         long num = new java.util.Random().nextLong();
    329         if (num < 0)
    330             num = 0 - num;
    331         _answers.put("timestamperPassword", new Long(num));
    332328    }
    333329
  • installer/java/src/install.config

    r3c9b027 r352396b  
    116116libs.0013.name=heartbeat.config
    117117    libs.0013.islib=false
    118 libs.0014.name=timestamper.jar
    119     libs.0014.islib=true
  • installer/java/src/router.config.template

    r3c9b027 r352396b  
    110110#router.shutdownPassword=thisIsASecret
    111111
    112 #
    113 # the remaining lines describe how you can get your router to fire up client
    114 # applications it is up and running, all within the router's JVM.  Uncomment the
    115 # ones you want (revising the numbers and ports accordingly)
    116 
    117 # Keep the router's clock in sync by querying one of the specified NTP servers once
    118 # a minute (uses UDP port 123)
     112# Comma delimited list of SNTP servers to query.  pool.ntp.org is a DNS trick to
    119113# This defaults to the DNS round-robin ntp pool - see http://www.pool.ntp.org/
    120114# Please change the NTP server specified to include ones closer to you - see
     
    127121#  BE: ntp2.belbone.be
    128122#  AU: ntp.saard.net
    129 clientApp.0.main=net.i2p.time.Timestamper
    130 clientApp.0.name=Timestamper
    131 clientApp.0.onBoot=true
    132 clientApp.0.args=http://localhost:7655/setTime?##timestamperPassword## pool.ntp.org pool.ntp.org pool.ntp.org
     123time.sntpServerList=pool.ntp.org,pool.ntp.org,pool.ntp.org
    133124
    134 # The admin time passphrase, used to prevent unauthorized people from updating your
    135 # routers time.  The value should be included in the timestamper's args above,
    136 # otherwise it wont honor timestamp updates.  You shouldnt include any spaces or funky
    137 # characters - just pick some random numbers.
    138 adminTimePassphrase=##timestamperPassword##
     125# Query an SNTP server every 5 minutes
     126# time.queryFrequencyMs=300000
     127
     128# If you really really know that your computer's clock is ALWAYS correct, set this property
     129# time.disabled=true
     130
     131#
     132# the remaining lines describe how you can get your router to fire up client
     133# applications it is up and running, all within the router's JVM.  Uncomment the
     134# ones you want (revising the numbers and ports accordingly)
    139135
    140136# SAM bridge (a simplified socket based protocol for using I2P - listens on port 7656.  see
    141137# the specs at http://www.i2p.net/node/view/144 for more info)
    142 clientApp.1.main=net.i2p.sam.SAMBridge
    143 clientApp.1.name=SAMBridge
    144 clientApp.1.args=sam.keys 0.0.0.0 7656 i2cp.tcp.host=localhost i2cp.tcp.port=##_router_i2cp_port##
     138clientApp.0.main=net.i2p.sam.SAMBridge
     139clientApp.0.name=SAMBridge
     140clientApp.0.args=sam.keys 0.0.0.0 7656 i2cp.tcp.host=localhost i2cp.tcp.port=##_router_i2cp_port##
    145141
    146142# The eepProxy (HTTP proxy that lets you browse both eepsites and the normal web via squid.i2p) and
    147143# the ircProxy (which connects to the anonymously hosted ircd at irc.duck.i2p)
    148 clientApp.2.main=net.i2p.i2ptunnel.I2PTunnel
    149 clientApp.2.name=Tunnels
    150 clientApp.2.args=-nocli -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444" -e "client 6668 irc.duck.i2p"
     144clientApp.1.main=net.i2p.i2ptunnel.I2PTunnel
     145clientApp.1.name=Tunnels
     146clientApp.1.args=-nocli -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444" -e "client 6668 irc.duck.i2p"
    151147# note: if you want the proxies to be reachable from other machines, add:
    152148#       -e "listen_on 0.0.0.0"   
     
    158154# script
    159155# (don't bother trying to figure this out prior to the 0.4 release)
    160 #clientApp.3.main=net.i2p.router.web.RouterConsoleRunner
    161 #clientApp.3.name=webConsole
    162 #clientApp.3.args=7657 127.0.0.1 ./webapps/
    163 #clientApp.3.onBoot=true
     156#clientApp.2.main=net.i2p.router.web.RouterConsoleRunner
     157#clientApp.2.name=webConsole
     158#clientApp.2.args=7657 127.0.0.1 ./webapps/
     159#clientApp.2.onBoot=true
    164160
    165161# To require simple HTTP authentication for accessing any of the pages underneath the web console
     
    170166#
    171167#consolePassword=fooBarBaz
    172 
    173 # Network monitor (harvests data from the network database and stores it under
    174 # monitorData/, and with the netviewer GUI you can browse through its results)
    175 #clientApp.4.main=net.i2p.netmonitor.NetMonitor
    176 #clientApp.4.name=NetMonitor
    177 #clientApp.4.args=
    178 
    179 # Heartbeat engine (ueber-simple ping/pong system, configured in heartbeat.config.  By itself
    180 # it just writes out stat data where its told to, but there's a seperate HeartbeatMonitor
    181 # GUI to let you visualize things)
    182 #clientApp.5.main=net.i2p.heartbeat.Heartbeat
    183 #clientApp.5.name=Heartbeat
    184 #clientApp.5.args=heartbeat.config
  • installer/java/src/startRouter.bat.template

    r3c9b027 r352396b  
    55REM the -XX args are workarounds for bugs in java 1.4.2's garbage collector
    66
    7 java -cp lib\i2p.jar;lib\router.jar;lib\mstreaming.jar;lib\heartbeat.jar;lib\i2ptunnel.jar;lib\netmonitor.jar;lib\sam.jar;lib\timestamper.jar -Djava.library.path=. -DloggerFilenameOverride=logs\log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router
     7java -cp lib\i2p.jar;lib\router.jar;lib\mstreaming.jar;lib\heartbeat.jar;lib\i2ptunnel.jar;lib\netmonitor.jar;lib\sam.jar -Djava.library.path=. -DloggerFilenameOverride=logs\log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router
  • installer/java/src/startRouter.sh.template

    r3c9b027 r352396b  
    33export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
    44# the -XX args are workarounds for bugs in java 1.4.2's garbage collector
    5 nohup nice java -cp lib/i2p.jar:lib/router.jar:lib/mstreaming.jar:lib/heartbeat.jar:lib/i2ptunnel.jar:lib/netmonitor.jar:lib/sam.jar:lib/timestamper.jar -Djava.library.path=. -DloggerFilenameOverride=logs/log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router --quiet > /dev/null &
     5nohup nice java -cp lib/i2p.jar:lib/router.jar:lib/mstreaming.jar:lib/heartbeat.jar:lib/i2ptunnel.jar:lib/netmonitor.jar:lib/sam.jar -Djava.library.path=. -DloggerFilenameOverride=logs/log-router-#.txt -XX:NewSize=4M -XX:MaxNewSize=8M -XX:PermSize=8M -XX:MaxPermSize=32M net.i2p.router.Router --quiet > /dev/null &
    66# Save the pid just in case we ever want to stop the router
    77echo $! > router.pid
Note: See TracChangeset for help on using the changeset viewer.