proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-05-25 15:34:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of magic number 1500 and replace with PACKET_SIZE_MAX.

Browse Source 
Also fix a glaring memory overwrite bug in gmi_init which would
init 256k of memory instead of PACKET_SIZE_MAX memory.

(Logical change 1.66)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@242 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2004-09-08 03:25:56 +00:00
parent f4560a1424
commit 246687d689
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
exec/gmi.c
View File

@ -102,6 +102,7 @@
#define MAX_MEMBERS 16
#define HOLE_LIST_MAX MISSING_MCAST_WINDOW
#define PRIORITY_MAX 4
#define PACKET_SIZE_MAX 1500
/*
* Authentication of messages
@ -385,14 +386,14 @@ static struct memb_join memb_join;
static struct memb_form_token memb_form_token;
static char iov_buffer[1500];
static char iov_buffer[PACKET_SIZE_MAX];
static struct iovec gmi_iov_recv = {
.iov_base = iov_buffer,
.iov_len = sizeof (iov_buffer)
};
static char iov_encrypted_buffer[1500];
static char iov_encrypted_buffer[PACKET_SIZE_MAX];
static struct iovec iov_encrypted = {
.iov_base = iov_encrypted_buffer,
@ -513,7 +514,7 @@ int gmi_init (
*/
memcpy (&sockaddr_in_mcast, sockaddr_mcast, sizeof (struct sockaddr_in));
memset (&memb_next, 0, sizeof (struct sockaddr_in));
memset (iov_buffer, 0, MESSAGE_SIZE_MAX);
memset (iov_buffer, 0, PACKET_SIZE_MAX);
for (i = 0; i < PRIORITY_MAX; i++) {
queue_init (&queues_pend_trans[i], QUEUE_PEND_TRANS_SIZE_MAX,
@ -828,7 +829,7 @@ print_digest ("calculated digest", digest_comparison);
* forward progress. So the packets must be fragmented by the algorithm
* and reassembled at the receiver.
*/
#define FRAGMENT_SIZE (1500 - sizeof (struct mcast) - 20 - 8)
#define FRAGMENT_SIZE (PACKET_SIZE_MAX - sizeof (struct mcast) - 20 - 8)
static void timer_function_single_member (void *data);
@ -1394,7 +1395,7 @@ static int orf_token_mcast (
* Multicast message
*/
res = sendmsg (gmi_sockets[0].mcast, &msg_mcast, MSG_NOSIGNAL | MSG_DONTWAIT);
iov_encrypted.iov_len = 1500;
iov_encrypted.iov_len = PACKET_SIZE_MAX;
/*
* An error here is recovered by the multicast algorithm
@ -2546,7 +2547,7 @@ static int message_handler_orf_token (
ufd.events = POLLIN;
nfds = poll (&ufd, 1, 0);
if (nfds == 1 && ufd.revents & POLLIN) {
gmi_iov_recv.iov_len = 1500;
gmi_iov_recv.iov_len = PACKET_SIZE_MAX;
recv_handler (0, gmi_sockets[0].mcast, ufd.revents, 0,
&prio);
}
@ -3425,7 +3426,7 @@ static int recv_handler (poll_handle handle, int fd, int revents, void *data, un
gmi_iov_recv.iov_len = bytes_received;
res = authenticate_and_decrypt (&gmi_iov_recv);
if (res == -1) {
gmi_iov_recv.iov_len = 1500;
gmi_iov_recv.iov_len = PACKET_SIZE_MAX;
return 0;
}
@ -3443,6 +3444,6 @@ static int recv_handler (poll_handle handle, int fd, int revents, void *data, un
msg_recv.msg_iovlen,
bytes_received);
gmi_iov_recv.iov_len = 1500;
gmi_iov_recv.iov_len = PACKET_SIZE_MAX;
return (0);
}