FOSS/nethogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix packet matching for packets with IPv6 addresses

Browse Source
This commit is contained in:
Arnout Engelen
2016-03-28 00:30:53 +02:00
parent c73b8cd065
commit 8b245e1be0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/packet.cpp
View File

@@ -198,6 +198,10 @@ bool sameinaddr(in_addr one, in_addr other) {
return one.s_addr == other.s_addr; return one.s_addr == other.s_addr;
} }
bool samein6addr(in6_addr one, in6_addr other) {
return std::equal(one.s6_addr, one.s6_addr + 16, other.s6_addr);
}
bool Packet::isOlderThan(timeval t) { bool Packet::isOlderThan(timeval t) {
std::cout << "Comparing " << time.tv_sec << " <= " << t.tv_sec << std::endl; std::cout << "Comparing " << time.tv_sec << " <= " << t.tv_sec << std::endl;
return (time.tv_sec <= t.tv_sec); return (time.tv_sec <= t.tv_sec);
@@ -249,12 +253,12 @@ bool Packet::Outgoing() {
/* returns the packet in '1.2.3.4:5-1.2.3.4:5'-form, for use in the 'conninode' /* returns the packet in '1.2.3.4:5-1.2.3.4:5'-form, for use in the 'conninode'
* table */ * table */
/* '1.2.3.4' should be the local address. */ /* '1.2.3.4' should be the local address. */
/* the calling code should take care of deletion of the hash string */
char *Packet::gethashstring() { char *Packet::gethashstring() {
if (hashstring != NULL) { if (hashstring != NULL) {
return hashstring; return hashstring;
} }
// TODO free this value in the Packet destructor
hashstring = (char *)malloc(HASHKEYSIZE * sizeof(char)); hashstring = (char *)malloc(HASHKEYSIZE * sizeof(char));
char *local_string = (char *)malloc(50); char *local_string = (char *)malloc(50);
@@ -284,8 +288,12 @@ char *Packet::gethashstring() {
/* 2 packets match if they have the same /* 2 packets match if they have the same
* source and destination ports and IP's. */ * source and destination ports and IP's. */
bool Packet::match(Packet *other) { bool Packet::match(Packet *other) {
return (sport == other->sport) && (dport == other->dport) && return sa_family == other->sa_family && (sport == other->sport) &&
(sameinaddr(sip, other->sip)) && (sameinaddr(dip, other->dip)); (dport == other->dport) &&
(sa_family == AF_INET
? (sameinaddr(sip, other->sip)) && (sameinaddr(dip, other->dip))
: (samein6addr(sip6, other->sip6)) &&
(samein6addr(dip6, other->dip6)));
} }
bool Packet::matchSource(Packet *other) { bool Packet::matchSource(Packet *other) {