X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=69462d5c56f1ee73e9796ab972d201f55957fd70;hb=f79cc0e0bba16a3aa42a5fa13098cda714623205;hp=c0ed984964ae000c34aa65088b8583a2af3f4889;hpb=b95becf1382a6e194b7b4e867a4f808440ad0ff9;p=meshlink

diff --git a/src/net.c b/src/net.c
index c0ed9849..69462d5c 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,6 +1,6 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #if !defined(min)
-static const int min(int a, int b) {
+static inline int min(int a, int b) {
 	return a < b ? a : b;
 }
 #endif
@@ -344,7 +344,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 		// get cur_connects
 
-		int cur_connects = 0;
+		unsigned int cur_connects = 0;
 
 		for list_each(connection_t, c, mesh->connections) {
 			if(c->status.active)
@@ -358,8 +358,8 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 		assert(mesh->devclass >= 0 && mesh->devclass <= _DEV_CLASS_MAX);
 
-		int min_connects = dev_class_traits[mesh->devclass].min_connects;
-		int max_connects = dev_class_traits[mesh->devclass].max_connects;
+		unsigned int min_connects = dev_class_traits[mesh->devclass].min_connects;
+		unsigned int max_connects = dev_class_traits[mesh->devclass].max_connects;
 
 		logger(mesh, MESHLINK_DEBUG, "* min_connects = %d", min_connects);
 		logger(mesh, MESHLINK_DEBUG, "* max_connects = %d", max_connects);
@@ -393,7 +393,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 		if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects) {
 			unsigned int connects = 0;
 
-			for(int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+			for(unsigned int devclass = 0; devclass <= mesh->devclass; ++devclass) {
 				for list_each(connection_t, c, mesh->connections) {
 					if(c->status.active && c->node && c->node->devclass == devclass)
 						connects += 1;
@@ -476,7 +476,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 		if(min_connects < cur_connects /*&& cur_connects <= max_connects*/) {
 			unsigned int connects = 0;
 
-			for(int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+			for(unsigned int devclass = 0; devclass <= mesh->devclass; ++devclass) {
 				for list_each(connection_t, c, mesh->connections) {
 					if(c->status.active && c->node && c->node->devclass == devclass)
 						connects += 1;