diff --git a/README.md b/README.md index 5511226..92a027d 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ At this stage, if a cryptographic identity for this node does not already exist bool networkReady = false; -void myZeroTierEventCallback(struct zts_callback_msg *msg) +void on_zts_event(struct zts_callback_msg *msg) { if (msg->eventCode == ZTS_EVENT_NODE_ONLINE) { printf("ZTS_EVENT_NODE_ONLINE, nodeId=%llx\n", msg->node->address); @@ -77,7 +77,7 @@ void myZeroTierEventCallback(struct zts_callback_msg *msg) int main() { - zts_start("configPath", &myZeroTierEventCallback, 9994); + zts_start("configPath", &on_zts_event, 9994); uint64_t nwid = 0x0123456789abcdef; while (!networkReady) { sleep(1); } zts_join(nwid); @@ -138,7 +138,7 @@ struct zts_callback_msg Here's an example of a callback function: ``` -void myZeroTierEventCallback(struct zts_callback_msg *msg) +void on_zts_event(struct zts_callback_msg *msg) { if (msg->eventCode == ZTS_EVENT_NODE_ONLINE) { printf("ZTS_EVENT_NODE_ONLINE, node=%llx\n", msg->node->address); diff --git a/README.pdf b/README.pdf deleted file mode 100644 index d736e25..0000000 Binary files a/README.pdf and /dev/null differ diff --git a/examples/cpp/adhoc.cpp b/examples/cpp/adhoc.cpp index df37a91..b83ece2 100644 --- a/examples/cpp/adhoc.cpp +++ b/examples/cpp/adhoc.cpp @@ -104,7 +104,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -233,7 +233,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/client.cpp b/examples/cpp/client.cpp index 5c33439..aec3d7b 100644 --- a/examples/cpp/client.cpp +++ b/examples/cpp/client.cpp @@ -22,7 +22,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -234,7 +234,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/comprehensive.cpp b/examples/cpp/comprehensive.cpp index 9d04442..77dd319 100644 --- a/examples/cpp/comprehensive.cpp +++ b/examples/cpp/comprehensive.cpp @@ -218,7 +218,7 @@ void printNetifDetails(const char *msgStr, struct zts_netif_details *d) to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; printf("eventCode=%d\n", msg->eventCode); @@ -393,7 +393,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(configPath.c_str(), &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(configPath.c_str(), &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/earthtest.cpp b/examples/cpp/earthtest.cpp index a0275c8..0807fa6 100644 --- a/examples/cpp/earthtest.cpp +++ b/examples/cpp/earthtest.cpp @@ -104,7 +104,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -189,7 +189,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/nonblockingclient.cpp b/examples/cpp/nonblockingclient.cpp index debead1..1cf4de0 100644 --- a/examples/cpp/nonblockingclient.cpp +++ b/examples/cpp/nonblockingclient.cpp @@ -104,7 +104,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -237,7 +237,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/nonblockingserver.cpp b/examples/cpp/nonblockingserver.cpp index 0281f09..3cb0d4c 100644 --- a/examples/cpp/nonblockingserver.cpp +++ b/examples/cpp/nonblockingserver.cpp @@ -103,7 +103,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -236,7 +236,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp index 1684ab0..aca3c52 100644 --- a/examples/cpp/server.cpp +++ b/examples/cpp/server.cpp @@ -22,7 +22,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -234,7 +234,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/node/binding.cc b/examples/node/binding.cc index f1d8b0e..b6e1366 100644 --- a/examples/node/binding.cc +++ b/examples/node/binding.cc @@ -29,7 +29,7 @@ struct Node to ensure timely receipt of future events. You should not call libzt API functions from this function unless it's something trivial like zts_inet_ntop() or similar that has no state-change implications. */ -void myZeroTierEventCallback(void *msgPtr) +void on_zts_event(void *msgPtr) { struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; @@ -239,7 +239,7 @@ public: int err = ZTS_ERR_OK; - if((err = zts_start(configPath, &myZeroTierEventCallback, servicePort)) != ZTS_ERR_OK) { + if((err = zts_start(configPath, &on_zts_event, servicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d.\n", err); return err; } diff --git a/examples/objective-c/adhoc.m b/examples/objective-c/adhoc.m index bdac06d..1273c3b 100644 --- a/examples/objective-c/adhoc.m +++ b/examples/objective-c/adhoc.m @@ -101,7 +101,7 @@ bool nodeReady = false; bool networkReady = false; // Example callbacks -void myZeroTierEventCallback(struct zts_callback_msg *msg) +void on_zts_event(struct zts_callback_msg *msg) { // Node events if (msg->eventCode == ZTS_EVENT_NODE_ONLINE) { @@ -213,7 +213,7 @@ int main(int argc, char **argv) // If disabled: Settings will NOT be read from local.conf zts_allow_local_conf(1); - if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { + if((err = zts_start(argv[1], &on_zts_event, ztServicePort)) != ZTS_ERR_OK) { NSLog(@"Unable to start service, error = %d. Exiting.\n", err); exit(1); } diff --git a/examples/swift/main.swift b/examples/swift/main.swift index 5056f3c..afcd60b 100644 --- a/examples/swift/main.swift +++ b/examples/swift/main.swift @@ -202,7 +202,7 @@ let printNetifDetails : @convention(c) (UnsafeMutableRawPointer?) -> Void = var nodeReady:Bool = false var networkReady:Bool = false -let myZeroTierEventCallback : @convention(c) (UnsafeMutableRawPointer?) -> Void = +let on_zts_event : @convention(c) (UnsafeMutableRawPointer?) -> Void = { (msgPtr) -> Void in let msg = msgPtr?.bindMemory(to: zts_callback_msg.self, capacity: 1) @@ -322,7 +322,7 @@ let myZeroTierEventCallback : @convention(c) (UnsafeMutableRawPointer?) -> Void func main() { print("waiting for node to come online...") - zts_start("config_path", myZeroTierEventCallback, 0) + zts_start("config_path", on_zts_event, 0) while(!nodeReady) { sleep(1) }