At present, the access concentrator name (acName) and service name
(pppd_pppoe_service) are set by option parsing, but are used at the
point of PPPOEInitDevice(), which gets called when the ethernet
device name is seen. So if the rp_pppoe_service or rp_pppoe_ac
options appear after the device name, they are ignored.
This fixes it by using acName and pppd_pppoe_service in
PPPOEConnectDevice, which gets called after all options have been
parsed.
Signed-off-by: Paul Mackerras <paulus@samba.org>
novm("PPPoE session data");
}
memset(conn, 0, sizeof(PPPoEConnection));
- conn->acName = acName;
- conn->serviceName = pppd_pppoe_service;
conn->ifName = devnam;
conn->discoverySocket = -1;
conn->sessionSocket = -1;
{
struct sockaddr_pppox sp;
+ conn->acName = acName;
+ conn->serviceName = pppd_pppoe_service;
strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
if (existingSession) {
unsigned int mac[ETH_ALEN];