denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define protocol string

Browse Source
This commit is contained in:
Andreas Steffen
2013-06-21 23:25:25 +02:00
parent 41dabbad41
commit 4fe7294bb3
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_scanner/imv_scanner_agent.c
+10 -9
View File
@@ -324,8 +324,8 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
TNC_IMV_Action_Recommendation rec; TNC_IMV_Action_Recommendation rec;
u_int8_t protocol_family, protocol; u_int8_t protocol_family, protocol;
u_int16_t port; u_int16_t port;
bool closed_port_policy, blocked, first = TRUE; bool closed_port_policy, blocked, first;
char result_str[BUF_LEN], *pos; char result_str[BUF_LEN], *pos, *protocol_str;
size_t len, written; size_t len, written;
linked_list_t *port_list; linked_list_t *port_list;
enumerator_t *e1, *e2; enumerator_t *e1, *e2;
@@ -362,9 +362,11 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
} }
port_list = get_port_list(protocol_family, closed_port_policy, port_list = get_port_list(protocol_family, closed_port_policy,
workitem->get_arg_str(workitem)); workitem->get_arg_str(workitem));
protocol_str = (protocol_family == IPPROTO_TCP) ? "tcp" : "udp";
result_str[0] = '\0'; result_str[0] = '\0';
pos = result_str; pos = result_str;
len = BUF_LEN; len = BUF_LEN;
first = TRUE;
e1 = port_filter_attr->create_port_enumerator(port_filter_attr); e1 = port_filter_attr->create_port_enumerator(port_filter_attr);
while (e1->enumerate(e1, &blocked, &protocol, &port)) while (e1->enumerate(e1, &blocked, &protocol, &port))
@@ -391,18 +393,17 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
e2->destroy(e2); e2->destroy(e2);
passed = (closed_port_policy == found); passed = (closed_port_policy == found);
DBG2(DBG_IMV, "%s port %5u open: %s", DBG2(DBG_IMV, "%s port %5u open: %s", protocol_str, port,
(protocol == IPPROTO_TCP) ? "tcp" : "udp", port, passed ? "ok" : "fatal");
passed ? "ok" : "fatal");
if (!passed) if (!passed)
{ {
eval = TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MINOR; eval = TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MINOR;
snprintf(buf, sizeof(buf), "%s/%u", snprintf(buf, sizeof(buf), "%s/%u", protocol_str, port);
(protocol == IPPROTO_TCP) ? "tcp" : "udp", port);
scanner_state->add_violating_port(scanner_state, strdup(buf)); scanner_state->add_violating_port(scanner_state, strdup(buf));
if (first) if (first)
{ {
written = snprintf(pos, len, "violating ports:"); written = snprintf(pos, len, "violating %s ports:",
protocol_str);
pos += written; pos += written;
len -= written; len -= written;
first = FALSE; first = FALSE;
@@ -424,7 +425,7 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
if (first) if (first)
{ {
snprintf(pos, len, "no violating ports"); snprintf(pos, len, "no violating %s ports", protocol_str);
} }
port_list->destroy(port_list); port_list->destroy(port_list);