diff options
| author |   imarom <imarom@cisco.com> | 2016-11-30 15:04:59 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-11-30 15:04:59 +0200 |
| commit | b812770167d37125b3f3e1b0673517d8f83393ac (patch) | |
| tree | b99f73265f7f713995ed9ccdf5016e01c45b9ca9 /src/utl_ip.cpp | |
| parent | 5b4fcd558793cf7222cc260d8d5aead03cf1cb86 (diff) | |
| parent | 3beb07058c3781d9f3ce888be636b6484f750c96 (diff) | |
merging with latest master
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
src/main_dpdk.cpp
Diffstat (limited to 'src/utl_ip.cpp')
| -rw-r--r-- | src/utl_ip.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/utl_ip.cpp b/src/utl_ip.cpp index 5bd83f95..e7bb6fab 100644 --- a/src/utl_ip.cpp +++ b/src/utl_ip.cpp @@ -29,8 +29,14 @@ void COneIPInfo::dump(FILE *fd, const char *offset) const { get_ip_str(ip_str); std::string mac_str; utl_macaddr_to_str(mac, mac_str); - const char *mac_char = resolve_needed() ? "Not resolved" : mac_str.c_str(); - fprintf(fd, "%sip: %s vlan: %d port: %d mac: %s\n", offset, ip_str, m_vlan, m_port, mac_char); + const char *mac_char = resolve_needed() ? "Unknown" : mac_str.c_str(); + fprintf(fd, "%sip: %s ", offset, ip_str); + if (m_vlan != 0) + fprintf(fd, "vlan: %d ", m_vlan); + if (m_port != UINT8_MAX) + fprintf(fd, "port: %d ", m_port); + fprintf(fd, "mac: %s", mac_char); + fprintf(fd, "\n"); } bool COneIPInfo::resolve_needed() const { |