tipc: Optimize re-initialization of configuration service

Streamlines the job of re-initializing TIPC's configuration service
when a node's network address is first assigned. Rather than destroying
the configuration server port and then recreating it, TIPC now simply
withdraws the existing {0,<0.0.0>} name publication and creates a new
{0,<Z.C.N>} name publication that identifies the node's network address
to interested subscribers.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/config.c b/net/tipc/config.c
index f5458eddd7bcafed50afbefff656397484a6c9c9..a4988cdbde6d611496cd8d48d2e8feef8ee1077a 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -489,6 +489,21 @@ failed:
        return res;
 }
 
+void tipc_cfg_reinit(void)
+{
+       struct tipc_name_seq seq;
+       int res;
+
+       seq.type = TIPC_CFG_SRV;
+       seq.lower = seq.upper = 0;
+       tipc_withdraw(config_port_ref, TIPC_ZONE_SCOPE, &seq);
+
+       seq.lower = seq.upper = tipc_own_addr;
+       res = tipc_publish(config_port_ref, TIPC_ZONE_SCOPE, &seq);
+       if (res)
+               err("Unable to reinitialize configuration service\n");
+}
+
 void tipc_cfg_stop(void)
 {
        if (config_port_ref) {

diff --git a/net/tipc/config.h b/net/tipc/config.h
index 80da6ebc2785ce1f6704c45929bbdd512962efca..1f252f3fa0586b103fc129059c0df3906b1f9365 100644 (file)
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@@ -66,6 +66,7 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd,
                                int headroom);
 
 int  tipc_cfg_init(void);
+void tipc_cfg_reinit(void);
 void tipc_cfg_stop(void);
 
 #endif

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 5fab4ff24a946b2360ab0d750b198b1f8f96448a..f4a490b0cf4c3a5477f67c91611d4b7e406097d0 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -176,7 +176,6 @@ int tipc_net_start(u32 addr)
        char addr_string[16];
 
        tipc_subscr_stop();
-       tipc_cfg_stop();
 
        write_lock_bh(&tipc_net_lock);
        tipc_own_addr = addr;
@@ -186,7 +185,7 @@ int tipc_net_start(u32 addr)
        write_unlock_bh(&tipc_net_lock);
 
        tipc_k_signal((Handler)tipc_subscr_start, 0);
-       tipc_k_signal((Handler)tipc_cfg_init, 0);
+       tipc_cfg_reinit();
 
        info("Started in network mode\n");
        info("Own node address %s, network identity %u\n",