Sasha,
This is the first of two patches, which depend on each other.
I split the osm_console.c code into two modules, one containing the console
commands, and the other (new osm_console_io.c) containing the console setup,
tear down and connection specific code.
The primary purpose of the separation is to provide an isolated and decoupled
place to add the implementation of the new SSL connection.
--
Timothy A. Meier
Computer Scientist
ICCD/High Performance Computing
925.422.3341
[EMAIL PROTECTED]
>From 453991ff76f01464cf90d9d1a1b6b38bbb96ef7e Mon Sep 17 00:00:00 2001
From: Tim Meier <[EMAIL PROTECTED]>
Date: Wed, 20 Feb 2008 13:56:04 -0800
Subject: [PATCH] opensm: console split console into two modules
Added osm_console_io.c module, to decouple connection and IO
code from the console functionality. Provides the ability
to extend (add) an implementation for an SSL connection.
Signed-off-by: Tim Meier <[EMAIL PROTECTED]>
---
opensm/include/opensm/osm_console.h | 18 +---
opensm/include/opensm/osm_opensm.h | 13 +--
opensm/opensm/Makefile.am | 2 +-
opensm/opensm/main.c | 6 +-
opensm/opensm/osm_console.c | 206 +---------------------------------
5 files changed, 14 insertions(+), 231 deletions(-)
diff --git a/opensm/include/opensm/osm_console.h
b/opensm/include/opensm/osm_console.h
index 8b31d6a..3ea8fa5 100644
--- a/opensm/include/opensm/osm_console.h
+++ b/opensm/include/opensm/osm_console.h
@@ -34,22 +34,8 @@
#ifndef _OSM_CONSOLE_H_
#define _OSM_CONSOLE_H_
-#include <opensm/osm_base.h>
-#include <opensm/osm_subnet.h>
#include <opensm/osm_opensm.h>
-#define OSM_DISABLE_CONSOLE "off"
-#define OSM_LOCAL_CONSOLE "local"
-#define OSM_REMOTE_CONSOLE "socket"
-#define OSM_LOOPBACK_CONSOLE "loopback"
-#define OSM_CONSOLE_NAME "OSM Console"
-
-#define OSM_COMMAND_LINE_LEN 120
-#define OSM_COMMAND_PROMPT "$ "
-#define OSM_DEFAULT_CONSOLE OSM_DISABLE_CONSOLE
-#define OSM_DEFAULT_CONSOLE_PORT 10000
-#define OSM_DAEMON_NAME "opensm"
-
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
# define END_C_DECLS }
@@ -59,9 +45,7 @@
#endif /* __cplusplus */
BEGIN_C_DECLS
-void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t * p_osm);
+// TODO replace p_osm
void osm_console(osm_opensm_t * p_osm);
-void osm_console_exit(osm_opensm_t * p_osm);
-int is_console_enabled(osm_subn_opt_t *p_opt);
END_C_DECLS
#endif /* _OSM_CONSOLE_H_ */
diff --git a/opensm/include/opensm/osm_opensm.h
b/opensm/include/opensm/osm_opensm.h
index 8fbe488..cd1e73b 100644
--- a/opensm/include/opensm/osm_opensm.h
+++ b/opensm/include/opensm/osm_opensm.h
@@ -53,6 +53,7 @@
#include <complib/cl_passivelock.h>
#include <complib/cl_atomic.h>
#include <complib/cl_nodenamemap.h>
+#include <opensm/osm_console_io.h>
#include <opensm/osm_stats.h>
#include <opensm/osm_log.h>
#include <opensm/osm_sm.h>
@@ -153,18 +154,6 @@ struct osm_routing_engine {
* internals cleanup.
*/
-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
* NAME
* osm_opensm_t
diff --git a/opensm/opensm/Makefile.am b/opensm/opensm/Makefile.am
index 50fdae1..5ab31a3 100644
--- a/opensm/opensm/Makefile.am
+++ b/opensm/opensm/Makefile.am
@@ -30,7 +30,7 @@ libopensm_la_DEPENDENCIES = $(srcdir)/libopensm.map
sbin_PROGRAMS = opensm
opensm_DEPENDENCIES = libopensm.la
-opensm_SOURCES = main.c osm_console.c osm_db_files.c \
+opensm_SOURCES = main.c osm_console_io.c osm_console.c osm_db_files.c \
osm_db_pack.c osm_drop_mgr.c osm_fwd_tbl.c \
osm_inform.c osm_lid_mgr.c osm_lin_fwd_rcv.c \
osm_lin_fwd_tbl.c osm_link_mgr.c osm_mcast_fwd_rcv.c \
diff --git a/opensm/opensm/main.c b/opensm/opensm/main.c
index fcc7a44..f8c091e 100644
--- a/opensm/opensm/main.c
+++ b/opensm/opensm/main.c
@@ -60,6 +60,7 @@
#include <opensm/osm_version.h>
#include <opensm/osm_opensm.h>
#include <opensm/osm_console.h>
+#include <opensm/osm_console_io.h>
#include <opensm/osm_perfmgr.h>
volatile unsigned int osm_exit_flag = 0;
@@ -550,7 +551,8 @@ static int daemonize(osm_opensm_t * osm)
int osm_manager_loop(osm_subn_opt_t * p_opt, osm_opensm_t * p_osm)
{
if (is_console_enabled(p_opt))
- osm_console_init(p_opt, p_osm);
+ osm_console_init(p_opt, &p_osm->console, &p_osm->log);
+// osm_console_init(p_opt, p_osm);
/*
Sit here forever - dwell or do console i/o & cmds
@@ -573,7 +575,7 @@ int osm_manager_loop(osm_subn_opt_t * p_opt, osm_opensm_t *
p_osm)
}
}
if (is_console_enabled(p_opt))
- osm_console_exit(p_osm);
+ osm_console_exit(&p_osm->console, &p_osm->log);
return 0;
}
diff --git a/opensm/opensm/osm_console.c b/opensm/opensm/osm_console.c
index 7b1f87c..f9ee915 100644
--- a/opensm/opensm/osm_console.c
+++ b/opensm/opensm/osm_console.c
@@ -43,15 +43,12 @@
#include <sys/socket.h>
#include <netdb.h>
#ifdef ENABLE_OSM_CONSOLE_SOCKET
-#include <tcpd.h>
#include <arpa/inet.h>
-#include <netinet/in.h>
#endif
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include <sys/time.h>
-#include <signal.h>
#include <opensm/osm_console.h>
#include <opensm/osm_version.h>
#include <complib/cl_passivelock.h>
@@ -696,41 +693,6 @@ static void portstatus_parse(char **p_last, osm_opensm_t *
p_osm, FILE * out)
fprintf(out, "\n");
}
-static int is_local(char *str)
-{
- // convenience - checks if just stdin/stdout
- if (str)
- return (strcmp(str, OSM_LOCAL_CONSOLE) == 0);
- return 0;
-}
-
-static int is_loopback(char *str)
-{
- // convenience - checks if socket based connection
- if (str)
- return (strcmp(str, OSM_LOOPBACK_CONSOLE) == 0);
- return 0;
-}
-
-static int is_remote(char *str)
-{
- // convenience - checks if socket based connection
- if (str)
- return (strcmp(str, OSM_REMOTE_CONSOLE) == 0)
- || is_loopback(str);
- return 0;
-}
-
-int is_console_enabled(osm_subn_opt_t * p_opt)
-{
- // checks for a variety of types of consoles - default is off or 0
- if (p_opt)
- return (is_local(p_opt->console)
- || is_loopback(p_opt->console)
- || is_remote(p_opt->console));
- return 0;
-}
-
#ifdef ENABLE_OSM_PERF_MGR
static void perfmgr_parse(char **p_last, osm_opensm_t * p_osm, FILE * out)
{
@@ -795,37 +757,9 @@ static void perfmgr_parse(char **p_last, osm_opensm_t *
p_osm, FILE * out)
}
#endif /* ENABLE_OSM_PERF_MGR */
-#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)
-{
-#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,
- "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(p_osm);
+ osm_console_exit(&p_osm->console, &p_osm->log);
}
static void help_version(FILE * out, int detail)
@@ -899,133 +833,6 @@ static void parse_cmd_line(char *line, osm_opensm_t *
p_osm)
}
}
-/**********************************************************************
- * Do authentication & authorization check
- **********************************************************************/
-#ifdef ENABLE_OSM_CONSOLE_SOCKET
-static int is_authorized(osm_console_t * p_oct)
-{
- /* 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");
- return p_oct->authorized;
-}
-#endif
-
-static void osm_console_prompt(FILE * out)
-{
- if (out) {
- fprintf(out, "OpenSM %s", OSM_COMMAND_PROMPT);
- fflush(out);
- }
-}
-
-void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t * p_osm)
-{
- 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_oct->in = stdin;
- p_oct->out = stdout;
- p_oct->in_fd = fileno(stdin);
- p_oct->out_fd = fileno(stdout);
-
- 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_oct->socket = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- OSM_LOG(&(p_osm->log), OSM_LOG_ERROR,
- "ERR 4B01: Failed to open console socket: %s\n",
- strerror(errno));
- return;
- }
- setsockopt(p_oct->socket, SOL_SOCKET, SO_REUSEADDR,
- &optval, sizeof(optval));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(opt->console_port);
- if (strcmp(opt->console, OSM_REMOTE_CONSOLE) == 0)
- sin.sin_addr.s_addr = htonl(INADDR_ANY);
- else
- sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- if (bind(p_oct->socket, &sin, sizeof(sin)) < 0) {
- OSM_LOG(&(p_osm->log), OSM_LOG_ERROR,
- "ERR 4B02: Failed to bind console socket: %s\n",
- strerror(errno));
- return;
- }
- if (listen(p_oct->socket, 1) < 0) {
- OSM_LOG(&(p_osm->log), OSM_LOG_ERROR,
- "ERR 4B03: Failed to listen on socket: %s\n",
- strerror(errno));
- return;
- }
-
- signal(SIGPIPE, SIG_IGN); /* protect ourselves from
closed pipes */
- 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,
- "Console listening on port %d\n", opt->console_port);
-#endif
- }
-}
-
-/* clean up and release resources */
-void osm_console_exit(osm_opensm_t * p_osm)
-{
- // clean up and release resources, currently just close the socket
- osm_console_close(p_osm);
-}
-
-#ifdef ENABLE_OSM_CONSOLE_SOCKET
-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_oct->in_fd >= 0) {
- FILE *file = fdopen(new_fd, "w+");
-
- fprintf(file, "OpenSM Console connection already in use\n"
- " kill other session (y/n)? ");
- fflush(file);
- p_line = NULL;
- n = getline(&p_line, &len, file);
- if (n > 0 && (p_line[0] == 'y' || p_line[0] == 'Y')) {
- osm_console_close(p_osm);
- } else {
- OSM_LOG(&(p_osm->log), OSM_LOG_INFO,
- "Console connection aborted: %s (%s)\n",
- p_oct->client_hn, p_oct->client_ip);
- close(new_fd);
- return -1;
- }
- }
- 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,
- "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];
@@ -1035,6 +842,7 @@ void osm_console(osm_opensm_t * p_osm)
struct pollfd *fds;
nfds_t nfds;
osm_console_t *p_oct = &p_osm->console;
+ osm_log_t *p_log = &p_osm->log;
pollfd[0].fd = p_oct->socket;
pollfd[0].events = POLLIN;
@@ -1067,7 +875,7 @@ void osm_console(osm_opensm_t * p_osm)
socklen_t len = sizeof(sin);
struct hostent *hent;
if ((new_fd = accept(p_oct->socket, &sin, &len)) < 0) {
- OSM_LOG(&(p_osm->log), OSM_LOG_ERROR,
+ OSM_LOG(p_log, OSM_LOG_ERROR,
"ERR 4B04: Failed to accept console socket:
%s\n",
strerror(errno));
p_oct->in_fd = -1;
@@ -1085,10 +893,10 @@ void osm_console(osm_opensm_t * p_osm)
} else {
snprintf(p_oct->client_hn, 128, "%s", hent->h_name);
}
- if (is_authorized(&p_osm->console)) {
- cio_open(p_osm, new_fd);
+ if (is_authorized(p_oct)) {
+ cio_open(p_oct, new_fd, p_log);
} else {
- OSM_LOG(&(p_osm->log), OSM_LOG_ERROR,
+ OSM_LOG(p_log, OSM_LOG_ERROR,
"ERR 4B05: Console connection denied: %s
(%s)\n",
p_oct->client_hn, p_oct->client_ip);
close(new_fd);
@@ -1108,7 +916,7 @@ void osm_console(osm_opensm_t * p_osm)
osm_console_prompt(p_oct->out);
}
} else
- osm_console_close(p_osm);
+ osm_console_exit(p_oct, p_log);
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
