From 92c811deb7134cf26c306870ba5ed1b6eb29e452 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 29 Mar 2019 12:14:03 -0700 Subject: [PATCH] Destroy feth devices before creating to delete old ones if they were left behind (MacEthernetTap). --- osdep/MacEthernetTapAgent.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osdep/MacEthernetTapAgent.c b/osdep/MacEthernetTapAgent.c index 7fbd9c0d2..ab3068ab3 100644 --- a/osdep/MacEthernetTapAgent.c +++ b/osdep/MacEthernetTapAgent.c @@ -245,13 +245,17 @@ int main(int argc,char **argv) return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE; } + snprintf(s_deviceName,sizeof(s_deviceName),"feth%d",deviceNo); snprintf(s_peerDeviceName,sizeof(s_peerDeviceName),"feth%d",deviceNo+5000); + run(P_IFCONFIG,s_peerDeviceName,"destroy",(char *)0); + usleep(10); + run(P_IFCONFIG,s_deviceName,"destroy",(char *)0); + usleep(10); if (run(P_IFCONFIG,s_peerDeviceName,"create",(char *)0) != 0) { fprintf(stderr,"E unable to create %s\n",s_deviceName); return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE; } usleep(10); - snprintf(s_deviceName,sizeof(s_deviceName),"feth%d",deviceNo); if (run(P_IFCONFIG,s_deviceName,"create",(char *)0) != 0) { fprintf(stderr,"E unable to create %s\n",s_deviceName); return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;