From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sat, 5 Jul 2014 17:52:03 +0000 (+0100)
Subject: When printing MAC addresses, always use trailing zeroes.
X-Git-Tag: release-1.1pre11~82
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=dc55691ca7399bab28963f92e4c3dea9d6bf8eb1;p=tinc

When printing MAC addresses, always use trailing zeroes.

tinc currently prints MAC addresses without trailing zeroes, for example:

    1:2:3:4:5:6

This looks weird and is inconsistent with how MAC addresses are
displayed everywhere else. This commit adds trailing zeroes, so the
above address will be printed as the following:

    01:02:03:04:05:06
---

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 35f078af..5fac415b 100644
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -308,7 +308,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 
 	switch (subnet->type) {
 		case SUBNET_MAC:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
+			snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx#%d",
 					 subnet->net.mac.address.x[0],
 					 subnet->net.mac.address.x[1],
 					 subnet->net.mac.address.x[2],