d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle peer REQ/NAKs of >1500 byte MRUs when we have no preference.

Browse Source 
MFC after: 3 days
This commit is contained in:
Brian Somers 2001-07-26 11:33:53 +00:00
parent a0e4393eaf
commit 525b58c9ce
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/ppp/command.c
View File

@ -1760,7 +1760,7 @@ SetVariable(struct cmdargs const *arg)
break; break;
if (long_val == 0) if (long_val == 0)
*change = DEF_MRU; *change = 0;
else if (long_val < MIN_MRU) { else if (long_val < MIN_MRU) {
log_Printf(LogWARN, "MRU %ld: too small - min %d\n", long_val, MIN_MRU); log_Printf(LogWARN, "MRU %ld: too small - min %d\n", long_val, MIN_MRU);
res = 1; res = 1;

26
usr.sbin/ppp/lcp.c
View File

@ -177,8 +177,12 @@ lcp_ReportStatus(struct cmdargs const *arg)
(u_long)lcp->want_magic, lcp->want_mrru, (u_long)lcp->want_magic, lcp->want_mrru,
lcp->want_shortseq ? "on" : "off", lcp->my_reject); lcp->want_shortseq ? "on" : "off", lcp->my_reject);
prompt_Printf(arg->prompt, "\n Defaults: MRU = %d (max %d), ", if (lcp->cfg.mru)
lcp->cfg.mru, lcp->cfg.max_mru); prompt_Printf(arg->prompt, "\n Defaults: MRU = %d (max %d), ",
lcp->cfg.mru, lcp->cfg.max_mru);
else
prompt_Printf(arg->prompt, "\n Defaults: MRU = any (max %d), ",
lcp->cfg.max_mru);
if (lcp->cfg.mtu) if (lcp->cfg.mtu)
prompt_Printf(arg->prompt, "MTU = %d (max %d), ", prompt_Printf(arg->prompt, "MTU = %d (max %d), ",
lcp->cfg.mtu, lcp->cfg.max_mtu); lcp->cfg.mtu, lcp->cfg.max_mtu);
@ -246,7 +250,7 @@ lcp_Init(struct lcp *lcp, struct bundle *bundle, struct link *l,
fsm_Init(&lcp->fsm, "LCP", PROTO_LCP, mincode, LCP_MAXCODE, LogLCP, fsm_Init(&lcp->fsm, "LCP", PROTO_LCP, mincode, LCP_MAXCODE, LogLCP,
bundle, l, parent, &lcp_Callbacks, lcp_TimerNames); bundle, l, parent, &lcp_Callbacks, lcp_TimerNames);
lcp->cfg.mru = DEF_MRU; lcp->cfg.mru = 0;
lcp->cfg.max_mru = MAX_MRU; lcp->cfg.max_mru = MAX_MRU;
lcp->cfg.mtu = 0; lcp->cfg.mtu = 0;
lcp->cfg.max_mtu = MAX_MTU; lcp->cfg.max_mtu = MAX_MTU;
@ -289,7 +293,8 @@ lcp_Setup(struct lcp *lcp, int openmode)
lcp->his_callback.opmask = 0; lcp->his_callback.opmask = 0;
lcp->his_shortseq = 0; lcp->his_shortseq = 0;
lcp->want_mru = lcp->cfg.mru; if ((lcp->want_mru = lcp->cfg.mru) == 0)
lcp->want_mru = DEF_MRU;
lcp->want_mrru = lcp->fsm.bundle->ncp.mp.cfg.mrru; lcp->want_mrru = lcp->fsm.bundle->ncp.mp.cfg.mrru;
lcp->want_shortseq = IsEnabled(lcp->fsm.bundle->ncp.mp.cfg.shortseq) ? 1 : 0; lcp->want_shortseq = IsEnabled(lcp->fsm.bundle->ncp.mp.cfg.shortseq) ? 1 : 0;
lcp->want_acfcomp = IsEnabled(lcp->cfg.acfcomp) ? 1 : 0; lcp->want_acfcomp = IsEnabled(lcp->cfg.acfcomp) ? 1 : 0;
@ -695,29 +700,26 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type,
maxmtu = p ? physical_DeviceMTU(p) : 0; maxmtu = p ? physical_DeviceMTU(p) : 0;
if (lcp->cfg.max_mtu && (!maxmtu || maxmtu > lcp->cfg.max_mtu)) if (lcp->cfg.max_mtu && (!maxmtu || maxmtu > lcp->cfg.max_mtu))
maxmtu = lcp->cfg.max_mtu; maxmtu = lcp->cfg.max_mtu;
if ((wantmtu = lcp->cfg.mtu) == 0 && (wantmtu = maxmtu) == 0) wantmtu = lcp->cfg.mtu;
wantmtu = DEF_MRU;
if (maxmtu && wantmtu > maxmtu) { if (maxmtu && wantmtu > maxmtu) {
log_Printf(LogWARN, "%s: Reducing configured MTU from %u to %u\n", log_Printf(LogWARN, "%s: Reducing configured MTU from %u to %u\n",
fp->link->name, wantmtu, maxmtu); fp->link->name, wantmtu, maxmtu);
wantmtu = maxmtu; wantmtu = maxmtu;
} }
if (wantmtu < MIN_MRU)
wantmtu = MIN_MRU;
if (maxmtu && mru > maxmtu) { if (maxmtu && mru > maxmtu) {
lcp->his_mru = maxmtu; lcp->his_mru = maxmtu;
memcpy(dec->nakend, cp, 2); memcpy(dec->nakend, cp, 2);
ua_htons(&lcp->his_mru, dec->nakend + 2); ua_htons(&lcp->his_mru, dec->nakend + 2);
dec->nakend += 4; dec->nakend += 4;
} else if (mru < wantmtu) { } else if (wantmtu && mru < wantmtu) {
/* Push him up to MTU or MIN_MRU */ /* Push him up to MTU or MIN_MRU */
lcp->his_mru = wantmtu; lcp->his_mru = wantmtu;
memcpy(dec->nakend, cp, 2); memcpy(dec->nakend, cp, 2);
ua_htons(&lcp->his_mru, dec->nakend + 2); ua_htons(&lcp->his_mru, dec->nakend + 2);
dec->nakend += 4; dec->nakend += 4;
} else { } else {
lcp->his_mru = wantmtu; lcp->his_mru = mru;
memcpy(dec->ackend, cp, 4); memcpy(dec->ackend, cp, 4);
dec->ackend += 4; dec->ackend += 4;
} }
@ -728,8 +730,10 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type,
maxmru = lcp->cfg.max_mru; maxmru = lcp->cfg.max_mru;
wantmru = lcp->cfg.mru > maxmru ? maxmru : lcp->cfg.mru; wantmru = lcp->cfg.mru > maxmru ? maxmru : lcp->cfg.mru;
if (mru > wantmru) if (wantmru && mru > wantmru)
lcp->want_mru = wantmru; lcp->want_mru = wantmru;
else if (mru > maxmru)
lcp->want_mru = maxmru;
else if (mru < MIN_MRU) else if (mru < MIN_MRU)
lcp->want_mru = MIN_MRU; lcp->want_mru = MIN_MRU;
else else