zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

removes a bug in SAM v1 and v2 (introduced when merging with v3)

Browse Source
This commit is contained in:
mkvore-commit
2009-09-07 17:33:29 +00:00
parent 1f1d089fda
commit 1850e893e9
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/sam/java/src/net/i2p/sam/SAMHandler.java
View File

@@ -124,9 +124,11 @@ public abstract class SAMHandler implements Runnable {
* @return True if the string was successfully written, false otherwise * @return True if the string was successfully written, false otherwise
*/ */
protected final boolean writeString(String str) { protected final boolean writeString(String str) {
if (_log.shouldLog(Log.DEBUG)) synchronized (socketWLock) {
_log.debug("Sending the client: [" + str + "]"); if (_log.shouldLog(Log.DEBUG))
return writeString(str, socket); _log.debug("Sending the client: [" + str + "]");
return writeString(str, socket);
}
} }
public static boolean writeString(String str, SocketChannel out) public static boolean writeString(String str, SocketChannel out)

14
core/c/jbigi/build.sh
View File

@@ -15,21 +15,21 @@
mkdir -p lib/ mkdir -p lib/
mkdir -p bin/local mkdir -p bin/local
VER=4.2.4 VER=4.3.1
if [ "$1" != "dynamic" -a ! -d gmp-$VER ] if [ "$1" != "dynamic" -a ! -d gmp-$VER ]
then then
TAR=gmp-$VER.tar.bz2 TAR=gmp-$VER.tar.lzma
if [ ! -f $TAR ] if [ ! -f $TAR ]
then then
echo "GMP tarball $TAR not found. You must download it from http://gmplib.org/" echo "Downloading ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma"
exit 1 wget ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma
fi fi
echo "Building the jbigi library with GMP Version $VER" echo "Building the jbigi library with GMP Version $VER"
echo "Extracting GMP..." echo "Extracting GMP..."
tar -xjf gmp-$VER.tar.bz2 tar -xf gmp-$VER.tar.lzma --lzma
fi fi
cd bin/local cd bin/local
@@ -42,7 +42,7 @@ then
# --with-pic is required for static linking # --with-pic is required for static linking
../../gmp-$VER/configure --with-pic;; ../../gmp-$VER/configure --with-pic;;
*) *)
../../gmp-$VER/configure;; ../../gmp-$VER/configure --with-pic;;
esac esac
make make
sh ../../build_jbigi.sh static sh ../../build_jbigi.sh static
@@ -54,7 +54,7 @@ cp *jbigi???* ../../lib/
echo 'Library copied to lib/' echo 'Library copied to lib/'
cd ../.. cd ../..
I2P=~/i2p I2P=~/i2p/i2p
if [ ! -f $I2P/lib/i2p.jar ] if [ ! -f $I2P/lib/i2p.jar ]
then then
echo "I2P installation not found in $I2P - correct \$I2P definition in script to run speed test" echo "I2P installation not found in $I2P - correct \$I2P definition in script to run speed test"

4
core/c/jcpuid/build.sh
View File

@@ -37,13 +37,13 @@ FreeBSD*)
Linux*) Linux*)
COMPILEFLAGS="-fPIC -Wall" COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
LINKFLAGS="-shared -static -static-libgcc -Wl,-soname,libjcpuid-x86-linux.so" LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";; LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
esac esac
echo "Compiling C code..." echo "Compiling C code..."
rm -f $LIBFILE rm -f $LIBFILE
$CC $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE $CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
strip $LIBFILE strip $LIBFILE
echo Built $LIBFILE echo Built $LIBFILE

3
history.txt
View File

@@ -1,3 +1,6 @@
2009-09-07 mkvore
* removes a SAM v1&2 bug
2009-09-04 zzz 2009-09-04 zzz
* SessionKeyManager, OCMOSJ, Garlic: * SessionKeyManager, OCMOSJ, Garlic:
- Enable per-client SessionKeyManagers for better anonymity - Enable per-client SessionKeyManagers for better anonymity