Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with libevent 2.2 (#7765)

Browse Source 
* Compatibility with libevent 2.2

* Fix Android builds

* Fix Win32 builds
This commit is contained in:
Cœur
2025-11-10 17:33:20 +01:00
committed by GitHub
parent a2d2097b9f
commit b372f7b193
5 changed files with 80 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@@ -8,8 +8,9 @@
branch = post-1.2.1-transmission
[submodule "third-party/libevent"]
path = third-party/libevent
url = https://github.com/transmission/libevent.git
branch = post-2.1.12-transmission
# Windows/Android build fixes (libevent/libevent#1813 and libevent/libevent#1817)
url = https://github.com/coeur/libevent.git
branch = master
[submodule "third-party/libnatpmp"]
path = third-party/libnatpmp
url = https://github.com/transmission/libnatpmp.git

38
Transmission.xcodeproj/project.pbxproj
View File

@@ -433,6 +433,8 @@
C8B27BA328153F6300A22B5D /* create.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC02807FCE900867D3C /* create.cc */; };
C8B27BA428153F6600A22B5D /* edit.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC22807FCE900867D3C /* edit.cc */; };
C8B27BA528153F6900A22B5D /* show.cc in Sources */ = {isa = PBXBuildFile; fileRef = C887BEC32807FCE900867D3C /* show.cc */; };
C8C3508D2DEB812400E94512 /* ws.c in Sources */ = {isa = PBXBuildFile; fileRef = C8C3508C2DEB812400E94512 /* ws.c */; };
C8C3508F2DEB817F00E94512 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = C8C3508E2DEB817F00E94512 /* sha1.c */; };
C8ED0FB1281C10F100B44472 /* addr_is_reserved.c in Sources */ = {isa = PBXBuildFile; fileRef = C8ED0FAF281C10F100B44472 /* addr_is_reserved.c */; };
C8ED0FB2281C10F100B44472 /* addr_is_reserved.h in Headers */ = {isa = PBXBuildFile; fileRef = C8ED0FB0281C10F100B44472 /* addr_is_reserved.h */; };
CAB35C64252F6F5E00552A55 /* mime-types.h in Headers */ = {isa = PBXBuildFile; fileRef = CAB35C62252F6F5E00552A55 /* mime-types.h */; };
@@ -1404,6 +1406,8 @@
C8B27B7F28153F2B00A22B5D /* transmission-create */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-create"; sourceTree = BUILT_PRODUCTS_DIR; };
C8B27B9028153F3100A22B5D /* transmission-edit */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-edit"; sourceTree = BUILT_PRODUCTS_DIR; };
C8B27BA128153F3400A22B5D /* transmission-show */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-show"; sourceTree = BUILT_PRODUCTS_DIR; };
C8C3508C2DEB812400E94512 /* ws.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ws.c; sourceTree = "<group>"; };
C8C3508E2DEB817F00E94512 /* sha1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
C8ED0FAF281C10F100B44472 /* addr_is_reserved.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = addr_is_reserved.c; sourceTree = "<group>"; };
C8ED0FB0281C10F100B44472 /* addr_is_reserved.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = addr_is_reserved.h; sourceTree = "<group>"; };
CAB35C62252F6F5E00552A55 /* mime-types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = "mime-types.h"; sourceTree = "<group>"; };
@@ -2258,7 +2262,9 @@
A2074FC612BEABC800F70985 /* log.c */,
A207503612BEADA200F70985 /* poll.c */,
A207503412BEAD9C00F70985 /* select.c */,
C8C3508E2DEB817F00E94512 /* sha1.c */,
A2074FDD12BEAC5000F70985 /* signal.c */,
C8C3508C2DEB812400E94512 /* ws.c */,
);
name = libevent;
path = "third-party/libevent";
@@ -3679,6 +3685,8 @@
A2074F5B12BEA8E000F70985 /* bufferevent_pair.c in Sources */,
A2074F5D12BEA8E000F70985 /* bufferevent_sock.c in Sources */,
A2074F5E12BEA8E000F70985 /* bufferevent.c in Sources */,
C8C3508D2DEB812400E94512 /* ws.c in Sources */,
C8C3508F2DEB817F00E94512 /* sha1.c in Sources */,
A2074F7412BEAA3300F70985 /* event.c in Sources */,
A2074F8512BEAA6600F70985 /* evmap.c in Sources */,
A2074F9912BEAAAF00F70985 /* evthread.c in Sources */,
@@ -4309,8 +4317,14 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
"third-party/libevent/compat",
);
OTHER_CFLAGS = (
"-DHAVE_CONFIG_H",
"-DLITTLE_ENDIAN",
);
PRODUCT_NAME = event;
};
name = Debug;
@@ -4986,8 +5000,14 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
"third-party/libevent/compat",
);
OTHER_CFLAGS = (
"-DHAVE_CONFIG_H",
"-DLITTLE_ENDIAN",
);
PRODUCT_NAME = event;
};
name = "Release - Debug";
@@ -5140,8 +5160,14 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = "third-party/libevent/include";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
HEADER_SEARCH_PATHS = (
"third-party/libevent/include",
"third-party/libevent/compat",
);
OTHER_CFLAGS = (
"-DHAVE_CONFIG_H",
"-DLITTLE_ENDIAN",
);
PRODUCT_NAME = event;
};
name = Release;

8
libtransmission/rpc-server.cc
View File

@@ -335,7 +335,11 @@ void handle_web_client(struct evhttp_request* req, tr_rpc_server const* server)
{
if (auto* const con = evhttp_request_get_connection(req); con != nullptr)
{
#if LIBEVENT_VERSION_NUMBER >= 0x02020001
char const* remote_host = nullptr;
#else
char* remote_host = nullptr;
#endif
auto remote_port = ev_uint16_t{};
evhttp_connection_get_peer(con, &remote_host, &remote_port);
tr_logAddWarn(fmt::format(
@@ -509,7 +513,11 @@ void handle_request(struct evhttp_request* req, void* arg)
auto* server = static_cast<tr_rpc_server*>(arg);
#if LIBEVENT_VERSION_NUMBER >= 0x02020001
char const* remote_host = nullptr;
#else
char* remote_host = nullptr;
#endif
auto remote_port = ev_uint16_t{};
evhttp_connection_get_peer(con, &remote_host, &remote_port);

2
third-party/libevent vendored

Submodule third-party/libevent updated: 5bbf2aafe4...f80095019a

123
third-party/macosx-libevent-event-config.h vendored
View File

@@ -10,15 +10,15 @@
#define EVENT2_EVENT_CONFIG_H_INCLUDED_
/* Numeric representation of the version */
#define EVENT__NUMERIC_VERSION 0x02010c00
#define EVENT__PACKAGE_VERSION "2.1.12"
#define EVENT__NUMERIC_VERSION 0x02020100
#define EVENT__PACKAGE_VERSION "2.2.1"
#define EVENT__VERSION_MAJOR 2
#define EVENT__VERSION_MINOR 1
#define EVENT__VERSION_PATCH 12
#define EVENT__VERSION_MINOR 2
#define EVENT__VERSION_PATCH 1
/* Version number of package */
#define EVENT__VERSION "2.1.12-stable"
#define EVENT__VERSION "2.2.1-alpha-dev"
/* Name of package */
#define EVENT__PACKAGE "libevent"
@@ -53,25 +53,14 @@
/* Define to 1 if you have the `arc4random_buf' function. */
#define EVENT__HAVE_ARC4RANDOM_BUF 1
/* Define to 1 if you have the `arc4random_addrandom' function. */
/* NOTE(nevack): this defines `evutil_secure_rng_add_bytes` function which
uses deprecated on macOS arc4random_addrandom(2).
Transmission on macOS never calls `evutil_secure_rng_add_bytes`, that's
why we remove this define to get rid of compiler warning. */
/* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
/* Define if clock_gettime is available in libc */
/* #undef EVENT__DNS_USE_CPU_CLOCK_FOR_ID */
/* Define is no secure id variant is available */
/* #undef EVENT__DNS_USE_GETTIMEOFDAY_FOR_ID */
/* #undef EVENT__DNS_USE_FTIME_FOR_ID */
/* Define to 1 if you have the `arc4random_stir' function. */
#define EVENT__HAVE_ARC4RANDOM_STIR 1
/* Define to 1 if you have the <arpa/inet.h> header file. */
#define EVENT__HAVE_ARPA_INET_H 1
/* Define to 1 if you have the `clock_gettime' function. */
/* #undef EVENT__HAVE_CLOCK_GETTIME */
#define EVENT__HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the declaration of `CTL_KERN'. */
#define EVENT__HAVE_DECL_CTL_KERN 1
@@ -91,20 +80,17 @@
/* Define to 1 if fd_mask type is defined */
#define EVENT__HAVE_FD_MASK 1
/* Define to 1 if the <sys/queue.h> header file defines TAILQ_FOREACH. */
#define EVENT__HAVE_TAILQFOREACH 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define EVENT__HAVE_DLFCN_H 1
/* Define if your system supports the epoll system calls */
/* #undef EVENT__HAVE_EPOLL */
/* Define to 1 if you have the `epoll_create1' function. */
/* #undef EVENT__HAVE_EPOLL_CREATE1 */
/* Define to 1 if you have the `epoll_ctl' function. */
/* #undef EVENT__HAVE_EPOLL_CTL */
/* Define to 1 if you have the `epoll_pwait2' function. */
/* #undef EVENT__HAVE_EPOLL_PWAIT2 */
/* Define if your system supports the wepoll module */
/* #undef EVENT__HAVE_WEPOLL */
/* Define to 1 if you have the `eventfd' function. */
/* #undef EVENT__HAVE_EVENTFD */
@@ -185,12 +171,12 @@
/* Define to 1 if you have the <mach/mach.h> header file. */
#define EVENT__HAVE_MACH_MACH_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define EVENT__HAVE_MEMORY_H 1
/* Define to 1 if you have the `mmap' function. */
#define EVENT__HAVE_MMAP 1
/* Define to 1 if you have the `mmap64' function. */
/* #undef EVENT__HAVE_MMAP64 */
/* Define to 1 if you have the `nanosleep' function. */
#define EVENT__HAVE_NANOSLEEP 1
@@ -215,6 +201,9 @@
/* Define if the system has openssl */
/* #undef EVENT__HAVE_OPENSSL */
/* Define if the system has mbedtls */
/* #undef EVENT__HAVE_MBEDTLS */
/* Define to 1 if you have the `pipe' function. */
#define EVENT__HAVE_PIPE 1
@@ -224,18 +213,12 @@
/* Define to 1 if you have the `poll' function. */
#define EVENT__HAVE_POLL 1
/* Define to 1 if you have the <poll.h> header file. */
#define EVENT__HAVE_POLL_H 1
/* Define to 1 if you have the `port_create' function. */
/* #undef EVENT__HAVE_PORT_CREATE */
/* Define to 1 if you have the <port.h> header file. */
/* #undef EVENT__HAVE_PORT_H */
/* Define if we have pthreads on this system */
#define EVENT__HAVE_PTHREADS 1
/* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
#define EVENT__HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL 1
/* Define to 1 if you have the `putenv' function. */
#define EVENT__HAVE_PUTENV 1
@@ -257,14 +240,17 @@
/* Define to 1 if you have the `sendfile' function. */
#define EVENT__HAVE_SENDFILE 1
/* Define to 1 if you have the `pread' function. */
#define EVENT__HAVE_PREAD 1
/* Define to 1 if you have the `sigaction' function. */
#define EVENT__HAVE_SIGACTION 1
/* Define to 1 if you have the `signal' function. */
#define EVENT__HAVE_SIGNAL 1
/* Define to 1 if you have the `socketpair` function. */
#define EVENT__HAVE_SOCKETPAIR 1
/* Define to 1 if you have the `splice' function. */
/* #undef EVENT__HAVE_SPLICE */
/* Define to 1 if you have the `strsignal' function. */
#define EVENT__HAVE_STRSIGNAL 1
/* Define to 1 if you have the <stdarg.h> header file. */
#define EVENT__HAVE_STDARG_H 1
@@ -278,9 +264,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#define EVENT__HAVE_STDLIB_H 1
/* Define to 1 if you have the <string.h> header file. */
#define EVENT__HAVE_STRING_H 1
/* Define to 1 if you have the `strlcpy' function. */
#define EVENT__HAVE_STRLCPY 1
@@ -305,12 +288,6 @@
/* Define to 1 if the system has the type `struct in6_addr'. */
#define EVENT__HAVE_STRUCT_IN6_ADDR 1
/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */
/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 */
/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */
/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 */
/* Define to 1 if the system has the type `struct sockaddr_in6'. */
#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
@@ -338,15 +315,9 @@
/* Define to 1 if you have the `sysctl' function. */
#define EVENT__HAVE_SYSCTL 1
/* Define to 1 if you have the <sys/epoll.h> header file. */
/* #undef EVENT__HAVE_SYS_EPOLL_H */
/* Define to 1 if you have the <sys/eventfd.h> header file. */
/* #undef EVENT__HAVE_SYS_EVENTFD_H */
/* Define to 1 if you have the <sys/event.h> header file. */
#define EVENT__HAVE_SYS_EVENT_H 1
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#define EVENT__HAVE_SYS_IOCTL_H 1
@@ -356,9 +327,6 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#define EVENT__HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/queue.h> header file. */
#define EVENT__HAVE_SYS_QUEUE_H 1
/* Define to 1 if you have the <sys/resource.h> header file. */
#define EVENT__HAVE_SYS_RESOURCE_H 1
@@ -383,6 +351,9 @@
/* Define to 1 if you have the <sys/timerfd.h> header file. */
/* #undef EVENT__HAVE_SYS_TIMERFD_H */
/* Define to 1 if you have the <sys/signalfd.h> header file. */
/* #undef EVENT__HAVE_SYS_SIGNALFD_H */
/* Define to 1 if you have the <sys/time.h> header file. */
#define EVENT__HAVE_SYS_TIME_H 1
@@ -398,19 +369,12 @@
/* Define to 1 if you have the <errno.h> header file. */
#define EVENT__HAVE_ERRNO_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
#define EVENT__HAVE_TAILQFOREACH 1
/* Define if timeradd is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERADD 1
/* Define if timerclear is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERCLEAR 1
/* Define if timercmp is defined in <sys/time.h> */
#define EVENT__HAVE_TIMERCMP 1
/* Define to 1 if you have the `timerfd_create' function. */
/* #undef EVENT__HAVE_TIMERFD_CREATE */
@@ -441,18 +405,9 @@
/* Define to 1 if you have the `unsetenv' function. */
#define EVENT__HAVE_UNSETENV 1
/* Define to 1 if you have the `vasprintf' function. */
#define EVENT__HAVE_VASPRINTF 1
/* Define if kqueue works correctly with pipes */
#define EVENT__HAVE_WORKING_KQUEUE 1
#ifdef __USE_UNUSED_DEFINITIONS__
/* Define to necessary symbol if this constant uses a non-standard name on your system. */
/* XXX: Hello, this isn't even used, nor is it defined anywhere... - Ellzey */
#define EVENT__PTHREAD_CREATE_JOINABLE
#endif
/* The size of `pthread_t', as computed by sizeof. */
#define EVENT__SIZEOF_PTHREAD_T 8
@@ -468,26 +423,23 @@
/* The size of `off_t', as computed by sizeof. */
#define EVENT__SIZEOF_OFF_T 8
#define EVENT__SIZEOF_SSIZE_T 8
/* The size of a `short', as computed by sizeof. */
#define EVENT__SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */
#define EVENT__SIZEOF_SIZE_T 8
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
/* #undef EVENT__TIME_WITH_SYS_TIME */
/* The size of `socklen_t', as computed by sizeof. */
#define EVENT__SIZEOF_SOCKLEN_T 4
/* The size of 'void *', as computer by sizeof */
#define EVENT__SIZEOF_VOID_P 8
/* The size of 'time_t', as computer by sizeof */
#define EVENT__SIZEOF_TIME_T 8
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
calls it, or do nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
/* why not c++?
*
@@ -505,9 +457,6 @@
#define EVENT__HAVE___func__ 1
#define EVENT__HAVE___FUNCTION__ 1
/* Define to `unsigned' if <sys/types.h> does not define. */
#define EVENT__size_t size_t
/* Define to unsigned int if you dont have it */
#define EVENT__socklen_t socklen_t