Commit 1110b8d3 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Update node-scope publications when network address is assigned 



Ensures that node-scope name publications that exist prior to the
configuration of a node's network address are properly re-initialized
with that address when it is assigned. TIPC's node-scope publications
are now tracked using a publications list like the lists used for
cluster-scope and zone-scope publications so they can be easily updated
when required.

The inclusion of node scope name publications in a conventional publication
list means that they must now also be withdrawn, just like cluster and zone
scope publications are currently withdrawn.  So some conditional tests on
scope ==/!= TIPC_NODE_SCOPE are inserted/removed accordingly.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent a909804f

net/tipc/name_distr.c

+10 −4
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ void tipc_named_publish(struct publication *publ) 
	list_add_tail(&publ->local_list, &publ_lists[publ->scope]->list);

	publ_lists[publ->scope]->size++;



	if (publ->scope == TIPC_NODE_SCOPE)

		return;



	buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0);

	if (!buf) {

		warn("Publication distribution failure\n");
@@ -183,6 +186,9 @@ void tipc_named_withdraw(struct publication *publ) 
	list_del(&publ->local_list);

	publ_lists[publ->scope]->size--;



	if (publ->scope == TIPC_NODE_SCOPE)

		return;



	buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);

	if (!buf) {

		warn("Withdrawal distribution failure\n");
@@ -349,11 +355,11 @@ void tipc_named_recv(struct sk_buff *buf) 
}



/**

 * tipc_named_reinit - re-initialize local publication list

 * tipc_named_reinit - re-initialize local publications

 *

 * This routine is called whenever TIPC networking is enabled.

 * All existing publications by this node that have "cluster" or "zone" scope

 * are updated to reflect the node's new network address.

 * All name table entries published by this node are updated to reflect

 * the node's new network address.

 */



void tipc_named_reinit(void)
@@ -363,7 +369,7 @@ void tipc_named_reinit(void) 


	write_lock_bh(&tipc_nametbl_lock);



	for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_CLUSTER_SCOPE; scope++)

	for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_NODE_SCOPE; scope++)

		list_for_each_entry(publ, &publ_lists[scope]->list, local_list)

			publ->node = tipc_own_addr;

net/tipc/name_table.c

+2 −3
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper, 
	table.local_publ_count++;

	publ = tipc_nametbl_insert_publ(type, lower, upper, scope,

				   tipc_own_addr, port_ref, key);

	if (publ && (scope != TIPC_NODE_SCOPE))

	if (likely(publ))

		tipc_named_publish(publ);

	write_unlock_bh(&tipc_nametbl_lock);

	return publ;
@@ -716,7 +716,6 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key) 
	publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);

	if (likely(publ)) {

		table.local_publ_count--;

		if (publ->scope != TIPC_NODE_SCOPE)

		tipc_named_withdraw(publ);

		write_unlock_bh(&tipc_nametbl_lock);

		list_del_init(&publ->pport_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE