tipc: Enhance cleanup of broadcast link when contact with node is lost (c5bd4d85) · Commits · 戴 / test

Enhances cleanup of broadcast link-related information when contact with a node is lost. 1) All broadcast link-related cleanup now occurs only if the lost node was capable of communicating over the broadcast link. 2) Following cleanup, the lost node is marked as no longer supporting the broadcast link, ensuring that any remaining broadcast messages received from that node prior to the re-establishment of a normal communication link are ignored. Thanks to Surya [Suryanarayana.Garlapati@emerson.com] for contributing a prototype version of this patch. Signed-off-by:

Allan Stephens <allan.stephens@windriver.com> Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com>

net/tipc/node.c

+18 −14

Original line number	Diff line number	Diff line
		@@ -331,28 +331,32 @@ static void node_lost_contact(struct tipc_node *n_ptr)
		char addr_string[16];
		u32 i;

		/* Clean up broadcast reception remains */
		info("Lost contact with %s\n",
		tipc_addr_string_fill(addr_string, n_ptr->addr));

		/* Flush broadcast link info associated with lost node */

		if (n_ptr->bclink.supported) {
		n_ptr->bclink.gap_after = n_ptr->bclink.gap_to = 0;
		while (n_ptr->bclink.deferred_head) {
		struct sk_buff *buf = n_ptr->bclink.deferred_head;
		n_ptr->bclink.deferred_head = buf->next;
		buf_discard(buf);
		}

		if (n_ptr->bclink.defragm) {
		buf_discard(n_ptr->bclink.defragm);
		n_ptr->bclink.defragm = NULL;
		}

		if (n_ptr->bclink.supported) {
		tipc_bclink_acknowledge(n_ptr,
		mod(n_ptr->bclink.acked + 10000));
		tipc_nmap_remove(&tipc_bcast_nmap, n_ptr->addr);
		if (n_ptr->addr < tipc_own_addr)
		tipc_own_tag--;
		}

		info("Lost contact with %s\n",
		tipc_addr_string_fill(addr_string, n_ptr->addr));
		n_ptr->bclink.supported = 0;
		}

		/* Abort link changeover */
		for (i = 0; i < MAX_BEARERS; i++) {

Admin message