void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

comment out addInterface/removeInterface code for now

Browse source 
We already have ioctl based code to do this
This commit is contained in:
Grant Limberg 2018-05-25 15:37:00 -07:00
parent 442595d6fc
commit 3ace61ef85
2 changed files with 71 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
osdep/LinuxNetLink.cpp
View file

@ -27,6 +27,8 @@
#include "LinuxNetLink.hpp" #include "LinuxNetLink.hpp"
#include <unistd.h> #include <unistd.h>
#include <linux/if_tun.h>
namespace ZeroTier { namespace ZeroTier {
@ -42,6 +44,12 @@ struct nl_if_req {
char buf[8192]; char buf[8192];
}; };
struct nl_adr_req {
struct nlmsghdr nl;
struct ifaddrmsg ifa;
char buf[8192];
};
LinuxNetLink::LinuxNetLink() LinuxNetLink::LinuxNetLink()
: _t() : _t()
, _running(false) , _running(false)
@ -528,7 +536,7 @@ void LinuxNetLink::addRoute(const InetAddress &target, const InetAddress &via, c
} }
req.nl.nlmsg_len = NLMSG_LENGTH(rtl); req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE; req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL;
req.nl.nlmsg_type = RTM_NEWROUTE; req.nl.nlmsg_type = RTM_NEWROUTE;
req.nl.nlmsg_pid = 0; req.nl.nlmsg_pid = 0;
req.nl.nlmsg_seq = ++_seq; req.nl.nlmsg_seq = ++_seq;
@ -637,12 +645,68 @@ void LinuxNetLink::delRoute(const InetAddress &target, const InetAddress &via, c
sendmsg(_fd, &msg, 0); sendmsg(_fd, &msg, 0);
} }
void LinuxNetLink::addInterface(const char *iface, unsigned int mtu) // void LinuxNetLink::addInterface(const char *iface, unsigned int mtu, const MAC &mac)
// {
// int rtl = sizeof(struct ifinfomsg);
// struct nl_if_req req;
// bzero(&req, sizeof(nl_if_req));
// struct rtattr *rtap = (struct rtattr *)req.buf;
// rtap->rta_type = IFLA_IFNAME;
// rtap->rta_len = sizeof(struct rtattr)+strlen(iface)+1;
// rtl += rtap->rta_len;
// rtap = (struct rtattr*)(((char*)rtap)+rtap->rta_len);
// rtap->rta_type = IFLA_MTU;
// rtap->rta_len = sizeof(struct rtattr)+sizeof(unsigned int);
// rtl += rtap->rta_len;
// rtap = (struct rtattr*)(((char*)rtap)+rtap->rta_len);
// rtap->rta_type = IFLA_ADDRESS;
// rtap->rta_len = sizeof(struct rtattr)+6;
// mac.copyTo(((char*)rtap)+sizeof(struct rtattr), 6);
// rtl += rtap->rta_len;
// IFLA_LINKINFO;
// req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
// req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL;
// req.nl.nlmsg_type = RTM_NEWLINK;
// req.nl.nlmsg_pid = 0;
// req.nl.nlmsg_seq = ++_seq;
// req.ifa.ifi_family = AF_UNSPEC;
// req.ifa.ifi_type = 0; // TODO figure this one out
// req.ifa.ifi_index = 0;
// req.ifa.ifi_flags = IFF_UP;
// struct sockaddr_nl pa;
// bzero(&pa, sizeof(pa));
// pa.nl_family = AF_NETLINK;
// struct msghdr msg;
// bzero(&msg, sizeof(msg));
// msg.msg_name = (void*)&pa;
// msg.msg_namelen = sizeof(pa);
// struct iovec iov;
// iov.iov_base = (void*)&req.nl;
// iov.iov_len = req.nl.nlmsg_len;
// msg.msg_iov = &iov;
// msg.msg_iovlen = 1;
// sendmsg(_fd, &msg, 0);
// }
// void LinuxNetLink::removeInterface(const char *iface)
// {
// }
void LinuxNetLink::addAddress(const InetAddress &addr, const char *iface)
{ {
} }
void LinuxNetLink::addAddress(const InetAddress &addr, const char *iface) void LinuxNetLink::removeAddress(const InetAddress &addr, const char *iface)
{ {
} }

5
osdep/LinuxNetLink.hpp
View file

@ -36,6 +36,7 @@
#include <linux/if.h> #include <linux/if.h>
#include "../node/InetAddress.hpp" #include "../node/InetAddress.hpp"
#include "../node/MAC.hpp"
#include "Thread.hpp" #include "Thread.hpp"
#include "../node/Hashtable.hpp" #include "../node/Hashtable.hpp"
@ -74,9 +75,11 @@ public:
RouteList getIPV4Routes() const; RouteList getIPV4Routes() const;
RouteList getIPV6Routes() const; RouteList getIPV6Routes() const;
void addInterface(const char *iface, unsigned int mtu); // void addInterface(const char *iface, unsigned int mtu, const MAC &mac);
// void removeInterface(const char *iface);
void addAddress(const InetAddress &addr, const char *iface); void addAddress(const InetAddress &addr, const char *iface);
void removeAddress(const InetAddress &addr, const char *iface);
void threadMain() throw(); void threadMain() throw();
private: private: