Small IPv6 fixes for PPP

accel-pppd/ifcfg.c

@@ -156,7 +156,7 @@ void __export ap_session_accounting_started(struct ap_session *ses)
 				memset(&ifr6, 0, sizeof(ifr6));
 
 				if (ses->ctrl->ppp) {
-					ifr6.ifr6_addr.s6_addr32[0] = htons(0xfe80);
+					ifr6.ifr6_addr.s6_addr32[0] = htonl(0xfe800000);
 					*(uint64_t *)(ifr6.ifr6_addr.s6_addr + 8) = ses->ipv6->intf_id;
 					ifr6.ifr6_prefixlen = 64;
 					ifr6.ifr6_ifindex = ses->ifindex;
@@ -239,7 +239,7 @@ void __export ap_session_ifdown(struct ap_session *ses)
 
 	if (ses->ipv6) {
 		memset(&ifr6, 0, sizeof(ifr6));
-		ifr6.ifr6_addr.s6_addr32[0] = htons(0xfe80);
+		ifr6.ifr6_addr.s6_addr32[0] = htonl(0xfe800000);
 		*(uint64_t *)(ifr6.ifr6_addr.s6_addr + 8) = ses->ipv6->intf_id;
 		ifr6.ifr6_prefixlen = 64;
 		ifr6.ifr6_ifindex = ses->ifindex;

accel-pppd/ppp/ipv6cp_opt_intfid.c

@@ -127,7 +127,7 @@ static int check_exists(struct ppp_t *self_ppp)
 			continue;
 
 		list_for_each_entry(a1, &ses->ipv6->addr_list, entry) {
-			list_for_each_entry(a2, &ses->ipv6->addr_list, entry) {
+			list_for_each_entry(a2, &self_ppp->ses.ipv6->addr_list, entry) {
 				if (a1->addr.s6_addr32[0] == a2->addr.s6_addr32[0] &&
 						a1->addr.s6_addr32[1] == a2->addr.s6_addr32[1]) {
 					log_ppp_warn("ppp: requested IPv6 address already assigned to %s\n", ses->ifname);

accel-pppd/ppp/ppp_ifcfg.c

@@ -92,7 +92,7 @@ void ppp_ifup(struct ppp_t *ppp)
 		devconf(ppp, "forwarding", "1");
 
 		memset(&ifr6, 0, sizeof(ifr6));
-		ifr6.ifr6_addr.s6_addr32[0] = htons(0xfe80);
+		ifr6.ifr6_addr.s6_addr32[0] = htonl(0xfe800000);
 		*(uint64_t *)(ifr6.ifr6_addr.s6_addr + 8) = ppp->ses.ipv6->intf_id;
 		ifr6.ifr6_prefixlen = 64;
 		ifr6.ifr6_ifindex = ppp->ifindex;
@@ -161,7 +161,7 @@ void __export ppp_ifdown(struct ppp_t *ppp)
 
 	if (ppp->ses.ipv6) {
 		memset(&ifr6, 0, sizeof(ifr6));
-		ifr6.ifr6_addr.s6_addr32[0] = htons(0xfe80);
+		ifr6.ifr6_addr.s6_addr32[0] = htonl(0xfe800000);
 		*(uint64_t *)(ifr6.ifr6_addr.s6_addr + 8) = ppp->ses.ipv6->intf_id;
 		ifr6.ifr6_prefixlen = 64;
 		ifr6.ifr6_ifindex = ppp->ifindex;