fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-06 09:41:02 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: replace hardcoded 4096 for bus msg len with sizeof().

Browse Source
This commit is contained in:
antirez 2013-11-08 17:19:19 +01:00
parent 94a07d5901
commit d289c628b1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cluster.c
View File

@ -1327,7 +1327,7 @@ void clusterWriteHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
* full length of the packet. When a whole packet is in memory this function * full length of the packet. When a whole packet is in memory this function
* will call the function to process the packet. And so forth. */ * will call the function to process the packet. And so forth. */
void clusterReadHandler(aeEventLoop *el, int fd, void *privdata, int mask) { void clusterReadHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
char buf[4096]; char buf[sizeof(clusterMsg)];
ssize_t nread; ssize_t nread;
clusterMsg *hdr; clusterMsg *hdr;
clusterLink *link = (clusterLink*) privdata; clusterLink *link = (clusterLink*) privdata;
@ -1466,7 +1466,7 @@ void clusterBuildMessageHdr(clusterMsg *hdr, int type) {
/* Send a PING or PONG packet to the specified node, making sure to add enough /* Send a PING or PONG packet to the specified node, making sure to add enough
* gossip informations. */ * gossip informations. */
void clusterSendPing(clusterLink *link, int type) { void clusterSendPing(clusterLink *link, int type) {
unsigned char buf[4096]; unsigned char buf[sizeof(clusterMsg)];
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
int gossipcount = 0, totlen; int gossipcount = 0, totlen;
/* freshnodes is the number of nodes we can still use to populate the /* freshnodes is the number of nodes we can still use to populate the
@ -1553,7 +1553,7 @@ void clusterBroadcastPong(void) {
* *
* If link is NULL, then the message is broadcasted to the whole cluster. */ * If link is NULL, then the message is broadcasted to the whole cluster. */
void clusterSendPublish(clusterLink *link, robj *channel, robj *message) { void clusterSendPublish(clusterLink *link, robj *channel, robj *message) {
unsigned char buf[4096], *payload; unsigned char buf[sizeof(clusterMsg)], *payload;
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
uint32_t totlen; uint32_t totlen;
uint32_t channel_len, message_len; uint32_t channel_len, message_len;
@ -1599,7 +1599,7 @@ void clusterSendPublish(clusterLink *link, robj *channel, robj *message) {
* we switch the node state to REDIS_NODE_FAIL and ask all the other * we switch the node state to REDIS_NODE_FAIL and ask all the other
* nodes to do the same ASAP. */ * nodes to do the same ASAP. */
void clusterSendFail(char *nodename) { void clusterSendFail(char *nodename) {
unsigned char buf[4096]; unsigned char buf[sizeof(clusterMsg)];
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
clusterBuildMessageHdr(hdr,CLUSTERMSG_TYPE_FAIL); clusterBuildMessageHdr(hdr,CLUSTERMSG_TYPE_FAIL);
@ -1611,7 +1611,7 @@ void clusterSendFail(char *nodename) {
* slots configuration. The node name, slots bitmap, and configEpoch info * slots configuration. The node name, slots bitmap, and configEpoch info
* are included. */ * are included. */
void clusterSendUpdate(clusterLink *link, clusterNode *node) { void clusterSendUpdate(clusterLink *link, clusterNode *node) {
unsigned char buf[4096]; unsigned char buf[sizeof(clusterMsg)];
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
clusterBuildMessageHdr(hdr,CLUSTERMSG_TYPE_UPDATE); clusterBuildMessageHdr(hdr,CLUSTERMSG_TYPE_UPDATE);
@ -1643,7 +1643,7 @@ void clusterPropagatePublish(robj *channel, robj *message) {
* Note that we send the failover request to everybody, master and slave nodes, * Note that we send the failover request to everybody, master and slave nodes,
* but only the masters are supposed to reply to our query. */ * but only the masters are supposed to reply to our query. */
void clusterRequestFailoverAuth(void) { void clusterRequestFailoverAuth(void) {
unsigned char buf[4096]; unsigned char buf[sizeof(clusterMsg)];
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
uint32_t totlen; uint32_t totlen;
@ -1655,7 +1655,7 @@ void clusterRequestFailoverAuth(void) {
/* Send a FAILOVER_AUTH_ACK message to the specified node. */ /* Send a FAILOVER_AUTH_ACK message to the specified node. */
void clusterSendFailoverAuth(clusterNode *node) { void clusterSendFailoverAuth(clusterNode *node) {
unsigned char buf[4096]; unsigned char buf[sizeof(clusterMsg)];
clusterMsg *hdr = (clusterMsg*) buf; clusterMsg *hdr = (clusterMsg*) buf;
uint32_t totlen; uint32_t totlen;