Merge branch 'master' into dev

This commit is contained in:
Adam Ierymenko 2022-04-13 19:55:22 -04:00
commit f0b0172434
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
9 changed files with 116 additions and 33 deletions

View file

@ -2294,6 +2294,7 @@ public:
fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
}
}
#endif
#ifdef __APPLE__
if (!MacDNSHelper::addIps(n.config().nwid, n.config().mac, n.tap()->deviceName().c_str(), newManagedIps))