diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-04-25 17:04:15 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-04-25 17:04:15 +0400 |
| commit | 41ef1132bc7439ee378eb2d1cff2da3d6f75edc8 (patch) | |
| tree | fb60915aeb48592ad02062b47d687e27df42f145 /accel-pppd/ctrl/ipoe/ipoe.c | |
| parent | 22ecfca77f927d753669e3a1d8247b7b8b790cdc (diff) | |
| download | accel-ppp-41ef1132bc7439ee378eb2d1cff2da3d6f75edc8.tar.gz accel-ppp-41ef1132bc7439ee378eb2d1cff2da3d6f75edc8.zip | |
ipoe: detect giaddr if not specified
Diffstat (limited to 'accel-pppd/ctrl/ipoe/ipoe.c')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index f0e61c95..8d304fd5 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -378,7 +378,6 @@ static void ipoe_session_start(struct ipoe_session *ses) if (ses->serv->opt_shared == 0 && (!ses->ses.ipv4 || ses->ses.ipv4->peer_addr == ses->yiaddr)) { strncpy(ses->ses.ifname, ses->serv->ifname, AP_IFNAME_LEN); ses->ses.ifindex = ses->serv->ifindex; - ses->ctrl.dont_ifcfg = 1; } else if (ses->ifindex == -1) { pthread_mutex_lock(&uc_lock); if (!list_empty(&uc_list)) { @@ -410,6 +409,7 @@ static void ipoe_session_start(struct ipoe_session *ses) strncpy(ses->ses.ifname, ifr.ifr_name, AP_IFNAME_LEN); ses->ses.ifindex = ses->ifindex; ses->ses.unit_idx = ses->ifindex; + ses->ctrl.dont_ifcfg = 0; } ap_session_set_ifindex(&ses->ses); @@ -1511,7 +1511,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt) serv->dhcpv4_relay = NULL; } - if (serv->opt_dhcpv4 && opt_relay && opt_giaddr) { + if (serv->opt_dhcpv4 && opt_relay) { if (opt_ifcfg) ipoe_serv_add_addr(serv, giaddr); serv->dhcpv4_relay = dhcpv4_relay_create(opt_relay, opt_giaddr, &serv->ctx, (triton_event_func)ipoe_recv_dhcpv4_relay); @@ -1550,7 +1550,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt) if (serv->dhcpv4) serv->dhcpv4->recv = ipoe_recv_dhcpv4; - if (opt_relay && opt_giaddr) { + if (opt_relay) { if (opt_ifcfg) ipoe_serv_add_addr(serv, giaddr); serv->dhcpv4_relay = dhcpv4_relay_create(opt_relay, opt_giaddr, &serv->ctx, (triton_event_func)ipoe_recv_dhcpv4_relay); |