Skip to content

[web] Support libevent as WS server instead of libwebsockets #1818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chme merged 6 commits into from
Jan 18, 2025
Merged

[web] Support libevent as WS server instead of libwebsockets #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0192cc
[web] Support libevent as WS server instead of libwebsockets
chme Oct 3, 2024
07a5e68
[httpd] libevent proxy handling changes with libevent >= 2.2
chme Dec 27, 2024
27c9224
[listener] Support passing context arg to listener callbacks
chme Dec 27, 2024
f2e4819
[web] Implement libevent ws in httpd_libeventhttp, address thread safety
chme Dec 27, 2024
4206940
[web] Fix linter error
chme Dec 27, 2024
ea9df4f
[httpd] Fix infinite loop with more than one ws connection
chme Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,13 @@ OWNTONE_MODULES_CHECK([COMMON], [SQLITE3], [sqlite3 >= 3.5.0],
])

OWNTONE_MODULES_CHECK([OWNTONE], [LIBEVENT], [libevent >= 2.1.4],
[event_base_new], [event2/event.h])
[event_base_new], [event2/event.h],
[dnl check for version 2.2 (with websocket server support)
PKG_CHECK_EXISTS([libevent >= 2.2.1],
Comment thread
chme marked this conversation as resolved.
[AC_DEFINE([HAVE_LIBEVENT22], 1,
[Define to 1 if you have libevent > 2.2])],
[])
])
OWNTONE_MODULES_CHECK([OWNTONE], [LIBEVENT_PTHREADS], [libevent_pthreads],
[evthread_use_pthreads], [event2/thread.h])

Expand Down
4 changes: 2 additions & 2 deletions src/cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ cache_database_update(void *arg, int *retval)

/* Callback from filescanner thread */
static void
cache_daap_listener_cb(short event_mask)
cache_daap_listener_cb(short event_mask, void *ctx)
{
commands_exec_async(cmdbase, cache_database_update, NULL);
}
Expand Down Expand Up @@ -1715,7 +1715,7 @@ cache(void *arg)
for (i = 0; i < ARRAY_SIZE(cache_xcode_jobs); i++)
CHECK_NULL(L_CACHE, cache_xcode_jobs[i].ev = evtimer_new(evbase_cache, cache_xcode_job_complete_cb, &cache_xcode_jobs[i]));

CHECK_ERR(L_CACHE, listener_add(cache_daap_listener_cb, LISTENER_DATABASE));
CHECK_ERR(L_CACHE, listener_add(cache_daap_listener_cb, LISTENER_DATABASE, NULL));

cache_is_initialized = 1;

Expand Down
4 changes: 2 additions & 2 deletions src/httpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ speaker_update_handler_cb(void *arg)

// Thread: player (must not block)
static void
httpd_speaker_update_handler(short event_mask)
httpd_speaker_update_handler(short event_mask, void *ctx)
{
worker_execute(speaker_update_handler_cb, NULL, 0, 0);
}
Expand Down Expand Up @@ -1636,7 +1636,7 @@ httpd_init(const char *webroot)

// We need to know about speaker format changes so we can ask the cache to
// start preparing headers for mp4/alac if selected
listener_add(httpd_speaker_update_handler, LISTENER_SPEAKER);
listener_add(httpd_speaker_update_handler, LISTENER_SPEAKER, NULL);

return 0;

Expand Down
4 changes: 2 additions & 2 deletions src/httpd_dacp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ update_fail_cb(void *arg)

/* Thread: player */
static void
dacp_playstatus_update_handler(short event_mask)
dacp_playstatus_update_handler(short event_mask, void *ctx)
{
struct dacp_update_request *ur;

Expand Down Expand Up @@ -2818,7 +2818,7 @@ dacp_init(void)

CHECK_ERR(L_DACP, mutex_init(&update_request_lck));
update_current_rev = 2;
listener_add(dacp_playstatus_update_handler, LISTENER_PLAYER | LISTENER_VOLUME | LISTENER_QUEUE);
listener_add(dacp_playstatus_update_handler, LISTENER_PLAYER | LISTENER_VOLUME | LISTENER_QUEUE, NULL);

return 0;
}
Expand Down
Loading