From a91483d4e4c41ba443f832810a066c65ea6076b5 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 2 Jun 2016 17:17:00 -0700 Subject: [PATCH] Use ether_ntoa instead of ether_ntoa_r The latter is thread-safe, but a GNU addition which does not exist on OS-X. Since the function only is called in the main thread, it should not matter if it is or is not threadsafe. --- src/Conn.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Conn.cc b/src/Conn.cc index 9189f50fa0..69a9b7149f 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -391,19 +391,18 @@ RecordVal* Connection::BuildConnVal() if ( inner_vlan != 0 ) conn_val->Assign(10, new Val(inner_vlan, TYPE_INT)); - char buffer[20]; char null[sizeof(eth_src)]{}; if ( memcmp(ð_src, &null, sizeof(eth_src)) != 0 ) { - ether_ntoa_r(ð_src, buffer); - conn_val->Assign(11, new StringVal(buffer)); + char* eaddr = ether_ntoa(ð_src); + conn_val->Assign(11, new StringVal(eaddr)); } if ( memcmp(ð_dst, &null, sizeof(eth_dst)) != 0 ) { - ether_ntoa_r(ð_dst, buffer); - conn_val->Assign(12, new StringVal(buffer)); + char* eaddr = ether_ntoa(ð_dst); + conn_val->Assign(12, new StringVal(eaddr)); } }