summaryrefslogtreecommitdiffstats
path: root/mmss
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-03-18 19:30:37 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-03-18 19:30:37 +0100
commit976cea11de8bc45fcff1a5c1e007b406e2469db7 (patch)
tree20efeb6b8ce0e03675e3a12ea20f7b1919729f8c /mmss
parent33d1cf04a7e8d5b4cb7ed45af75eed06a27d1292 (diff)
downloadgmrf-976cea11de8bc45fcff1a5c1e007b406e2469db7.tar
gmrf-976cea11de8bc45fcff1a5c1e007b406e2469db7.zip
Inform protocol about interfaces
Diffstat (limited to 'mmss')
-rw-r--r--mmss/iface.c22
-rw-r--r--mmss/mmss.c19
-rw-r--r--mmss/mmss.h7
3 files changed, 31 insertions, 17 deletions
diff --git a/mmss/iface.c b/mmss/iface.c
index b175fa7..47a2877 100644
--- a/mmss/iface.c
+++ b/mmss/iface.c
@@ -33,6 +33,10 @@ gmrf_addr_t gmrf_iface_get_addr(gmrf_t *gmrf, gmrf_iface_t *iface) {
return iface->address;
}
+const char* gmrf_iface_get_name(gmrf_t *gmrf, gmrf_iface_t *iface) {
+ return iface->name;
+}
+
size_t gmrf_iface_get_mtu(gmrf_t *gmrf, gmrf_iface_t *iface) {
return iface->net->mtu;
}
@@ -74,3 +78,21 @@ void mmss_dispatch(mmss_packet_t *packet) {
&packet->source->address, packet->data, packet->len);
free(packet);
}
+
+void mmss_add_iface(gmrf_t *node, mmss_network_t *net, const char *name, const gmrf_addr_t *address) {
+ gmrf_iface_t *iface = calloc(1, sizeof(gmrf_iface_t));
+
+ iface->name = strdup(name);
+ iface->address = *address;
+
+ iface->node = node;
+ iface->net = net;
+
+ iface->node_next = node->interfaces;
+ node->interfaces = iface;
+
+ iface->network_next = net->interfaces;
+ net->interfaces = iface;
+
+ node->proto->add_iface(node, node->ctx, iface);
+}
diff --git a/mmss/mmss.c b/mmss/mmss.c
index 444445e..77ec21f 100644
--- a/mmss/mmss.c
+++ b/mmss/mmss.c
@@ -68,27 +68,16 @@ int main(int argc, char *argv[]) {
mmss_network_t net = { .mtu = 1500 };
gmrf_t node1 = { .name = "node1", .mmss = &mmss, .proto = proto }, node2 = { .name = "node2", .mmss = &mmss, .proto = proto };
- gmrf_iface_t iface1 = {}, iface2 = {};
-
- iface1.net = &net;
- iface1.node = &node1;
- iface1.address = (gmrf_addr_t){{1}};
-
- iface2.net = &net;
- iface2.node = &node2;
- iface2.address = (gmrf_addr_t){{2}};
-
- node1.interfaces = &iface1;
- node2.interfaces = &iface2;
-
- iface2.network_next = &iface1;
- net.interfaces = &iface2;
node2.next = &node1;
gmrf_t *nodes = &node2;
init_nodes(nodes);
+ gmrf_addr_t addr1 = {{1}}, addr2 = {{2}};
+ mmss_add_iface(&node1, &net, "mmss0", &addr1);
+ mmss_add_iface(&node2, &net, "mmss0", &addr2);
+
while (true) {
int timeout = get_queue_timeout(&mmss);
diff --git a/mmss/mmss.h b/mmss/mmss.h
index c10a119..728bc3c 100644
--- a/mmss/mmss.h
+++ b/mmss/mmss.h
@@ -80,15 +80,18 @@ struct gmrf_iface {
gmrf_iface_t *node_next;
gmrf_iface_t *network_next;
+ char *name;
+ gmrf_addr_t address;
+
gmrf_t *node;
mmss_network_t *net;
-
- gmrf_addr_t address;
};
const mmss_protocol_t* mmss_load_protocol(const char *module);
+void mmss_add_iface(gmrf_t *node, mmss_network_t *net, const char *name, const gmrf_addr_t *address);
+
void mmss_dispatch(mmss_packet_t *packet);
void mmss_run_scheduled(mmss_scheduled_t *scheduled);