[Cluster-devel] cluster/ccs/daemon cnx_mgr.c
rohara at sourceware.org
rohara at sourceware.org
Tue Dec 11 20:58:00 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rohara at sourceware.org 2007-12-11 20:58:00
Modified files:
ccs/daemon : cnx_mgr.c
Log message:
Fix issue with endian conversion that caused problems for mixed architecture
nodes on same subnet. Need to correct swap byte ordering of comm_header_t
structure before copying into buffer and when dereferencing.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&r1=1.43&r2=1.44
--- cluster/ccs/daemon/cnx_mgr.c 2007/05/08 14:25:41 1.43
+++ cluster/ccs/daemon/cnx_mgr.c 2007/12/11 20:58:00 1.44
@@ -1365,18 +1365,19 @@
ch->comm_flags |= COMM_BROADCAST_FROM_QUORATE;
}
+ swab_header(ch);
memcpy(buffer, ch, sizeof(comm_header_t));
+ swab_header(ch); /* Swab back to dip into ch for payload_size */
memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);
log_dbg("Sending cluster.conf (version %d)...\n", get_doc_version(master_doc->od_doc));
sendlen = ch->comm_payload_size + sizeof(comm_header_t);
- swab_header(ch);
if(sendto(sfd, buffer, sendlen, 0,
(struct sockaddr *)&addr, (socklen_t)len) < 0){
log_sys_err("Sendto failed");
error = -errno;
}
-
+
fail:
if(buffer) free(buffer);
if(payload) free(payload);
More information about the Cluster-devel
mailing list