if_wg: replace %lu with PRIu64

While on __LP64__ uint64_t is unsigned long, that is not the case for
!__LP64__, which is commonly unsigned long long. Here we use the PRIu64
macro as defined in machine/_inttypes.h.

Signed-off-by: Matt Dunwoodie <ncon@noconroy.net>

1 files changed, 15 insertions, 14 deletions

diff --git a/src/if_wg.c b/src/if_wg.c
index addb331..fe31746 100644
--- a/src/if_wg.c
+++ b/src/if_wg.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/nd6.h>
 
 #include <machine/in_cksum.h>
+#include <machine/_inttypes.h>
 
 #include "support.h"
 #include "wg_noise.h"
@@ -464,7 +465,7 @@ wg_peer_destroy(struct wg_peer *peer)
 	/* Final cleanup */
 	peer->p_sc->sc_peers_num--;
 	TAILQ_REMOVE(&peer->p_sc->sc_peers, peer, p_entry);
-	DPRINTF(peer->p_sc, "Peer %lu destroyed\n", peer->p_id);
+	DPRINTF(peer->p_sc, "Peer %"PRIu64" destroyed\n", peer->p_id);
 	noise_remote_free(peer->p_remote, wg_peer_free_deferred);
 }
 
@@ -1070,7 +1071,7 @@ wg_timers_run_retry_handshake(void *_peer)
 		peer->p_handshake_retries++;
 		mtx_unlock(&peer->p_handshake_mtx);
 
-		DPRINTF(peer->p_sc, "Handshake for peer %lu did not complete "
+		DPRINTF(peer->p_sc, "Handshake for peer %"PRIu64" did not complete "
 		    "after %d seconds, retrying (try %d)\n", peer->p_id,
 		    REKEY_TIMEOUT, peer->p_handshake_retries + 1);
 		wg_peer_clear_src(peer);
@@ -1078,7 +1079,7 @@ wg_timers_run_retry_handshake(void *_peer)
 	} else {
 		mtx_unlock(&peer->p_handshake_mtx);
 
-		DPRINTF(peer->p_sc, "Handshake for peer %lu did not complete "
+		DPRINTF(peer->p_sc, "Handshake for peer %"PRIu64" did not complete "
 		    "after %d retries, giving up\n", peer->p_id,
 		    MAX_TIMER_HANDSHAKES + 2);
 
@@ -1110,7 +1111,7 @@ wg_timers_run_new_handshake(void *_peer)
 {
 	struct wg_peer *peer = _peer;
 
-	DPRINTF(peer->p_sc, "Retrying handshake with peer %lu because we "
+	DPRINTF(peer->p_sc, "Retrying handshake with peer %"PRIu64" because we "
 	    "stopped hearing back after %d seconds\n",
 	    peer->p_id, NEW_HANDSHAKE_TIMEOUT);
 
@@ -1123,7 +1124,7 @@ wg_timers_run_zero_key_material(void *_peer)
 {
 	struct wg_peer *peer = _peer;
 
-	DPRINTF(peer->p_sc, "Zeroing out keys for peer %lu, since we "
+	DPRINTF(peer->p_sc, "Zeroing out keys for peer %"PRIu64", since we "
 	    "haven't received a new one in %d seconds\n",
 	    peer->p_id, REJECT_AFTER_TIME * 3);
 	noise_remote_keypairs_clear(peer->p_remote);
@@ -1162,7 +1163,7 @@ wg_send_initiation(struct wg_peer *peer)
 	    pkt.es, pkt.ets) != 0)
 		goto out;
 
-	DPRINTF(peer->p_sc, "Sending handshake initiation to peer %lu\n", peer->p_id);
+	DPRINTF(peer->p_sc, "Sending handshake initiation to peer %"PRIu64"\n", peer->p_id);
 
 	pkt.t = WG_PKT_INITIATION;
 	cookie_maker_mac(&peer->p_cookie, &pkt.m, &pkt,
@@ -1184,7 +1185,7 @@ wg_send_response(struct wg_peer *peer)
 	    pkt.ue, pkt.en) != 0)
 		goto out;
 
-	DPRINTF(peer->p_sc, "Sending handshake response to peer %lu\n", peer->p_id);
+	DPRINTF(peer->p_sc, "Sending handshake response to peer %"PRIu64"\n", peer->p_id);
 
 	wg_timers_event_session_derived(peer);
 	pkt.t = WG_PKT_RESPONSE;
@@ -1226,7 +1227,7 @@ wg_send_keepalive(struct wg_peer *peer)
 
 	pkt->p_mtu = 0;
 	wg_queue_push_staged(&peer->p_stage_queue, pkt);
-	DPRINTF(peer->p_sc, "Sending keepalive packet to peer %lu\n", peer->p_id);
+	DPRINTF(peer->p_sc, "Sending keepalive packet to peer %"PRIu64"\n", peer->p_id);
 send:
 	wg_peer_send_staged(peer);
 }
@@ -1291,7 +1292,7 @@ wg_handshake(struct wg_softc *sc, struct wg_packet *pkt)
 
 		peer = noise_remote_arg(remote);
 
-		DPRINTF(sc, "Receiving handshake initiation from peer %lu\n", peer->p_id);
+		DPRINTF(sc, "Receiving handshake initiation from peer %"PRIu64"\n", peer->p_id);
 
 		wg_peer_set_endpoint(peer, e);
 		wg_send_response(peer);
@@ -1323,7 +1324,7 @@ wg_handshake(struct wg_softc *sc, struct wg_packet *pkt)
 		}
 
 		peer = noise_remote_arg(remote);
-		DPRINTF(sc, "Receiving handshake response from peer %lu\n", peer->p_id);
+		DPRINTF(sc, "Receiving handshake response from peer %"PRIu64"\n", peer->p_id);
 
 		wg_peer_set_endpoint(peer, e);
 		wg_timers_event_session_derived(peer);
@@ -1470,7 +1471,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt)
 	/* A packet with length 0 is a keepalive packet */
 	if (__predict_false(m->m_pkthdr.len == 0)) {
 		DPRINTF(sc, "Receiving keepalive packet from peer "
-		    "%lu\n", peer->p_id);
+		    "%"PRIu64"\n", peer->p_id);
 		goto done;
 	}
 
@@ -1500,12 +1501,12 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt)
 
 		allowed_peer = wg_aip_lookup(sc, AF_INET6, &ip6->ip6_src);
 	} else {
-		DPRINTF(sc, "Packet is neither ipv4 nor ipv6 from " "peer %lu\n", peer->p_id);
+		DPRINTF(sc, "Packet is neither ipv4 nor ipv6 from " "peer %"PRIu64"\n", peer->p_id);
 		goto error;
 	}
 
 	if (__predict_false(peer != allowed_peer)) {
-		DPRINTF(sc, "Packet has unallowed src IP from peer " "%lu\n", peer->p_id);
+		DPRINTF(sc, "Packet has unallowed src IP from peer " "%"PRIu64"\n", peer->p_id);
 		goto error;
 	}
 
@@ -2004,7 +2005,7 @@ wg_transmit(struct ifnet *ifp, struct mbuf *m)
 	peer_af = peer->p_endpoint.e_remote.r_sa.sa_family;
 	if (__predict_false(peer_af != AF_INET && peer_af != AF_INET6)) {
 		DPRINTF(sc, "No valid endpoint has been configured or "
-			    "discovered for peer %lu\n", peer->p_id);
+			    "discovered for peer %"PRIu64"\n", peer->p_id);
 		rc = EHOSTUNREACH;
 		goto err;
 	}