diff options
Diffstat (limited to 'pppd/plugins/pppoe/plugin.c')
| -rw-r--r-- | pppd/plugins/pppoe/plugin.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c index 5732460..e9353eb 100644 --- a/pppd/plugins/pppoe/plugin.c +++ b/pppd/plugins/pppoe/plugin.c @@ -161,8 +161,8 @@ PPPOEConnectDevice(void) } /* Restore configuration */ - lcp_allowoptions[0].mru = conn->mtu; - lcp_wantoptions[0].mru = conn->mru; + lcp_allowoptions[0].mru = conn->mtu = conn->storedmtu; + lcp_wantoptions[0].mru = conn->mru = conn->storedmru; /* Update maximum MRU */ s = socket(AF_INET, SOCK_DGRAM, 0); @@ -179,9 +179,9 @@ PPPOEConnectDevice(void) close(s); if (lcp_allowoptions[0].mru > ifr.ifr_mtu - TOTAL_OVERHEAD) - lcp_allowoptions[0].mru = ifr.ifr_mtu - TOTAL_OVERHEAD; + lcp_allowoptions[0].mru = conn->mtu = ifr.ifr_mtu - TOTAL_OVERHEAD; if (lcp_wantoptions[0].mru > ifr.ifr_mtu - TOTAL_OVERHEAD) - lcp_wantoptions[0].mru = ifr.ifr_mtu - TOTAL_OVERHEAD; + lcp_wantoptions[0].mru = conn->mru = ifr.ifr_mtu - TOTAL_OVERHEAD; if (pppoe_host_uniq) { if (!parseHostUniq(pppoe_host_uniq, &conn->hostUniq)) @@ -217,11 +217,17 @@ PPPOEConnectDevice(void) goto errout; } discovery1(conn); + /* discovery1() may update conn->mtu and conn->mru */ + lcp_allowoptions[0].mru = conn->mtu; + lcp_wantoptions[0].mru = conn->mru; if (conn->discoveryState != STATE_RECEIVED_PADO) { error("Unable to complete PPPoE Discovery phase 1"); goto errout; } discovery2(conn); + /* discovery2() may update conn->mtu and conn->mru */ + lcp_allowoptions[0].mru = conn->mtu; + lcp_wantoptions[0].mru = conn->mru; if (conn->discoveryState != STATE_SESSION) { error("Unable to complete PPPoE Discovery phase 2"); goto errout; @@ -452,8 +458,8 @@ void pppoe_check_options(void) lcp_wantoptions[0].mru = MAX_PPPOE_MTU; /* Save configuration */ - conn->mtu = lcp_allowoptions[0].mru; - conn->mru = lcp_wantoptions[0].mru; + conn->storedmtu = lcp_allowoptions[0].mru; + conn->storedmru = lcp_wantoptions[0].mru; ccp_allowoptions[0].deflate = 0; ccp_wantoptions[0].deflate = 0; |