[SSI] openssi/kernel/cluster/ssi/net ipvs_ssisys.c,1.13,1.14

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10243/cluster/ssi/net

Modified Files:
      Tag: OPENSSI-FC
	ipvs_ssisys.c 
Log Message:
- _ipvs_del_entry, _ipvs_add_entry: handle RPC error. fix uninitialized return value.
- local_ipvs_del_entry, local_ipvs_add_entry: no longer needed. client updates all directors.
- ripvs_add_entry, ripvs_del_entry: master director no longer updates other directors. client will update all directors.


Index: ipvs_ssisys.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/net/ipvs_ssisys.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ipvs_ssisys.c	18 Dec 2013 07:31:55 -0000	1.13
+++ ipvs_ssisys.c	18 Dec 2013 07:53:35 -0000	1.14
@@ -72,29 +72,14 @@
 _ipvs_add_entry(clusternode_t node, u_int cvip, u_short port,
 		   u_int rip, int weight, u_short protocol, char *lvs_sched)
 {
-	int retval;
+	int retval, err;
 
-	(void) RIPVS_ADD_ENTRY(node, &retval, cvip, port, rip,
+	err = RIPVS_ADD_ENTRY(node, &retval, cvip, port, rip,
 				weight, protocol, lvs_sched,
 				strlen(lvs_sched));
-	return retval;
-}
-
-int
-ipvs_add_entry(struct ipvs_dirinfo *info, u_short port,
-		   u_int rip, int weight, u_short protocol, char *lvs_sched)
-{
-	int retval;
-	extern void local_ipvs_add_entry(struct ipvs_dirinfo *, int *, u_short,
-			u_int, int, u_short, char *);
+	if (err)
+		return err;
 
-	if (__is_master_director(info))
-		local_ipvs_add_entry(info, &retval, port, rip, weight,
-				protocol, lvs_sched);
-	else
-		(void) RIPVS_ADD_ENTRY(info->dnode, &retval, info->daddr, port, rip,
-				weight, protocol, lvs_sched,
-				strlen(lvs_sched));
 	return retval;
 }
 
@@ -102,25 +87,11 @@
 _ipvs_del_entry(clusternode_t node, u_int cvip, u_short port,
 		   u_int rip, u_short protocol)
 {
-	int retval;
-
-	(void) RIPVS_DEL_ENTRY(node, &retval, cvip, port, rip, protocol);
-	return retval;
-}
-
-int
-ipvs_del_entry(struct ipvs_dirinfo *info, u_short port,
-		   u_int rip, u_short protocol)
-{
-	int retval;
-	extern void local_ipvs_del_entry(struct ipvs_dirinfo *, int *, u_short,
-			u_int, u_short);
+	int retval, err;
 
-	if (__is_master_director(info))
-		local_ipvs_del_entry(info, &retval, port, rip, protocol);
-	else
-		(void) RIPVS_DEL_ENTRY(info->dnode, &retval, info->daddr,
-					port, rip, protocol);
+	err = RIPVS_DEL_ENTRY(node, &retval, cvip, port, rip, protocol);
+	if (err)
+		return err;
 
 	return retval;
 }


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk