Commit Graph

431 Commits

Author SHA1 Message Date
Christian Hergert 0c9ff5bb03 Add GLib 2.0 adapter
[Cleaned up Makefile and header includes.  Didn't change crazy
coding style because it's the convention for GLib systems.]

Closes #83
Closes #71
2015-01-05 16:39:30 -05:00
NanXiao e30c96ebde Add empty pointer check in error cleanup
If realloc fails, the curargv will be NULL.

Closes #253
2015-01-05 16:39:30 -05:00
NanXiao d1e820d8ee Add error check in redisContextInit
Check whether the obuf or reader is empty: if one of the items is empty,
free the redisContext.
2015-01-05 16:39:30 -05:00
Nan Xiao b6a860795c Fix redisvFormatCommand format parsing
Flags can occur in any order in format string, so we can't assume any order.

In original code, the redisvFormatCommand can process " %#+d" correctly,
but can't process "%+#d".

Closes #257
2015-01-05 16:39:30 -05:00
Matt Stancliff 9a753b4251 Add API to free hiredis (sds) formattings
External callers may not know about sdsfree, so let's
give them an easy way to know how to free their sds result.
2015-01-05 16:39:30 -05:00
Mareq 1b392eb796 Add API to free hiredis (char *) formattings
[Cleaned up:
  - name of function: freeRedis... -> redisFree...
  - return value of function (free doesn't return anything)
  - parameter type for function.
    - we don't need to free a char**, the char** is just
    for returning from the assignment functoin.]

Closes #250
2015-01-05 16:39:30 -05:00
Chris Lamb 85c6bfb02a Fix build under kfreebsd
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-05 16:39:30 -05:00
Matt Stancliff 9b83ddc2d9 Fix clang analyzer warning
redisAsyncInitialize() can return NULL, but then we pass
the return value from redisAsyncInitialize() into something
dereferencing the return value, which can cause crashies.
2015-01-05 16:39:30 -05:00
mike 7c4d2557c4 Add support for SO_REUSEADDR
[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
2015-01-05 16:39:30 -05:00
jinguoli a1bc89b236 Improve calloc() correctness
[It doesn't _actually_ matter, but technically
the order argument is: (number of items, size of items)]

Closes #279
2015-01-05 16:39:30 -05:00
torque 9c57314489 Cleanup libuv adapter
This:
  - Removes misplaced libuv function prototype
  - Includes stdlib for free()

Closes #251
2015-01-05 16:38:57 -05:00
michael-grunder 40f7035ba4 Improve redisAppendCommandArgv performance
OK, perhaps the second time is a charm.  I forgot that I had
hiredis forked from a long time ago, so the initial pull
request was hosed.  :)

* Pulled in sdscatfmt() from Redis, and modified it to accept a
  size_t (%T) style format specifier.

* Pulled in sdsll2str() and sdsull2str() from Redis (needed by
  sdscatfmt).

* Added a new method, redisFormatSdsCommandArgv() which takes
  and sds* as the target, rather than char* (and uses sdscatfmt
  instead of sprintf for the construction).

I get roughly the following improvement:

Old: 1.044806
New: 0.481620

The benchmark code itself can be found here:
https://gist.github.com/michael-grunder/c92ef31bb632b3d0ad81

Closes #260
2015-01-05 11:21:38 -05:00
Hang Su 3315c09839 Use stricter function argument types
'const' where we can.

Closes #268
2015-01-05 11:21:38 -05:00
Chris Williams 865a3683a3 Fix README typos
Closes #267
2015-01-05 11:21:38 -05:00
Gary Grossman 2d814b8da3 Fix minor comment problems
"sdscatpritf" -> "sdscatprintf"
Example used sdsempty("text") but should say sdsnew("text")

Closes #282
2015-01-05 11:21:38 -05:00
Mohnish Thallavajhula abbd340785 Fix README typo
Closes #285
2015-01-05 11:21:38 -05:00
Jan-Erik Rediger 2a6dbdd225 Free string if it is unused
If the string is already in the dict, we need to free this.

Original fix by @tt33415366.

Fixes #256
Closes #286
2015-01-05 11:21:38 -05:00
Ryan Jacobs a1f6ce0194 Add syntax highlighting to README.md
Closes #293
2015-01-05 09:32:03 -05:00
Salvatore Sanfilippo 8f60ee6532 Merge pull request #274 from mattsta/fix-memory-leak
Fix getaddrinfo() memory leak
2014-09-19 12:48:48 +02:00
Matt Stancliff 537a8845d1 Fix getaddrinfo() memory leak
See antirez/redis#2012 for the leak causing unbounded memory growth.
2014-09-18 14:51:27 -04:00
Pieter Noordhuis 2602e1b6bc Merge pull request #246 from dmelani/master
Less surprising behaviour in redisFree() and freeReplyObject()
2014-05-29 08:20:43 -07:00
Daniel Melani 21a1207ae1 Add tests for redisFree() and freeReplyObject()
Test that redisFree() and freeReplyObject() do not crash when NULL is
passed in.
2014-05-29 17:10:03 +02:00
Daniel Melani 05b85ebe7f Less surprising behaviour.
Make redisFree() and freeReplyObject() less surprising by behaving just
like free(). That is, don't crash when passing in NULL.
2014-05-29 16:05:27 +02:00
Pieter Noordhuis f225c276be Fix HIREDIS_MINOR
Closes #219.
2014-04-09 23:16:33 -07:00
Pieter Noordhuis 8332a88393 File descriptors can be 0 2014-04-09 22:56:16 -07:00
Pieter Noordhuis a9c21e4d48 Fix const correctness 2014-04-09 22:30:04 -07:00
Pieter Noordhuis fa8bcca1dc Merge pull request #234 from mattsta/next-version
Next version of hiredis
2014-04-09 22:27:18 -07:00
Matt Stancliff 4369ee5d08 Fix build under Solaris
Solaris doesn't define the TCP options we try to set.  Let's
ignore those under Solaris.

Closes #207
2014-04-09 17:02:43 -04:00
Eddy Jansson 05fb7be3ea Fix Makefile test to use more compatible syntax
The existing way is not compatible with a lot of shells, including most
bash installations, because the echos that generates the configuration
sent to redis-server doesn't expand the escapes. Adding '-e' to the
echo works under bash, but breaks on the Travis CI server.

This is my attempt to find an alternative that works everywhere.
[committer note: it doesn't work under Solaris make, but the Makefile
was already broken under Solaris make.  Solaris users must use gmake.]

Closes #224 and Closes #221
2014-04-09 17:02:43 -04:00
antirez 2d66c4814e Add missing license and copyright for adapters
This is a backport of
d01aad329c
2014-04-09 17:02:42 -04:00
antirez 334525359a Upgrade sds to latest version
SDS is now broken out of Redis into its own project, so include
the latest version from the SDS repo.

This is a backport of the Redis commit doing the same to the bundled hiredis:
320fa02b9b
2014-04-09 17:02:42 -04:00
Patrick TJ McPhee 4441fa3513 Define _XOPEN_SOURCE for NetBSD
This is backported from
289942b625
2014-04-09 17:02:42 -04:00
Charlie Somerville 4ede1bada1 Define redisLibuvAttach as static
Closes #206
2014-04-09 17:02:42 -04:00
Axel Etcheverry 66192a0052 Add new redisAppendFormatedCommand with tests
Closes #202
2014-04-09 17:02:42 -04:00
John Graham f20f5ad102 Libuv: Fix compile warnings and C++ compatability
Closes #189
2014-04-09 17:02:42 -04:00
ripcurld00d 303a0421ef Fix "host cannot be resolved test" test
Closes #186
2014-04-09 17:02:42 -04:00
Eddy Jansson ae30d58ff9 Add redisConnectFd() and redisFreeKeepFd()
These allows for easier integration of hiredis with external
code that wants to manage its fds, say for instance in a pool.

Closes #223
2014-04-09 17:02:42 -04:00
Matt Stancliff 37d25a392c Add ability to bind source address on connect
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-08 19:37:54 -04:00
Matt Stancliff 61eeedbe77 Fix potential undefined struct read
All the assignments to cb are inside conditionals, so it's
vaguely possible it never gets initialized before we try
to read from it with (cb.fn == NULL).

Condition discovered with scan-build.

Closes #229
2014-04-08 19:37:45 -04:00
Matt Stancliff e35266e68f Stop redisCheckSocketError from more than checking
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-08 19:37:45 -04:00
Matt Stancliff 7f0c7a29fd Remove possiblity of multiple close on same fd
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
2014-04-08 19:37:29 -04:00
Pieter Noordhuis 065e90557c Merge pull request #215 from charliesome/fix-bugs
Fix a couple of bugs uncovered by the Clang static analyzer
2014-01-14 17:18:57 -08:00
Charlie Somerville 070da21623 async.c: avoid a NULL deref when redisAsyncInitialize returns NULL 2014-01-15 11:38:45 +11:00
Charlie Somerville 81c95a5fd3 sds.c: avoid leaking tokens when seplen < 1 || len < 0 2014-01-15 11:38:02 +11:00
Pieter Noordhuis cc3ee45325 Merge branch 'ipv6' 2013-07-11 08:58:05 -07:00
antirez 06919b3f86 Minimal IPv6 support.
redisContextConnectTcp() is now able to use IPv6 addresses if there is
no IPv4 address found resolving the specified hostname.
2013-07-11 11:48:13 +02:00
antirez 253e796a59 example.c: it is now possible to specify server ip/port.
This makes possible to use the example with IPv6 addresses and/or with a
different Redis instance than 127.0.0.1:6379.
2013-07-11 10:25:48 +02:00
Noah Williamsson fbf1bb648e Mark the timeout parameter as const in various functions
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-10 23:34:49 -07:00
Pieter Noordhuis c532edc27f Fix const-related compiler errors 2013-07-10 23:31:30 -07:00
Pieter Noordhuis 049346aa33 Merge pull request #132 from nwmcsween/constify
constify: constify some variables / functions
2013-07-10 23:13:36 -07:00