From patchwork Wed Feb 21 17:33:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 241 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id E5RaKXhIjlpDcwAAIUCqbw for ; Wed, 21 Feb 2018 23:35:04 -0500 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net (Dovecot) with LMTP id CW1zEHhIjlpMNwAApN4f7A ; Wed, 21 Feb 2018 23:35:04 -0500 Received: from smtp50.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net (Dovecot) with LMTP id y8MfHXhIjlp0WAAAfawv4w ; Wed, 21 Feb 2018 23:35:04 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp50.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Classification-ID: c01b1d22-1789-11e8-8e00-b8ca3a659864-1-1 Received: from [216.105.38.7] ([216.105.38.7:51375] helo=lists.sourceforge.net) by smtp50.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BE/03-32260-8784E8A5; Wed, 21 Feb 2018 23:35:04 -0500 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eoiZk-0002fl-EX; Thu, 22 Feb 2018 04:33:44 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eoiZj-0002fe-PH for openvpn-devel@lists.sourceforge.net; Thu, 22 Feb 2018 04:33:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0gMjCTg0XLmbA+n97h4hV/BM2bpiEW2z2mv6lqs8S+4=; b=kV5BmLJoFpyJlNwdsvT6M7/a9+ 7bMr4W2eioVACx0plp6gQv/U+khQoh1t+cJJVvGTbNKNDDRlUZsP7Bj13bRo0iHGDBkxHHduq9YRj yYIrU9VLp5xYE+y5igTArtMoiWDSTknAo/i2yYvMDEJFGzWw2jGpSKY3dif9SCP8Tb0c=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0gMjCTg0XLmbA+n97h4hV/BM2bpiEW2z2mv6lqs8S+4=; b=Wq54XS1NcmmkIyIGqEm6xi9WBu CM3la3QdObiEgl6adoqcfBS2vcJCsTcuDDOXofCoyykxFa4HzeJgLIZ6FT5yEK2zcWwPdhlMTg6IB TKn87foNGWuHfLrglr7nsr348QE9zxvNIxgYfRbYy/VcOM1+hZbPtoGLE7o5I8HXNbU4=; Received: from sfi-lb-mx.v20.lw.sourceforge.com ([172.30.20.201] helo=mail-it0-f68.google.com) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1eoiZj-00044b-Kf for openvpn-devel@lists.sourceforge.net; Thu, 22 Feb 2018 04:33:43 +0000 Received: by mail-it0-f68.google.com with SMTP id l129so4941870ita.3 for ; Wed, 21 Feb 2018 20:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0gMjCTg0XLmbA+n97h4hV/BM2bpiEW2z2mv6lqs8S+4=; b=V04CtuyxzBqAFOIF8meQ0OD/GOllVxkUWy1TOkMunyDBUp8cgvAMuIQfiC9G7eOQvy +NsWfyH7hqbeqGQppjbp1ejVVP8Dmy4n695WcPHZ167n+AHrSUsj1jsh9yy6a0bnzzYJ WhcGvYFmPtFiqIt101+iZRr1EQw56vjAY/TcAV8Zq5QRGi2UbBPG3CjaElm2702UY8If iBu0VptAgCrVfsZdUG8by8ZAOdOmjsARW74D97lKWtT0SBEZWnS/onBlICOPBl5uxYOG /zJM3gEZXM0cMKEsm3OZBLeI1cToAwZRHsXpY9AziKORgbIgpvZrHHACPXqnhGKFDMB3 dIuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0gMjCTg0XLmbA+n97h4hV/BM2bpiEW2z2mv6lqs8S+4=; b=dhVyOykVQoZX5PRU8NCZmj0zwPF52sAaCiojneOsAsCHy2y1mqRdFf/RRnp6OX6fRD +bsKx/hYK1+QR/TVO1JfFcgyYmWjMOQaJnXdVad9HkXQsO5796YRQLO5wfrjov36HBEc c2LGpHEz2DG/x6agnTQ+FuWL1aXxOEQ5sKL9z2n/FQs01qSN54+d+PeNM0ZqdRvdUyoQ AXp7x+9+3bVCFzM3DV+AX5ab9ai/5Q38E/t4ZxP7Yd8nvsyNN1+0KrdBLqS49EXN6lCJ GwEG9gQQFpIrApSTlnyKUvvbW6+Aab1A3fE1sRYpI4xH+rDMNca/rspzz2aYXy6eDOdI B6Kw== X-Gm-Message-State: APf1xPA49fEn/3h3coA0GdxwQiqp1vICSSZFV3GC16C3v9yO1wkAvgEz dC0nOpKgGUCwMwmNelPhjiFO2XKA X-Google-Smtp-Source: AH8x226QU5qAXuXFIJNVPz8lraYaV5m6h4zmNv/WRKAkhSiA9k8Er31OOMS9P0j4Kca1FkPXzWv8lg== X-Received: by 10.36.0.130 with SMTP id 124mr6061802ita.91.1519274022805; Wed, 21 Feb 2018 20:33:42 -0800 (PST) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id j198sm15636540ioe.15.2018.02.21.20.33.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Feb 2018 20:33:41 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Wed, 21 Feb 2018 23:33:37 -0500 Message-Id: <1519274017-19921-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [Openvpn-devel] [PATCH for-2.4] Fix format spec errors in Windows builds X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Selva Nair - Correct an instance of %s used for wchar_t * (should be %ls) and some %d for DWORD or %lu for int. - Cast socket descriptor to (int) during i/o as its unsigned int or int64 in Windows but signed int in other platforms. Signed-off-by: Selva Nair Acked-by: Gert Doering --- Unlike master, use of %lld for time variables are either absent or already fixed in 2.4. Also keeping changes to the minimum required as this is the release version. src/openvpn/route.c | 12 ++++++------ src/openvpn/socket.c | 6 +++--- src/openvpn/tun.c | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index ef7c19c..2d6428b 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1969,12 +1969,12 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag struct buffer out = alloc_buf_gc(64, &gc); if (r6->adapter_index) /* vpn server special route */ { - buf_printf(&out, "interface=%d", r6->adapter_index ); + buf_printf(&out, "interface=%lu", r6->adapter_index ); gateway_needed = true; } else { - buf_printf(&out, "interface=%d", tt->adapter_index ); + buf_printf(&out, "interface=%lu", tt->adapter_index ); } device = buf_bptr(&out); @@ -2416,12 +2416,12 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt, unsigned struct buffer out = alloc_buf_gc(64, &gc); if (r6->adapter_index) /* vpn server special route */ { - buf_printf(&out, "interface=%d", r6->adapter_index ); + buf_printf(&out, "interface=%lu", r6->adapter_index ); gateway_needed = true; } else { - buf_printf(&out, "interface=%d", tt->adapter_index ); + buf_printf(&out, "interface=%lu", tt->adapter_index ); } device = buf_bptr(&out); @@ -2841,7 +2841,7 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, goto done; } - msg( D_ROUTE, "GDG6: II=%d DP=%s/%d NH=%s", + msg( D_ROUTE, "GDG6: II=%lu DP=%s/%d NH=%s", BestRoute.InterfaceIndex, print_in6_addr( BestRoute.DestinationPrefix.Prefix.Ipv6.sin6_addr, 0, &gc), BestRoute.DestinationPrefix.PrefixLength, @@ -3002,7 +3002,7 @@ do_route_service(const bool add, const route_message_t *rt, const size_t size, H if (ack.error_number != NO_ERROR) { - msg(M_WARN, "ROUTE: route %s failed using service: %s [status=%u if_index=%lu]", + msg(M_WARN, "ROUTE: route %s failed using service: %s [status=%u if_index=%d]", (add ? "addition" : "deletion"), strerror_win32(ack.error_number, &gc), ack.error_number, rt->iface.index); goto out; diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 8445daa..211e744 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1122,7 +1122,7 @@ socket_do_accept(socket_descriptor_t sd, if (!socket_defined(new_sd)) { - msg(D_LINK_ERRORS | M_ERRNO, "TCP: accept(%d) failed", sd); + msg(D_LINK_ERRORS | M_ERRNO, "TCP: accept(%d) failed", (int)sd); } /* only valid if we have remote_len_af!=0 */ else if (remote_len_af && remote_len != remote_len_af) @@ -1875,12 +1875,12 @@ phase2_inetd(struct link_socket *sock, const struct frame *frame, sock->info.lsa->actual.dest.addr.sa.sa_family = local_addr.addr.sa.sa_family; dmsg(D_SOCKET_DEBUG, "inetd(%s): using sa_family=%d from getsockname(%d)", proto2ascii(sock->info.proto, sock->info.af, false), - local_addr.addr.sa.sa_family, sock->sd); + local_addr.addr.sa.sa_family, (int)sock->sd); } else { msg(M_WARN, "inetd(%s): getsockname(%d) failed, using AF_INET", - proto2ascii(sock->info.proto, sock->info.af, false), sock->sd); + proto2ascii(sock->info.proto, sock->info.af, false), (int)sock->sd); } } #else /* ifdef HAVE_GETSOCKNAME */ diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 7945366..b071823 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -125,7 +125,7 @@ do_address_service(const bool add, const short family, const struct tuntap *tt) if (ack.error_number != NO_ERROR) { - msg(M_WARN, "TUN: %s address failed using service: %s [status=%u if_index=%lu]", + msg(M_WARN, "TUN: %s address failed using service: %s [status=%u if_index=%d]", (add ? "adding" : "deleting"), strerror_win32(ack.error_number, &gc), ack.error_number, addr.iface.index); goto out; @@ -3792,7 +3792,7 @@ get_panel_reg(struct gc_arena *gc) if (status != ERROR_SUCCESS || name_type != REG_SZ) { - dmsg(D_REGISTRY, "Error opening registry key: %s\\%s\\%s", + dmsg(D_REGISTRY, "Error opening registry key: %s\\%s\\%ls", NETWORK_CONNECTIONS_KEY, connection_string, name_string); } else