diff options
Diffstat (limited to 'accel-pppd/ctrl/ipoe')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index 36ba4e3..d9d71de 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -641,8 +641,27 @@ static void __ipoe_session_start(struct ipoe_session *ses) ses->timer.period = 0; ses->timer.expire_tv.tv_sec = conf_offer_timeout; triton_timer_add(&ses->ctx, &ses->timer, 0); - } else + } else { + if (!ses->siaddr) + find_gw_addr(ses); + + if (!ses->siaddr) + ses->siaddr = ses->serv->opt_src; + + if (!ses->siaddr) + ses->siaddr = iproute_get(ses->yiaddr); + + if (!ses->siaddr) { + log_ppp_error("can't determine local address\n"); + ap_session_terminate(&ses->ses, TERM_NAS_ERROR, 0); + return; + } + + if (ses->ses.ipv4 && !ses->ses.ipv4->addr) + ses->ses.ipv4->addr = ses->siaddr; + __ipoe_session_activate(ses); + } } static void ipoe_serv_add_addr(struct ipoe_serv *serv, in_addr_t addr) @@ -940,7 +959,7 @@ static void ipoe_session_finished(struct ap_session *s) if (ses->relay_addr && ses->serv->dhcpv4_relay) dhcpv4_relay_send_release(ses->serv->dhcpv4_relay, ses->hwaddr, ses->xid, ses->yiaddr, ses->client_id, ses->relay_agent, ses->serv->ifname, conf_agent_remote_id); - if (s->ipv4) { + if (s->ipv4 && s->ipv4->owner) { ipdb_put_ipv4(s, s->ipv4); s->ipv4 = NULL; } |