summaryrefslogtreecommitdiff
path: root/net.c
AgeCommit message (Collapse)Author
2019-07-03Remove unnecessary null check before freeQuentin Young
2019-04-01Port network layer to Winsockm
With this change, Hiredis builds with MinGW and runs on Windows.
2019-04-01Use recv/send instead of read/writem
The recv/send calls are more portable than read/write, since unlike the latter, the former work with Windows sockets. We also check for EWOULDBLOCK instead of EAGAIN. On most Unices, EAGAIN and EWOULDBLBOCK are the same thing. However, on Windows they are different, and send/recv are expected to give EWOULDBLOCK for non-blocking sockets.
2019-04-01Introduce a redisFD typem
The redisFD type should be equal to the system native socket file desciptor type (for POSIX, this is a plain int). We also introduce the REDIS_INVALID_FD value, which maps to -1 on POSIX systems.
2019-04-01Move network I/O calls to net.cm
This makes hiredis.c free from system calls related to socket I/O. This is also makes the treatment of raw socket connections more similar to the SSL backend.
2019-02-20Remove redundant line after rebaseMark Nunberg
2019-02-20Unix: set addrlen so async reconnect uses proper sizeMark Nunberg
2019-01-28Fix Invalid argument after redisAsyncConnectUnixCode Hz
2018-12-05Fix regression when connecting with Unix sockets (#629)Mark Nunberg
2018-09-25Handle connection errors better in blocking mode as wellMark Nunberg
2018-09-25saddr should be addrlen bytesMark Nunberg
Not sizeof saddr.
2018-09-25Call connect(2) again for non-blocking connectMark Nunberg
This retrieves the actual error which occurred, as getsockopt is not always reliable in this regard.
2018-04-30Remove redundant NULL checksJustin Brewer
free(NULL) is a valid NOP. Most of the hiredis free functions behave the same way. redisReaderFree is updated to also be NULL-safe. There is one redundant NULL check at sds.c:1036, but it's left as is since sds is imported from upstream. Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
2018-04-30Fix a segfault on *BSDJustin Brewer
freeaddrinfo is not required by POSIX to be NULL-safe. OpenBSD will SIGSEGV. NetBSD will assert. FreeBSD up to 11.1 will SIGSEGV, while in future versions, it will be a silent NOP [1]. Commit d4b715f0aa97 ("Fix potential race in 'invalid timeout' tests") added a code path to _redisContextConnectTcp which calls freeaddrinfo(NULL), triggering the segfault. Put a NULL check around the call to freeaddrinfo. [1] - https://github.com/freebsd/freebsd/commit/e9167239034a1e475c3238f8d133ebf703424ee0 Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
2018-04-30Drop __redis_strerror_rJustin Brewer
Since _GNU_SOURCE is now guaranteed to be unset, it is no longer necessary to support the GNU-specific version of strerror_r. Drop __redis_strerror_r from the header, and call strerror_r directly. This breaks any external users of this macro, but they shouldn't have been using it in the first place. Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
2018-04-28Strip down fmacros.hJustin Brewer
strerror_r and addrinfo require _POSIX_C_SOURCE >= 200112L, which is implied by _XOPEN_SOURCE >= 600. With the removal of AF_LOCAL usage, the only non-standard features being used are the TCP_KEEP* socket flags. _DARWIN_C_SOURCE is required to expose TCP_KEEPALIVE. Fall back to using _XOPEN_SOURCE 600 for all platforms, and additionally define _DARWIN_C_SOURCE for Darwin. Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
2018-04-28Use AF_UNIXJustin Brewer
AF_LOCAL is the old, non-standardized name for AF_UNIX. Just use AF_UNIX, rather than wrestling with platform specifics of AF_LOCAL definitions. Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
2017-07-15Merge #533not-a-robot[bot]
533: Small fixes r=badboy
2017-06-15Small fixesamallia
2017-05-15Fix leak if setsockopt failsFrederik Deweerdt
2016-12-30Fix __redisSetErrorFromErrno() can not get error string.Jin Qing
snprintf() may change errno.
2016-07-07fix: should close socket fd when retry connet remote (tcp)WSL
2015-11-18Fix potential race in 'invalid timeout' testsTom Lee
It's possible for the call to connect() to succeed on the very first try, in which case the logic for checking for invalid timeout fields is never executed. When this happens, the tests fail because they expect a REDIS_ERR_IO but no such failure has occurred. Tests aside, this is a potential source of irritating and hard-to-find intermittent bugs. This patch forces the validation to occur early so that we get predictable behavior whenever an invalid timeout is specified.
2015-04-30Renamed redisContext struct member 'unix' to 'unix_sock' to avoid ↵Alex Balashov
encountering defined constant 'unix' in GNU C environment (see commit d8145d79ce715054980938c751067ebaa541573c). Not all code using hiredis can compile using '-std=c99', and/or not all users are able to easily make that change to the build process of various open-source projects, so it is more pragmatic to choose a different identifier that does not impose this requirement.
2015-04-16Change copyright date and add copyright holderJan-Erik Rediger
2015-04-16Implement a reconnect method for the client contextJan-Erik Rediger
Originally implemented by @abedra as part of #306. In case a write or read times out, we force an error state, because we can't guarantuee that the next read will get the right data. Instead we need to reconnect to have a clean-state connection, which is now easily possible with this method.
2015-01-05Fix errno error buffers to not clobber errorsMatt Stancliff
The strerror_r API has two flavors depending on system options. The bad flavor uses a static buffer for returning results, so if you save the pointer from strerror_r, the string you're referencing becomes useless if anybody else calls strerror_r again The good flavor does what you expect: it writes the error to your buffer. This commit uses strerror_r directly if it's a good version or copies the static buffer into our private buffer if it's a bad version. Thanks to gemorin for explaining the problem and drafting a fix. Fixes #239
2015-01-05Fix build under kfreebsdChris Lamb
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk> [Instead of checking for "not solaris" we feature detect for availability of what we want, then remove the system that advertises compatability but doesn't actually provide it (given our assumptions about what we're guarding).] Closes #254
2015-01-05Add support for SO_REUSEADDRmike
[This introduces some new API functions.] * Adds new flag to the connection context indicating SO_REUSEADDR should be set. * Adds max number of retries constant for when connect() hits EADDRNOTAVAIL. * Adds new function, redisAsyncConnectBindWithReuse(), letting clients enable this functionality. [Removed trailing whitespace in new header lines.] Closes #264
2014-09-18Fix getaddrinfo() memory leakMatt Stancliff
See antirez/redis#2012 for the leak causing unbounded memory growth.
2014-04-09File descriptors can be 0Pieter Noordhuis
2014-04-09Fix const correctnessPieter Noordhuis
2014-04-09Fix build under SolarisMatt Stancliff
Solaris doesn't define the TCP options we try to set. Let's ignore those under Solaris. Closes #207
2014-04-08Add ability to bind source address on connectMatt Stancliff
Some environments require binding to specific source addresses instead of letting the system determine which IP a connection should originate from. Closes #233
2014-04-08Stop redisCheckSocketError from more than checkingMatt Stancliff
redisCheckSocketError should only CheckSocketError and not close any misbehaving sockets. If CheckSocketError discovers a problem, the caller will discover the contest is in ERR and will start destroying the context (which involves finalizing all callbacks (which may still be using fd for something, so we should not close fd until all callbacks have been told we are failing) and eventually close the fd in redisFree() immediately before the context is released).
2014-04-08Remove possiblity of multiple close on same fdMatt Stancliff
With all the async connects and disconnects and error handling going on in hiredis, we need to centralize how we close our fd and set it so it doesn't get re-closed. Prior to this commit, sometimes we'd close(fd), run an async error handler, then call close(fd) again. To stop multiple closes, we now set fd to -1 after we free it, but that requires not passing fd as an independent argument to functions. This commit moves all fd usage to c->fd. Since the context has a fd field and all functions receive the context, it makes more sense to use the fd inside of c instead of passing along fd as an independent argument. Also, by only using c->fd, we can set c->fd after we close it to signify we shouldn't re-close the same fd again. This does change one semi-public interface function redisCheckSocketError() to only take (context) instead of (context, fd). A search on github returned zero occasions of people using redisCheckSocketError() outside of net.{c,h} in hiredis itself. Commit inspired by the bug report at: https://groups.google.com/forum/#!topic/redis-db/mQm46XkIPOY Thanks go out to Thijs for trying high-frequency reconnects on a host that isn't there. Closes #230
2013-07-11Minimal IPv6 support.antirez
redisContextConnectTcp() is now able to use IPv6 addresses if there is no IPv4 address found resolving the specified hostname.
2013-07-10Mark the timeout parameter as const in various functionsNoah Williamsson
The struct timeval argument in redisConnectWithTimeout(), redisConnectUnixWithTimeout(), redisSetTimeout(), redisContextSetTimeout(), redisContextConnectTcp() and redisContextConnectUnix() is never modified and can therefore be marked as const. Signed-off-by: Noah Williamsson <noah.williamsson@gmail.com>
2013-07-10WhitespacePieter Noordhuis
2013-05-07Fix possible uninitialized value access due to strerror_r errorEugene Bolotin
2013-05-01Make redisKeepAlive work on OSXPieter Noordhuis
2013-04-30Make KeepAlive optionalAllen.Dou
Make Connection KeepAlive being optional instead of default.
2013-04-19SetKeepAliveAllen.Dou
Keep client alive even though no command was sent to server for a long time.
2013-03-14Set error when invalid timeout value is given to redisConnectWithTimeoutAaron Bedra
Closes #154 This commit properly sets the error value inside of redisContextWaitReady when an invalid sec or usec value is provided. Tests for each case are provided to demonstrate that the issue is properly fixed and to avoid regression. Signed-off-by: Aaron Bedra <aaron@aaronbedra.com>
2012-04-18Use poll() instead of select() inside redisContextWaitReady()Mark Ellzey
The current select() is limiting in instances where the fd num is > FD_SETSIZE. Since redisContextWaitReady() only processes a single fd, select would still fail. For compatibility reasons I have converted select() over to poll(), eliminating this problem.
2011-07-20Merge pull request #47 from geoffgarside/addrinfoPieter Noordhuis
Use getaddrinfo
2011-07-10Put back missing socket error check after select(2)Pieter Noordhuis
2011-06-27Extract function to check a socket for errorsPieter Noordhuis
2011-06-18Fix incorrect "no route to host" errors.Geoff Garside
If getaddrinfo(3) includes an AF_INET6 address before an AF_INET address on a host with only IPv4 network connectivity then the redisContextConnectTcp call would fail with "no route to host". This commit fixes this issue by specifically handling the errno EHOSTUNREACH error and entering another iteration of the addrinfo loop. This will allow following AF_INET addresses to be attempted.
2011-06-17Use getaddrinfo(3) in redisContextConnectTcp.Geoff Garside
Change redisContextConnectTcp() function to use getaddrinfo(3) to perform address resolution, socket creation and connection. Resolved addresses are limited to those reachable by the AF_INET family.