8332 2005-10-24 15:40:46 +0400 Add PPPTIMEOUT support 2005-10-28 12:08:35 +0400 1 1 4 Development Sisyphus etcnet unstable all Linux CLOSED FIXED P5 enhancement --- 1 raorn sem ldv rider sem shaba qa-sisyphus oldest_to_newest 32382 0 raorn 2005-10-24 15:40:49 +0400 Attached patch adds PPPTIMEOUT option. For modem and pptp links it sets lcp-echo-interval to $PPPTIMEOUT/3 and lcp-echo-failure to 3. For pppoe links it also adds -T $PPPTIMEOUT*4/3 to PTYOPTION. from pppoe(8): -T timeout The -T option causes pppoe to exit if no session traffic is detected for timeout seconds. I recom­ mend that you use this option as an extra safety measure, but if you do, you should make sure that PPP generates enough traffic so the timeout will normally not be triggered. The best way to do this is to use the lcp-echo-interval option to pppd. You should set the PPPoE timeout to be about four times the LCP echo interval. Not sure if this really needed... 32383 1 1213 raorn 2005-10-24 15:41:27 +0400 Created attachment 1213 etcnet-0.7.12-ppp-timeout.patch 32385 2 1213 raorn 2005-10-24 15:45:00 +0400 Comment on attachment 1213 etcnet-0.7.12-ppp-timeout.patch diff -Naurp etcnet-0.7.12-orig/etc/net/scripts/create-ppp etcnet-0.7.12/etc/net/scripts/create-ppp --- etcnet-0.7.12-orig/etc/net/scripts/create-ppp 2005-08-03 21:56:15 +0400 +++ etcnet-0.7.12/etc/net/scripts/create-ppp 2005-10-24 15:34:06 +0400 @@ -44,6 +44,7 @@ BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS${PPP is_yes "$PPPPERSIST" && BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS persist" BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS${PPPHOLDOFF:+ holdoff $PPPHOLDOFF}" BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS${PPPIDLE:+ idle $PPPIDLE}" +[ -n "$PPPTIMEOUT" -a "$PPPTIMEOUT" -gt 3 ] && BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS lcp-echo-interval $(($PPPTIMEOUT / 3)) lcp-echo-failure 3" case "$PPPTYPE" in pptp) @@ -67,6 +68,7 @@ case "$PPPTYPE" in exit 1 } PTYOPTION="$PPPOE -I $HOST -U" + [ -n "$PPPTIMEOUT" -a "$PPPTIMEOUT" -gt 3 ] && PTYOPTION="$PTYOPTION -T $(($PPPTIMEOUT * 4 / 3))" ;; dialup) BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS modem" 32386 3 1213 raorn 2005-10-24 15:45:57 +0400 Comment on attachment 1213 etcnet-0.7.12-ppp-timeout.patch >+[ -n "$PPPTIMEOUT" -a "$PPPTIMEOUT" -gt 3 ] && BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS lcp-echo-interval $(("$PPPTIMEOUT" / 3)) lcp-echo-failure 3" $(($PPPTIMEOUT / 3)) конечно, без кавычек. 32387 4 1214 raorn 2005-10-24 15:47:51 +0400 Created attachment 1214 etcnet-0.7.12-ppp-timeout.patch Чё-т я запутался... Вот кошерный патч. 32443 5 pilot 2005-10-25 20:02:44 +0400 Хорошая идея. 32468 6 pilot 2005-10-26 10:16:19 +0400 Мне кажется, это лишнее: + [ -n "$PPPTIMEOUT" -a "$PPPTIMEOUT" -gt 3 ] && PTYOPTION="$PTYOPTION -T $(($PPPTIMEOUT * 4 / 3))" LCP сделает своё дело. 32494 7 pilot 2005-10-26 22:17:38 +0400 Приложено к 0.7.15. 32500 8 raorn 2005-10-26 23:25:01 +0400 (In reply to comment #6) > Мне кажется, это лишнее: ... > LCP сделает своё дело. Ну в общем я погоняю это какое-то время на 0.7.14 с прописаными вручную lcp-echo-*, если что - переоткрою. Чесгря, я из-за этого -T всё и затевал, но пока не видел витуации когда это реально было бы нужно. P.S. Записал себе в TODO - попробовать синхронный режим и linux plugin. 32578 9 pilot 2005-10-28 12:08:35 +0400 Версия 0.7.15 отправлена в incoming/Sisyphus 1213 2005-10-24 15:41:27 +0400 2005-10-24 15:47:51 +0400 etcnet-0.7.12-ppp-timeout.patch etcnet-0.7.12-ppp-timeout.patch text/plain 936 raorn ZGlmZiAtTmF1cnAgZXRjbmV0LTAuNy4xMi1vcmlnL2V0Yy9uZXQvc2NyaXB0cy9jcmVhdGUtcHBw IGV0Y25ldC0wLjcuMTIvZXRjL25ldC9zY3JpcHRzL2NyZWF0ZS1wcHAKLS0tIGV0Y25ldC0wLjcu MTItb3JpZy9ldGMvbmV0L3NjcmlwdHMvY3JlYXRlLXBwcAkyMDA1LTA4LTAzIDIxOjU2OjE1ICsw NDAwCisrKyBldGNuZXQtMC43LjEyL2V0Yy9uZXQvc2NyaXB0cy9jcmVhdGUtcHBwCTIwMDUtMTAt MjQgMTU6MzQ6MDYgKzA0MDAKQEAgLTQ0LDYgKzQ0LDcgQEAgQkFTSUNfUFBQT1BUSU9OUz0iJEJB U0lDX1BQUE9QVElPTlMke1BQUAogaXNfeWVzICIkUFBQUEVSU0lTVCIgJiYgQkFTSUNfUFBQT1BU SU9OUz0iJEJBU0lDX1BQUE9QVElPTlMgcGVyc2lzdCIKIEJBU0lDX1BQUE9QVElPTlM9IiRCQVNJ Q19QUFBPUFRJT05TJHtQUFBIT0xET0ZGOisgaG9sZG9mZiAkUFBQSE9MRE9GRn0iCiBCQVNJQ19Q UFBPUFRJT05TPSIkQkFTSUNfUFBQT1BUSU9OUyR7UFBQSURMRTorIGlkbGUgJFBQUElETEV9Igor WyAtbiAiJFBQUFRJTUVPVVQiIC1hICIkUFBQVElNRU9VVCIgLWd0IDMgXSAmJiBCQVNJQ19QUFBP UFRJT05TPSIkQkFTSUNfUFBQT1BUSU9OUyBsY3AtZWNoby1pbnRlcnZhbCAkKCgiJFBQUFRJTUVP VVQiIC8gMykpIGxjcC1lY2hvLWZhaWx1cmUgMyIKIAogY2FzZSAiJFBQUFRZUEUiIGluCiAJcHB0 cCkKQEAgLTY3LDYgKzY4LDcgQEAgY2FzZSAiJFBQUFRZUEUiIGluCiAJCQlleGl0IDEKIAkJfQog CQlQVFlPUFRJT049IiRQUFBPRSAtSSAkSE9TVCAtVSIKKwkJWyAtbiAiJFBQUFRJTUVPVVQiIC1h ICIkUFBQVElNRU9VVCIgLWd0IDMgXSAmJiBQVFlPUFRJT049IiRQVFlPUFRJT04gLVQgJCgoJFBQ UFRJTUVPVVQgKiA0IC8gMykpIgogCTs7CiAJZGlhbHVwKQogCQlCQVNJQ19QUFBPUFRJT05TPSIk QkFTSUNfUFBQT1BUSU9OUyBtb2RlbSIK 1214 2005-10-24 15:47:51 +0400 2005-10-24 15:47:51 +0400 etcnet-0.7.12-ppp-timeout.patch etcnet-0.7.12-ppp-timeout.patch text/plain 934 raorn ZGlmZiAtTmF1cnAgZXRjbmV0LTAuNy4xMi1vcmlnL2V0Yy9uZXQvc2NyaXB0cy9jcmVhdGUtcHBw IGV0Y25ldC0wLjcuMTIvZXRjL25ldC9zY3JpcHRzL2NyZWF0ZS1wcHAKLS0tIGV0Y25ldC0wLjcu MTItb3JpZy9ldGMvbmV0L3NjcmlwdHMvY3JlYXRlLXBwcAkyMDA1LTA4LTAzIDIxOjU2OjE1ICsw NDAwCisrKyBldGNuZXQtMC43LjEyL2V0Yy9uZXQvc2NyaXB0cy9jcmVhdGUtcHBwCTIwMDUtMTAt MjQgMTU6MzQ6MDYgKzA0MDAKQEAgLTQ0LDYgKzQ0LDcgQEAgQkFTSUNfUFBQT1BUSU9OUz0iJEJB U0lDX1BQUE9QVElPTlMke1BQUAogaXNfeWVzICIkUFBQUEVSU0lTVCIgJiYgQkFTSUNfUFBQT1BU SU9OUz0iJEJBU0lDX1BQUE9QVElPTlMgcGVyc2lzdCIKIEJBU0lDX1BQUE9QVElPTlM9IiRCQVNJ Q19QUFBPUFRJT05TJHtQUFBIT0xET0ZGOisgaG9sZG9mZiAkUFBQSE9MRE9GRn0iCiBCQVNJQ19Q UFBPUFRJT05TPSIkQkFTSUNfUFBQT1BUSU9OUyR7UFBQSURMRTorIGlkbGUgJFBQUElETEV9Igor WyAtbiAiJFBQUFRJTUVPVVQiIC1hICIkUFBQVElNRU9VVCIgLWd0IDMgXSAmJiBCQVNJQ19QUFBP UFRJT05TPSIkQkFTSUNfUFBQT1BUSU9OUyBsY3AtZWNoby1pbnRlcnZhbCAkKCgkUFBQVElNRU9V VCAvIDMpKSBsY3AtZWNoby1mYWlsdXJlIDMiCiAKIGNhc2UgIiRQUFBUWVBFIiBpbgogCXBwdHAp CkBAIC02Nyw2ICs2OCw3IEBAIGNhc2UgIiRQUFBUWVBFIiBpbgogCQkJZXhpdCAxCiAJCX0KIAkJ UFRZT1BUSU9OPSIkUFBQT0UgLUkgJEhPU1QgLVUiCisJCVsgLW4gIiRQUFBUSU1FT1VUIiAtYSAi JFBQUFRJTUVPVVQiIC1ndCAzIF0gJiYgUFRZT1BUSU9OPSIkUFRZT1BUSU9OIC1UICQoKCRQUFBU SU1FT1VUICogNCAvIDMpKSIKIAk7OwogCWRpYWx1cCkKIAkJQkFTSUNfUFBQT1BUSU9OUz0iJEJB U0lDX1BQUE9QVElPTlMgbW9kZW0iCg==