From e8abe14395e63e6c9745cf33ef9b5a5eca671ce1 Mon Sep 17 00:00:00 2001 From: mathiasdm Date: Wed, 20 Oct 2010 15:55:28 +0000 Subject: [PATCH 1/4] Fixed susimail javadoc errors. --- .../src/src/i2p/susi/util/Config.java | 3 -- .../src/src/i2p/susi/util/Folder.java | 16 +++----- .../src/src/i2p/susi/webmail/Attachment.java | 12 ++---- .../src/src/i2p/susi/webmail/Mail.java | 5 +-- .../src/src/i2p/susi/webmail/MailCache.java | 4 +- .../src/i2p/susi/webmail/RequestWrapper.java | 39 ++++--------------- 6 files changed, 20 insertions(+), 59 deletions(-) diff --git a/apps/susimail/src/src/i2p/susi/util/Config.java b/apps/susimail/src/src/i2p/susi/util/Config.java index 723c56b992..8564cbfad8 100644 --- a/apps/susimail/src/src/i2p/susi/util/Config.java +++ b/apps/susimail/src/src/i2p/susi/util/Config.java @@ -42,7 +42,6 @@ public class Config { /** * * @param name - * @return */ public static String getProperty( String name ) { @@ -98,7 +97,6 @@ public class Config { * * @param name * @param defaultValue - * @return */ public static String getProperty( String name, String defaultValue ) { @@ -109,7 +107,6 @@ public class Config { * * @param name * @param defaultValue - * @return */ public static int getProperty( String name, int defaultValue ) { diff --git a/apps/susimail/src/src/i2p/susi/util/Folder.java b/apps/susimail/src/src/i2p/susi/util/Folder.java index 7a18a2477d..c8cd9b7669 100644 --- a/apps/susimail/src/src/i2p/susi/util/Folder.java +++ b/apps/susimail/src/src/i2p/susi/util/Folder.java @@ -270,7 +270,7 @@ public class Folder { /** * Returns the element on the current page on the given position. * - * @param Position of the element on the current page. + * @param x Position of the element on the current page. * @return Element on the current page on the given position. */ public Object getElementAtPosXonCurrentPage( int x ) @@ -331,7 +331,7 @@ public class Folder { * Gets index of an element in the array regardless of sorting direction. * * @param element - * @return + * @return index */ private int getIndexOf( Object element ) { @@ -348,7 +348,7 @@ public class Folder { * Sorting direction is taken into account. * * @param element - * @return + * @return The next element */ public Object getNextElement( Object element ) { @@ -369,7 +369,7 @@ public class Folder { * Sorting direction is taken into account. * * @param element - * @return + * @return The previous element */ public Object getPreviousElement( Object element ) { @@ -388,7 +388,7 @@ public class Folder { * Retrieves element at index i. Depends on sorting direction. * * @param i - * @return + * @return Element at index i */ private Object getElement( int i ) { @@ -404,8 +404,6 @@ public class Folder { /** * Returns true, if folder shows points to the last page. - * - * @return */ public boolean isLastPage() { @@ -414,8 +412,6 @@ public class Folder { /** * Returns true, if folder shows points to the first page. - * - * @return */ public boolean isFirstPage() { @@ -427,7 +423,6 @@ public class Folder { * The sorting direction influences which element is taken for comparison. * * @param element - * @return */ public boolean isLastElement( Object element ) { @@ -441,7 +436,6 @@ public class Folder { * The sorting direction influences which element is taken for comparison. * * @param element - * @return */ public boolean isFirstElement( Object element ) { diff --git a/apps/susimail/src/src/i2p/susi/webmail/Attachment.java b/apps/susimail/src/src/i2p/susi/webmail/Attachment.java index 91da870640..922ca8069f 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Attachment.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Attachment.java @@ -56,16 +56,12 @@ public class Attachment { public void setBuffer(ReadBuffer buffer) { this.buffer = buffer; } - /** - * @return - */ + public String getTransferEncoding() { // TODO Auto-generated method stub return transferEncoding; } - /** - * @return - */ + public String getContentType() { // TODO Auto-generated method stub return contentType; @@ -82,9 +78,7 @@ public class Attachment { public void setTransferEncoding(String transferEncoding) { this.transferEncoding = transferEncoding; } - /** - * @param string - */ + public void setData(String data ) { this.data = data; } diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java index 80f6d67bff..98cf7c9e59 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java @@ -78,8 +78,8 @@ public class Mail { } /** * - * @param address - * @return + * @param address E-mail address to be validated + * @return Is the e-mail address valid? */ public static boolean validateAddress( String address ) { @@ -105,7 +105,6 @@ public class Mail { } /** * @param address - * @return */ public static String getAddress(String address ) { diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java index 05694f2bf5..a7116811ce 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java +++ b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java @@ -47,9 +47,9 @@ public class MailCache { /** * Fetch any needed data from pop3 server. * - * @param id message id to get + * @param uidl message id to get * @param headerOnly fetch only header lines? - * @return + * @return An e-mail */ public Mail getMail( String uidl, boolean headerOnly ) { diff --git a/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java b/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java index 0cb20af2f6..0c1d835cc1 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java +++ b/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java @@ -67,29 +67,25 @@ public class RequestWrapper { /** * @param b - * @return */ public HttpSession getSession(boolean b) { return httpRequest.getSession( b ); } /** - * @param key - * @return + * @param name Specific parameter key + * @return parameter value */ public String getParameter(String name ) { return getParameter( name, null ); } - /** - * @return - */ public HttpSession getSession() { return httpRequest.getSession(); } /** - * @return + * @return List of request parameter names */ public Enumeration getParameterNames() { if( multiPartRequest != null ) { @@ -106,24 +102,19 @@ public class RequestWrapper { } /** - * @return + * @return The total length of the content. */ public int getContentLength() { return httpRequest.getContentLength(); } /** - * @return + * @return The content type of the request. */ public String getContentType() { return httpRequest.getContentType(); } - /** - * - * @param partName - * @return - */ public String getContentType( String partName ) { String result = null; @@ -143,19 +134,11 @@ public class RequestWrapper { } return result; } - /** - * @param string - * @return - */ + public Object getAttribute(String string) { return httpRequest.getAttribute( string ); } - /** - * @param new_subject - * @param string - * @return - */ public String getParameter( String name, String defaultValue ) { String result = defaultValue; @@ -184,10 +167,7 @@ public class RequestWrapper { } return result; } - /** - * @param new_filename - * @return - */ + public String getFilename(String partName ) { String result = null; @@ -198,10 +178,7 @@ public class RequestWrapper { } return result; } - /** - * @param new_filename - * @return - */ + public InputStream getInputStream(String partName ) { InputStream result = null; From e6c45ae5f89d2eb7f1fba54b29f8de2f5263f619 Mon Sep 17 00:00:00 2001 From: mathiasdm Date: Wed, 20 Oct 2010 16:01:18 +0000 Subject: [PATCH 2/4] Added package files for router. --- router/java/src/net/i2p/router/package.html | 10 ++++++++++ .../java/src/net/i2p/router/peermanager/package.html | 10 ++++++++++ router/java/src/net/i2p/router/startup/package.html | 10 ++++++++++ .../src/net/i2p/router/transport/ntcp/package.html | 7 +++++++ router/java/src/net/i2p/router/transport/package.html | 7 +++++++ .../java/src/net/i2p/router/transport/udp/package.html | 7 +++++++ 6 files changed, 51 insertions(+) create mode 100644 router/java/src/net/i2p/router/package.html create mode 100644 router/java/src/net/i2p/router/peermanager/package.html create mode 100644 router/java/src/net/i2p/router/startup/package.html create mode 100644 router/java/src/net/i2p/router/transport/ntcp/package.html create mode 100644 router/java/src/net/i2p/router/transport/package.html create mode 100644 router/java/src/net/i2p/router/transport/udp/package.html diff --git a/router/java/src/net/i2p/router/package.html b/router/java/src/net/i2p/router/package.html new file mode 100644 index 0000000000..02e1bb6566 --- /dev/null +++ b/router/java/src/net/i2p/router/package.html @@ -0,0 +1,10 @@ + + +

+ The I2P router application handles the I2P network communication. +

+

+ It encompasses sending and receiving messages, building up tunnels, encrypting and decrypting (on multiple levels) where applicable, and so on. +

+ + diff --git a/router/java/src/net/i2p/router/peermanager/package.html b/router/java/src/net/i2p/router/peermanager/package.html new file mode 100644 index 0000000000..f422d0c109 --- /dev/null +++ b/router/java/src/net/i2p/router/peermanager/package.html @@ -0,0 +1,10 @@ + + +

+ The peer manager logs information about the history and quality of network peers. +

+

+ Peer capacity, speed and other parameters are calculated to determine in what cases we should use each peer. +

+ + diff --git a/router/java/src/net/i2p/router/startup/package.html b/router/java/src/net/i2p/router/startup/package.html new file mode 100644 index 0000000000..7dfdabf9ec --- /dev/null +++ b/router/java/src/net/i2p/router/startup/package.html @@ -0,0 +1,10 @@ + + +

+ The I2P startup package loads the configuration when I2P is started. +

+

+ The startup consists of a number of different jobs, like loading data from files for the network database, creating new router information (keypairs), and so on. +

+ + diff --git a/router/java/src/net/i2p/router/transport/ntcp/package.html b/router/java/src/net/i2p/router/transport/ntcp/package.html new file mode 100644 index 0000000000..4aeb388cf2 --- /dev/null +++ b/router/java/src/net/i2p/router/transport/ntcp/package.html @@ -0,0 +1,7 @@ + + +

+ The NTCP transport allows passing I2P messages on top of TCP. The N in NTCP stands for 'New', as the NTCP transport replaces an older TCP transport which had issues concerning congestion collapse. +

+ + diff --git a/router/java/src/net/i2p/router/transport/package.html b/router/java/src/net/i2p/router/transport/package.html new file mode 100644 index 0000000000..4970c053e1 --- /dev/null +++ b/router/java/src/net/i2p/router/transport/package.html @@ -0,0 +1,7 @@ + + +

+ The transport system allows the usage of communication layers that are below I2P in the stack, on which I2P messages are sent. +

+ + diff --git a/router/java/src/net/i2p/router/transport/udp/package.html b/router/java/src/net/i2p/router/transport/udp/package.html new file mode 100644 index 0000000000..1c1f948524 --- /dev/null +++ b/router/java/src/net/i2p/router/transport/udp/package.html @@ -0,0 +1,7 @@ + + +

+ The UDP transport (also known as 'SSU transport') allows passing I2P messages on top of UDP. +

+ + From 3998ce311fd69e8df8edbdaf409e9db5e2083c1a Mon Sep 17 00:00:00 2001 From: sponge Date: Fri, 22 Oct 2010 02:26:13 +0000 Subject: [PATCH 3/4] Fix rc.i2p for slackware package --- Slackware/i2p-base/rc.i2p_def | 21 +++++++++++++++++++-- history.txt | 3 +++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Slackware/i2p-base/rc.i2p_def b/Slackware/i2p-base/rc.i2p_def index 8e059c23d6..075e9e8472 100644 --- a/Slackware/i2p-base/rc.i2p_def +++ b/Slackware/i2p-base/rc.i2p_def @@ -2,15 +2,32 @@ # Start/stop i2p service. i2p_start() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )" + # Check if router is up first! + /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )" > /dev/null + if [ ! $? -eq 0 ] ; then { + # I2p is already running, so tell the user. + echo "I2P is already running..." + i2p_status + } + else + { + # Just in-case there are leftover junk in /tmp... + rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping + # Now that all junk is cleaned up, start. + /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )" + } + fi } i2p_stop() { /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )" + rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping } i2p_restart() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory restart)" + # We want a FULL cycle here, not the wrappers idea of this! + i2p_stop + i2p_start } i2p_status() { diff --git a/history.txt b/history.txt index d6231fa2bb..af4b19410f 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-10-22 sponge + * Fix rc.i2p for slackware package + 2010-10-10 sponge * Fulfill Request for name resolving in BOB From e6bf1af982773ff6b6c3d2bca7ad90ed05aa0e1d Mon Sep 17 00:00:00 2001 From: sponge Date: Fri, 22 Oct 2010 02:43:17 +0000 Subject: [PATCH 4/4] Sanity and some fixs for slackware package --- Slackware/i2p/i2p.SlackBuild | 19 +++++++++++-------- history.txt | 3 +++ .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index fc95ce3791..3ae2075c8c 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -85,23 +85,26 @@ cp -a ../i2p $PKG/$INSTALL_DIR/ mkdir -p $PKG/install ############################################################################# -# Preconfigureation to make package smaller +# Preconfigureation to make package smaller, and... +# we keep as much as reasonable in the installation directory. +# This makes the install map fairly well to the standard installation. +# It also makes it easier to find the log and pid files! ############################################################################# cd $PKG/$INSTALL_DIR/i2p # wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir -sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a -sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config +sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a +sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config # eepget %INSTALL_PATH -sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a +sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a rm eepget mv a eepget # runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir -sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a -sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh +sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a +sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh # i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir -sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a -sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter +sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a +sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > i2prouter chmod 744 ./i2prouter chmod 744 ./osid diff --git a/history.txt b/history.txt index af4b19410f..90664730b1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-10-22 sponge + * Sanity and some fixs for slackware package + 2010-10-22 sponge * Fix rc.i2p for slackware package diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4f6b6353ed..df69e964f9 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 04; + public final static long BUILD = 05; /** for example "-test" */ public final static String EXTRA = "";