Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Deprecate bro_inet_ntop.{c,h}

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-06-28 16:02:44 -07:00
parent f624c18383
commit 18ae40277a
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/3rdparty

@ -1 +1 @@
Subproject commit eb87829547270eab13c223e6de58b25bc9a0282e
Subproject commit e97fb41fb76f88fc96e853e5ffccd99734a0d934

6
src/CMakeLists.txt
View file

@ -419,7 +419,8 @@ set(MAIN_SRCS
)
set(THIRD_PARTY_SRCS
3rdparty/bro_inet_ntop.c
3rdparty/bro_inet_ntop.c # Remove in v6.1.
3rdparty/zeek_inet_ntop.c
3rdparty/bsd-getopt-long.c
3rdparty/ConvertUTF.c
3rdparty/in_cksum.cc
@ -606,7 +607,8 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ConvertUTF.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bro_inet_ntop.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bro_inet_ntop.h # Remove in v6.1
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zeek_inet_ntop.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bsd-getopt-long.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/modp_numtoa.h
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/nb_dns.h

6
src/IPAddr.cc
View file

@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "zeek/3rdparty/bro_inet_ntop.h"
#include "zeek/3rdparty/zeek_inet_ntop.h"
#include "zeek/Conn.h"
#include "zeek/Hash.h"
#include "zeek/Reporter.h"
@ -246,7 +246,7 @@ std::string IPAddr::AsString() const
{
char s[INET_ADDRSTRLEN];
if ( ! bro_inet_ntop(AF_INET, &in6.s6_addr[12], s, INET_ADDRSTRLEN) )
if ( ! zeek_inet_ntop(AF_INET, &in6.s6_addr[12], s, INET_ADDRSTRLEN) )
return "<bad IPv4 address conversion";
else
return s;
@ -255,7 +255,7 @@ std::string IPAddr::AsString() const
{
char s[INET6_ADDRSTRLEN];
if ( ! bro_inet_ntop(AF_INET6, in6.s6_addr, s, INET6_ADDRSTRLEN) )
if ( ! zeek_inet_ntop(AF_INET6, in6.s6_addr, s, INET6_ADDRSTRLEN) )
return "<bad IPv6 address conversion";
else
return s;

6
src/threading/Formatter.cc
View file

@ -6,7 +6,7 @@
#include <cerrno>
#include "zeek/3rdparty/bro_inet_ntop.h"
#include "zeek/3rdparty/zeek_inet_ntop.h"
#include "zeek/threading/MsgThread.h"
using zeek::threading::Field;
@ -28,7 +28,7 @@ std::string Formatter::Render(const threading::Value::addr_t& addr)
{
char s[INET_ADDRSTRLEN];
if ( ! bro_inet_ntop(AF_INET, &addr.in.in4, s, INET_ADDRSTRLEN) )
if ( ! zeek_inet_ntop(AF_INET, &addr.in.in4, s, INET_ADDRSTRLEN) )
return "<bad IPv4 address conversion>";
else
return s;
@ -37,7 +37,7 @@ std::string Formatter::Render(const threading::Value::addr_t& addr)
{
char s[INET6_ADDRSTRLEN];
if ( ! bro_inet_ntop(AF_INET6, &addr.in.in6, s, INET6_ADDRSTRLEN) )
if ( ! zeek_inet_ntop(AF_INET6, &addr.in.in6, s, INET6_ADDRSTRLEN) )
return "<bad IPv6 address conversion>";
else
return s;