X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdevtools.c;h=fab0c72019325ad4e893207305c2fc71abf81e94;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=cd45e39ff61e6a19047aae023e0ee19b964ea9d1;hpb=282b99f3c71705bd6e34d4e4f9e8369ea63c87ed;p=meshlink

diff --git a/src/devtools.c b/src/devtools.c
index cd45e39f..fab0c720 100644
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -52,7 +52,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 		return NULL;
 	}
 
-	pthread_mutex_lock(&(mesh->mesh_mutex));
+	pthread_mutex_lock(&mesh->mutex);
 
 	devtool_edge_t *result = NULL;
 	unsigned int result_size = 0;
@@ -61,7 +61,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 
 	// if result is smaller than edges, we have to dealloc all the excess devtool_edge_t
 	if((size_t)result_size > *nmemb) {
-		result = realloc(edges, result_size * sizeof(*result));
+		result = xrealloc(edges, result_size * sizeof(*result));
 	} else {
 		result = edges;
 	}
@@ -93,19 +93,21 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 		}
 
 		// shrink result to the actual amount of memory used
-		result = realloc(result, n * sizeof(*result));
+		result = xrealloc(result, n * sizeof(*result));
 		*nmemb = n;
 	} else {
 		*nmemb = 0;
 		meshlink_errno = MESHLINK_ENOMEM;
 	}
 
-	pthread_mutex_unlock(&(mesh->mesh_mutex));
+	pthread_mutex_unlock(&mesh->mutex);
 
 	return result;
 }
 
 static bool fstrwrite(const char *str, FILE *stream) {
+	assert(stream);
+
 	size_t len = strlen(str);
 
 	if(fwrite((void *)str, 1, len, stream) != len) {
@@ -115,20 +117,12 @@ static bool fstrwrite(const char *str, FILE *stream) {
 	return true;
 }
 
-static const char *__itoa(int value) {
-	static char buffer[sizeof(int) * 8 + 1];        // not thread safe
-
-	if(snprintf(buffer, sizeof(buffer), "%d", value) == -1) {
-		return "";
-	}
-
-	return buffer;
-}
-
 bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) {
+	assert(stream);
+
 	bool result = true;
 
-	pthread_mutex_lock(&(mesh->mesh_mutex));
+	pthread_mutex_lock(&mesh->mutex);
 
 	// export edges and nodes
 	size_t node_count = 0;
@@ -151,6 +145,8 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream)
 		goto fail;
 	}
 
+	char buf[16];
+
 	for(size_t i = 0; i < node_count; ++i) {
 		if(!fstrwrite("\t\t\"", stream) || !fstrwrite(((node_t *)nodes[i])->name, stream) || !fstrwrite("\": {\n", stream)) {
 			goto fail;
@@ -160,7 +156,9 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream)
 			goto fail;
 		}
 
-		if(!fstrwrite("\t\t\t\"devclass\": ", stream) || !fstrwrite(__itoa(((node_t *)nodes[i])->devclass), stream) || !fstrwrite("\n", stream)) {
+		snprintf(buf, sizeof(buf), "%d", ((node_t *)nodes[i])->devclass);
+
+		if(!fstrwrite("\t\t\t\"devclass\": ", stream) || !fstrwrite(buf, stream) || !fstrwrite("\n", stream)) {
 			goto fail;
 		}
 
@@ -209,7 +207,9 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream)
 
 		free(address);
 
-		if(!fstrwrite("\t\t\t\"weight\": ", stream) || !fstrwrite(__itoa(edges[i].weight), stream) || !fstrwrite("\n", stream)) {
+		snprintf(buf, sizeof(buf), "%d", edges[i].weight);
+
+		if(!fstrwrite("\t\t\t\"weight\": ", stream) || !fstrwrite(buf, stream) || !fstrwrite("\n", stream)) {
 			goto fail;
 		}
 
@@ -237,7 +237,7 @@ done:
 	free(nodes);
 	free(edges);
 
-	pthread_mutex_unlock(&(mesh->mesh_mutex));
+	pthread_mutex_unlock(&mesh->mutex);
 
 	return result;
 }
@@ -250,7 +250,7 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
 
 	node_t *internal = (node_t *)node;
 
-	pthread_mutex_lock(&mesh->mesh_mutex);
+	pthread_mutex_lock(&mesh->mutex);
 
 	memcpy(&status->status, &internal->status, sizeof status->status);
 	memcpy(&status->address, &internal->address, sizeof status->address);
@@ -280,7 +280,7 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
 		status->udp_status = DEVTOOL_UDP_UNKNOWN;
 	}
 
-	pthread_mutex_unlock(&mesh->mesh_mutex);
+	pthread_mutex_unlock(&mesh->mutex);
 }
 
 meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink_submesh_t **submeshes, size_t *nmemb) {
@@ -292,7 +292,7 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
 	meshlink_submesh_t **result;
 
 	//lock mesh->nodes
-	pthread_mutex_lock(&(mesh->mesh_mutex));
+	pthread_mutex_lock(&mesh->mutex);
 
 	*nmemb = mesh->submeshes->count;
 	result = realloc(submeshes, *nmemb * sizeof(*submeshes));
@@ -309,10 +309,11 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
 		meshlink_errno = MESHLINK_ENOMEM;
 	}
 
-	pthread_mutex_unlock(&(mesh->mesh_mutex));
+	pthread_mutex_unlock(&mesh->mutex);
 
 	return result;
 }
+
 meshlink_handle_t *devtool_open_in_netns(const char *confbase, const char *name, const char *appname, dev_class_t devclass, int netns) {
 	meshlink_open_params_t *params = meshlink_open_params_init(confbase, name, appname, devclass);
 	params->netns = dup(netns);