Skip to content

Split AddrList into object-iterator-container components #5410

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

Merged
devyte merged 4 commits into from
Dec 3, 2018
Merged

Split AddrList into object-iterator-container components #5410

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1ee864
Split AddrList into object-iterator-container components
devyte Dec 2, 2018
8f91848
Merge branch 'master' into addrList
devyte Dec 2, 2018
cf26897
Update AddrList.h
devyte Dec 3, 2018
d222330
Merge branch 'master' into addrList
devyte Dec 3, 2018
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
Prev Previous commit
Next Next commit
Update AddrList.h 
Remove gist code
  • Loading branch information
@devyte
devyte authored Dec 3, 2018
commit cf26897fef109b88f3f8e96444f55ec314155a41
108 changes: 0 additions & 108 deletions cores/esp8266/AddrList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,111 +194,3 @@ extern esp8266::AddressListImplementation::AddressList addrList;


#endif










#if 0


#ifndef __IFLIST_H__
#define __IFLIST_H__

struct NetInterface
{

NetInterface(_netif *netif) : _netif(netif), _num(-1) {}
NetInterface(const NetInterface & o) : _netif(o.netif), _num(o._num) {}

bool isLegacy() const { return _num == 0; }
IPAddress addr () const { return _ip_from_netif_num(); }
IPAddress netmask () const { return _netif->netmask; }
IPAddress gw () const { return _netif->gw; }
String iface () const { return String(_netif->name[0]) + _netif->name[1]; }
const char* hostname () const { return _netif->hostname ? : ""; }
const char* mac () const { return (const char*)_netif->hwaddr; }
int number () const { return _netif->num; }

bool operator==(const NetInterface & o) {return equal(o);}
bool operator!=(const NetInterface & o) {return !equal(o);}

bool equal (const NetInterface& o)
{
return _netif == o._netif && (!_netif || _num == o._num);
}


const ip_addr_t* ip_from_netif_num () const
{
#if LWIP_IPV6
return _num ? &_netif->ip6_addr[_num - 1] : &_netif->ip_addr;
#else
return &_netif->ip_addr;
#endif
}


netif* _netif;
int _num;
};




class NetInterfaceIterator
{
public:
const NetInterfaceIterator& operator* () const { return netIface; }
const NetInterfaceIterator* operator-> () const { return &netIface; }

bool operator==(const NetInterfaceIterator & o) {return netIface.equal(o.netIface);}
bool operator!=(const NetInterfaceIterator & o) {return !netIface.equal(o.netIface);}

NetInterfaceIterator & operator= (const NetInterfaceIterator& o) { _netif = o._netif; _num = o._num; return *this; }

NetInterfaceIterator operator++(int)
{
NetInterfaceIterator ret = *this;
++(*this);
return ret;
}

NetInterfaceIterator & operator++()
{
while (netIface._netif)
{
if (++netIface._num == IF_NUM_ADDRESSES)
{
netIface = NetInterface(netIface._netif->next);
continue;
}

if (!ip_addr_isany(netIface.ip_from_netif_num()))
break;
}
return *this;
}

private:
NetInterface netIface;
};


class IfList
{
using const_iterator = const NetInterfaceIterator;

const_iterator begin() {return const_iterator(netif_list);}
const_iterator end() {return const_iterator(nullptr);}
};

#endif


#endif