libknet: remove that horrid dst_cache update and mask it around link_…

…enabled

makes the API a bit more readable.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

kronosnetd/vty_cli_cmds.c

@@ -717,8 +717,7 @@ static int knet_cmd_no_link(struct knet_vty *vty)
 		return -1;
 	}
 
-	host->link[j].configured = 0;
-	if (knet_host_dst_cache_update(knet_iface->cfg_ring.knet_h, host->node_id))
+	if (knet_link_enable(knet_iface->cfg_ring.knet_h, host->node_id, &host->link[j], 0))
 		knet_vty_write(vty, "Error: unable to update switching cache%s", telnet_newline);
 
 	return 0;
@@ -769,7 +768,7 @@ static int knet_cmd_link(struct knet_vty *vty)
 
 		knet_link_timeout(klink, 1000, 5000, 2048);
 
-		klink->configured = 1;
+		knet_link_enable(knet_iface->cfg_ring.knet_h, host->node_id, klink, 1);
 	}
 
 	vty->link = (void *)klink;
@@ -1273,7 +1272,7 @@ static int knet_cmd_no_interface(struct knet_vty *vty)
 		}
 
 		for (i = 0; i < KNET_MAX_LINK; i++)
-			host->link[i].configured = 0;
+			knet_link_enable(knet_iface->cfg_ring.knet_h, host->node_id, &host->link[i], 0);
 
 		knet_listener_remove(knet_iface->cfg_ring.knet_h, host->listener);
 

libknet/handle.c

@@ -230,6 +230,30 @@ int knet_handle_crypto(knet_handle_t knet_h, struct knet_handle_crypto_cfg *knet
 	return crypto_init(knet_h, knet_handle_crypto_cfg);
 }
 
+int knet_link_enable(knet_handle_t knet_h, uint16_t node_id, struct knet_link *lnk, int configured)
+{
+	int write_retry = 0;
+
+	if (lnk->configured == configured)
+		return 0;
+
+	lnk->configured = configured;
+
+	if (configured)
+		return 0;
+
+try_again:
+	if (write(knet_h->pipefd[1], &node_id, sizeof(node_id)) != sizeof(node_id)) {
+		if ((write_retry < 10) && ((errno = EAGAIN) || (errno = EWOULDBLOCK))) {
+			write_retry++;
+			goto try_again;
+		} else {
+			return -1;
+		}
+	}
+	return 0;
+}
+
 void knet_link_timeout(struct knet_link *lnk,
 				time_t interval, time_t timeout, int precision)
 {

libknet/host.c

@@ -153,22 +153,6 @@ int knet_host_remove(knet_handle_t knet_h, uint16_t node_id)
 	return ret;
 }
 
-int knet_host_dst_cache_update(knet_handle_t knet_h, uint16_t node_id)
-{
-	int write_retry = 0;
-
-try_again:
-	if (write(knet_h->pipefd[1], &node_id, sizeof(node_id)) != sizeof(node_id)) {
-		if ((write_retry < 10) && ((errno = EAGAIN) || (errno = EWOULDBLOCK))) {
-			write_retry++;
-			goto try_again;
-		} else {
-			return -1;
-		}
-	}
-	return 0;
-}
-
 /* bcast = 0 -> unicast packet | 1 -> broadcast|mcast */
 
 /* make this bcast/ucast aware */

libknet/libknet.h

@@ -152,8 +152,8 @@ int knet_host_acquire(knet_handle_t knet_h, struct knet_host **host);
 int knet_host_get(knet_handle_t knet_h, uint16_t node_id, struct knet_host **host);
 int knet_host_release(knet_handle_t knet_h, struct knet_host **host);
 int knet_host_remove(knet_handle_t knet_h, uint16_t node_id);
-int knet_host_dst_cache_update(knet_handle_t knet_h, uint16_t node_id);
 
+int knet_link_enable(knet_handle_t knet_h, uint16_t node_id, struct knet_link *lnk, int configured);
 void knet_link_timeout(struct knet_link *lnk, time_t interval, time_t timeout, int precision);
 
 #define KNET_HOST_FOREACH_NEXT 0	/* next host */

tests/listener_test.c

@@ -50,7 +50,7 @@ static void test_add_host(void)
 	knet_host_get(knet_h, 1, &host);
 
 	host->link[0].sock = listener->sock;
-	host->link[0].configured = 1;
+	knet_link_enable(knet_h, host->node_id, &host->link[0], 1);
 
 	knet_host_release(knet_h, &host);
 }

tests/ping_test.c

@@ -129,7 +129,7 @@ static void argv_to_hosts(int argc, char *argv[])
 
 		knet_link_timeout(&host->link[0], 1000, 5000, 2048);
 
-		host->link[0].configured = 1;
+		knet_link_enable(knet_h, host->node_id, &host->link[0], 1);
 
 		err = tok_inaddrport(argv[i],
 				(struct sockaddr_in *) &host->link[0].address);