]> granicus.if.org Git - libevent/log
libevent
6 years agobufferevent_socket_connect{,_hostname}() missing event callback and use ret code
Jesse Fang [Fri, 23 Feb 2018 11:15:12 +0000 (19:15 +0800)]
bufferevent_socket_connect{,_hostname}() missing event callback and use ret code

- When socket() failed in bufferevent_socket_connect() , the event
  callback should be called also in
  bufferevent_socket_connect_hostname().  eg. when use
  bufferevent_socket_connect_hostname() to resolve and connect an IP
  address but process have a smaller ulimit open files, socket() fails
  always but caller is not notified.

- Make bufferevent_socket_connect()'s behavior more consistent: function
  return error then no callback, function return ok then error passed by
  event callback.

Fixes: #597
Closes: #599
Closes: #600
6 years agotest/dns: cleanup test_bufferevent_connect_hostname()
Azat Khuzhin [Mon, 23 Apr 2018 22:34:06 +0000 (01:34 +0300)]
test/dns: cleanup test_bufferevent_connect_hostname()

6 years agoMerge branch 'pull-628'
Azat Khuzhin [Sun, 22 Apr 2018 21:52:57 +0000 (00:52 +0300)]
Merge branch 'pull-628'

* pull-628:
  Give priority to the build directory headers
  Do not ship evconfig-private.h in dist archive

Closes: #628
6 years agoGive priority to the build directory headers
Cristian Morales Vega [Thu, 19 Apr 2018 08:39:39 +0000 (09:39 +0100)]
Give priority to the build directory headers

Not changing anything right now AFAIK. But if for any reason in the
future we end up with two headers with the same name in the source and
build directories, chances are we want to use the one in the build
directory.

6 years agoDo not ship evconfig-private.h in dist archive
Cristian Morales Vega [Thu, 19 Apr 2018 08:28:36 +0000 (09:28 +0100)]
Do not ship evconfig-private.h in dist archive

It will be generated by autotools, so there is not reason to include it.
And infact this breaks compilation with out-of-tree builds (VPATH),
since, for the quote form of the include directive, headers in the
directory of the file with the #include line have priority over those
named in -I options, the copy of evconfig-private.h from the source
directory had priority over the one in the build directory.

6 years agoAdopt ignore rules for cmake + ninja
Azat Khuzhin [Sun, 22 Apr 2018 21:26:08 +0000 (00:26 +0300)]
Adopt ignore rules for cmake + ninja

In case we have build directory differs from source directory there will be
bunch of files we should ignore, so just remove leading "/" for some or rules.
And fix others.

6 years agoFix assert() condition in evbuffer_drain() for IOCP
SuckShit [Fri, 20 Apr 2018 07:48:32 +0000 (15:48 +0800)]
Fix assert() condition in evbuffer_drain() for IOCP

In the case of iocp, in the for loop above, there is a situation where:
  remaining == chain->off == 0

And this happens due to CHAIN_PINNED_R() case (that is used only in
buffer_iocp.c)

Closes: #630 (picked)
6 years agoAdd Gitter badge
The Gitter Badger [Sun, 15 Apr 2018 23:02:05 +0000 (23:02 +0000)]
Add Gitter badge

6 years agocmake: ensure windows dll's are installed as well as lib files
Philip Herron [Thu, 5 Apr 2018 14:17:06 +0000 (15:17 +0100)]
cmake: ensure windows dll's are installed as well as lib files

Closes: #621
6 years agoGenerating evdns_base_config_windows_nameservers docs on all platforms
dpayne [Tue, 3 Apr 2018 22:43:22 +0000 (15:43 -0700)]
Generating evdns_base_config_windows_nameservers docs on all platforms

6 years agoFixing doxygen docs for evdns_base_search_clear when generated on non-windows machines
dpayne [Tue, 3 Apr 2018 22:17:51 +0000 (15:17 -0700)]
Fixing doxygen docs for evdns_base_search_clear when generated on non-windows machines

6 years agoFix build with LibreSSL 2.7
Bernard Spil [Mon, 2 Apr 2018 11:18:27 +0000 (13:18 +0200)]
Fix build with LibreSSL 2.7

LibreSSL 2.7 implements OpenSSL 1.1 API except for BIO_get_init()

See also: https://bugs.freebsd.org/226900
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
Closes: #617 (cherry-pick)
6 years agoAvoid possible SEGVs in select() (in unit tests)
Philip Prindeville [Wed, 28 Mar 2018 14:25:28 +0000 (08:25 -0600)]
Avoid possible SEGVs in select() (in unit tests)

Per the POSIX definition of select():

http://pubs.opengroup.org/onlinepubs/009696699/functions/pselect.html

"Upon successful completion, the select() function may modify the object
pointed to by the timout argument."

If "struct timeval" pointer is a "static const", it could potentially
be allocated in a RO text segment.  The kernel would then try to copy
back the modified value (with the time remaining) into a read-only
address and SEGV.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #614
6 years agodon't fail be_null_filter if bytes are copied
Greg Hazel [Wed, 21 Mar 2018 01:04:53 +0000 (18:04 -0700)]
don't fail be_null_filter if bytes are copied

Otherwise it will not reset timeouts for the IO, but other things should
still works correctly.

Also evbuffer_remove_buffer() could return 0, due to empty buffers, for
example during flushing bufferevent, so let's count this is BEV_OK too.

6 years agoCall underlying bev ctrl GET_FD on filtered bufferevents
Greg Hazel [Tue, 20 Mar 2018 22:12:07 +0000 (15:12 -0700)]
Call underlying bev ctrl GET_FD on filtered bufferevents

Fixes: #611
Fixes: #610
6 years agoFix base unlocking in event_del() if event_base_set() runned in another thread
Azat Khuzhin [Tue, 27 Feb 2018 18:12:14 +0000 (21:12 +0300)]
Fix base unlocking in event_del() if event_base_set() runned in another thread

Image next situation:
  T1:                                        T2:
   event_del_()
     lock the event.ev_base.th_base_lock
     event_del_nolock_()                     event_set_base()
     unlock the event.ev_base.th_base_lock

In this case we will unlock the wrong base after event_del_nolock_()
returns, and deadlock is likely to happens, since event_base_set() do
not check any mutexes (due to it is possible to do this only if event is
not inserted anywhere).

So event_del_() has to cache the base before removing the event, and
cached base.th_base_lock after.

6 years agoConvert event_debug_*() helpers from macros to static functions
Azat Khuzhin [Tue, 27 Feb 2018 18:08:35 +0000 (21:08 +0300)]
Convert event_debug_*() helpers from macros to static functions

6 years agoProvide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS}
stenn [Sun, 14 May 2017 10:22:11 +0000 (06:22 -0400)]
Provide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS}

This will allow a parent package to specify compiler, CPP, and linker
flags to a libevent built as a sub-package. Document this in
whatsnew-2.2.txt.

Picked-from: #506
Closes: #506
6 years agohttp: remove message in case !Content-Length and Connection!=close
Azat Khuzhin [Tue, 13 Feb 2018 14:43:02 +0000 (17:43 +0300)]
http: remove message in case !Content-Length and Connection!=close

Since [1] GET can have body, and hence for every incomming connection it
will print this error.

[1] db483e3b002b33890fc88cadd77f6fd1fccad2d2 ("Allow bodies for
GET/DELETE/OPTIONS/CONNECT")

Noticed-by: BotoX (irc)
Refs: #408

6 years agobuffer: fix incorrect unlock of the buffer mutex (for deferred callbacks)
Azat Khuzhin [Mon, 12 Feb 2018 16:43:13 +0000 (19:43 +0300)]
buffer: fix incorrect unlock of the buffer mutex (for deferred callbacks)

TSAN reports:
  WARNING: ThreadSanitizer: unlock of an unlocked mutex (or by a wrong thread) (pid=17111)
      #0 pthread_mutex_unlock /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:3621 (libtsan.so.0+0x00000003b71c)
      #1 evbuffer_add <null> (libevent_core-2.2.so.1+0x00000000ddb6)
      ...

    Mutex M392 (0x7b0c00000f00) created at:
      #0 pthread_mutex_init /build/gcc/src/gcc/libsanitizer/tsan/tsan_interceptors.cc:1117 (libtsan.so.0+0x0000000291af)
      #1 <null> <null> (libevent_pthreads-2.2.so.1+0x000000000d46)
      ...

$ addr2line -e /lib/libevent_core-2.2.so.1 0x00000000ddb6
/src/libevent/buffer.c:1815 (discriminator 1)

Introduced-in: ae2b84b2575be93d0aebba5c0b78453836f89f3c ("Replace
deferred_cbs with event_callback-based implementation.")

6 years agoFix typos in comments
Dmitry Alimov [Mon, 15 Jan 2018 14:30:08 +0000 (17:30 +0300)]
Fix typos in comments

6 years agohttp: fix leaks in evhttp_uriencode()
Azat Khuzhin [Tue, 9 Jan 2018 18:44:57 +0000 (21:44 +0300)]
http: fix leaks in evhttp_uriencode()

Fixes: #584
6 years agoMerge branch 'listener-immediate-close'
Azat Khuzhin [Thu, 4 Jan 2018 16:28:59 +0000 (19:28 +0300)]
Merge branch 'listener-immediate-close'

* listener-immediate-close:
  test/listener: cover immediate-close logic
  Immediately stop trying to accept more connections if listener disabled

6 years agotest/listener: cover immediate-close logic
Azat Khuzhin [Thu, 4 Jan 2018 16:26:50 +0000 (19:26 +0300)]
test/listener: cover immediate-close logic

6 years agoImmediately stop trying to accept more connections if listener disabled
John Fremlin [Mon, 18 Dec 2017 03:43:00 +0000 (22:43 -0500)]
Immediately stop trying to accept more connections if listener disabled

This is a refined version of the logic previously in #578

The rationale is that the consumer of sockets may wish to temporarily
delay accepting for some reason (e.g. being out of file-descriptors).
The kernel will then queue them up. The kernel queue is bounded and
programs like NodeJS will actually try to quickly accept and then close
(as the current behaviour before this PR).

However, it seems that libevent should allow the user to choose whether
to accept and respond correctly if the listener is disabled.

7 years agoFixed last_with_datap description
Marcin Szewczyk [Mon, 18 Dec 2017 13:01:15 +0000 (14:01 +0100)]
Fixed last_with_datap description

Grammar and typo fix

7 years agohttp: add callback to allow server to decline (and thereby close) incoming connections.
John Fremlin [Fri, 1 Dec 2017 01:29:32 +0000 (01:29 +0000)]
http: add callback to allow server to decline (and thereby close) incoming connections.

This is important, as otherwise clients can easily exhaust the file
descriptors available on a libevent HTTP server, which can cause
problems in other code which does not handle EMFILE well: for example,
see https://github.com/bitcoin/bitcoin/issues/11368

Closes: #578 (patch cherry picked)
7 years agoFix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong
Azat Khuzhin [Sat, 16 Dec 2017 20:28:41 +0000 (23:28 +0300)]
Fix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong

Fixes: #580
7 years agoCONNECT method only takes an authority
Greg Hazel [Sat, 2 Dec 2017 20:53:57 +0000 (12:53 -0800)]
CONNECT method only takes an authority

7 years agoIf precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER
yongqing.jiao [Sat, 9 Dec 2017 06:39:07 +0000 (14:39 +0800)]
If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER

Fixes: 630f077c296de61c7b99ed83bf30de11e75e2740 ("Simple unit tests for
monotonic timers")

7 years agoMerge branch 'evconnlistener-do-not-close-client-fd'
Azat Khuzhin [Sun, 10 Dec 2017 20:57:19 +0000 (23:57 +0300)]
Merge branch 'evconnlistener-do-not-close-client-fd'

Fixes: #577
* evconnlistener-do-not-close-client-fd:
  listener: cover closing of fd in case evconnlistener_free() called from acceptcb
  Revert "Fix potential fd leak in listener_read_cb()"

7 years agolistener: cover closing of fd in case evconnlistener_free() called from acceptcb
Azat Khuzhin [Tue, 5 Dec 2017 20:26:28 +0000 (23:26 +0300)]
listener: cover closing of fd in case evconnlistener_free() called from acceptcb

7 years agoRevert "Fix potential fd leak in listener_read_cb()"
Azat Khuzhin [Tue, 5 Dec 2017 19:59:20 +0000 (22:59 +0300)]
Revert "Fix potential fd leak in listener_read_cb()"

This reverts commit a695a720cda892c270736d127333d73553842094.

@kgraefe:
  "I believe that this commit is just wrong: if lev->cnt is not 1 after
  the callback, new_fd will still never be closed in listener_read_cb().
  So in that case it is the responsibility of the user's code to close
  the file descriptor (which is fine). But why shouldn't it be in the
  other case? And how does the user's code know?"

And I agree

7 years agoFix generation of LibeventConfig.cmake for the installation tree
Andrey Okoshkin [Wed, 29 Nov 2017 08:13:51 +0000 (11:13 +0300)]
Fix generation of LibeventConfig.cmake for the installation tree

'LIBEVENT_INCLUDE_DIRS' is properly initialized in 'LibeventConfig.cmake' as
'LibeventConfig.cmake.in' contains usage of 'LIBEVENT_CMAKE_DIR' and
'EVENT_INSTALL_INCLUDE_DIR' variables but not 'EVENT_CMAKE_DIR' and
'EVENT__INCLUDE_DIRS'.
Related typos are fixed.

7 years agoAdd missing includes into openssl-compat.h
Azat Khuzhin [Wed, 22 Nov 2017 07:33:15 +0000 (10:33 +0300)]
Add missing includes into openssl-compat.h

Before it depends from the caller #include appropriate headers (at least
for OPENSSL_VERSION_NUMBER), but let's make it independent.

Fixes: #574
7 years agoFree dns/event bases in dns-example to avoid leaks
Azat Khuzhin [Sun, 19 Nov 2017 23:07:54 +0000 (02:07 +0300)]
Free dns/event bases in dns-example to avoid leaks

7 years agoFix incorrect ref to evhttp_get_decoded_uri in http.h
ejurgensen [Sun, 5 Nov 2017 11:18:49 +0000 (12:18 +0100)]
Fix incorrect ref to evhttp_get_decoded_uri in http.h

Replaces reference in the http.h include header file to evhttp_get_decoded_uri
with evhttp_uridecode. There is no function called evhttp_get_decoded_uri.

7 years agoFix crashing http server when callback do not reply in place from *gencb*
Azat Khuzhin [Sat, 4 Nov 2017 16:13:28 +0000 (19:13 +0300)]
Fix crashing http server when callback do not reply in place from *gencb*

This is the second hunk of the first patch
5ff8eb26371c4dc56f384b2de35bea2d87814779 ("Fix crashing http server when
callback do not reply in place")

Fixes: #567
7 years agocmake doesn't has POLICY CMP0054 in low version
lightningkay [Thu, 2 Nov 2017 06:58:17 +0000 (14:58 +0800)]
cmake doesn't has POLICY CMP0054 in low version

7 years agoAllow bodies for GET/DELETE/OPTIONS/CONNECT
Azat Khuzhin [Sun, 29 Oct 2017 19:53:41 +0000 (22:53 +0300)]
Allow bodies for GET/DELETE/OPTIONS/CONNECT

I checked with nginx, and via it's lua bindings it allows body for all
this methods. Also everybody knows that some of web-servers allows body
for GET even though this is not RFC conformant.

Refs: #408

7 years agoDo not crash when evhttp_send_reply_start() is called after a timeout.
Andreas Gustafsson [Tue, 26 Sep 2017 16:23:29 +0000 (19:23 +0300)]
Do not crash when evhttp_send_reply_start() is called after a timeout.

This fixes the crash reported in issue #509.  The "would be nice"
items discussed in #509 can be addressed separately.

7 years agoFix crashing http server when callback do not reply in place
Azat Khuzhin [Sun, 22 Oct 2017 21:13:37 +0000 (00:13 +0300)]
Fix crashing http server when callback do not reply in place

General http callback looks like:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    evhttp_send_reply(req, HTTP_OK, "Everything is fine", NULL);
  }

And they will work fine becuase in this case http will write request
first, and during write preparation it will disable *read callback* (in
evhttp_write_buffer()), but if we don't reply immediately, for example:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    return;
  }

This will leave connection in incorrect state, and if another request
will be written to the same connection libevent will abort with:
  [err] ../http.c: illegal connection state 7

Because it thinks that read for now is not possible, since there were no
write.

Fix this by disabling EV_READ entirely. We couldn't just reset callbacks
because this will leave EOF detection, which we don't need, since user
hasn't replied to callback yet.

Reported-by: Cory Fields <cory@coryfields.com>
7 years agofix handling of close_notify (ssl) in http with openssl bufferevents
Azat Khuzhin [Wed, 13 Sep 2017 18:39:32 +0000 (21:39 +0300)]
fix handling of close_notify (ssl) in http with openssl bufferevents

Since it can arrive after we disabled events in that bufferevent and
reseted fd, hence evhttp_error_cb() could be called after
SSL_RECEIVED_SHUTDOWN.

Closes: #557
7 years agoPort `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3.
Kiyoshi Aman [Thu, 14 Sep 2017 22:39:20 +0000 (17:39 -0500)]
Port `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3.

These scripts remain compatible with Python 2.

7 years agoRemove OpenSSL paragram from README
Azat Khuzhin [Sun, 24 Sep 2017 12:12:13 +0000 (15:12 +0300)]
Remove OpenSSL paragram from README

Because it is mauvais ton to use binaries instead of normal packages
(like apt-get in debian, pacman in arch, and others).

Plus that link was borken and according to [1] OpenSSL do not ship
binaries officially.

And personally I don't think that this is not obvious that you need
openssl libraries to build libevent with it's support, and BTW you need
headers too (of course).

[1]: https://www.openssl.org/community/binaries.html
Fixes: #562
7 years agotest: fix warning
Vincent JARDIN [Mon, 11 Sep 2017 19:56:30 +0000 (21:56 +0200)]
test: fix warning

In function ‘send_a_byte_cb’:
test/regress.c:1853:2: warning: ignoring return value of ‘write’, declared with
attribute warn_unused_result [-Wunused-result]
  (void) write(*sockp, "A", 1);

7 years agoconfigure: avoid false positive in DragonFlyBSD
Carlo Marcelo Arenas Belón [Sat, 19 Aug 2017 23:01:46 +0000 (16:01 -0700)]
configure: avoid false positive in DragonFlyBSD

by default, the max buffer size is 16K and histeresis is at 50%, so
a bigger read is needed to unlock writes than you would expect from
other BSD (512 bytes)

this doesn't introduce any regression on FreeBSD 11.1, OpenBSD 6.1, NetBSD 7.1,
macOS 10.12.6 and of course DragonFlyBSD 4.8.1, and most of them show
a max pipe size of 64K, so the read call should drain them all regardless
of how conservative they are on the free pipe space they will require
(usually 512 bytes) before kevent reports the fd as ready for write.

I couldn't find a reference to which bug this code was trying to look for
and it seems to be there from the beginning of git history so it might be
no longer relevant.

Issue: #548

7 years agotest: avoid regress hanging in macOS
Carlo Marcelo Arenas Belón [Wed, 16 Aug 2017 23:52:33 +0000 (16:52 -0700)]
test: avoid regress hanging in macOS

a backtrace of the process without this patch :
  * thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP
    * frame #0: 0x00007fffb1fb7d96 libsystem_kernel.dylib`kevent + 10
      frame #1: 0x0000000108ed0a58 libevent-2.2.1.dylib`kq_dispatch + 696
      frame #2: 0x0000000108ec53d8 libevent-2.2.1.dylib`event_base_loop + 696
      frame #3: 0x0000000108e1763b regress`test_fork + 1931
      frame #4: 0x0000000108e5c7ad regress`run_legacy_test_fn + 45
      frame #5: 0x0000000108e690aa regress`testcase_run_one + 858
      frame #6: 0x0000000108e6954f regress`tinytest_main + 495
      frame #7: 0x0000000108e5c94b regress`main + 171
      frame #8: 0x00007fffb1e88235 libdyld.dylib`start + 1
      frame #9: 0x00007fffb1e88235 libdyld.dylib`start + 1

Issue: #546

7 years agoautotools: confirm openssl is working before using
Carlo Marcelo Arenas Belón [Tue, 29 Aug 2017 07:44:57 +0000 (00:44 -0700)]
autotools: confirm openssl is working before using

latest versions of macOS provide pkg-config and libraries for an ancient
version of openssl as part of the system, but no headers

7 years agotest: fix 32bit linux regress
Carlo Marcelo Arenas Belón [Fri, 1 Sep 2017 22:50:36 +0000 (15:50 -0700)]
test: fix 32bit linux regress

7 years agoautotools: pass $(OPENSSL_INCS) for samples (FTBFS macOS)
Carlo Marcelo Arenas Belón [Mon, 21 Aug 2017 08:08:15 +0000 (01:08 -0700)]
autotools: pass $(OPENSSL_INCS) for samples (FTBFS macOS)

if OpenSSL is in a non standard location, need to pass that information
to any sample that needs it

Closes: #550
7 years agoalways define EV_INT16_MIN
Carlo Marcelo Arenas Belón [Thu, 17 Aug 2017 08:37:01 +0000 (01:37 -0700)]
always define EV_INT16_MIN

somehow missing from 043ae7481f4a73b0f48055a0260afa454f02d136

7 years agoAdd configure check for midipix
Redfoxmoon [Tue, 15 Aug 2017 03:11:05 +0000 (05:11 +0200)]
Add configure check for midipix

Fixes: #540
7 years agoFix race in access to ev_res from event loop with event_active()
James Synge [Mon, 7 Aug 2017 15:06:28 +0000 (11:06 -0400)]
Fix race in access to ev_res from event loop with event_active()

Detected using ThreadSanitizer, resolved by capturing the value
of ev_res in a local variable while the event is locked, then
passing that captured variable to the callback.

TSAN report:
  I0728 14:35:09.822118   WARNING: ThreadSanitizer: data race (pid=815501)
  I0728 14:35:09.822186     Write of size 2 at 0x7b2c00001bf2 by thread T80 (mutexes: write M1110835549570434736):
  I0728 14:35:09.822248       #0 event_active_nolock_ libevent/event.c:2893:14 (0a2b90577e830d775300664df77d0b91+0x1fdab28)
  I0728 14:35:09.822316       #1 event_active libevent/event.c:2858:2 (0a2b90577e830d775300664df77d0b91+0x1fdd10e)
  I0728 14:35:09.822379       #2 Envoy::Event::TimerImpl::enableTimer(std::chrono::duration<long, std::ratio<1l, 1000l> > const&) envoy/source/common/event/timer_impl.cc:24:5 (0a2b90577e830d775300664df77d0b91+0x459fa0)
  ...

  I0728 14:35:09.824146     Previous read of size 2 at 0x7b2c00001bf2 by main thread:
  I0728 14:35:09.824232       #0 event_process_active_single_queue libevent/event.c:1646:33 (0a2b90577e830d775300664df77d0b91+0x1fdf83d)
  I0728 14:35:09.824350       #1 event_process_active libevent/event.c (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824445       #2 event_base_loop libevent/event.c:1961 (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824550       #3 Envoy::Event::DispatcherImpl::run(Envoy::Event::Dispatcher::RunType) envoy/source/common/event/dispatcher_impl.cc:166:3 (0a2b90577e830d775300664df77d0b91+0x4576d9)
  ...

Fixes: #543 (pull-request)
7 years agoRemove check against passed bufferevent in bufferevent_socket_connect()
Azat Khuzhin [Mon, 14 Aug 2017 20:11:53 +0000 (23:11 +0300)]
Remove check against passed bufferevent in bufferevent_socket_connect()

It is a bit confusing to check against the result of EVUTIL_UPCAST(),
because it can return not NULL for NULL pointers, but for even though
with bufferevent we are fine (because bufferevent is the first field in
bufferevent_private), there are no checks for "bufev" in bufferevent's
API, so just remove it to make it generic.

Fixes: #542
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
7 years agoFix wrong assert in evbuffer_drain()
Azat Khuzhin [Mon, 14 Aug 2017 20:03:48 +0000 (23:03 +0300)]
Fix wrong assert in evbuffer_drain()

"chain" cannot be NULL here because we have at least one chain (we
handle empty buffer separatelly) and hence loop will be executed at
least once.

Link: https://github.com/libevent/libevent/commit/841ecbd96105c84ac2e7c9594aeadbcc6fb38bc4#commitcomment-23631347
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
7 years agoMerge remote-tracking branch 'official/pr/527' -- documentation fixes
Azat Khuzhin [Sun, 16 Jul 2017 18:40:18 +0000 (21:40 +0300)]
Merge remote-tracking branch 'official/pr/527' -- documentation fixes

* official/pr/527:
  Fix a few trivial documentation typos
  Clarify event_free() documentation regarding pending/active events

7 years agoFix tests with detached builds
Ondřej Kuzník [Wed, 28 Jun 2017 11:29:29 +0000 (12:29 +0100)]
Fix tests with detached builds

Closes: #524
7 years agoFix a few trivial documentation typos
Nikolay Edigaryev [Thu, 6 Jul 2017 20:24:26 +0000 (01:24 +0500)]
Fix a few trivial documentation typos

7 years agoClarify event_free() documentation regarding pending/active events
Nikolay Edigaryev [Thu, 6 Jul 2017 20:22:43 +0000 (01:22 +0500)]
Clarify event_free() documentation regarding pending/active events

Currently it's not clear as to whether "first make it non-pending and
non-active" sentence requires user to take some action (e.g. call event_del(),
which event_free() already does internally) or just describes what this
function does from the developer point of view.

7 years agoDocument some obvious cases where a function might also return NULL
Nikolay Edigaryev [Thu, 29 Jun 2017 21:27:08 +0000 (02:27 +0500)]
Document some obvious cases where a function might also return NULL

Closes: #525
7 years agoFix event_debug_logging_mask_ exporting on win32
Azat Khuzhin [Mon, 29 May 2017 19:11:48 +0000 (22:11 +0300)]
Fix event_debug_logging_mask_ exporting on win32

7 years agoVagrant test
Azat Khuzhin [Mon, 29 May 2017 19:12:09 +0000 (22:12 +0300)]
Vagrant test

7 years agoRevert "Make event_debug_get_logging_mask_() real symbol (win32)"
Azat Khuzhin [Mon, 29 May 2017 19:07:57 +0000 (22:07 +0300)]
Revert "Make event_debug_get_logging_mask_() real symbol (win32)"

This reverts commit 5f17c12de021c070501e97268e595da82bf38879.

7 years agoMake event_debug_get_logging_mask_() real symbol (win32)
Azat Khuzhin [Mon, 29 May 2017 17:46:33 +0000 (20:46 +0300)]
Make event_debug_get_logging_mask_() real symbol (win32)

I cannot made it work without this, even though dumpbin shows that that symbol
exists in the event_core.dll, event_extra.dll failed to compile:
==> win:      Creating library C:/vagrant/.cmake-vagrant/lib/Debug/event_extra.lib and object C:/vagrant/.cmake-vagrant/lib/Debug/event_extra.exp
==> win: http.obj : error LNK2001: unresolved external symbol _event_debug_logging_mask_ [C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj]
==> win: C:\vagrant\.cmake-vagrant\bin\Debug\event_extra.dll : fatal error LNK1120: 1 unresolved externals [C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj]
==> win: Done Building Project "C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj" (default targets) -- FAILED.

And dumpbin:
  sh-4.1$ /cygdrive/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 12.0/VC/bin/amd64/dumpbin.exe /EXPORTS ./bin/Debug/event_core.dll
M
    202   C9 00059A3C event_debug_logging_mask_ = _event_debug_logging_mask_

7 years agoFix visibility issues under (mostly on win32)
Azat Khuzhin [Mon, 29 May 2017 12:04:50 +0000 (15:04 +0300)]
Fix visibility issues under (mostly on win32)

Refs: #511
Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED and
STATIC libraries (like autoconf does)")

7 years agocmake: set CMP0054 to NEW to avoid variables over expansion (since cmake 3.8)
Azat Khuzhin [Mon, 29 May 2017 15:48:48 +0000 (18:48 +0300)]
cmake: set CMP0054 to NEW to avoid variables over expansion (since cmake 3.8)

==> win: CMake Warning (dev) at CMakeLists.txt:782 (elseif):
==> win:   Policy CMP0054 is not set: Only interpret if() arguments as variables or
==> win:   keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
==> win:   details.  Use the cmake_policy command to set the policy and suppress this
==> win:   warning.
==> win:
==> win:   Quoted variables like "MSVC" will no longer be dereferenced when the policy
==> win:   is set to NEW.  Since the policy is not set the OLD behavior will be used.
==> win: This warning is for project developers.  Use -Wno-dev to suppress it.

7 years agocmake: fix building bench/bench_cascade under win32 (missing getopt)
Azat Khuzhin [Mon, 29 May 2017 13:36:24 +0000 (16:36 +0300)]
cmake: fix building bench/bench_cascade under win32 (missing getopt)

Because of typo in cmake, now rewrote to make it less error prone (since even
for non-win32 there are variables overlap).

7 years agocmake: avoid requiring cmake 3.1 on win32 for dns-example
Azat Khuzhin [Mon, 29 May 2017 13:32:30 +0000 (16:32 +0300)]
cmake: avoid requiring cmake 3.1 on win32 for dns-example

Avoid using target_sources() from cmake 3.1, just pass needable sources as
list.

7 years agole-proxy: fix compiling under win32 (because of no "inline" in C)
Azat Khuzhin [Mon, 29 May 2017 13:24:48 +0000 (16:24 +0300)]
le-proxy: fix compiling under win32 (because of no "inline" in C)

Include <util-internal.h> for regular "inline", since it is used everywhere.

7 years agohttp-connect: exit on error
Azat Khuzhin [Sun, 28 May 2017 13:38:20 +0000 (16:38 +0300)]
http-connect: exit on error

7 years agotest: do not use .fieldname in structure initializations (fixes win32)
Azat Khuzhin [Mon, 1 May 2017 18:56:27 +0000 (21:56 +0300)]
test: do not use .fieldname in structure initializations (fixes win32)

Fixes: #497
7 years agoAdd missing print-winsock-errors.c into dist archive
Azat Khuzhin [Mon, 1 May 2017 18:55:00 +0000 (21:55 +0300)]
Add missing print-winsock-errors.c into dist archive

Refs: #497

7 years agole-proxy: add missing return statement (UAF)
Maximilian Brunner [Tue, 25 Apr 2017 21:10:13 +0000 (23:10 +0200)]
le-proxy: add missing return statement (UAF)

Refs: #501501501501501501501501501

7 years agoReturn from event_del() after the last event callback termination
José Luis Millán [Mon, 13 Apr 2015 06:54:52 +0000 (08:54 +0200)]
Return from event_del() after the last event callback termination

Delete the event from the queue before blocking for the current
event callback termination.

Ensures that no callback is being executed when event_del() returns,
hence making this function a secure mechanism to access data which is
handled in the event callack.

Fixes: #236
Fixes: #225
Refs: 6b4b77a
Fixes: del_wait
7 years agotest: cover that after event_del() callback will not be scheduled again
Azat Khuzhin [Sat, 29 Apr 2017 22:11:31 +0000 (01:11 +0300)]
test: cover that after event_del() callback will not be scheduled again

Refs: #236
Refs: #225

7 years agoCorrect URL for the libevent logo
Gonçalo Ribeiro [Fri, 28 Apr 2017 18:36:42 +0000 (19:36 +0100)]
Correct URL for the libevent logo

7 years agoExplicitly call SSL_clear when reseting the fd.
David Benjamin [Thu, 20 Apr 2017 22:03:50 +0000 (18:03 -0400)]
Explicitly call SSL_clear when reseting the fd.

If reconnecting the via BEV_CTRL_SET_FD, bufferevent_openssl.c expects
OpenSSL to reuse the configuration state in the SSL object but retain
connection state. This corresponds to the SSL_clear API.

The code currently only calls SSL_set_connect_state or
SSL_set_accept_state. Due to a quirk in OpenSSL, doing this causes the
handshake to implicitly SSL_clear the next time it is entered. However,
this, in the intervening time, leaves the SSL object in an odd state as
the connection state has not been dropped yet. This behavior also does
not appear to be documented by OpenSSL.

Instead, call SSL_clear explicitly:
https://www.openssl.org/docs/manmaster/man3/SSL_clear.html

7 years agobufferevent: refactor to use type check macros
Dominic Chen [Thu, 13 Apr 2017 18:58:13 +0000 (14:58 -0400)]
bufferevent: refactor to use type check macros

7 years agoFix arc4random_addrandom() detecting and fallback (regression)
Azat Khuzhin [Mon, 27 Mar 2017 12:50:23 +0000 (15:50 +0300)]
Fix arc4random_addrandom() detecting and fallback (regression)

But this is kind of hot-fix, we definitelly need more sane arc4random
compat layer.

Fixes: #488
Introduced-in: 6541168 ("Detect arch4random_addrandom() existence")

7 years agoMake event_count macros cleaner
Azat Khuzhin [Fri, 24 Mar 2017 08:49:59 +0000 (16:49 +0800)]
Make event_count macros cleaner

Fixes: #489
7 years agofix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write
Xiang Zhang [Thu, 16 Mar 2017 15:32:43 +0000 (23:32 +0800)]
fix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write

7 years agocmake: use APPEND during exporting targets (for old cmake)
Azat Khuzhin [Tue, 14 Mar 2017 10:33:31 +0000 (13:33 +0300)]
cmake: use APPEND during exporting targets (for old cmake)

On centos with cmake 2.8.12.2:
  CMake Error at cmake/AddEventLibrary.cmake:92 (export):
    export called with target "event_extra_shared" which requires target
    "event_core_shared" that is not in the export list.

    If the required target is not easy to reference in this call, consider
    using the APPEND option with multiple separate calls.

But on newer cmake I guess everything is ok.

Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED
and STATIC libraries (like autoconf does)")

7 years agoMerge branch 'win32-fixes'
Azat Khuzhin [Tue, 14 Mar 2017 10:31:02 +0000 (13:31 +0300)]
Merge branch 'win32-fixes'

This patchset fixes win32 builds after some previous patches (referenced
in particular commits), and also removes some quirks for win32.

* win32-fixes:
  test: do not return void
  log/win32: fix exporting extern variable
  log-internal: missing extern "C"
  log: remove USE_GLOBAL_FOR_DEBUG_LOGGING
  cmake: Export missing symbols for win32
  cmake: eliminate EVENT_BUILDING_REGRESS_TEST, since we link with shared libs
  test: windows doesn't have WNOWAIT
  cmake: clean not used #defines from event-config.h
  cmake: add <pthread.h> only for non-win32

7 years agotest: do not return void
Azat Khuzhin [Tue, 14 Mar 2017 10:21:16 +0000 (13:21 +0300)]
test: do not return void

7 years agolog/win32: fix exporting extern variable
Azat Khuzhin [Mon, 13 Mar 2017 21:33:26 +0000 (00:33 +0300)]
log/win32: fix exporting extern variable

  ==> win:   C:\vagrant\log.c(73): error C2370: 'event_debug_logging_mask_' : redefinition; different storage class [C:\vagrant\.cmake-vagrant\event_core_shared.vcxproj]

7 years agolog-internal: missing extern "C"
Azat Khuzhin [Mon, 13 Mar 2017 22:06:10 +0000 (01:06 +0300)]
log-internal: missing extern "C"

7 years agolog: remove USE_GLOBAL_FOR_DEBUG_LOGGING
Azat Khuzhin [Mon, 13 Mar 2017 19:33:38 +0000 (22:33 +0300)]
log: remove USE_GLOBAL_FOR_DEBUG_LOGGING

Fixes: 9081b66c9c1446b11c0052bade799fafb460efed ("Export symbols for
-fvisibility=hidden (under cmake)")

7 years agocmake: Export missing symbols for win32
Azat Khuzhin [Mon, 13 Mar 2017 21:46:47 +0000 (00:46 +0300)]
cmake: Export missing symbols for win32

7 years agocmake: eliminate EVENT_BUILDING_REGRESS_TEST, since we link with shared libs
Azat Khuzhin [Mon, 13 Mar 2017 21:07:17 +0000 (00:07 +0300)]
cmake: eliminate EVENT_BUILDING_REGRESS_TEST, since we link with shared libs

Before 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED
and STATIC libraries (like autoconf does)") it links with *.c.

7 years agotest: windows doesn't have WNOWAIT
Azat Khuzhin [Mon, 13 Mar 2017 20:52:15 +0000 (23:52 +0300)]
test: windows doesn't have WNOWAIT

Fixes: 66a4eb0c3ae3b1f22b084b2d3aeb5c872f37efbd ("Check for WNOWAIT in
waitpid() in runtime (not in cmake/configure)")

7 years agocmake: clean not used #defines from event-config.h
Azat Khuzhin [Mon, 13 Mar 2017 18:54:33 +0000 (21:54 +0300)]
cmake: clean not used #defines from event-config.h

- _LARGE_FILES: we have it in evconfig-private.h.in, drop from event-config.h
- EVENT___FILE_OFFSET_BITS: remove it for now
- EVENT__const

7 years agocmake: add <pthread.h> only for non-win32
Azat Khuzhin [Mon, 13 Mar 2017 19:02:45 +0000 (22:02 +0300)]
cmake: add <pthread.h> only for non-win32

Fixes: b2b4b4d74e78a3e4fe7a74224d1e6aada5bde351 ("cmake: add <pthread.h>
into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)")

7 years agocmake: fix pkgconfig generation (copy-paste typo)
Azat Khuzhin [Mon, 13 Mar 2017 18:40:52 +0000 (21:40 +0300)]
cmake: fix pkgconfig generation (copy-paste typo)

7 years agoMerge branch 'cmake-missing-bits'
Azat Khuzhin [Mon, 13 Mar 2017 18:05:32 +0000 (21:05 +0300)]
Merge branch 'cmake-missing-bits'

This patchset adds next missing things (in compare to autotools):
- pkgconfig
- event_pthreads/event_openssl
- compile shared/static libraries always

And some fixes, because it will not build after fixing other things:
- export missing symbols for cmake (-fvisibility=hidden)

* cmake-missing-bits:
  cmake: support visibility for AppleClang too
  cmake: fix export absolute path and relative path and cleanup a bit
  cmake: generate and install pkgconfig files
  cmake: build SHARED and STATIC libraries (like autoconf does)
  cmake: add missing event_openssl/event_pthreads libraries
  Export symbols for -fvisibility=hidden (under cmake)

Refs: #246

7 years agocmake: support visibility for AppleClang too
Azat Khuzhin [Mon, 13 Mar 2017 12:49:11 +0000 (15:49 +0300)]
cmake: support visibility for AppleClang too

Defaults apple linker behaviour is -two_levelnamespace, and you cannot
use "-undefined suppress" with it, so let's link non event_core with
event_core library to avoid undefined symbols.

7 years agocmake: fix export absolute path and relative path and cleanup a bit
Azat Khuzhin [Mon, 13 Mar 2017 00:18:02 +0000 (03:18 +0300)]
cmake: fix export absolute path and relative path and cleanup a bit

Remove next vars, since I don't think that somebody want to change it:
- bin
- lib
- include

And fix exports problem:
  CMake Error: INSTALL(EXPORT "LibeventTargets") given absolute DESTINATION "/usr/lib/cmake/libevent" but the export references an installation of target "event_core_static" which has relative DESTINATION "lib".

7 years agocmake: generate and install pkgconfig files
Azat Khuzhin [Sun, 12 Mar 2017 23:26:39 +0000 (02:26 +0300)]
cmake: generate and install pkgconfig files

Fixes: #443
7 years agocmake: build SHARED and STATIC libraries (like autoconf does)
Azat Khuzhin [Sun, 12 Mar 2017 20:31:59 +0000 (23:31 +0300)]
cmake: build SHARED and STATIC libraries (like autoconf does)

Since they are useful for debugging, and if autotools build them then
cmamke has to do this too, to make migration more simple.

And now:
- tests: uses shared libraries (since this is upstreams one)
- other binaries: uses static libraries

This removes next private config:
- EVENT__NEED_DLLIMPORT

7 years agocmake: add missing event_openssl/event_pthreads libraries
Azat Khuzhin [Sun, 6 Nov 2016 21:46:45 +0000 (00:46 +0300)]
cmake: add missing event_openssl/event_pthreads libraries

This will remove openssl requirement if you don't use it (i.e. if you
not link with openssl_pthreads).

Plus it fixes some linking dependencies:
- libm required only for test-ratelim

And fix some coding style alignment issues.

Refs: #246