From: Dimitri Papadopoulos Orfanos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
Date: Sun, 28 Jan 2024 19:43:03 +0000 (+0100)
Subject: Fix compiler warnings when buliding on AppVeyor
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d8127b8f4bbaedfe1665c2052f47c5616aa404b1;p=users%2Fdwmw2%2Fopenconnect.git

Fix compiler warnings when buliding on AppVeyor

../mtucalc.c: In function 'calculate_mtu':
../mtucalc.c:75:33: warning: passing argument 4 of 'getsockopt' from incompatible pointer type [-Wincompatible-pointer-types]
   75 |                                 &mss, &mss_size)) {
      |                                 ^~~~
      |                                 |
      |                                 int *
In file included from ../openconnect-internal.h:31,
                 from ../mtucalc.c:20:
C:/msys64/mingw64/include/winsock2.h:1010:82: note: expected 'char *' but argument is of type 'int *'
 1010 |   WINSOCK_API_LINKAGE int WSAAPI getsockopt(SOCKET s,int level,int optname,char *optval,int *optlen);
      |                                                                            ~~~~~~^~~~~~
  CC       libopenconnect_la-lzo.lo

../cstp.c: In function 'calculate_dtls_mtu':
../cstp.c:134:33: warning: passing argument 4 of 'getsockopt' from incompatible pointer type [-Wincompatible-pointer-types]
  134 |                                 &mss, &mss_size)) {
      |                                 ^~~~
      |                                 |
      |                                 int *
In file included from ../openconnect-internal.h:31,
                 from ../cstp.c:21:
C:/msys64/mingw64/include/winsock2.h:1010:82: note: expected 'char *' but argument is of type 'int *'
 1010 |   WINSOCK_API_LINKAGE int WSAAPI getsockopt(SOCKET s,int level,int optname,char *optval,int *optlen);
      |                                                                            ~~~~~~^~~~~~

Signed-off-by: Dimitri Papadopoulos Orfanos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
---

diff --git a/cstp.c b/cstp.c
index 8c3ebfbc..f3dda05e 100644
--- a/cstp.c
+++ b/cstp.c
@@ -131,7 +131,7 @@ static void calculate_dtls_mtu(struct openconnect_info *vpninfo, int *base_mtu,
 		int mss;
 		socklen_t mss_size = sizeof(mss);
 		if (!getsockopt(vpninfo->ssl_fd, IPPROTO_TCP, TCP_MAXSEG,
-				&mss, &mss_size)) {
+				(void *)&mss, &mss_size)) {
 			vpn_progress(vpninfo, PRG_DEBUG, _("TCP_MAXSEG %d\n"), mss);
 			*base_mtu = mss - 13;
 		}
diff --git a/mtucalc.c b/mtucalc.c
index 0b96be05..3c5ef389 100644
--- a/mtucalc.c
+++ b/mtucalc.c
@@ -72,7 +72,7 @@ int calculate_mtu(struct openconnect_info *vpninfo, int is_udp,
 	if (!mtu && !mss) {
 		socklen_t mss_size = sizeof(mss);
 		if (!getsockopt(vpninfo->ssl_fd, IPPROTO_TCP, TCP_MAXSEG,
-				&mss, &mss_size)) {
+				(void *)&mss, &mss_size)) {
 			vpn_progress(vpninfo, PRG_DEBUG, _("TCP_MAXSEG %d\n"), mss);
 		}
 	}