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

merge of '0fc24e38cf763d87b57238415416a162be39e1ad'

Browse Source 
and 'eb56602a5a6fb7a1d5b54be0a0618c0e861da10f'
This commit is contained in:
zzz
2011-12-11 20:59:26 +00:00
parent b47deadc97 6caa1c3e81
commit 032b7d8230
5 changed files with 182 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
View File

@@ -46,6 +46,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
private static final String SERVER_HEADER = "Server"; private static final String SERVER_HEADER = "Server";
private static final String[] SERVER_SKIPHEADERS = {SERVER_HEADER}; private static final String[] SERVER_SKIPHEADERS = {SERVER_HEADER};
private static final long HEADER_TIMEOUT = 60*1000; private static final long HEADER_TIMEOUT = 60*1000;
private static final long START_INTERVAL = (60 * 1000) * 3;
private long _startedOn = 0L;
private final static byte[] ERR_UNAVAILABLE = private final static byte[] ERR_UNAVAILABLE =
("HTTP/1.1 503 Service Unavailable\r\n"+ ("HTTP/1.1 503 Service Unavailable\r\n"+
@@ -81,6 +83,14 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 }); getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
} }
@Override
public void startRunning() {
super.startRunning();
_startedOn = getTunnel().getContext().clock().now();
// Would be better if this was set when the inbound tunnel becomes alive.
}
/** /**
* Called by the thread pool of I2PSocket handlers * Called by the thread pool of I2PSocket handlers
* *
@@ -168,8 +178,10 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
try { try {
socket.close(); socket.close();
} catch (IOException ioe) {} } catch (IOException ioe) {}
if (_log.shouldLog(Log.ERROR)) // Don't complain too early, Jetty may not be ready.
_log.error("Error connecting to HTTP server " + remoteHost + ':' + remotePort, ex); int level = getTunnel().getContext().clock().now() - _startedOn > START_INTERVAL ? Log.ERROR : Log.WARN;
if (_log.shouldLog(level))
_log.log(level, "Error connecting to HTTP server " + remoteHost + ':' + remotePort, ex);
} catch (IOException ex) { } catch (IOException ex) {
try { try {
socket.close(); socket.close();

4
build.xml
View File

@@ -274,7 +274,7 @@
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="&quot;[:space:]&quot;" />
<arg value="," /> <arg value="," />
</exec> </exec>
</target> </target>
@@ -462,7 +462,7 @@
</exec> </exec>
<exec executable="tr" inputstring="${build.temp}" outputproperty="build.temp.tr" failonerror="true"> <exec executable="tr" inputstring="${build.temp}" outputproperty="build.temp.tr" failonerror="true">
<arg value="-d" /> <arg value="-d" />
<arg value="[:space:]"/> <arg value="&quot;[:space:]&quot;"/>
</exec> </exec>
<exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failonerror="true" > <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failonerror="true" >
<arg value="-f1" /> <arg value="-f1" />

267
core/c/jbigi/mbuild-all.sh
View File

@@ -1,12 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
if [ -z "$BASH_VERSION" ]; then
echo "This script needs to be run with Bash."
echo
echo "Please install bash and then run this script with"
echo "bash $0"
exit 1
fi
#FIXME What platforms for MacOS? #FIXME What platforms for MacOS?
MISC_DARWIN_PLATFORMS="powerpc powerpc64 powerpc64le powerpcle" MISC_DARWIN_PLATFORMS="powerpc powerpc64 powerpc64le powerpcle"
@@ -50,6 +42,17 @@ X86_PLATFORMS="pentium pentiummmx pentium2 pentium3 pentiumm k6 k62 k63 athlon g
# You should not need to edit anything below this comment. # You should not need to edit anything below this comment.
# #
# The built-in echo in /bin/sh (the real bourne shell) on BSD systems supports -e.
# The built-in echo in dash (the default /bin/sh on Debian) does not support -e
# but /bin/echo always supports -e in Linux; therefore, let's set echo to /bin/echo
# whenever we're on Linux and use the shell's built-in "echo" on everything else.
if [ $(uname -s |tr "[A-Z]" "[a-z]") = "linux" ]; then
ECHO="/bin/echo"
else
ECHO="echo"
fi
MINGW_PLATFORMS="${X86_PLATFORMS} ${MISC_MINGW_PLATFORMS}" MINGW_PLATFORMS="${X86_PLATFORMS} ${MISC_MINGW_PLATFORMS}"
LINUX_PLATFORMS="${X86_PLATFORMS} ${MISC_LINUX_PLATFORMS}" LINUX_PLATFORMS="${X86_PLATFORMS} ${MISC_LINUX_PLATFORMS}"
FREEBSD_PLATFORMS="${X86_PLATFORMS} ${MISC_FREEBSD_PLATFORMS}" FREEBSD_PLATFORMS="${X86_PLATFORMS} ${MISC_FREEBSD_PLATFORMS}"
@@ -60,146 +63,144 @@ OPENBSD_PLATFORM="${X86_PLATFORMS} ${MISC_OPENBSD_PLATFORMS}"
# FIXME Is this all? # FIXME Is this all?
DARWIN_PLATFORMS="core2 corei" DARWIN_PLATFORMS="core2 corei"
# Set the version to 5.0.2 for OSX because # Set the version to 5.0.2 for OSX because AFAIK there are only 64bit capable CPUs for the Intel Macs
# 1) it doesn't have the -r parameter as an option for sed
# 2) AFAIK there are only 64bit capable CPUs for the Intel Macs
if [ `uname -s |grep Darwin` ]; then if [ `uname -s |grep Darwin` ]; then
VER=5.0.2 VER=5.0.2
else else
VER=$(echo gmp-*.tar.bz2 | sed -re "s/(.*-)(.*)(.*.tar.bz2)$/\2/" | tail -n 1) VER=$($ECHO gmp-*.tar.bz2 | sed -e "s/\(.*-\)\(.*\)\(.*.tar.bz2\)$/\2/" | tail -n 1)
fi fi
if [ "$VER" = "" ] ; then if [ "$VER" = "" ] ; then
echo "ERROR! Can't find gmp source tarball." $ECHO "ERROR! Can't find gmp source tarball."
exit 1 exit 1
fi fi
case `uname -sr` in case `uname -s` in
MINGW*) MINGW*)
PLATFORM_LIST="${MINGW_PLATFORMS}" PLATFORM_LIST="${MINGW_PLATFORMS}"
NAME="jbigi" NAME="jbigi"
TYPE="dll" TYPE="dll"
TARGET="-windows-" TARGET="-windows-"
echo "Building windows .dlls for all architectures";; $ECHO "Building windows .dlls for all architectures";;
Darwin*) Darwin*)
PLATFORM_LIST="${DARWIN_PLATFORMS}" PLATFORM_LIST="${DARWIN_PLATFORMS}"
NAME="libjbigi" NAME="libjbigi"
TYPE="jnilib" TYPE="jnilib"
TARGET="-osx-" TARGET="-osx-"
echo "Building ${TARGET} .jnilibs for all architectures";; $ECHO "Building ${TARGET} .jnilibs for all architectures";;
Linux*) Linux*)
NAME="libjbigi" NAME="libjbigi"
TYPE="so" TYPE="so"
PLATFORM_LIST="" PLATFORM_LIST=""
TARGET="-linux-" TARGET="-linux-"
arch=$(uname -m | cut -f1 -d" ") arch=$(uname -m | cut -f1 -d" ")
case ${arch} in case ${arch} in
i[3-6]86) i[3-6]86)
arch="x86";; arch="x86";;
esac esac
case ${arch} in case ${arch} in
x86_64 | amd64) x86_64 | amd64)
PLATFORM_LIST="${X86_64_PLATFORMS}" PLATFORM_LIST="${X86_64_PLATFORMS}"
TARGET="-linux-X86_64-";; TARGET="-linux-X86_64-";;
ia64) ia64)
PLATFORM_LIST="${X86_64_PLATFORMS}" PLATFORM_LIST="${X86_64_PLATFORMS}"
TARGET="-linux-ia64-";; TARGET="-linux-ia64-";;
x86) x86)
PLATFORM_LIST="${X86_PLATFORMS}" PLATFORM_LIST="${X86_PLATFORMS}"
TARGET="-linux-x86-";; TARGET="-linux-x86-";;
*) *)
PLATFORM_LIST="${LINUX_PLATFORMS}";; PLATFORM_LIST="${LINUX_PLATFORMS}";;
esac esac
echo "Building ${TARGET} .so's for ${arch}";; $ECHO "Building ${TARGET} .sos for ${arch}";;
NetBSD*|FreeBSD*|OpenBSD*) NetBSD*|FreeBSD*|OpenBSD*)
NAME="libjbigi" NAME="libjbigi"
TYPE="so" TYPE="so"
PLATFORM_LIST="" PLATFORM_LIST=""
BSDTYPE="`uname -s | tr [A-Z] [a-z]`" BSDTYPE=$(uname -s | tr "[A-Z]" "[a-z]")
arch=$(uname -m | cut -f1 -d" ") arch=$(uname -m | cut -f1 -d" ")
case ${arch} in case ${arch} in
i[3-6]86) i[3-6]86)
arch="x86";; arch="x86";;
esac esac
case ${arch} in case ${arch} in
x86_64|amd64) x86_64|amd64)
PLATFORM_LIST="${X86_64_PLATFORMS}" PLATFORM_LIST="${X86_64_PLATFORMS}"
TARGET="-${BSDTYPE}-X86_64-";; TARGET="-${BSDTYPE}-X86_64-";;
ia64) ia64)
PLATFORM_LIST="${X86_64_PLATFORMS}" PLATFORM_LIST="${X86_64_PLATFORMS}"
TARGET="-${BSDTYPE}-ia64-";; TARGET="-${BSDTYPE}-ia64-";;
x86) x86)
PLATFORM_LIST="${X86_PLATFORMS}" PLATFORM_LIST="${X86_PLATFORMS}"
TARGET="-${BSDTYPE}-x86-";; TARGET="-${BSDTYPE}-x86-";;
*) *)
case ${BSDTYPE} in case ${BSDTYPE} in
netbsd) netbsd)
PLATFORM_LIST="${NETBSD_PLATFORMS}";; PLATFORM_LIST="${NETBSD_PLATFORMS}";;
openbsd) openbsd)
PLATFORM_LIST="${OPENBSD_PLATFORMS}";; PLATFORM_LIST="${OPENBSD_PLATFORMS}";;
freebsd) freebsd)
PLATFORM_LIST="${FREEBSD_PLATFORMS}";; PLATFORM_LIST="${FREEBSD_PLATFORMS}";;
*) *)
echo "Unsupported build environment" $ECHO "Unsupported build environment"
exit 1;; exit 1;;
esac esac
esac esac
echo "Building ${BSDTYPE} .so's for ${arch}";; $ECHO "Building ${BSDTYPE} .sos for ${arch}";;
*) *)
echo "Unsupported build environment" $ECHO "Unsupported build environment"
exit;; exit;;
esac esac
function make_static { make_static () {
echo "Attempting .${4} creation for ${3}${5}${2}" $ECHO "Attempting .${4} creation for ${3}${5}${2}"
../../mbuild_jbigi.sh static || return 1 ../../mbuild_jbigi.sh static || return 1
cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${2}.${4} cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${2}.${4}
return 0 return 0
} }
function make_file { make_file () {
# Nonfatal bail out on Failed build. # Nonfatal bail out on Failed build.
echo "Attempting build for ${3}${5}${2}" $ECHO "Attempting build for ${3}${5}${2}"
make && return 0 make && return 0
cd .. cd ..
rm -R "$2" rm -R "$2"
echo -e "\n\nFAILED! ${3}${5}${2} not made.\a" $ECHO -e "\n\nFAILED! ${3}${5}${2} not made.\a"
sleep 10 sleep 10
return 1 return 1
} }
function configure_file { configure_file () {
echo -e "\n\n\nAttempting configure for ${3}${5}${2}\n\n\n" $ECHO -e "\n\n\nAttempting configure for ${3}${5}${2}\n\n\n"
sleep 10 sleep 10
# Nonfatal bail out on unsupported platform. # Nonfatal bail out on unsupported platform.
if [ `uname -s |grep Darwin` ]; then if [ `uname -s |grep Darwin` ]; then
../../gmp-${1}/configure --build=${2}-apple-darwin --with-pic && return 0 ../../gmp-${1}/configure --build=${2}-apple-darwin --with-pic && return 0
else else
../../gmp-${1}/configure --build=${2} --with-pic && return 0 ../../gmp-${1}/configure --build=${2} --with-pic && return 0
fi fi
cd .. cd ..
rm -R "$2" rm -R "$2"
echo -e "\n\nSorry, ${3}${5}${2} is not supported on your build environment.\a" $ECHO -e "\n\nSorry, ${3}${5}${2} is not supported on your build environment.\a"
sleep 10 sleep 10
return 1 return 1
} }
function build_file { build_file () {
configure_file "$1" "$2" "$3" "$4" "$5" && make_file "$1" "$2" "$3" "$4" "$5" && make_static "$1" "$2" "$3" "$4" "$5" && return 0 configure_file "$1" "$2" "$3" "$4" "$5" && make_file "$1" "$2" "$3" "$4" "$5" && make_static "$1" "$2" "$3" "$4" "$5" && return 0
echo -e "\n\n\nError building static!\n\n\a" $ECHO -e "\n\n\nError building static!\n\n\a"
sleep 10 sleep 10
return 1 return 1
} }
echo "Extracting GMP Version $VER ..." $ECHO "Extracting GMP Version $VER ..."
tar -xjf gmp-$VER.tar.bz2 || ( echo "Error in tarball file!" ; exit 1 ) tar -xjf gmp-$VER.tar.bz2 || ( $ECHO "Error in tarball file!" ; exit 1 )
if [ ! -d bin ]; then if [ ! -d bin ]; then
mkdir bin mkdir bin
fi fi
if [ ! -d lib/net/i2p/util ]; then if [ ! -d lib/net/i2p/util ]; then
mkdir -p lib/net/i2p/util mkdir -p lib/net/i2p/util
fi fi
# Don't touch this one. # Don't touch this one.
@@ -207,18 +208,18 @@ NO_PLATFORM=none
for x in $NO_PLATFORM $PLATFORM_LIST for x in $NO_PLATFORM $PLATFORM_LIST
do do
( (
if [ ! -d bin/$x ]; then if [ ! -d bin/$x ]; then
mkdir bin/$x mkdir bin/$x
cd bin/$x cd bin/$x
else else
cd bin/$x cd bin/$x
rm -Rf * rm -Rf *
fi fi
build_file "$VER" "$x" "$NAME" "$TYPE" "$TARGET" build_file "$VER" "$x" "$NAME" "$TYPE" "$TARGET"
) )
done done
echo "Success!" $ECHO "Success!"
exit 0 exit 0

58
core/c/jbigi/mbuild_jbigi.sh
View File

@@ -1,30 +1,30 @@
#!/usr/bin/env bash #!/bin/sh
# When executed in Mingw: Produces a jbigi.dll # When executed in Mingw: Produces a jbigi.dll
# When executed in Linux/FreeBSD: Produces a libjbigi.so # When executed in Linux/FreeBSD: Produces a libjbigi.so
# When executed in OSX: Produces a libjbigi.jnilib # When executed in OSX: Produces a libjbigi.jnilib
CC="gcc" CC="gcc"
case `uname -sr` in case `uname -s` in
MINGW*) MINGW*)
JAVA_HOME="c:/software/j2sdk1.4.2_05" JAVA_HOME="c:/software/j2sdk1.4.2_05"
COMPILEFLAGS="-Wall" COMPILEFLAGS="-Wall"
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include/win32/ -I$JAVA_HOME/include/" INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include/win32/ -I$JAVA_HOME/include/"
LINKFLAGS="-shared -Wl,--kill-at" LINKFLAGS="-shared -Wl,--kill-at"
LIBFILE="jbigi.dll";; LIBFILE="jbigi.dll";;
CYGWIN*) CYGWIN*)
JAVA_HOME="c:/software/j2sdk1.4.2_05" JAVA_HOME="c:/software/j2sdk1.4.2_05"
COMPILEFLAGS="-Wall -mno-cygwin" COMPILEFLAGS="-Wall -mno-cygwin"
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include/win32/ -I$JAVA_HOME/include/" INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include/win32/ -I$JAVA_HOME/include/"
LINKFLAGS="-shared -Wl,--kill-at" LINKFLAGS="-shared -Wl,--kill-at"
LIBFILE="jbigi.dll";; LIBFILE="jbigi.dll";;
Darwin*) Darwin*)
JAVA_HOME=$(/usr/libexec/java_home) JAVA_HOME=$(/usr/libexec/java_home)
COMPILEFLAGS="-fPIC -Wall" COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include" INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include"
LINKFLAGS="-dynamiclib -framework JavaVM" LINKFLAGS="-dynamiclib -framework JavaVM"
LIBFILE="libjbigi.jnilib";; LIBFILE="libjbigi.jnilib";;
SunOS*|OpenBSD*|NetBSD*|FreeBSD*|Linux*) SunOS*|OpenBSD*|NetBSD*|FreeBSD*|Linux*)
UNIXTYPE="`uname -s | tr [A-Z] [a-z]`" UNIXTYPE=$(uname -s | tr "[A-Z]" "[a-z]")
if [ $UNIXTYPE = "sunos" ]; then if [ $UNIXTYPE = "sunos" ]; then
UNIXTYPE="solaris" UNIXTYPE="solaris"
elif [ $UNIXTYPE = "freebsd" ]; then elif [ $UNIXTYPE = "freebsd" ]; then
@@ -37,31 +37,31 @@ SunOS*|OpenBSD*|NetBSD*|FreeBSD*|Linux*)
if [ -d /usr/local/jdk-1.7.0 ]; then if [ -d /usr/local/jdk-1.7.0 ]; then
JAVA_HOME="/usr/local/jdk-1.7.0" JAVA_HOME="/usr/local/jdk-1.7.0"
fi fi
elif [ $UNIXTYPE = "netbsd" ]; then elif [ $UNIXTYPE = "netbsd" ]; then
if [ -d /usr/pkg/java/openjdk7 ]; then if [ -d /usr/pkg/java/openjdk7 ]; then
JAVA_HOME="/usr/pkg/java/openjdk7" JAVA_HOME="/usr/pkg/java/openjdk7"
fi fi
elif [ $UNIXTYPE = "linux" -a -e /etc/debian_version ]; then elif [ $UNIXTYPE = "linux" ] && [ -e /etc/debian_version ]; then
if [ -d /usr/lib/jvm/default-java ]; then if [ -d /usr/lib/jvm/default-java ]; then
JAVA_HOME="/usr/lib/jvm/default-java" JAVA_HOME="/usr/lib/jvm/default-java"
fi fi
fi fi
COMPILEFLAGS="-fPIC -Wall" COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}" INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
LINKFLAGS="-shared -Wl,-soname,libjbigi.so" LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";; LIBFILE="libjbigi.so";;
*) *)
echo "Unsupported system type." echo "Unsupported system type."
exit 1;; exit 1;;
esac esac
if [ "$1" = "dynamic" ] ; then if [ "$1" = "dynamic" ] ; then
echo "Building a jbigi lib that is dynamically linked to GMP" echo "Building a jbigi lib that is dynamically linked to GMP"
LIBPATH="-L.libs" LIBPATH="-L.libs"
INCLUDELIBS="-lgmp" INCLUDELIBS="-lgmp"
else else
echo "Building a jbigi lib that is statically linked to GMP" echo "Building a jbigi lib that is statically linked to GMP"
STATICLIBS=".libs/libgmp.a" STATICLIBS=".libs/libgmp.a"
fi fi
echo "Compiling C code..." echo "Compiling C code..."

3
history.txt
View File

@@ -1,3 +1,6 @@
2011-12-11 sponge
* HTTP server tunnel, use log.WARN for 3 first minutes. (closes #460)
2011-12-10 kytv 2011-12-10 kytv
* Replace eepget's whitelist of accepted characters with the * Replace eepget's whitelist of accepted characters with the
blacklist from i2psnark. (closes #562) blacklist from i2psnark. (closes #562)