Skip to content

switch to ns1 conan server and ns1 package of PcapPlusPlus #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 5, 2021
Merged

switch to ns1 conan server and ns1 package of PcapPlusPlus #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88b0f46
switch to ns1 conan server and ns1 package of PcapPlusPlus
weyrick Apr 5, 2021
ace252e
and conan settings
weyrick Apr 5, 2021
c21b429
fix osx conan remote
weyrick Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
# uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2
uses: turtlebrowser/get-conan@v1.0

- name: Conan profile
- name: Conan profile and settings
run: |
conan profile new --detect default
conan config set general.revisions_enabled=1

- name: Conan profile (linux-workaround)
if: matrix.os == 'ubuntu-latest'
Expand All @@ -52,7 +53,7 @@ jobs:
if: matrix.os == 'macos-latest'
working-directory: ${{github.workspace}}/build
run: |
conan remote add public-conan https://api.bintray.com/conan/bincrafters/public-conan
conan remote add ns1labs-conan https://ns1labs.jfrog.io/artifactory/api/conan/ns1labs-conan
conan install --build=missing ..

- name: linux package install
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ add_compile_options(-Wall -pedantic -W -Wextra -Wno-unknown-pragmas)

include(conan)

conan_add_remote(NAME bincrafters INDEX 1
URL https://api.bintray.com/conan/bincrafters/public-conan
conan_add_remote(NAME ns1labs INDEX 1
URL https://ns1labs.jfrog.io/artifactory/api/conan/ns1labs-conan
VERIFY_SSL True)

conan_cmake_autodetect(settings)
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ docopt.cpp/0.6.3
nlohmann_json/3.9.1
cpp-httplib/0.8.0
corrade/2020.06
pcapplusplus/20.08@bincrafters/stable
pcapplusplus/ns1-dev
json-schema-validator/2.1.0

[build_requires]
Expand Down
24 changes: 12 additions & 12 deletions src/handlers/net/NetStreamHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ void NetworkMetricsBucket::process_packet(bool deep, pcpp::Packet &payload, Pack
auto IP6layer = payload.getLayerOfType<pcpp::IPv6Layer>();
if (IP4layer) {
if (dir == PacketDirection::toHost) {
_srcIPCard.update(IP4layer->getSrcIpAddress().toInt());
_topIPv4.update(IP4layer->getSrcIpAddress().toInt());
_srcIPCard.update(IP4layer->getSrcIPv4Address().toInt());
_topIPv4.update(IP4layer->getSrcIPv4Address().toInt());
if (geo::enabled()) {
if (IPv4tosockaddr(IP4layer->getSrcIpAddress(), &sa4)) {
if (IPv4tosockaddr(IP4layer->getSrcIPv4Address(), &sa4)) {
if (geo::GeoIP().enabled()) {
_topGeoLoc.update(geo::GeoIP().getGeoLocString(reinterpret_cast<struct sockaddr *>(&sa4)));
}
Expand All @@ -254,10 +254,10 @@ void NetworkMetricsBucket::process_packet(bool deep, pcpp::Packet &payload, Pack
}
}
} else if (dir == PacketDirection::fromHost) {
_dstIPCard.update(IP4layer->getDstIpAddress().toInt());
_topIPv4.update(IP4layer->getDstIpAddress().toInt());
_dstIPCard.update(IP4layer->getDstIPv4Address().toInt());
_topIPv4.update(IP4layer->getDstIPv4Address().toInt());
if (geo::enabled()) {
if (IPv4tosockaddr(IP4layer->getDstIpAddress(), &sa4)) {
if (IPv4tosockaddr(IP4layer->getDstIPv4Address(), &sa4)) {
if (geo::GeoIP().enabled()) {
_topGeoLoc.update(geo::GeoIP().getGeoLocString(reinterpret_cast<struct sockaddr *>(&sa4)));
}
Expand All @@ -269,10 +269,10 @@ void NetworkMetricsBucket::process_packet(bool deep, pcpp::Packet &payload, Pack
}
} else if (IP6layer) {
if (dir == PacketDirection::toHost) {
_srcIPCard.update(reinterpret_cast<const void *>(IP6layer->getSrcIpAddress().toBytes()), 16);
_topIPv6.update(IP6layer->getSrcIpAddress().toString());
_srcIPCard.update(reinterpret_cast<const void *>(IP6layer->getSrcIPv6Address().toBytes()), 16);
_topIPv6.update(IP6layer->getSrcIPv6Address().toString());
if (geo::enabled()) {
if (IPv6tosockaddr(IP6layer->getSrcIpAddress(), &sa6)) {
if (IPv6tosockaddr(IP6layer->getSrcIPv6Address(), &sa6)) {
if (geo::GeoIP().enabled()) {
_topGeoLoc.update(geo::GeoIP().getGeoLocString(reinterpret_cast<struct sockaddr *>(&sa6)));
}
Expand All @@ -282,10 +282,10 @@ void NetworkMetricsBucket::process_packet(bool deep, pcpp::Packet &payload, Pack
}
}
} else if (dir == PacketDirection::fromHost) {
_dstIPCard.update(reinterpret_cast<const void *>(IP6layer->getDstIpAddress().toBytes()), 16);
_topIPv6.update(IP6layer->getDstIpAddress().toString());
_dstIPCard.update(reinterpret_cast<const void *>(IP6layer->getDstIPv6Address().toBytes()), 16);
_topIPv6.update(IP6layer->getDstIPv6Address().toString());
if (geo::enabled()) {
if (IPv6tosockaddr(IP6layer->getDstIpAddress(), &sa6)) {
if (IPv6tosockaddr(IP6layer->getDstIPv6Address(), &sa6)) {
if (geo::GeoIP().enabled()) {
_topGeoLoc.update(geo::GeoIP().getGeoLocString(reinterpret_cast<struct sockaddr *>(&sa6)));
}
Expand Down
20 changes: 10 additions & 10 deletions src/inputs/pcap/PcapInputStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static void _packet_arrives_cb(pcpp::RawPacket *rawPacket, [[maybe_unused]] pcpp
stream->process_raw_packet(rawPacket);
}

static void _pcap_stats_update([[maybe_unused]] pcap_stat &stats, [[maybe_unused]] void *cookie)
static void _pcap_stats_update([[maybe_unused]] pcpp::IPcapDevice::PcapStats& stats, [[maybe_unused]] void *cookie)
{
// auto stream = static_cast<PcapInputStream *>(cookie);
// TODO expose this
Expand Down Expand Up @@ -213,20 +213,20 @@ void PcapInputStream::process_raw_packet(pcpp::RawPacket *rawPacket)
auto IP6layer = packet.getLayerOfType<pcpp::IPv6Layer>();
if (IP4layer) {
for (auto &i : _hostIPv4) {
if (IP4layer->getDstIpAddress().matchSubnet(i.address, i.mask)) {
if (IP4layer->getDstIPv4Address().matchSubnet(i.address, i.mask)) {
dir = PacketDirection::toHost;
break;
} else if (IP4layer->getSrcIpAddress().matchSubnet(i.address, i.mask)) {
} else if (IP4layer->getSrcIPv4Address().matchSubnet(i.address, i.mask)) {
dir = PacketDirection::fromHost;
break;
}
}
} else if (IP6layer) {
for (auto &i : _hostIPv6) {
if (IP6layer->getDstIpAddress().matchSubnet(i.address, i.mask)) {
if (IP6layer->getDstIPv6Address().matchSubnet(i.address, i.mask)) {
dir = PacketDirection::toHost;
break;
} else if (IP6layer->getSrcIpAddress().matchSubnet(i.address, i.mask)) {
} else if (IP6layer->getSrcIPv6Address().matchSubnet(i.address, i.mask)) {
dir = PacketDirection::fromHost;
break;
}
Expand Down Expand Up @@ -346,19 +346,19 @@ void PcapInputStream::_get_hosts_from_libpcap_iface()
continue;
}
if (i.addr->sa_family == AF_INET) {
auto adrcvt = pcpp::sockaddr2in_addr(i.addr);
auto adrcvt = pcpp::internal::sockaddr2in_addr(i.addr);
if (!adrcvt) {
throw PcapException("couldn't parse IPv4 address on device");
}
auto nmcvt = pcpp::sockaddr2in_addr(i.netmask);
auto nmcvt = pcpp::internal::sockaddr2in_addr(i.netmask);
if (!nmcvt) {
throw PcapException("couldn't parse IPv4 netmask address on device");
}
_hostIPv4.emplace_back(IPv4subnet(pcpp::IPv4Address(pcpp::in_addr2int(*adrcvt)), pcpp::IPv4Address(pcpp::in_addr2int(*nmcvt))));
_hostIPv4.emplace_back(IPv4subnet(pcpp::IPv4Address(pcpp::internal::in_addr2int(*adrcvt)), pcpp::IPv4Address(pcpp::internal::in_addr2int(*nmcvt))));
} else if (i.addr->sa_family == AF_INET6) {
char buf1[INET6_ADDRSTRLEN];
pcpp::sockaddr2string(i.addr, buf1);
auto nmcvt = pcpp::sockaddr2in6_addr(i.netmask);
pcpp::internal::sockaddr2string(i.addr, buf1);
auto nmcvt = pcpp::internal::sockaddr2in6_addr(i.netmask);
if (!nmcvt) {
throw PcapException("couldn't parse IPv4 netmask address on device");
}
Expand Down