ALT Linux Bugzilla – Full Text Bug Listing
| Summary: | Add PPPTIMEOUT support | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Sisyphus | Reporter: | Sir Raorn <raorn> | ||||||
| Component: | etcnet | Assignee: | Mikhail Efremov <sem> | ||||||
| Status: | CLOSED FIXED | QA Contact: | qa-sisyphus | ||||||
| Severity: | enhancement | ||||||||
| Priority: | P5 | CC: | ldv, rider, sem, shaba, vseleznv | ||||||
| Version: | unstable | ||||||||
| Hardware: | all | ||||||||
| OS: | Linux | ||||||||
| Attachments: |
|
||||||||
Created attachment 1213 [details]
etcnet-0.7.12-ppp-timeout.patch
Comment on attachment 1213 [details]
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"
Comment on attachment 1213 [details] 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)) конечно, без кавычек. Created attachment 1214 [details]
etcnet-0.7.12-ppp-timeout.patch
Чё-т я запутался... Вот кошерный патч.
Хорошая идея. Мне кажется, это лишнее: + [ -n "$PPPTIMEOUT" -a "$PPPTIMEOUT" -gt 3 ] && PTYOPTION="$PTYOPTION -T $(($PPPTIMEOUT * 4 / 3))" LCP сделает своё дело. Приложено к 0.7.15. (In reply to comment #6) > Мне кажется, это лишнее: ... > LCP сделает своё дело. Ну в общем я погоняю это какое-то время на 0.7.14 с прописаными вручную lcp-echo-*, если что - переоткрою. Чесгря, я из-за этого -T всё и затевал, но пока не видел витуации когда это реально было бы нужно. P.S. Записал себе в TODO - попробовать синхронный режим и linux plugin. Версия 0.7.15 отправлена в incoming/Sisyphus |
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...