increased maximum name size of DTLS cipher and other occtl cleanups.

This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-11 22:23:10 +01:00
parent 043355799d
commit 2a9d17a7bf
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -75,7 +75,7 @@ static const commands_st commands[] = {
"Prints the status of the server", 1),
ENTRY("show user", "[NAME]", handle_show_user_cmd,
"Prints information on the specified user", 1),
ENTRY("show id", "[NAME]", handle_show_id_cmd,
ENTRY("show id", "[ID]", handle_show_id_cmd,
"Prints information on the specified ID", 1),
ENTRY("stop", "now", handle_stop_cmd,
"Terminates the server", 1),
@@ -669,7 +669,7 @@ int handle_list_users_cmd(DBusConnection * conn, const char *arg)
/* add header */
if (iteration++ == 0) {
fprintf(out, "%6s %8s %8s %14s %14s %6s %7s %9s %9s\n",
fprintf(out, "%6s %8s %8s %14s %14s %6s %7s %14s %9s\n",
"id", "user", "group", "ip", "vpn-ip", "device",
"since", "cipher", "status");
}
@@ -686,9 +686,9 @@ int handle_list_users_cmd(DBusConnection * conn, const char *arg)
print_time_ival7(t, out);
if (dtls_ciphersuite != NULL && dtls_ciphersuite[0] != 0)
fprintf(out, " %9s %9s\n", dtls_ciphersuite, auth);
fprintf(out, " %14s %9s\n", dtls_ciphersuite, auth);
else
fprintf(out, " %9s %9s\n", "(no dtls)", auth);
fprintf(out, " %14s %9s\n", "(no dtls)", auth);
entries_add(username, strlen(username), id);
+1 -1
View File
@@ -77,7 +77,7 @@ extern int syslog_open;
#define LOG_HTTP_DEBUG 2048
#define MAX_CIPHERSUITE_NAME 64
#define MAX_DTLS_CIPHERSUITE_NAME 16
#define MAX_DTLS_CIPHERSUITE_NAME 24
#define MAX_MSG_SIZE 256
typedef enum {