diff --git a/nping/NpingTarget.cc b/nping/NpingTarget.cc index d40cde3ed..9dc0593bc 100644 --- a/nping/NpingTarget.cc +++ b/nping/NpingTarget.cc @@ -76,7 +76,7 @@ #include "output.h" #include "stats.h" #include "common_modified.h" - +#include "utils_net.h" /** Constructor */ @@ -650,26 +650,18 @@ const char *NpingTarget::getNextHopIPStr(){ } /* End of getNextHopIPStr() */ -const char *NpingTarget::getMACStr(u8 *mac){ - static char buffer[256]; - assert(mac!=NULL); - sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", (u8)mac[0],(u8)mac[1], - (u8)mac[2], (u8)mac[4],(u8)mac[4],(u8)mac[5]); - return buffer; -} - const char *NpingTarget::getTargetMACStr(){ - return getMACStr(this->MACaddress); + return MACtoa(this->MACaddress); } const char *NpingTarget::getSourceMACStr(){ - return getMACStr(this->SrcMACaddress); + return MACtoa(this->SrcMACaddress); } const char *NpingTarget::getNextHopMACStr(){ - return getMACStr(this->NextHopMACaddress); + return MACtoa(this->NextHopMACaddress); } diff --git a/nping/NpingTarget.h b/nping/NpingTarget.h index 64381c9ca..25b57d220 100644 --- a/nping/NpingTarget.h +++ b/nping/NpingTarget.h @@ -201,7 +201,6 @@ class NpingTarget { const char *getSourceIPStr(); const char *getSpoofedSourceIPStr(); const char *getNextHopIPStr(); - const char *getMACStr(u8 *mac); const char *getTargetMACStr(); const char *getSourceMACStr(); const char *getNextHopMACStr();