summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-29 12:14:03 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-29 12:14:03 -0700
commit92c811deb7134cf26c306870ba5ed1b6eb29e452 (patch)
treeb482ca79e209b41e33c79af7c6146f2f51bc0539
parent92f199ab985f861028ffcbd899f9037e8e575ab6 (diff)
downloadinfinitytier-92c811deb7134cf26c306870ba5ed1b6eb29e452.tar.gz
infinitytier-92c811deb7134cf26c306870ba5ed1b6eb29e452.zip
Destroy feth devices before creating to delete old ones if they were left behind (MacEthernetTap).
-rw-r--r--osdep/MacEthernetTapAgent.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/osdep/MacEthernetTapAgent.c b/osdep/MacEthernetTapAgent.c
index 7fbd9c0d..ab3068ab 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;