Testnet work... getting there!

This commit is contained in:
Adam Ierymenko 2014-10-23 16:46:09 -07:00
commit 4fbb098daa
11 changed files with 398 additions and 149 deletions

View file

@ -1018,22 +1018,6 @@ bool Node::updateCheck()
return false;
}
bool Node::injectPacketFromHost(uint64_t nwid,const unsigned char *from,const unsigned char *to,unsigned int etherType,const void *data,unsigned int len)
{
if (!running())
return false;
if ((!from)||(!to))
return false;
_NodeImpl *impl = (_NodeImpl *)_impl;
RuntimeEnvironment *RR = (RuntimeEnvironment *)&(impl->renv);
SharedPtr<Network> network(RR->nc->network(nwid));
if (network)
return network->tapInjectPacketFromHost(MAC(from,6),MAC(to,6),etherType,data,len);
return false;
}
class _VersionStringMaker
{
public:

View file

@ -226,23 +226,6 @@ public:
bool updateCheck()
throw();
/**
* Inject a packet into a network's tap as if it came from the host
*
* This is primarily for debugging, and at the moment is only supported on
* the test/dummy Ethernet tap implementation. Attempting to use it for real
* devices will fail and return 'false.'
*
* @param nwid Network ID
* @param from Source MAC address (must be 6 bytes in length)
* @param to Destination MAC address (must be 6 bytes in length)
* @param etherType Ethernet frame type
* @param data Frame data
* @param len Length of frame in bytes
* @return True on success; false if not a member of network, injection not supported, or data too large
*/
bool injectPacketFromHost(uint64_t nwid,const unsigned char *from,const unsigned char *to,unsigned int etherType,const void *data,unsigned int len);
static const char *versionString() throw();
static unsigned int versionMajor() throw();
static unsigned int versionMinor() throw();