aboutsummaryrefslogtreecommitdiff
path: root/src/network.cpp
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2019-06-04 23:00:55 -0400
committerDeterminant <[email protected]>2019-06-04 23:00:55 -0400
commitfad6446ce15bcd1303fdd162d6938ab30046467e (patch)
tree524e713d3574042176c1021bbfd610a885e950a2 /src/network.cpp
parentdab48a1825aed9c810ce83ea8054fa435ecb41be (diff)
finish the minimal working example
Diffstat (limited to 'src/network.cpp')
-rw-r--r--src/network.cpp33
1 files changed, 12 insertions, 21 deletions
diff --git a/src/network.cpp b/src/network.cpp
index 58b3ce1..9fc07fe 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -6,13 +6,21 @@ using namespace salticidae;
extern "C" {
+msgnetwork_config_t *msgnetwork_config_new() {
+ return new msgnetwork_config_t();
+}
+
+void msgnetwork_config_free(const msgnetwork_config_t *self) { delete self; }
+
msgnetwork_t *msgnetwork_new(const eventcontext_t *ec, const msgnetwork_config_t *config) {
return new msgnetwork_t(*ec, *config);
}
+void msgnetwork_free(const msgnetwork_t *self) { delete self; }
+
bool msgnetwork_send_msg(msgnetwork_t *self,
const msg_t *msg, const msgnetwork_conn_t *conn) {
- return self->send_msg(*msg, *conn);
+ return self->send_msg(*msg, *conn);
}
msgnetwork_conn_t *msgnetwork_connect(msgnetwork_t *self, const netaddr_t *addr) {
@@ -23,25 +31,14 @@ void msgnetwork_listen(msgnetwork_t *self, const netaddr_t *listen_addr) {
self->listen(*listen_addr);
}
-#ifdef SALTICIDAE_CBINDINGS_STR_OP
-void msgnetwork_reg_handler(msgnetwork_t *self,
- const char *opcode,
- msgnetwork_msg_callback_t cb) {
- self->set_handler(std::string(opcode),
- [cb](const msgnetwork_t::Msg &msg, const msgnetwork_t::conn_t &conn) {
- cb(&msg, &conn);
- });
-}
-#else
void msgnetwork_reg_handler(msgnetwork_t *self,
- uint8_t opcode,
+ _opcode_t opcode,
msgnetwork_msg_callback_t cb) {
self->set_handler(opcode,
[cb](const msgnetwork_t::Msg &msg, const msgnetwork_t::conn_t &conn) {
cb(&msg, &conn);
});
}
-#endif
void msgnetwork_reg_conn_handler(msgnetwork_t *self, msgnetwork_conn_callback_t cb) {
self->reg_conn_handler([cb](const ConnPool::conn_t &_conn, bool connected) {
@@ -50,12 +47,12 @@ void msgnetwork_reg_conn_handler(msgnetwork_t *self, msgnetwork_conn_callback_t
});
}
+void msgnetwork_start(msgnetwork_t *self) { self->start(); }
+
msgnetwork_t *msgnetwork_conn_get_net(const msgnetwork_conn_t *conn) {
return (*conn)->get_net();
}
-void msgnetwork_start(msgnetwork_t *self) { self->start(); }
-
msgnetwork_conn_mode_t msgnetwork_conn_get_mode(const msgnetwork_conn_t *conn) {
return (msgnetwork_conn_mode_t)(*conn)->get_mode();
}
@@ -64,12 +61,6 @@ netaddr_t *msgnetwork_conn_get_addr(const msgnetwork_conn_t *conn) {
return new netaddr_t((*conn)->get_addr());
}
-msgnetwork_config_t *msgnetwork_config_new() {
- return new msgnetwork_config_t();
-}
-
-void msgnetwork_config_free(msgnetwork_config_t *self) { delete self; }
-
}
#endif