github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-16 10:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2015-09-24 13:02:10 -07:00
commit b263926ea6
3 changed files with 42 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
netcon/NetconEthernetTap.cpp
View file

@ -125,9 +125,9 @@ bool NetconEthernetTap::addIp(const InetAddress &ip)
netmask.addr = *((u32_t *)ip.netmask().rawIpData());
// Set up the lwip-netif for LWIP's sake
lwipstack->netif_add(&interface,&ipaddr, &netmask, &gw, NULL, tapif_init, lwipstack->ethernet_input);
lwipstack->netif_add(&interface,&ipaddr, &netmask, &gw, NULL, tapif_init, lwipstack->_ethernet_input);
interface.state = this;
interface.output = lwipstack->etharp_output;
interface.output = lwipstack->_etharp_output;
_mac.copyTo(interface.hwaddr, 6);
interface.mtu = _mtu;
interface.name[0] = 't';
@ -166,7 +166,7 @@ std::vector<InetAddress> NetconEthernetTap::ips() const
void NetconEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
{
//fprintf(stderr, "__put(): tid = %d\n", gettid());
fprintf(stderr, "__put(): len = %d\n", len);
struct pbuf *p,*q;
//fprintf(stderr, "_put(%s,%s,%.4x,[data],%u)\n",from.toString().c_str(),to.toString().c_str(),etherType,len);