X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink.c;h=1d52724e26d6e31b52255bbb2ae8976e4edbb770;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=0799c4d7bed8b17d659e8b508236dddbc88edd9f;hpb=961386ebb103995bd323efed53fcbff99f5357d1;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 0799c4d7..1d52724e 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -742,11 +742,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 	return true;
 }
 
-meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dclass_t dclass) {
-	return meshlink_open_with_size(confbase, name, appname, dclass, sizeof(meshlink_handle_t));
+meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
+	return meshlink_open_with_size(confbase, name, appname, devclass, sizeof(meshlink_handle_t));
 }
 
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dclass_t dclass, size_t size) {
+meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dev_class_t devclass, size_t size) {
 
 	// Validate arguments provided by the application
 	bool usingname = false;
@@ -778,10 +778,16 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
 		} else { usingname = true;}
 	}
 
+	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+		logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
+		meshlink_errno = MESHLINK_EINVAL;
+		return NULL;
+	}
+
 	meshlink_handle_t *mesh = xzalloc(size);
 	mesh->confbase = xstrdup(confbase);
 	mesh->appname = xstrdup(appname);
-	mesh->dclass = dclass;
+	mesh->devclass = devclass;
 	if (usingname) mesh->name = xstrdup(name);
 
 	// initialize mutex
@@ -1880,9 +1886,7 @@ meshlink_edge_t **meshlink_get_all_edges_state(meshlink_handle_t *mesh, meshlink
 			}
 			copy->from = (meshlink_node_t*)e->from;
 			copy->to = (meshlink_node_t*)e->to;
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
 			copy->address = e->address.storage;
-#endif
 			copy->options = e->options;
 			copy->weight = e->weight;
 			*p++ = copy;
@@ -1912,19 +1916,11 @@ static void __attribute__((destructor)) meshlink_exit(void) {
 	crypto_exit();
 }
 
-int weight_from_dclass(dclass_t dclass)
-{
-	switch(dclass)
-	{
-	case BACKBONE:
-		return 1;
 
-	case STATIONARY:
-		return 3;
-
-	case PORTABLE:
-		return 6;
-	}
-
-	return 9;
-}
+/// Device class traits
+dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX +1] = {
+	{ .min_connects = 3, .max_connects = 10000, .edge_weight = 1 },	// DEV_CLASS_BACKBONE
+	{ .min_connects = 3, .max_connects = 100, .edge_weight = 3 },	// DEV_CLASS_STATIONARY
+	{ .min_connects = 3, .max_connects = 3, .edge_weight = 6 },		// DEV_CLASS_PORTABLE
+	{ .min_connects = 1, .max_connects = 1, .edge_weight = 9 },		// DEV_CLASS_UNKNOWN
+};