aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2025-07-06Merge branch 'honor-dns-port' into 'master'HEADmasterSamuel Thibault5-18/+67
fix: honor dns server port number on macos See merge request slirp/libslirp!153
2025-07-05fix: honor dns server port number on macosIhar Hrachyshka5-18/+67
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-06-06Mention how to get debugging printsSamuel Thibault1-0/+12
2025-05-28Release v4.9.1v4.9.1Samuel Thibault2-2/+23
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2025-05-26tcp: Fix starting the linger2 timer on socket shutdownSamuel Thibault2-1/+11
If the socket is completely shut down just before we get our FIN ack-ed, the socket state has SS_NOFDREF instead of SS_FCANTRCVMORE. If the socket sees write() shut down (and we thus switch to FIN_WAIT_1), and we get our FIN acked before seeing read() shut down, when we eventually see that we need to start the linger2 timer. This way, it's only if we still have a live Internet socket that we stay in the TCPS_FIN_WAIT_2 state without a timer, and we let the host decide the linger2 timer. Fixes #86 (hopefully)
2025-05-26tcp: Reduce linger time to two minutesSamuel Thibault2-2/+2
BSD & Linux do this to avoid non-cooperative peers, as TCP protocols usually don't stay idle for long after one peer shuts down its side. We could otherwise be waiting for FIN from the guest indefinitely without keepalive. Suggested-by: Fabian Merki
2025-05-26tcp: on input during init, reset TCPT_KEEP to TCPTV_KEEP_INITSamuel Thibault1-1/+4
rather than TCPTV_KEEP_IDLE: until it's established, we should be more demanding.
2025-05-26tcp: on input, reset TCPT_KEEP to TCPTV_KEEP_IDLE rather than TCPTV_KEEPINTVLSamuel Thibault1-4/+1
When receiving input, we should wait for 2h before trying to probe again for keepalive. We do not need to wake again until that.
2025-05-23Merge branch 'master' into 'master'Samuel Thibault1-16/+16
Modified util.c to handle WSA function return values closer to specification.... See merge request slirp/libslirp!152
2025-05-22Modified util.c to handle WSA function return values closer to ↵Jack Doherty1-16/+16
specification. Explicit checks for INVALID_SOCKET and SOCKET_ERROR are made.
2025-03-26apple: Fix getting IPv4 DNS server address when IPv4 and IPv4 are interleavedSamuel Thibault1-2/+5
When getting an IPv4 DNS server address, if libresolv returns IPv4 IPv6 IPv4 IPv6 (or just IPv4 and IPv6) we would still have found == 1 on the second iteration and thus take the IPv6 even if it's not the proper af. We can as well just completely ignore the non-matching af entries. Fixes #85
2025-02-16Merge branch 'master' into 'master'Samuel Thibault1-4/+4
Do not link tests with libslirp.map Closes #84 See merge request slirp/libslirp!151
2025-02-16Do not link tests with libslirp.mapSamuel Thibault1-4/+4
Fixes #84
2025-02-03Merge branch 'override' into 'master'Samuel Thibault1-0/+1
meson: add dependency override for libslirp See merge request slirp/libslirp!150
2025-02-02meson: add dependency override for libslirpBenjamin Gilbert1-0/+1
If libslirp is built as a Meson subproject, Meson needs to associate the superproject's dependency('slirp') call with our libslirp_libdep variable. The slirp.wrap file shipped in Meson wrapdb accomplishes this with: [provide] slirp = libslirp_libdep But that requires wrapdb to know the name of our libslirp_libdep variable, which changed in 04612eb31674. Explicitly bind the pkg-config name 'slirp' to libslirp_libdep. This will allow slirp.wrap to say: [provide] dependency_names = slirp and avoid hardcoding the variable name.
2025-02-02Merge branch 'meson' into 'master'Samuel Thibault2-5/+5
Fix Meson warnings See merge request slirp/libslirp!149
2025-02-02meson: specify that C++ is only used for host binariesBenjamin Gilbert1-1/+1
Fix Meson warning: meson.build:32: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build.
2025-02-02meson: use boolean defaults for boolean optionsBenjamin Gilbert1-4/+4
Fix Meson warning: NOTICE: Future-deprecated features used: * 1.1.0: {'"boolean option" keyword argument "value" of type str'}
2025-01-30Release v4.9.0v4.9.0Samuel Thibault2-3/+18
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2025-01-30Windows target build fixesB. Scott Michel3-19/+47
Meson (meson.build): - Add "target_winver" (default: "") option to support Windows versions earlier Windows 7 (0x0601, the same as glib.) This sets a compiler command-line define "-DTARGET_WINVER=${target_winver}", which unconditionally sets WINVER and _WIN32_WINNT to select the requested target Windows API. Ref: https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt - Clean up building the static library. - Build the static library when "-Dstatic=true" is present on the command line, not just when doing fuzz testing. - Add the "*_STATIC_COMPILATION" defines to the compiler's command line. For Windows, ensure that libiconv is an explicit dependency since "pkg-config --libs --static" fails to add it as a dependency library.
2025-01-30Fix assertionSamuel Thibault1-1/+1
2025-01-30Provide stubs for inet_ntop() and inet_pton()B. Scott Michel2-5/+82
for Windows versions earlier than Windows 7.
2025-01-30winver.h: Introduce header that forces defining WINVER and _WIN32_WINNTSamuel Thibault3-21/+34
2025-01-30ensure that WINVER and _WIN32_WINNT are unconditionally setB. Scott Michel1-2/+12
if TARGET_WINVER is defined.
2025-01-30sbuf.c: CleanupsB. Scott Michel1-24/+68
- sbcopy(): Make the code a little clearer to follow, with comments. - Type consistency - Eliminate type slices (size_t -> int) - Use ssize_t when doing pointer arithmetic. - Eliminate signed/unsigned comparisons. - Add range checking assertions.
2024-11-27Merge branch 'tcp_emu' into 'master'Samuel Thibault1-1/+15
fix for slirp ftp proxying putting slirp placeholder host ip in PORT commands Closes #82 See merge request slirp/libslirp!147
2024-11-26fix for slirp ftp proxying putting slirp placeholder host ip in PORT commandsrakslice1-1/+15
Fixes #82
2024-11-19Merge branch 'strerror-consistency' into 'master'Samuel Thibault7-29/+29
Prefer g_strerror() to strerror() See merge request slirp/libslirp!146
2024-11-19Merge branch 'vmstate-typeof-fix' into 'master'Samuel Thibault1-2/+8
vmstate.h: Prefer __typeof__ vice typeof See merge request slirp/libslirp!145
2024-11-18Prefer g_strerror() to strerror()B. Scott Michel7-29/+29
Use g_strerror() for better cross platform compatibility: glib handles the Windows "deprecation" (i.e., use strerror_s instead of strerror), fewer warnings at compile time.
2024-11-18vmstate.h: Prefer __typeof__ vice typeofB. Scott Michel1-2/+8
Clang masquerading as gcc on macOS (i.e., "gcc") borks on typeof(), but happily accepts __typeof__(). N.B., __typeof__ has been accepted by GCC and Clang for a long time, and recently MS decided to support it as well.
2024-11-14Merge branch 'cksum-netbsd-update' into 'master'Samuel Thibault2-110/+246
cksum: NetBSD-adapted cksum() See merge request slirp/libslirp!144
2024-11-14Review comments.B. Scott Michel1-5/+12
2024-11-14cksum: NetBSD-adapted cksum()B. Scott Michel2-109/+238
Update cksum() to use more recent NetBSD-based checksum implementation. The updated implementation includes both a 64-bit and 32-bit (the default) implementations. The 64-bit implementation has a longer stride length, which may be beneficial to overall performance. Update the return types for cksum() and ip6_cksum() to uint16_t, which is what the checksum algorithm computes.
2024-11-14Introduce SLIRP_PRIsize/ssize_tB. Scott Michel1-0/+29
2024-11-11Merge branch 'arp-c-cleanups' into 'master'Samuel Thibault1-2/+2
arp_table: use size_t to index arrays. See merge request slirp/libslirp!142
2024-11-10arp_table: use size_t to index arrays.B. Scott Michel1-2/+2
2024-11-01Merge branch 'expose-debugging' into 'master'Samuel Thibault6-51/+88
Debugging API See merge request slirp/libslirp!139
2024-11-01Debugging APIScott Michel6-51/+88
2024-11-01Merge branch 'void-no-return' into 'master'Samuel Thibault1-14/+16
slirp_(un)register_poll_socket: void returning value See merge request slirp/libslirp!141
2024-11-01slirp_(un)register_poll_socket: void returning valueB. Scott Michel1-14/+16
void functions don't return values.
2024-10-09Restore SlirpAddPollCb, {,un}register_poll_fdSamuel Thibault13-50/+164
as they were before 72f85005a230 ("socket abstraction: slirp_os_socket"): that broke the ABI. Better introduce SlirpAddPollCbSocket, {,un}register_poll_socket that people can use instead, and wrappers for the old API, for a smooth API/ABI upgrade.
2024-10-01Fix calling slirp_bind_outbound on tcp_fconnectSamuel Thibault1-1/+1
Fixes 72f85005a230 ("socket abstraction: slirp_os_socket")
2024-10-01fuzz: Fix memory leak inside fuzz-mainAlexander Kuznetsov2-1/+2
Found by ALT Linux Team. Signed-off-by: Alexander Kuznetsov <kuznetsovam@altlinux.org> Fixes #80
2024-09-26socket abstraction: slirp_os_socketB. Scott Michel16-180/+273
Use a typedef to abstract socket identifiers because Windows just has to be different (SOCKET type.) Moreover, SOCKET on Win64 is 64-bits and generates copious type slicing warnings. Other related changes: - Explicitly cast curtime's assignment to unsigned int to tamp down on type slicing warning. - Ensure that errno.h is always included. Important for Windows, which would otherwise #define errno as WSAGetLastError(); errno.h #define-s errno as a function, i.e., "*errno()". - Export slirp_inet_aton() utility function for Win32/64. - tcpx_listen() - WSASetLastError() unnecessary. - Use have_valid_socket() to check socket in error cleanup code (vs. "s >= 0").
2024-09-26tcp_listen: Missing register_poll_fdB. Scott Michel2-0/+3
Bug fix: tcpx_listen() needs to invoke the socket's register_poll_fd() callback so that platforms can add the socket to their collection of sockets-of-interest (primarily Windows, also platforms that use select() and not poll()). Same for udpx_listen(). Register the created socket! For Windows, host forwarding "now works gooder!" The socket is eventually unregistered via the two use cases in which tcpx_listen() is used: - slirp_add_hostfwd, slirp_add_hostxfwd: The corresponding "remove" functions (slirp_remove_hostfwd, slirp_remove_hostxfwd) invoke unregister_poll_fd(). - TCP emulation (tcp_emu() in tcp_subr.c): All calls to tcp_listen() set the SS_FACCEPTONCE flag, making the accept() a one-shot event. By carefully examining tcp_subr.c, lines 523-531, one sees that tcp_connect() unregisters the one-shot accept(). QED.
2024-08-04Merge branch 'siaddr-rfc2131' into 'master'Samuel Thibault1-1/+19
bootp: Fill siaddr with tftp addr if supplied as per RFC2131 See merge request slirp/libslirp!135
2024-07-30bootp: Fill siaddr with tftp addr as per RFC2131Arusekk1-1/+19
Signed-off-by: Arusekk <arek_koz@o2.pl>
2024-06-02Merge branch 'win32-static-linking' into 'master'Samuel Thibault1-1/+3
windows: allow static linking with LIBSLIRP_STATIC macro See merge request slirp/libslirp!134
2024-06-01windows: allow static linking with LIBSLIRP_STATIC macroBiswapriyo Nath1-1/+3
When the macro is defined it will help to link with libslirp statically. Otherwise, dllimport attribute is added with function symbols and linker errors are shown as following for static linking. undefined reference to `__imp_slirp_input' undefined reference to `__imp_slirp_cleanup' undefined reference to `__imp_slirp_remove_hostfwd' etc.
generated by cgit v1.1 at 2025-08-03 13:33:58 +0000