X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=f451d8e35ebb8229d987746b970b17de4d55049c;hb=31ab43d8a0691e773db6992fa3b52ca24f7f8db4;hp=68873096e76afde29429ab0f76e74806f56b06bf;hpb=a20765791b2a40ddd58452e8f74b0737f1f1f28e;p=meshlink

diff --git a/src/route.c b/src/route.c
index 68873096..f451d8e3 100644
--- a/src/route.c
+++ b/src/route.c
@@ -27,69 +27,53 @@
 
 bool decrement_ttl = false;
 
-static bool ratelimit(int frequency) {
-	static time_t lasttime = 0;
-	static int count = 0;
-
-	if(lasttime == mesh->loop.now.tv_sec) {
-		if(count >= frequency)
-			return true;
-	} else {
-		lasttime = mesh->loop.now.tv_sec;
-		count = 0;
-	}
-
-	count++;
-	return false;
-}
-
 static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
 	if(packet->len < length) {
-		logger(DEBUG_TRAFFIC, LOG_WARNING, "Got too short packet from %s (%s)", source->name, source->hostname);
+		logger(source->mesh, MESHLINK_WARNING, "Got too short packet from %s (%s)", source->name, source->hostname);
 		return false;
 	} else
 		return true;
 }
 
-void route(node_t *source,vpn_packet_t *packet) {
-    // TODO: route on name or key
+void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
+	// TODO: route on name or key
 
-    node_t* owner = NULL;
-    node_t* via = NULL;
-    meshlink_packethdr_t* hdr = (meshlink_packethdr_t*)packet->data;
-    owner = lookup_node(hdr->destination);
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "Routing packet from: %s . To: %s \n",hdr->source,hdr->destination);
+	node_t *owner = NULL;
+	node_t *via = NULL;
+	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
+	owner = lookup_node(mesh, (char *)hdr->destination);
+	logger(mesh, MESHLINK_DEBUG, "Routing packet from \"%s\" to \"%s\"\n", hdr->source, hdr->destination);
 
-    //Check Lenght
-    if(!checklength(source, packet, (sizeof(meshlink_packethdr_t))))
-        return;
+	//Check Lenght
+	if(!checklength(source, packet, (sizeof(meshlink_packethdr_t))))
+		return;
 
-    if (owner == NULL) {
-    //Lookup failed
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "Cant lookup the owner of a packet in the route() function. This should never happen \n");
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "Destination was: %s \n",hdr->destination);
-    return;
-    }
+	if(owner == NULL) {
+		//Lookup failed
+		logger(mesh, MESHLINK_WARNING, "Cant lookup the owner of a packet in the route() function. This should never happen!\n");
+		logger(mesh, MESHLINK_WARNING, "Destination was: %s\n", hdr->destination);
+		return;
+	}
 
-    if (owner == mesh->self ) {
-    //TODO: implement sending received data from meshlink library to the application
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
-    (meshlink_receive_cb_t)(packet->data + sizeof *hdr);
-    return;
-    }
+	if(owner == mesh->self) {
+		logger(mesh, MESHLINK_DEBUG, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
+		if(mesh->receive_cb)
+			mesh->receive_cb(mesh, (meshlink_node_t *)source, packet->data + sizeof *hdr, packet->len - sizeof *hdr);
+		return;
+	}
 
-    if(!owner->status.reachable) {
-    //TODO: check what to do here, not just print a warning
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "The owner of a packet in the route() function is unreachable. Dropping packet. \n");
-    return;
-    }
+	if(!owner->status.reachable) {
+		//TODO: check what to do here, not just print a warning
+		logger(mesh, MESHLINK_WARNING, "The owner of a packet in the route() function is unreachable. Dropping packet.\n");
+		return;
+	}
 
-    via = (owner->via == mesh->self) ? owner->nexthop : owner->via;
-    if(via == source) {
-	logger(DEBUG_TRAFFIC, LOG_ERR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
-	return;
-    }
+	via = (owner->via == mesh->self) ? owner->nexthop : owner->via;
+	if(via == source) {
+		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
+		return;
+	}
 
-    send_packet(owner,packet);
-    return;
+	send_packet(mesh, owner, packet);
+	return;
 }