From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- net-p2p/mldonkey/files/mldonkey.confd | 42 +++++++++++++++++++ net-p2p/mldonkey/files/mldonkey.confd-2.8 | 39 ----------------- net-p2p/mldonkey/files/mldonkey.initd | 70 ++++++++++++++++++++----------- 3 files changed, 87 insertions(+), 64 deletions(-) create mode 100644 net-p2p/mldonkey/files/mldonkey.confd delete mode 100644 net-p2p/mldonkey/files/mldonkey.confd-2.8 (limited to 'net-p2p/mldonkey/files') diff --git a/net-p2p/mldonkey/files/mldonkey.confd b/net-p2p/mldonkey/files/mldonkey.confd new file mode 100644 index 000000000000..7cdb2b7134ed --- /dev/null +++ b/net-p2p/mldonkey/files/mldonkey.confd @@ -0,0 +1,42 @@ +# /etc/conf.d/mldonkey +# Config file for mldonkey control script + +# Change the following vars only if you know +# what you're doing, there's no checking for +# invalid data yet! + +# owner of mlnet process (don't change, must be existing) +USER="p2p" + +# mldonkey's working dir (must be existing) +MLDONKEY_DIR="/home/p2p/mldonkey" + +# logfile (/dev/null for nowhere) +LOG="/var/log/mldonkey.log" + +# set to true, if you have enabled logging to syslog in MLDonkey with +# set log_to_syslog true +USE_LOGGER=false + +# bandwidth control, values in kb/s +LOW_DOWN="6" +LOW_UP="2" +HIGH_DOWN="30" +HIGH_UP="10" + +# nice level, 0 less cpuspeed consumed +NICE="19" + +# mldonkey server ip, usually localhost +SERVER="localhost" + +# port for webinterface, usually 4080 +PORT="4080" + +# port for telnet interface, usually 4000 +TELNET_PORT="4000" + +# to enable password restricted access, +# uncomment and set BOTH following vars: +#USERNAME="admin" +#PASSWORD="" diff --git a/net-p2p/mldonkey/files/mldonkey.confd-2.8 b/net-p2p/mldonkey/files/mldonkey.confd-2.8 deleted file mode 100644 index 1d1f282234f7..000000000000 --- a/net-p2p/mldonkey/files/mldonkey.confd-2.8 +++ /dev/null @@ -1,39 +0,0 @@ -# /etc/conf.d/mldonkey -# Config file for mldonkey control script - -# Change the following vars only if you know -# what you're doing, there's no checking for -# invalid data yet! - -# owner of mlnet process (don't change, must be existing) -USER="p2p" - -# mldonkey's working dir (must be existing) -MLDONKEY_DIR="/home/p2p/mldonkey" - -# logfile (/dev/null for nowhere) -LOG="/var/log/mldonkey.log" - -# set to true, if you have enabled logging to syslog in MLDonkey with -# set log_to_syslog true -USE_LOGGER=false - -# bandwidth control, values in kb/s -LOW_DOWN="6" -LOW_UP="2" -HIGH_DOWN="30" -HIGH_UP="10" - -# nice level, 0 less cpuspeed consumed -NICE="19" - -# mldonkey server ip, usually localhost -SERVER="localhost" - -# port for webinterface, usually 4080 -PORT="4080" - -# to enable password restricted access, -# uncomment and set BOTH following vars: -#USERNAME="admin" -#PASSWORD="" diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd index 12dd599de7be..b7e561372392 100644 --- a/net-p2p/mldonkey/files/mldonkey.initd +++ b/net-p2p/mldonkey/files/mldonkey.initd @@ -35,26 +35,55 @@ start() { eend $? } -setup_uri() { - BASE="http://" +send_telnet_commands() { + if [ -z "${TELNET_PORT+x}" ]; then + return 1 + fi + local cmds= if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then - BASE="${BASE}${USERNAME}:${PASSWORD}@" + cmds="auth ${USERNAME} ${PASSWORD}\n" fi - BASE="${BASE}${SERVER}:${PORT}" + cmds="$cmds\nansi false\n" + while [ $# -gt 0 ]; do + cmds="$cmds$1\n" + shift + done + printf "$cmds\nexit\n" | nc -w "${MLDONKEY_TIMEOUT}" localhost "${TELNET_PORT}" 2> /dev/null + return $? +} + +send_http_commands() { + if [ -z "${PORT+x}" ]; then + return 1 + fi + local base="http://" + if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then + base="${base}${USERNAME}:${PASSWORD}@" + fi + base="${base}${SERVER}:${PORT}" + local retval=0 + while [ $retval -eq 0 -a $# -gt 0 ]; do + wget -q -O /dev/stdout --timeout="${MLDONKEY_TIMEOUT}" "${base}/submit?q=${1// /+}" 2> /dev/null + retval=$? + shift + done + return $retval +} + +send_commands() { + send_telnet_commands "$@" &> /dev/null || send_http_commands "$@" &> /dev/null + return $? } stop() { ebegin "Stopping ${SVCNAME} -- please wait" - setup_uri - wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=close_fds -q - wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=save -q - wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=kill -q + send_commands close_fds save kill # give it a chance to die: local timeout=${MLDONKEY_TIMEOUT} while [ $timeout -gt 0 ]; do - if ! start-stop-daemon --test --quiet --stop \ + if ! start-stop-daemon --test --quiet --quiet --stop \ --exec "${MLDONKEY_BINARY}" \ --pidfile /var/run/"${SVCNAME}".pid ; then eend 0 @@ -87,32 +116,23 @@ reload() { slow() { ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k" - setup_uri - wget --spider --timeout="${MLDONKEY_TIMEOUT}" \ - "${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN}" -q - wget --spider --timeout=${MLDONKEY_TIMEOUT} \ - "${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP}" -q + send_commands "set max_hard_download_rate ${LOW_DOWN}" "set max_hard_upload_rate ${LOW_UP}" eend $? } fast() { ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k" - - setup_uri - wget --spider --timeout="${MLDONKEY_TIMEOUT}" \ - "${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP}" -q - wget --spider --timeout="${MLDONKEY_TIMEOUT}" \ - "${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN}" -q + send_commands "set max_hard_upload_rate ${HIGH_UP}" "set max_hard_download_rate ${HIGH_DOWN}" eend $? } info() { - setup_uri - local result=$(wget --timeout="${MLDONKEY_TIMEOUT}" \ - -O - "${BASE}"/submit?q=vo 2>/dev/null | \ - grep -C1 max_hard_upload | \ - grep value=\" | cut -d\" -f2) + set -o pipefail + local result=$( + send_telnet_commands "voo max_hard_upload_rate" | grep -a 'max_hard_upload_rate.* =' | cut -d \ -f 3 || + send_http_commands "voo max_hard_upload_rate" | fgrep name=value | sed -e 's/.*value="//' -e 's/".*//' + ) if [ "${result}" = "${LOW_UP}" ]; then einfo "${SVCNAME} runs slow" else -- cgit v1.2.3