Remove old circuit test code. Rules engine will let us do this much better and more simply.
This commit is contained in:
parent
36049a940c
commit
2ec88e8008
9 changed files with 4 additions and 764 deletions
|
@ -760,7 +760,6 @@ typedef struct
|
|||
*/
|
||||
uint64_t expiration;
|
||||
|
||||
|
||||
struct {
|
||||
uint64_t from;
|
||||
uint64_t to;
|
||||
|
@ -1105,197 +1104,6 @@ typedef struct
|
|||
unsigned long peerCount;
|
||||
} ZT_PeerList;
|
||||
|
||||
/**
|
||||
* ZeroTier circuit test configuration and path
|
||||
*/
|
||||
typedef struct {
|
||||
/**
|
||||
* Test ID -- an arbitrary 64-bit identifier
|
||||
*/
|
||||
uint64_t testId;
|
||||
|
||||
/**
|
||||
* Timestamp -- sent with test and echoed back by each reporter
|
||||
*/
|
||||
uint64_t timestamp;
|
||||
|
||||
/**
|
||||
* Originator credential: network ID
|
||||
*
|
||||
* If this is nonzero, a network ID will be set for this test and
|
||||
* the originator must be its primary network controller. This is
|
||||
* currently the only authorization method available, so it must
|
||||
* be set to run a test.
|
||||
*/
|
||||
uint64_t credentialNetworkId;
|
||||
|
||||
/**
|
||||
* Hops in circuit test (a.k.a. FIFO for graph traversal)
|
||||
*/
|
||||
struct {
|
||||
/**
|
||||
* Hop flags (currently unused, must be zero)
|
||||
*/
|
||||
unsigned int flags;
|
||||
|
||||
/**
|
||||
* Number of addresses in this hop (max: ZT_CIRCUIT_TEST_MAX_HOP_BREADTH)
|
||||
*/
|
||||
unsigned int breadth;
|
||||
|
||||
/**
|
||||
* 40-bit ZeroTier addresses (most significant 24 bits ignored)
|
||||
*/
|
||||
uint64_t addresses[ZT_CIRCUIT_TEST_MAX_HOP_BREADTH];
|
||||
} hops[ZT_CIRCUIT_TEST_MAX_HOPS];
|
||||
|
||||
/**
|
||||
* Number of hops (max: ZT_CIRCUIT_TEST_MAX_HOPS)
|
||||
*/
|
||||
unsigned int hopCount;
|
||||
|
||||
/**
|
||||
* If non-zero, circuit test will report back at every hop
|
||||
*/
|
||||
int reportAtEveryHop;
|
||||
|
||||
/**
|
||||
* An arbitrary user-settable pointer
|
||||
*/
|
||||
void *ptr;
|
||||
|
||||
/**
|
||||
* Pointer for internal use -- initialize to zero and do not modify
|
||||
*/
|
||||
void *_internalPtr;
|
||||
} ZT_CircuitTest;
|
||||
|
||||
/**
|
||||
* Circuit test result report
|
||||
*/
|
||||
typedef struct {
|
||||
/**
|
||||
* Sender of report (current hop)
|
||||
*/
|
||||
uint64_t current;
|
||||
|
||||
/**
|
||||
* Previous hop
|
||||
*/
|
||||
uint64_t upstream;
|
||||
|
||||
/**
|
||||
* 64-bit test ID
|
||||
*/
|
||||
uint64_t testId;
|
||||
|
||||
/**
|
||||
* Timestamp from original test (echoed back at each hop)
|
||||
*/
|
||||
uint64_t timestamp;
|
||||
|
||||
/**
|
||||
* 64-bit packet ID of packet received by the reporting device
|
||||
*/
|
||||
uint64_t sourcePacketId;
|
||||
|
||||
/**
|
||||
* Flags
|
||||
*/
|
||||
uint64_t flags;
|
||||
|
||||
/**
|
||||
* ZeroTier protocol-level hop count of packet received by reporting device (>0 indicates relayed)
|
||||
*/
|
||||
unsigned int sourcePacketHopCount;
|
||||
|
||||
/**
|
||||
* Error code (currently unused, will be zero)
|
||||
*/
|
||||
unsigned int errorCode;
|
||||
|
||||
/**
|
||||
* Remote device vendor ID
|
||||
*/
|
||||
enum ZT_Vendor vendor;
|
||||
|
||||
/**
|
||||
* Remote device protocol compliance version
|
||||
*/
|
||||
unsigned int protocolVersion;
|
||||
|
||||
/**
|
||||
* Software major version
|
||||
*/
|
||||
unsigned int majorVersion;
|
||||
|
||||
/**
|
||||
* Software minor version
|
||||
*/
|
||||
unsigned int minorVersion;
|
||||
|
||||
/**
|
||||
* Software revision
|
||||
*/
|
||||
unsigned int revision;
|
||||
|
||||
/**
|
||||
* Platform / OS
|
||||
*/
|
||||
enum ZT_Platform platform;
|
||||
|
||||
/**
|
||||
* System architecture
|
||||
*/
|
||||
enum ZT_Architecture architecture;
|
||||
|
||||
/**
|
||||
* Local device address on which packet was received by reporting device
|
||||
*
|
||||
* This may have ss_family equal to zero (null address) if unspecified.
|
||||
*/
|
||||
struct sockaddr_storage receivedOnLocalAddress;
|
||||
|
||||
/**
|
||||
* Remote address from which reporter received the test packet
|
||||
*
|
||||
* This may have ss_family set to zero (null address) if unspecified.
|
||||
*/
|
||||
struct sockaddr_storage receivedFromRemoteAddress;
|
||||
|
||||
/**
|
||||
* Path link quality of physical path over which test was received
|
||||
*/
|
||||
int receivedFromLinkQuality;
|
||||
|
||||
/**
|
||||
* Next hops to which packets are being or will be sent by the reporter
|
||||
*
|
||||
* In addition to reporting back, the reporter may send the test on if
|
||||
* there are more recipients in the FIFO. If it does this, it can report
|
||||
* back the address(es) that make up the next hop and the physical address
|
||||
* for each if it has one. The physical address being null/unspecified
|
||||
* typically indicates that no direct path exists and the next packet
|
||||
* will be relayed.
|
||||
*/
|
||||
struct {
|
||||
/**
|
||||
* 40-bit ZeroTier address
|
||||
*/
|
||||
uint64_t address;
|
||||
|
||||
/**
|
||||
* Physical address or null address (ss_family == 0) if unspecified or unknown
|
||||
*/
|
||||
struct sockaddr_storage physicalAddress;
|
||||
} nextHops[ZT_CIRCUIT_TEST_MAX_HOP_BREADTH];
|
||||
|
||||
/**
|
||||
* Number of next hops reported in nextHops[]
|
||||
*/
|
||||
unsigned int nextHopCount;
|
||||
} ZT_CircuitTestReport;
|
||||
|
||||
/**
|
||||
* A cluster member's status
|
||||
*/
|
||||
|
@ -1957,40 +1765,6 @@ int ZT_Node_sendUserMessage(ZT_Node *node,void *tptr,uint64_t dest,uint64_t type
|
|||
*/
|
||||
void ZT_Node_setNetconfMaster(ZT_Node *node,void *networkConfigMasterInstance);
|
||||
|
||||
/**
|
||||
* Initiate a VL1 circuit test
|
||||
*
|
||||
* This sends an initial VERB_CIRCUIT_TEST and reports results back to the
|
||||
* supplied callback until circuitTestEnd() is called. The supplied
|
||||
* ZT_CircuitTest structure should be initially zeroed and then filled
|
||||
* in with settings and hops.
|
||||
*
|
||||
* It is the caller's responsibility to call circuitTestEnd() and then
|
||||
* to dispose of the test structure. Otherwise this node will listen
|
||||
* for results forever.
|
||||
*
|
||||
* @param node Node instance
|
||||
* @param tptr Thread pointer to pass to functions/callbacks resulting from this call
|
||||
* @param test Test configuration
|
||||
* @param reportCallback Function to call each time a report is received
|
||||
* @return OK or error if, for example, test is too big for a packet or support isn't compiled in
|
||||
*/
|
||||
enum ZT_ResultCode ZT_Node_circuitTestBegin(ZT_Node *node,void *tptr,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *, ZT_CircuitTest *,const ZT_CircuitTestReport *));
|
||||
|
||||
/**
|
||||
* Stop listening for results to a given circuit test
|
||||
*
|
||||
* This does not free the 'test' structure. The caller may do that
|
||||
* after calling this method to unregister it.
|
||||
*
|
||||
* Any reports that are received for a given test ID after it is
|
||||
* terminated are ignored.
|
||||
*
|
||||
* @param node Node instance
|
||||
* @param test Test configuration to unregister
|
||||
*/
|
||||
void ZT_Node_circuitTestEnd(ZT_Node *node,ZT_CircuitTest *test);
|
||||
|
||||
/**
|
||||
* Initialize cluster operation
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue