#include "stroke_counter.h"
#include <threading/spinlock.h>
+#include <collections/hashtable.h>
ENUM(stroke_counter_type_names,
COUNTER_INIT_IKE_SA_REKEY, COUNTER_OUT_INFORMATIONAL_RSP,
stroke_counter_t public;
/**
- * Counter values
+ * Global counter values
*/
u_int64_t counter[COUNTER_MAX];
+ /**
+ * Counters for specific connection names, char* => entry_t
+ */
+ hashtable_t *conns;
+
/**
* Lock for counter values
*/
spinlock_t *lock;
};
+/**
+ * Counters for a specific connection name
+ */
+typedef struct {
+ /** connection name */
+ char *name;
+ /** counter values for connection */
+ u_int64_t counter[COUNTER_MAX];
+} entry_t;
+
+/**
+ * Destroy named entry
+ */
+static void destroy_entry(entry_t *this)
+{
+ free(this->name);
+ free(this);
+}
+
+/**
+ * Hashtable hash function
+ */
+static u_int hash(char *name)
+{
+ return chunk_hash(chunk_from_str(name));
+}
+
+/**
+ * Hashtable equals function
+ */
+static bool equals(char *a, char *b)
+{
+ return streq(a, b);
+}
+
+/**
+ * Get the name of an IKE_SA, but return NULL if it is not known yet
+ */
+static char *get_ike_sa_name(ike_sa_t *ike_sa)
+{
+ peer_cfg_t *peer_cfg;
+
+ peer_cfg = ike_sa->get_peer_cfg(ike_sa);
+ if (peer_cfg)
+ {
+ return peer_cfg->get_name(peer_cfg);
+ }
+ return NULL;
+}
+
+/**
+ * Increase a counter for a named entry
+ */
+static void count_named(private_stroke_counter_t *this,
+ ike_sa_t *ike_sa, stroke_counter_type_t type)
+{
+ entry_t *entry;
+ char *name;
+
+ name = get_ike_sa_name(ike_sa);
+ if (name)
+ {
+ entry = this->conns->get(this->conns, name);
+ if (!entry)
+ {
+ INIT(entry,
+ .name = strdup(name),
+ );
+ this->conns->put(this->conns, entry->name, entry);
+ }
+ entry->counter[type]++;
+ }
+}
+
+/**
+ * Get a counter value for a specific connection name
+ */
+static u_int64_t get_named_count(private_stroke_counter_t *this,
+ char *name, stroke_counter_type_t type)
+{
+ entry_t *entry;
+
+ entry = this->conns->get(this->conns, name);
+ if (entry)
+ {
+ return entry->counter[type];
+ }
+ return 0;
+}
+
METHOD(listener_t, alert, bool,
private_stroke_counter_t *this, ike_sa_t *ike_sa,
alert_t alert, va_list args)
this->lock->lock(this->lock);
this->counter[type]++;
+ count_named(this, ike_sa, type);
this->lock->unlock(this->lock);
return TRUE;
this->lock->lock(this->lock);
this->counter[type]++;
+ count_named(this, old, type);
this->lock->unlock(this->lock);
return TRUE;
{
this->lock->lock(this->lock);
this->counter[COUNTER_CHILD_SA_REKEY]++;
+ count_named(this, ike_sa, COUNTER_CHILD_SA_REKEY);
this->lock->unlock(this->lock);
return TRUE;
this->lock->lock(this->lock);
this->counter[type]++;
+ count_named(this, ike_sa, type);
this->lock->unlock(this->lock);
return TRUE;
}
METHOD(stroke_counter_t, print, void,
- private_stroke_counter_t *this, FILE *out)
+ private_stroke_counter_t *this, FILE *out, char *name)
{
u_int64_t counter[COUNTER_MAX];
int i;
this->lock->lock(this->lock);
for (i = 0; i < countof(this->counter); i++)
{
- counter[i] = this->counter[i];
+ if (name)
+ {
+ counter[i] = get_named_count(this, name, i);
+ }
+ else
+ {
+ counter[i] = this->counter[i];
+ }
}
this->lock->unlock(this->lock);
- fprintf(out, "\nList of IKE counters:\n\n");
+ if (name)
+ {
+ fprintf(out, "\nList of IKE counters for '%s':\n\n", name);
+ }
+ else
+ {
+ fprintf(out, "\nList of IKE counters:\n\n");
+ }
/* but do blocking write without the lock. */
for (i = 0; i < countof(this->counter); i++)
METHOD(stroke_counter_t, destroy, void,
private_stroke_counter_t *this)
{
+ enumerator_t *enumerator;
+ char *name;
+ entry_t *entry;
+
+ enumerator = this->conns->create_enumerator(this->conns);
+ while (enumerator->enumerate(enumerator, &name, &entry))
+ {
+ destroy_entry(entry);
+ }
+ enumerator->destroy(enumerator);
+ this->conns->destroy(this->conns);
this->lock->destroy(this->lock);
free(this);
}
.print = _print,
.destroy = _destroy,
},
+ .conns = hashtable_create((hashtable_hash_t)hash,
+ (hashtable_equals_t)equals, 4),
.lock = spinlock_create(),
);
/**
* list various information
*/
-static void stroke_list(private_stroke_socket_t *this, stroke_msg_t *msg, FILE *out)
+static void stroke_list(private_stroke_socket_t *this, stroke_msg_t *msg,
+ FILE *out)
{
if (msg->list.flags & LIST_CAINFOS)
{
this->ca->list(this->ca, msg, out);
}
this->list->list(this->list, msg, out);
- if (msg->list.flags & LIST_COUNTERS)
- {
- this->counter->print(this->counter, out);
- }
}
/**
this->config->set_user_credentials(this->config, msg, out);
}
+/**
+ * Print stroke counter values
+ */
+static void stroke_counters(private_stroke_socket_t *this,
+ stroke_msg_t *msg, FILE *out)
+{
+ pop_string(msg, &msg->counters.name);
+
+ this->counter->print(this->counter, out, msg->counters.name);
+}
+
/**
* set the verbosity debug output
*/
case STR_USER_CREDS:
stroke_user_creds(this, msg, out);
break;
+ case STR_COUNTERS:
+ stroke_counters(this, msg, out);
default:
DBG1(DBG_CFG, "received unknown stroke");
break;
return &this->public;
}
-
LIST_OCSP,
LIST_ALGS,
LIST_PLUGINS,
- LIST_COUNTERS,
LIST_ALL
};
return send_stroke_msg(&msg);
}
+static int counters(char *name)
+{
+ stroke_msg_t msg;
+
+ msg.type = STR_COUNTERS;
+ msg.length = offsetof(stroke_msg_t, buffer);
+ msg.counters.name = push_string(&msg, name);
+ return send_stroke_msg(&msg);
+}
+
static int set_loglevel(char *type, u_int level)
{
stroke_msg_t msg;
printf(" Show list of authority and attribute certificates:\n");
printf(" stroke listcacerts|listocspcerts|listaacerts|listacerts\n");
printf(" Show list of end entity certificates, ca info records and crls:\n");
- printf(" stroke listcerts|listcainfos|listcrls|listcounters|listall\n");
+ printf(" stroke listcerts|listcainfos|listcrls|listall\n");
printf(" Show list of supported algorithms:\n");
printf(" stroke listalgs\n");
printf(" Reload authority and attribute certificates:\n");
printf(" where: NAME is a connection name added with \"stroke add\"\n");
printf(" USERNAME is the username\n");
printf(" PASSWORD is the optional password, you'll be asked to enter it if not given\n");
+ printf(" Show IKE counters:\n");
+ printf(" stroke listcounters [connection-name]\n");
exit_error(error);
}
case STROKE_LIST_OCSP:
case STROKE_LIST_ALGS:
case STROKE_LIST_PLUGINS:
- case STROKE_LIST_COUNTERS:
case STROKE_LIST_ALL:
res = list(token->kw, argc > 2 && strcmp(argv[2], "--utc") == 0);
break;
}
res = user_credentials(argv[2], argv[3], argc > 4 ? argv[4] : NULL);
break;
+ case STROKE_COUNTERS:
+ if (argc > 2)
+ {
+ res = counters(argv[2]);
+ }
+ else
+ {
+ res = counters(NULL);
+ }
+ break;
default:
exit_usage(NULL);
}
projects / thirdparty / strongswan.git / commitdiff
