Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by panjiam from
([email protected])
2. Linux-HA CVS: pkg by davidlee from
([email protected])
3. Linux-HA CVS: lib by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Nov 2005 00:59:43 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/HBcomm
Modified Files:
tipc.c
Log Message:
- fixed a BEAM warning.
- can not release memory in tipc_close.
- reduced 2 variables.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/HBcomm/tipc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- tipc.c 10 Nov 2005 04:38:19 -0000 1.2
+++ tipc.c 15 Nov 2005 07:59:42 -0000 1.3
@@ -277,9 +277,6 @@
close(tipc->sendfd);
}
- FREE(tipc);
- FREE(mp);
-
PILCallLog(LOG, PIL_INFO, "%s: tipc closed", __FUNCTION__);
return HA_OK;
}
@@ -291,7 +288,7 @@
{
struct sockaddr_tipc client_addr;
struct tipc_private * tipc;
- int sock_len;
+ socklen_t sock_len;
int numbytes;
TIPC_ASSERT(mp);
@@ -328,19 +325,15 @@
tipc_write(struct hb_media * mp, void * msg, int len)
{
struct tipc_private * tipc;
-
int numbytes;
- int sock_len;
TIPC_ASSERT(mp);
tipc = (struct tipc_private *) mp->pd;
- sock_len = sizeof(struct sockaddr_tipc);
-
if ( (numbytes = sendto(tipc->sendfd, msg, len, 0,
(struct sockaddr *)&tipc->maddr,
- sock_len)) < 0 ){
+ sizeof(struct sockaddr_tipc))) < 0 ){
PILCallLog(LOG, PIL_CRIT, "%s: Unable to send message: %s",
__FUNCTION__, strerror(errno));
return HA_FAIL;
@@ -396,10 +389,8 @@
{
struct sockaddr_tipc server_addr;
struct tipc_private * tipc = NULL;
- int sock_len;
int sd;
- sock_len = sizeof (struct sockaddr_tipc);
sd = socket (AF_TIPC, SOCK_RDM, 0);
tipc = (struct tipc_private *) mp->pd;
@@ -413,7 +404,8 @@
/* Bind port to sequence */
- if (bind (sd, (struct sockaddr*)&server_addr, sock_len) != 0){
+ if (bind (sd, (struct sockaddr*)&server_addr,
+ sizeof(struct sockaddr_tipc)) != 0){
PILCallLog(LOG, PIL_CRIT,
"%s: Could not bind to sequence <%u,%u,%u> scope
%u",
__FUNCTION__,
------------------------------
Message: 2
Date: Tue, 15 Nov 2005 06:11:18 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: pkg by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : pkg
Dir : linux-ha/pkg
Modified Files:
Makefile.am
Log Message:
Solaris pkg: owner/perm adjustments (correspond to e.g. heartbeat.spec.in
1.136, 1.137 updates)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/pkg/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 13 Oct 2005 11:36:54 -0000 1.13
+++ Makefile.am 15 Nov 2005 13:11:17 -0000 1.14
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.13 2005/10/13 11:36:54 davidlee Exp $
+# $Id: Makefile.am,v 1.14 2005/11/15 13:11:17 davidlee Exp $
#
# "pkg" Makefile for Solaris etc.
#
@@ -76,7 +76,11 @@
{ $$4 = $$5 = $$6 = "?" } \
"/" $$3 ~ /^(\/usr|\/usr\/lib|\/usr\/lib\/ocf)$$/ \
{ $$4 = $$5 = $$6 = "?" } \
- "/" $$3 == "@HA_VARLIBDIR@/@HB_PKG@/ccm" \
+ "/" $$3 == "@HA_VARRUNDIR@/@HB_PKG@/ccm" \
+ { $$5 = "@HA_CCMUSER@" ; $$6 = "@HA_APIGROUP@" } \
+ "/" $$3 == "@HA_VARRUNDIR@/@HB_PKG@/crm" \
+ { $$5 = "@HA_CCMUSER@" ; $$6 = "@HA_APIGROUP@" } \
+ "/" $$3 == "@HA_VARLIBDIR@/@HB_PKG@/crm" \
{ $$5 = "@HA_CCMUSER@" ; $$6 = "@HA_APIGROUP@" } \
"/" $$3 == "@HA_COREDIR@/@HA_CCMUSER@" \
{ $$5 = "@HA_CCMUSER@" } \
------------------------------
Message: 3
Date: Tue, 15 Nov 2005 08:24:02 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/HBcomm
Modified Files:
tipc.c
Log Message:
family is needed by tipc-1.5.x
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/HBcomm/tipc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- tipc.c 15 Nov 2005 07:59:42 -0000 1.3
+++ tipc.c 15 Nov 2005 15:24:01 -0000 1.4
@@ -151,6 +151,7 @@
tipc->seq_upper = seq_upper;
/* setting mcast addr */
+ tipc->maddr.family = AF_TIPC;
tipc->maddr.addrtype = TIPC_ADDR_MCAST;
tipc->maddr.addr.name.domain = 0;
tipc->maddr.addr.nameseq.type = name_type;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 54
********************************************
