mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-08-24 15:16:02 +00:00
PPP, from PPPD upstream, accept IPCP ConfAck packets containing MS-WINS options
pppd: Accept IPCP ConfAck packets containing MS-WINS options Since last week I'm seeing IPCP negotiations going like this (and eventually failing) when connecting to my ISP: Jul 11 20:03:25 * pppd[4833]: sent [IPCP ConfReq id=0x2 <addr 0.0.0.0> <ms-dns1 0.0.0.0> <ms-dns2 0.0.0.0>] Jul 11 20:03:26 * pppd[4833]: sent [IPCP ConfReq id=0x2 <addr 0.0.0.0> <ms-dns1 0.0.0.0> <ms-dns2 0.0.0.0>] Jul 11 20:03:26 * pppd[4833]: rcvd [IPCP ConfNak id=0x2 <addr 10.167.246.198> <ms-dns1 213.162.69.1> <ms-dns2 213.162.69.169> <ms-wins 124.6.168.55> <ms-wins 17.17.17.17>] Jul 11 20:03:26 * pppd[4833]: sent [IPCP ConfReq id=0x3 <addr 10.167.246.198> <ms-dns1 213.162.69.1> <ms-dns2 213.162.69.169> <ms-wins 124.6.168.55> <ms-wins 17.17.17.17>] Jul 11 20:03:26 * pppd[4833]: rcvd [IPCP ConfAck id=0x3 <addr 10.167.246.198> <ms-dns1 213.162.69.1> <ms-dns2 213.162.69.169> <ms-wins 124.6.168.55> <ms-wins 17.17.17.17>] Jul 11 20:03:27 * pppd[4833]: sent [IPCP ConfReq id=0x3 <addr 10.167.246.198> <ms-dns1 213.162.69.1> <ms-dns2 213.162.69.169> <ms-wins 124.6.168.55> <ms-wins 17.17.17.17>] ... with the last two lines repeating until the IPCP error limit is reached. As you can see, the peer added two extra fields in the ConfNak reply. This is allowed, and indeed the following sent ConfReq packet reflects this. However, when the ConfAck packet is received, pppd discards it as invalid, because of the ms-wins fields. This fixes it.
This commit is contained in:
parent
c31b03327f
commit
25e398a8f0
|
@ -970,6 +970,21 @@ static int ipcp_ackci(fsm *f, u_char *p, int len) {
|
||||||
goto bad; \
|
goto bad; \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define ACKCIWINS(opt, addr) \
|
||||||
|
if (addr) { \
|
||||||
|
u_int32_t l; \
|
||||||
|
if ((len -= CILEN_ADDR) < 0) \
|
||||||
|
goto bad; \
|
||||||
|
GETCHAR(citype, p); \
|
||||||
|
GETCHAR(cilen, p); \
|
||||||
|
if (cilen != CILEN_ADDR || citype != opt) \
|
||||||
|
goto bad; \
|
||||||
|
GETLONG(l, p); \
|
||||||
|
cilong = htonl(l); \
|
||||||
|
if (addr != cilong) \
|
||||||
|
goto bad; \
|
||||||
|
}
|
||||||
|
|
||||||
ACKCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr,
|
ACKCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr,
|
||||||
go->hisaddr);
|
go->hisaddr);
|
||||||
|
|
||||||
|
@ -982,6 +997,10 @@ static int ipcp_ackci(fsm *f, u_char *p, int len) {
|
||||||
|
|
||||||
ACKCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]);
|
ACKCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]);
|
||||||
|
|
||||||
|
ACKCIWINS(CI_MS_WINS1, go->winsaddr[0]);
|
||||||
|
|
||||||
|
ACKCIWINS(CI_MS_WINS2, go->winsaddr[1]);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If there are any remaining CIs, then this packet is bad.
|
* If there are any remaining CIs, then this packet is bad.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user