Merge branch 'bugfix/ping-leases' into 'master'

Fix ping-leases option, broken since v1.1.1

See merge request openconnect/ocserv!471
This commit is contained in:
Dimitri Papadopoulos Orfanos
2025-11-22 14:32:40 +01:00
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@@ -3,6 +3,7 @@
- Fixed issues with PAM authentication when combined with pam_sssd (#618)
- Enhanced the seccomp filters to address issue in testing (#627)
- Fixed "unexpected URL" errors for Cisco AnyConnect clients
- Fixed the 'ping-leases' option, which was broken since version 1.1.1
* Version 1.3.0 (released 2024-05-05)
- Switch to https://github.com/nodejs/llhttp from http-parser.

View File

@@ -202,7 +202,7 @@ int icmp_ping4(main_server_st *s, struct sockaddr_in *addr1)
pkt->icmp_cksum = in_cksum((unsigned short *)pkt, sizeof(packet1));
while (sendto(pingsock, packet1, DEFDATALEN + ICMP_MINLEN, 0,
(struct sockaddr *)addr1, sizeof(*addr1) == -1) &&
(struct sockaddr *)addr1, sizeof(*addr1)) == -1 &&
retry(errno))
;
/* listen for replies */
@@ -300,7 +300,7 @@ int icmp_ping6(main_server_st *s, struct sockaddr_in6 *addr1)
setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
#endif
while (sendto(pingsock, packet1, DEFDATALEN + sizeof(struct icmp6_hdr),
0, (struct sockaddr *)addr1, sizeof(*addr1) == -1) &&
0, (struct sockaddr *)addr1, sizeof(*addr1)) == -1 &&
retry(errno))
;