Skip to content

extosdep: notify external OS handler of network config updates #2587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aadnehovda wants to merge 1 commit into
base: dev
Choose a base branch
from
+27 −0
Open

extosdep: notify external OS handler of network config updates #2587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions osdep/ExtOsdep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,18 @@ bool ExtOsdep::getBindAddrs(std::map<InetAddress, std::string>& ret)
return resp->result;
}

void ExtOsdep::configUpdate(uint64_t nwid, uint64_t revision)
{
zt_eod_msg_configupdate msg;
memset(&msg, 0, sizeof(msg));
msg.cmd = ZT_EOD_MSG_CONFIGUPDATE;
msg.nwid = nwid;
msg.revision = revision;

Mutex::Lock l(eodMutex);
__eodSend(msg);
}

ExtOsdepTap::ExtOsdepTap(
const char* homePath,
const MAC& mac,
Expand Down Expand Up @@ -499,6 +511,7 @@ bool ExtOsdepTap::removeIp(const InetAddress& ip)
for (auto i = allIps.begin(); i != allIps.end(); ++i) {
if (*i == ip) {
doRemoveIp(*i);
allIps.erase(i);
return true;
}
}
Expand Down
8 changes: 8 additions & 0 deletions osdep/ExtOsdep.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define ZT_EOD_MSG_ADDROUTERESP 17
#define ZT_EOD_MSG_DELROUTE 18
#define ZT_EOD_MSG_DELROUTERESP 19
#define ZT_EOD_MSG_CONFIGUPDATE 20

struct zt_eod_msg_addtap {
unsigned char cmd;
Expand Down Expand Up @@ -105,6 +106,12 @@ struct zt_eod_msg_route {
unsigned char src[16];
} __attribute__((packed));

struct zt_eod_msg_configupdate {
unsigned char cmd;
uint64_t nwid;
uint64_t revision;
} __attribute__((packed));

struct zt_eod_mgmt_req {
uint32_t method;
uint32_t pathlen;
Expand Down Expand Up @@ -144,6 +151,7 @@ class ExtOsdep {

static void routeAddDel(bool, const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName);
static bool getBindAddrs(std::map<InetAddress, std::string>&);
static void configUpdate(uint64_t nwid, uint64_t revision);

static bool mgmtRecv(void* cookie, void* data, unsigned long len, std::function<unsigned(unsigned, const std::string&, const std::string&, std::string&)>);
static bool mgmtWritable(void*);
Expand Down
6 changes: 6 additions & 0 deletions service/OneService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3607,6 +3607,9 @@ class OneServiceImpl : public OneService {
#endif
syncManagedStuff(n, true, true, true);
n.tap()->setMtu(nwc->mtu);
#ifdef ZT_EXTOSDEP
ExtOsdep::configUpdate(nwid, (uint64_t)nwc->netconfRevision);
#endif
}
else {
_nets.erase(nwid);
Expand All @@ -3619,6 +3622,9 @@ class OneServiceImpl : public OneService {
if (n.tap()) { // sanity check
#if defined(__WINDOWS__) && ! defined(ZT_SDK)
std::string winInstanceId(((WindowsEthernetTap*)(n.tap().get()))->instanceId());
#endif
#ifdef ZT_EXTOSDEP
ExtOsdep::configUpdate(nwid, (uint64_t)n.config().netconfRevision);
#endif
*nuptr = (void*)0;
n.tap().reset();
Expand Down