aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/name_table.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2012-04-17 18:02:01 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-19 15:46:39 -0400
commit336ebf5bf524e447227cb1d785b22ca722e6afa7 (patch)
tree72e72c183cf43ccfbb756a7866c8b3cf90eb6781 /net/tipc/name_table.c
parentfd6eced8a482986784eb1f3aa0838dbdd725e71c (diff)
tipc: Add routines for safe checking of node's network address
Introduces routines that test whether a given network address is equal to a node's own network address or if it lies within the node's own network cluster, and which work properly regardless of whether the node is using the default network address <0.0.0> or a non-zero network address that is assigned later on. In essence, these routines ensure that address <0.0.0> is treated as an alias for "this node", regardless of which network address the node is actually using. Old users of the pre-existing more strict match in_own_cluster() have been accordingly redirected to what is now called in_own_cluster_exact() --- which does not extend matching to <0,0,0>. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/name_table.c')
-rw-r--r--net/tipc/name_table.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 5d7004262647..1e0518da19da 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -342,7 +342,7 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
342 list_add(&publ->zone_list, &info->zone_list); 342 list_add(&publ->zone_list, &info->zone_list);
343 info->zone_list_size++; 343 info->zone_list_size++;
344 344
345 if (in_own_cluster(node)) { 345 if (in_own_cluster_exact(node)) {
346 list_add(&publ->cluster_list, &info->cluster_list); 346 list_add(&publ->cluster_list, &info->cluster_list);
347 info->cluster_list_size++; 347 info->cluster_list_size++;
348 } 348 }
@@ -411,7 +411,7 @@ found:
411 411
412 /* Remove publication from cluster scope list, if present */ 412 /* Remove publication from cluster scope list, if present */
413 413
414 if (in_own_cluster(node)) { 414 if (in_own_cluster_exact(node)) {
415 list_del(&publ->cluster_list); 415 list_del(&publ->cluster_list);
416 info->cluster_list_size--; 416 info->cluster_list_size--;
417 } 417 }
@@ -604,7 +604,7 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
604 publ = list_first_entry(&info->node_list, struct publication, 604 publ = list_first_entry(&info->node_list, struct publication,
605 node_list); 605 node_list);
606 list_move_tail(&publ->node_list, &info->node_list); 606 list_move_tail(&publ->node_list, &info->node_list);
607 } else if (in_own_cluster(*destnode)) { 607 } else if (in_own_cluster_exact(*destnode)) {
608 if (list_empty(&info->cluster_list)) 608 if (list_empty(&info->cluster_list))
609 goto no_match; 609 goto no_match;
610 publ = list_first_entry(&info->cluster_list, struct publication, 610 publ = list_first_entry(&info->cluster_list, struct publication,