3 files changed, 53 insertions, 2 deletions
diff --git a/src/common/basic_utils.cpp b/src/common/basic_utils.cpp
index f169c29f..dfd3b183 100755
--- a/src/common/basic_utils.cpp
+++ b/src/common/basic_utils.cpp
@@ -20,6 +20,10 @@ limitations under the License.
 #include <sstream>
 #include <sys/resource.h>
 
+#include "pal_utl.h"
+
+int my_inet_pton4(const char *src, unsigned char *dst);
+
 bool utl_is_file_exists (const std::string& name) {
     if (FILE *file = fopen(name.c_str(), "r")) {
         fclose(file);
@@ -190,6 +194,26 @@ void utl_macaddr_to_str(const uint8_t *macaddr, std::string &output) {
 
 }
 
+std::string utl_macaddr_to_str(const uint8_t *macaddr) {
+    std::string tmp;
+    utl_macaddr_to_str(macaddr, tmp);
+    
+    return tmp;
+}
+
+bool utl_str_to_macaddr(const std::string &s, uint8_t *mac) {
+    int last = -1;
+    int rc = sscanf(s.c_str(), "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx%n",
+                    mac + 0, mac + 1, mac + 2, mac + 3, mac + 4, mac + 5,
+                    &last);
+
+    if ( (rc != 6) || (s.size() != last) ) {
+        return false;
+    }
+    
+    return true;
+}
+
 /**
  * generate a random connection handler
  * 
@@ -248,3 +272,23 @@ void utl_set_coredump_size(long size, bool map_huge_pages) {
     fprintf(fp, "%08x\n", mask);
     fclose(fp);
 }
+
+uint32_t utl_ipv4_to_uint32(const char *ipv4_str, uint32_t &ipv4_num) {
+    
+    uint32_t tmp;
+    
+    int rc = my_inet_pton4(ipv4_str, (unsigned char *)&tmp);
+    if (!rc) {
+        return (0);
+    }
+    
+    ipv4_num = PAL_NTOHL(tmp);
+    
+    return (1);
+}
+   
+std::string utl_uint32_to_ipv4(uint32_t ipv4_addr) {
+    std::stringstream ss;
+    ss << ((ipv4_addr >> 24) & 0xff) << "." << ((ipv4_addr >> 16) & 0xff) << "." << ((ipv4_addr >> 8) & 0xff) << "." << (ipv4_addr & 0xff);
+    return ss.str();
+}
diff --git a/src/common/basic_utils.h b/src/common/basic_utils.h
index f6250a2b..ab0ff1ec 100755
--- a/src/common/basic_utils.h
+++ b/src/common/basic_utils.h
@@ -86,6 +86,9 @@ bool utl_is_file_exists (const std::string& name) ;
 
 void utl_macaddr_to_str(const uint8_t *macaddr, std::string &output);
 
+std::string utl_macaddr_to_str(const uint8_t *macaddr);
+bool utl_str_to_macaddr(const std::string &s, uint8_t *mac);
+
 std::string utl_generate_random_str(unsigned int &seed, int len);
 
 /**
@@ -98,6 +101,9 @@ std::string utl_generate_random_str(unsigned int &seed, int len);
  */
 void utl_set_coredump_size(long size, bool map_huge_pages = false);
 
+uint32_t       utl_ipv4_to_uint32(const char *ipv4_str, uint32_t &ipv4_num);
+std::string    utl_uint32_to_ipv4(uint32_t ipv4_addr);
+   
 #endif
 
 
diff --git a/src/common/pcap.h b/src/common/pcap.h
index 3f8dfd21..c9139e4c 100755
--- a/src/common/pcap.h
+++ b/src/common/pcap.h
@@ -1,5 +1,5 @@
-#ifndef __LIBPCAP_H__
-#define __LIBPCAP_H__ 
+#ifndef __TREX_LIBPCAP_H__
+#define __TREX_LIBPCAP_H__ 
 
 /*
 Copyright (c) 2015-2015 Cisco Systems, Inc.
@@ -151,4 +151,5 @@ private:
     bool m_is_open;
     uint32_t m_pkt_count;
 };
+
 #endif