diff -ru mldonkey/files/mldonkey.confd-2.8 mldonkey-newer/files/mldonkey.confd-2.8 --- mldonkey/files/mldonkey.confd-2.8 2011-08-01 10:41:06.000000000 -0400 +++ mldonkey-newer/files/mldonkey.confd-2.8 2011-08-01 10:45:08.000000000 -0400 @@ -18,12 +18,6 @@ # 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" diff -ru mldonkey/files/mldonkey.initd mldonkey-newer/files/mldonkey.initd --- mldonkey/files/mldonkey.initd 2011-08-01 10:41:06.000000000 -0400 +++ mldonkey-newer/files/mldonkey.initd 2011-08-01 10:48:33.000000000 -0400 @@ -96,12 +96,11 @@ return 1 fi - ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k" + ebegin "Using slower mlnet bandwidth setting" + einfo "(the one with less max_opened_connections)" 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 + "${BASE}/submit?q=bw_toggle+low" -q eend $? } @@ -111,31 +110,10 @@ return 1 fi - ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k" - + ebegin "Using faster mlnet bandwidth setting" + einfo "(the one with more max_opened_connections)" 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 + "${BASE}/submit?q=bw_toggle+high" -q eend $? } - - -info() { - if ! service_started "${SVCNAME}"; then - eerror "${SVCNAME} is not started" - return 1 - fi - - 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) - if [ "${result}" = "${LOW_UP}" ]; then - einfo "${SVCNAME} runs slow" - else - einfo "${SVCNAME} runs fast" - fi -}