Sasha,
This patch prepares the console code to accept changes needed for an OpenSSL
connection.
It doesn't contain new functionality, but should make integrating new features
easier and more clear.
--
Timothy A. Meier
Computer Scientist
ICCD/High Performance Computing
925.422.3341
[EMAIL PROTECTED]
>From 559434fc86ad689e5e97aa0d757c73ad6ebe7bc2 Mon Sep 17 00:00:00 2001
From: Tim Meier <[EMAIL PROTECTED]>
Date: Thu, 14 Feb 2008 15:57:02 -0800
Subject: [PATCH] opensm:osm_console cleanup, rename, reorg, no new
functionality
These changes support the addition of an ssl connection for the
console. Some name changes were made to more accurately reflect
usage.
Signed-off-by: Tim Meier <[EMAIL PROTECTED]>
---
opensm/include/opensm/osm_opensm.h | 4 +
opensm/opensm/osm_console.c | 170 +++++++++++++++++++++--------------
2 files changed, 106 insertions(+), 68 deletions(-)
diff --git a/opensm/include/opensm/osm_opensm.h
b/opensm/include/opensm/osm_opensm.h
index ffcb785..8fbe488 100644
--- a/opensm/include/opensm/osm_opensm.h
+++ b/opensm/include/opensm/osm_opensm.h
@@ -157,8 +157,12 @@ typedef struct _osm_console_t {
int socket;
int in_fd;
int out_fd;
+ int authorized;
FILE *in;
FILE *out;
+ char client_type[32];
+ char client_ip[64];
+ char client_hn[128];
} osm_console_t;
/****s* OpenSM: OpenSM/osm_opensm_t
diff --git a/opensm/opensm/osm_console.c b/opensm/opensm/osm_console.c
index 4597bde..85df4fe 100644
--- a/opensm/opensm/osm_console.c
+++ b/opensm/opensm/osm_console.c
@@ -44,9 +44,9 @@
#include <netdb.h>
#ifdef ENABLE_OSM_CONSOLE_SOCKET
#include <tcpd.h>
-#endif
#include <arpa/inet.h>
#include <netinet/in.h>
+#endif
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
@@ -797,21 +797,38 @@ static void perfmgr_parse(char **p_last, osm_opensm_t *
p_osm, FILE * out)
}
#endif /* ENABLE_OSM_PERF_MGR */
-/* This is public to be able to close it on exit */
-void osm_console_close_socket(osm_opensm_t * p_osm)
+#ifdef ENABLE_OSM_CONSOLE_SOCKET
+static int cio_close( osm_console_t *p_oct)
+{
+ int rtnval = -1;
+ if(p_oct && (p_oct->in_fd > 0))
+ {
+ rtnval = close(p_oct->in_fd);
+ p_oct->in_fd = -1;
+ p_oct->out_fd = -1;
+ p_oct->in = NULL;
+ p_oct->out = NULL;
+ }
+ return rtnval;
+}
+#endif
+
+/* close the connection */
+static void osm_console_close(osm_opensm_t * p_osm)
{
- if (p_osm->console.socket > 0) {
- close(p_osm->console.in_fd);
- p_osm->console.in_fd = -1;
- p_osm->console.out_fd = -1;
- p_osm->console.in = NULL;
- p_osm->console.out = NULL;
+#ifdef ENABLE_OSM_CONSOLE_SOCKET
+ if ((p_osm->console.socket > 0) && (p_osm->console.in_fd != -1)) {
+ osm_log(&(p_osm->log), OSM_LOG_INFO,
+ "cio_close: Console connection closed:
%s (%s)\n",
+ p_osm->console.client_hn,
p_osm->console.client_ip);
+ cio_close( &p_osm->console);
}
+#endif
}
static void quit_parse(char **p_last, osm_opensm_t * p_osm, FILE * out)
{
- osm_console_close_socket(p_osm);
+ osm_console_close(p_osm);
}
static void help_version(FILE * out, int detail)
@@ -885,6 +902,21 @@ static void parse_cmd_line(char *line, osm_opensm_t *
p_osm)
}
}
+/**********************************************************************
+ * Do authentication & authorization check
+ **********************************************************************/
+static int is_authorized(osm_console_t *p_oct)
+{
+#ifdef ENABLE_OSM_CONSOLE_SOCKET
+ /* allowed to use the console? */
+ p_oct->authorized = !is_remote(p_oct->client_type) ||
+ hosts_ctl(OSM_DAEMON_NAME, p_oct->client_hn,
p_oct->client_ip, "STRING_UNKNOWN");
+#else
+ p_oct->authorized = 1;
+#endif
+ return p_oct->authorized;
+}
+
static void osm_console_prompt(FILE * out)
{
if (out) {
@@ -895,29 +927,32 @@ static void osm_console_prompt(FILE * out)
void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t * p_osm)
{
- p_osm->console.socket = -1;
+ osm_console_t *p_oct = &p_osm->console;
+ p_oct->socket = -1;
+ strncpy(p_oct->client_type, opt->console, sizeof(p_oct->client_type));
+
/* set up the file descriptors for the console */
if (strcmp(opt->console, OSM_LOCAL_CONSOLE) == 0) {
- p_osm->console.in = stdin;
- p_osm->console.out = stdout;
- p_osm->console.in_fd = fileno(stdin);
- p_osm->console.out_fd = fileno(stdout);
+ p_oct->in = stdin;
+ p_oct->out = stdout;
+ p_oct->in_fd = fileno(stdin);
+ p_oct->out_fd = fileno(stdout);
- osm_console_prompt(p_osm->console.out);
+ osm_console_prompt(p_oct->out);
#ifdef ENABLE_OSM_CONSOLE_SOCKET
} else if (strcmp(opt->console, OSM_REMOTE_CONSOLE) == 0
|| strcmp(opt->console, OSM_LOOPBACK_CONSOLE) == 0) {
struct sockaddr_in sin;
int optval = 1;
- if ((p_osm->console.socket =
+ if ((p_oct->socket =
socket(AF_INET, SOCK_STREAM, 0)) < 0) {
osm_log(&(p_osm->log), OSM_LOG_ERROR,
"osm_console_init: ERR 4B01: Failed to open
console socket: %s\n",
strerror(errno));
return;
}
- setsockopt(p_osm->console.socket, SOL_SOCKET, SO_REUSEADDR,
+ setsockopt(p_oct->socket, SOL_SOCKET, SO_REUSEADDR,
&optval, sizeof(optval));
sin.sin_family = AF_INET;
sin.sin_port = htons(opt->console_port);
@@ -925,13 +960,13 @@ void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t
* p_osm)
sin.sin_addr.s_addr = htonl(INADDR_ANY);
else
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- if (bind(p_osm->console.socket, &sin, sizeof(sin)) < 0) {
+ if (bind(p_oct->socket, &sin, sizeof(sin)) < 0) {
osm_log(&(p_osm->log), OSM_LOG_ERROR,
"osm_console_init: ERR 4B02: Failed to bind
console socket: %s\n",
strerror(errno));
return;
}
- if (listen(p_osm->console.socket, 1) < 0) {
+ if (listen(p_oct->socket, 1) < 0) {
osm_log(&(p_osm->log), OSM_LOG_ERROR,
"osm_console_init: ERR 4B03: Failed to listen
on socket: %s\n",
strerror(errno));
@@ -939,10 +974,10 @@ void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t
* p_osm)
}
signal(SIGPIPE, SIG_IGN); /* protect ourselves from
closed pipes */
- p_osm->console.in = NULL;
- p_osm->console.out = NULL;
- p_osm->console.in_fd = -1;
- p_osm->console.out_fd = -1;
+ p_oct->in = NULL;
+ p_oct->out = NULL;
+ p_oct->in_fd = -1;
+ p_oct->out_fd = -1;
osm_log(&(p_osm->log), OSM_LOG_INFO,
"osm_console_init: Console listening on port %d\n",
opt->console_port);
@@ -950,22 +985,23 @@ void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t
* p_osm)
}
}
-/* clean up and release resouces */
+/* clean up and release resources */
void osm_console_exit(osm_opensm_t * p_osm)
{
- // clean up and release resouces, currently just close the socket
- osm_console_close_socket(p_osm);
+ // clean up and release resources, currently just close the socket
+ osm_console_close(p_osm);
}
#ifdef ENABLE_OSM_CONSOLE_SOCKET
-static void handle_osm_connection(osm_opensm_t * p_osm, int new_fd,
- char *client_ip, char *client_hn)
+static int cio_open( osm_opensm_t * p_osm, int new_fd)
{
+ // returns zero if opened fine, -1 otherwise
+ osm_console_t *p_oct = &p_osm->console;
char *p_line;
size_t len;
ssize_t n;
- if (p_osm->console.in_fd >= 0) {
+ if (p_oct->in_fd >= 0) {
FILE *file = fdopen(new_fd, "w+");
fprintf(file, "OpenSM Console connection already in use\n"
@@ -974,29 +1010,29 @@ static void handle_osm_connection(osm_opensm_t * p_osm,
int new_fd,
p_line = NULL;
n = getline(&p_line, &len, file);
if (n > 0 && (p_line[0] == 'y' || p_line[0] == 'Y')) {
- osm_console_close_socket(p_osm);
+ osm_console_close(p_osm);
} else {
+ osm_log(&(p_osm->log), OSM_LOG_INFO,
+ "cio_open: Console connection aborted:
%s (%s)\n",
+ p_oct->client_hn, p_oct->client_ip);
close(new_fd);
- return;
+ return -1;
}
}
- p_osm->console.in_fd = new_fd;
- p_osm->console.out_fd = p_osm->console.in_fd;
- p_osm->console.in = fdopen(p_osm->console.in_fd, "w+");
- p_osm->console.out = p_osm->console.in;
- osm_console_prompt(p_osm->console.out);
+ p_oct->in_fd = new_fd;
+ p_oct->out_fd = p_oct->in_fd;
+ p_oct->in = fdopen(p_oct->in_fd, "w+");
+ p_oct->out = p_oct->in;
+ osm_console_prompt(p_oct->out);
osm_log(&(p_osm->log), OSM_LOG_INFO,
- "osm_console_init: Console connection accepted: %s (%s)\n",
- client_hn, client_ip);
-}
-
-static int connection_ok(char *client_ip, char *client_hn)
-{
- return (hosts_ctl
- (OSM_DAEMON_NAME, client_hn, client_ip, "STRING_UNKNOWN"));
+ "cio_open: Console connection accepted: %s (%s)\n",
+ p_oct->client_hn, p_oct->client_ip);
+
+ return (p_oct->in == NULL) ? -1 : 0;
}
#endif
+
void osm_console(osm_opensm_t * p_osm)
{
struct pollfd pollfd[2];
@@ -1005,23 +1041,24 @@ void osm_console(osm_opensm_t * p_osm)
ssize_t n;
struct pollfd *fds;
nfds_t nfds;
+ osm_console_t *p_oct = &p_osm->console;
- pollfd[0].fd = p_osm->console.socket;
+ pollfd[0].fd = p_oct->socket;
pollfd[0].events = POLLIN;
pollfd[0].revents = 0;
- pollfd[1].fd = p_osm->console.in_fd;
+ pollfd[1].fd = p_oct->in_fd;
pollfd[1].events = POLLIN;
pollfd[1].revents = 0;
- fds = p_osm->console.socket < 0 ? &pollfd[1] : pollfd;
- nfds = p_osm->console.socket < 0 || pollfd[1].fd < 0 ? 1 : 2;
+ fds = p_oct->socket < 0 ? &pollfd[1] : pollfd;
+ nfds = p_oct->socket < 0 || pollfd[1].fd < 0 ? 1 : 2;
if (loop_command.on && loop_command_check_time() &&
loop_command.loop_function) {
- if (p_osm->console.out) {
- loop_command.loop_function(p_osm, p_osm->console.out);
- fflush(p_osm->console.out);
+ if (p_oct->out) {
+ loop_command.loop_function(p_osm, p_oct->out);
+ fflush(p_oct->out);
} else {
loop_command.on = 0;
}
@@ -1035,35 +1072,32 @@ void osm_console(osm_opensm_t * p_osm)
int new_fd = 0;
struct sockaddr_in sin;
socklen_t len = sizeof(sin);
- char client_ip[64];
- char client_hn[128];
struct hostent *hent;
- if ((new_fd = accept(p_osm->console.socket, &sin, &len)) < 0) {
+ if ((new_fd = accept(p_oct->socket, &sin, &len)) < 0) {
osm_log(&(p_osm->log), OSM_LOG_ERROR,
"osm_console: ERR 4B04: Failed to accept
console socket: %s\n",
strerror(errno));
- p_osm->console.in_fd = -1;
+ p_oct->in_fd = -1;
return;
}
if (inet_ntop
- (AF_INET, &sin.sin_addr, client_ip,
- sizeof(client_ip)) == NULL) {
- snprintf(client_ip, 64, "STRING_UNKNOWN");
+ (AF_INET, &sin.sin_addr, p_oct->client_ip,
+ sizeof(p_oct->client_ip)) == NULL) {
+ snprintf(p_oct->client_ip, 64, "STRING_UNKNOWN");
}
if ((hent = gethostbyaddr((const char *)&sin.sin_addr,
sizeof(struct in_addr),
AF_INET)) == NULL) {
- snprintf(client_hn, 128, "STRING_UNKNOWN");
+ snprintf(p_oct->client_hn, 128, "STRING_UNKNOWN");
} else {
- snprintf(client_hn, 128, "%s", hent->h_name);
+ snprintf(p_oct->client_hn, 128, "%s", hent->h_name);
}
- if (connection_ok(client_ip, client_hn)) {
- handle_osm_connection(p_osm, new_fd, client_ip,
- client_hn);
+ if (is_authorized(&p_osm->console)) {
+ cio_open( p_osm, new_fd);
} else {
osm_log(&(p_osm->log), OSM_LOG_ERROR,
"osm_console: ERR 4B05: Console connection
denied: %s (%s)\n",
- client_hn, client_ip);
+ p_oct->client_hn, p_oct->client_ip);
close(new_fd);
}
return;
@@ -1073,15 +1107,15 @@ void osm_console(osm_opensm_t * p_osm)
if (pollfd[1].revents & POLLIN) {
p_line = NULL;
/* Get input line */
- n = getline(&p_line, &len, p_osm->console.in);
+ n = getline(&p_line, &len, p_oct->in);
if (n > 0) {
/* Parse and act on input */
parse_cmd_line(p_line, p_osm);
if (!loop_command.on) {
- osm_console_prompt(p_osm->console.out);
+ osm_console_prompt(p_oct->out);
}
} else
- osm_console_close_socket(p_osm);
+ osm_console_close(p_osm);
if (p_line)
free(p_line);
}
--
1.5.1
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
