
The nightly tests showed that the recent PR #12022 caused random failures in aof.tcl on checking RDB preamble inside an AOF file. Root cause: When checking RDB preamble in an AOF file, what's passed into redis_check_rdb is aof_filename, not aof_filepath. The newly introduced isFifo function does not check return status of the stat call and hence uses the uninitailized stat_p object. Fix: 1. Fix isFifo by checking stat call's return code. 2. Pass aof_filepath instead of aof_filename to redis_check_rdb. 3. move the FIFO check to rdb.c since the limitation is the re-opening of the file, and not anything specific about redis-check-rdb.
76 lines
3.2 KiB
C
76 lines
3.2 KiB
C
/* anet.c -- Basic TCP socket stuff made a bit less boring
|
|
*
|
|
* Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef ANET_H
|
|
#define ANET_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#define ANET_OK 0
|
|
#define ANET_ERR -1
|
|
#define ANET_ERR_LEN 256
|
|
|
|
/* Flags used with certain functions. */
|
|
#define ANET_NONE 0
|
|
#define ANET_IP_ONLY (1<<0)
|
|
|
|
#if defined(__sun) || defined(_AIX)
|
|
#define AF_LOCAL AF_UNIX
|
|
#endif
|
|
|
|
#ifdef _AIX
|
|
#undef ip_len
|
|
#endif
|
|
|
|
int anetTcpNonBlockConnect(char *err, const char *addr, int port);
|
|
int anetTcpNonBlockBestEffortBindConnect(char *err, const char *addr, int port, const char *source_addr);
|
|
int anetResolve(char *err, char *host, char *ipbuf, size_t ipbuf_len, int flags);
|
|
int anetTcpServer(char *err, int port, char *bindaddr, int backlog);
|
|
int anetTcp6Server(char *err, int port, char *bindaddr, int backlog);
|
|
int anetUnixServer(char *err, char *path, mode_t perm, int backlog);
|
|
int anetTcpAccept(char *err, int serversock, char *ip, size_t ip_len, int *port);
|
|
int anetUnixAccept(char *err, int serversock);
|
|
int anetNonBlock(char *err, int fd);
|
|
int anetBlock(char *err, int fd);
|
|
int anetCloexec(int fd);
|
|
int anetEnableTcpNoDelay(char *err, int fd);
|
|
int anetDisableTcpNoDelay(char *err, int fd);
|
|
int anetSendTimeout(char *err, int fd, long long ms);
|
|
int anetRecvTimeout(char *err, int fd, long long ms);
|
|
int anetFdToString(int fd, char *ip, size_t ip_len, int *port, int remote);
|
|
int anetKeepAlive(char *err, int fd, int interval);
|
|
int anetFormatAddr(char *fmt, size_t fmt_len, char *ip, int port);
|
|
int anetPipe(int fds[2], int read_flags, int write_flags);
|
|
int anetSetSockMarkId(char *err, int fd, uint32_t id);
|
|
int anetGetError(int fd);
|
|
int anetIsFifo(char *filepath);
|
|
|
|
#endif
|