Merge pull request #24 from svlobanov/T50-arp-smac

T50: use server mac in arp replies for proxy_arp=2
accel-ppp · Oct 21, 2021 · 51bd816 · 51bd816
2 parents 1b8711c + 791acb4
commit 51bd816
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/accel-pppd/ctrl/ipoe/arp.c b/accel-pppd/ctrl/ipoe/arp.c
@@ -109,13 +109,8 @@ static void arp_ctx_read(struct _arphdr *ah)
 			pthread_mutex_unlock(&ipoe->lock);
 			goto out;
 		}
-
-		if (ipoe->opt_arp == 2)
-			memcpy(ah2.ar_sha, ses2->hwaddr, ETH_ALEN);
-		else
-			memcpy(ah2.ar_sha, ipoe->hwaddr, ETH_ALEN);
-	} else
-		memcpy(ah2.ar_sha, ipoe->hwaddr, ETH_ALEN);
+	}
+	memcpy(ah2.ar_sha, ipoe->hwaddr, ETH_ALEN);
 
 	pthread_mutex_unlock(&ipoe->lock);