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

make a 'runtests' make target that runs some 'unit test'-like tests. Fix crash when uid's without a password entry are encountered, return the uid as a string instead.

Browse Source
This commit is contained in:
Arnout Engelen
2012-03-15 22:31:28 +00:00
parent 2c04ca9267
commit 4ff973bbd7
11 changed files with 284 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
connection.cpp
View File

@@ -25,17 +25,7 @@
#include <malloc.h>
#include "nethogs.h"
#include "connection.h"
class ConnList
{
public:
ConnList (Connection * m_val = NULL, ConnList * m_next = NULL)
{
val = m_val; next = m_next;
}
Connection * val;
ConnList * next;
};
#include "process.h"
ConnList * connections = NULL;
@@ -127,22 +117,22 @@ Connection::~Connection ()
ConnList * prev_conn = NULL;
while (curr_conn != NULL)
{
if (curr_conn->val == this)
if (curr_conn->getVal() == this)
{
ConnList * todelete = curr_conn;
curr_conn = curr_conn->next;
curr_conn = curr_conn->getNext();
if (prev_conn == NULL)
{
connections = curr_conn;
} else {
prev_conn->next = curr_conn;
prev_conn->setNext(curr_conn);
}
delete (todelete);
}
else
{
prev_conn = curr_conn;
curr_conn = curr_conn->next;
curr_conn = curr_conn->getNext();
}
}
}
@@ -186,12 +176,12 @@ Connection * findConnection (Packet * packet)
while (current != NULL)
{
/* the reference packet is always *outgoing* */
if (packet->match(current->val->refpacket))
if (packet->match(current->getVal()->refpacket))
{
return current->val;
return current->getVal();
}
current = current->next;
current = current->getNext();
}
// Try again, now with the packet inverted:
@@ -201,13 +191,13 @@ Connection * findConnection (Packet * packet)
while (current != NULL)
{
/* the reference packet is always *outgoing* */
if (invertedPacket->match(current->val->refpacket))
if (invertedPacket->match(current->getVal()->refpacket))
{
delete invertedPacket;
return current->val;
return current->getVal();
}
current = current->next;
current = current->getNext();
}
delete invertedPacket;