From 89e14ff4361e576ee3f7f308fdd7999726fad7e0 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 8 Jan 2014 11:15:32 -0500
Subject: [PATCH] replace some more occurrences of the eth format

---
 dhtest.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dhtest.c b/dhtest.c
index 615b2b6..605462a 100644
--- a/dhtest.c
+++ b/dhtest.c
@@ -155,14 +155,13 @@ int main(int argc, char *argv[])
 				{
 					u_char aux_dhmac[ETHER_ADDR_LEN + 1];
 
-					if(strlen(optarg) > 18) {
+					if(strlen(optarg) != 18
+							|| sscanf(optarg, ETH_F_FMT, ETH_F_PARG(aux_dhmac)) != 6
+					  )
+					{
 						fprintf(stderr, "Invalid mac address\n");
 						exit(2);
 					}
-					sscanf((char *)optarg, "%2X:%2X:%2X:%2X:%2X:%2X",
-							(u_int32_t *) &aux_dhmac[0], (u_int32_t *) &aux_dhmac[1],
-							(u_int32_t *) &aux_dhmac[2], (u_int32_t *) &aux_dhmac[3],
-							(u_int32_t *) &aux_dhmac[4], (u_int32_t *) &aux_dhmac[5]);
 					memcpy(dhmac, aux_dhmac, sizeof(dhmac));
 					dhmac_flag = 1;
 				}