Skip to content

U
unique-xids
Commit 12852411 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Give mgt_cli_setup() a explict close callback argument, to call when 

we reach EOF on the input filedescriptor.

List all cli connections on a VTAILQ, and add a function for closing
them all.

Use close callback for stdin and telnet CLI connections.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4448 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 7d895b2d
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 52 deletions
bin/varnishd/mgt.h
View file @ 12852411
......@@ -49,12 +49,14 @@ void mgt_stop_child(void);
/* mgt_cli.c */
void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident);
typedef void mgt_cli_close_f(void *priv);
void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f *close_func, void *priv);
int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...);
void mgt_cli_start_child(int fdi, int fdo);
void mgt_cli_stop_child(void);
void mgt_cli_telnet(const char *T_arg);
void mgt_cli_secret(const char *S_arg);
void mgt_cli_close_all(void);
/* mgt_param.c */
void MCF_ParamSync(void);
......
bin/varnishd/mgt_cli.c
View file @ 12852411
......@@ -71,14 +71,16 @@ static int cli_i = -1, cli_o = -1;
static const char *secret_file;
struct telnet {
unsigned magic;
#define TELNET_MAGIC 0x53ec3ac0
int fd;
struct vev *ev;
VTAILQ_ENTRY(telnet) list;
};
struct cli_port {
unsigned magic;
#define CLI_PORT_MAGIC 0x5791079f
VTAILQ_ENTRY(cli_port) list;
struct vev *ev;
int fdi;
int fdo;
......@@ -87,11 +89,11 @@ struct cli_port {
struct cli cli[1];
char *name;
char challenge[34];
mgt_cli_close_f *closefunc;
void *priv;
};
static VTAILQ_HEAD(,telnet) telnets = VTAILQ_HEAD_INITIALIZER(telnets);
static void telnet_close_all(void);
static void telnet_close_one(int fd);
static VTAILQ_HEAD(,cli_port) clilist = VTAILQ_HEAD_INITIALIZER(clilist);
/*--------------------------------------------------------------------*/
......@@ -436,31 +438,35 @@ mgt_cli_close(struct cli_port *cp)
CHECK_OBJ_NOTNULL(cp, CLI_PORT_MAGIC);
syslog(LOG_NOTICE, "CLI %d closed", cp->fdi);
/*
* Remove from list, so that if closefunc calls mgt_cli_close_all
* it will not try to remove this one too.
*/
VTAILQ_REMOVE(&clilist, cp, list);
free(cp->name);
vsb_delete(cp->cli->sb);
VLU_Destroy(cp->vlu);
(void)close(cp->fdi);
if (cp->fdo != cp->fdi)
(void)close(cp->fdo);
cp->closefunc(cp->priv);
FREE_OBJ(cp);
return (1);
}
/* Special case for stdin/out/err */
if (cp->fdi == 0) {
assert(open("/dev/null", O_RDONLY) == 0);
assert(open("/dev/null", O_WRONLY) == 1);
(void)close(2);
assert(open("/dev/null", O_WRONLY) == 2);
/*--------------------------------------------------------------------
* Get rid of all CLI sessions
*/
if (d_flag == 2) {
mgt_stop_child();
telnet_close_all();
}
} else {
telnet_close_one(cp->fdi);
}
void
mgt_cli_close_all(void)
{
struct cli_port *cp;
free(cp);
return (1);
while (!VTAILQ_EMPTY(&clilist)) {
cp = VTAILQ_FIRST(&clilist);
vev_del(mgt_evb, cp->ev);
(void)mgt_cli_close(cp);
}
}
/*--------------------------------------------------------------------
......@@ -485,7 +491,7 @@ mgt_cli_callback(const struct vev *e, int what)
/*--------------------------------------------------------------------*/
void
mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident)
mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f *closefunc, void *priv)
{
struct cli_port *cp;
......@@ -502,6 +508,9 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident)
cp->fdo = fdo;
cp->verbose = verbose;
cp->closefunc = closefunc;
cp->priv = priv;
cp->cli->sb = vsb_newauto();
XXXAN(cp->cli->sb);
cp->cli->priv = cp;
......@@ -520,42 +529,26 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident)
} else if (params->cli_banner)
(void)VLU_Data("banner\n", -1, cp->vlu);
cp->ev = calloc(sizeof *cp->ev, 1);
cp->ev = vev_new();
cp->ev->name = cp->name;
cp->ev->fd = fdi;
cp->ev->fd_flags = EV_RD;
cp->ev->callback = mgt_cli_callback;
cp->ev->priv = cp;
VTAILQ_INSERT_TAIL(&clilist, cp, list);
AZ(vev_add(mgt_evb, cp->ev));
}
/*--------------------------------------------------------------------*/
static void
telnet_close_one(int fd)
telnet_close(void *priv)
{
struct telnet *tn, *tn2;
VTAILQ_FOREACH_SAFE(tn, &telnets, list, tn2) {
if (tn->fd != fd)
continue;
VTAILQ_REMOVE(&telnets, tn, list);
(void)close(tn->fd);
free(tn);
break;
}
}
static void
telnet_close_all()
{
struct telnet *tn, *tn2;
struct telnet *tn;
VTAILQ_FOREACH_SAFE(tn, &telnets, list, tn2) {
VTAILQ_REMOVE(&telnets, tn, list);
AZ(close(tn->fd));
free(tn);
}
CAST_OBJ_NOTNULL(tn, priv, TELNET_MAGIC);
(void)close(tn->fd);
FREE_OBJ(tn);
}
static struct telnet *
......@@ -563,10 +556,9 @@ telnet_new(int fd)
{
struct telnet *tn;
tn = calloc(sizeof *tn, 1);
ALLOC_OBJ(tn, TELNET_MAGIC);
AN(tn);
tn->fd = fd;
VTAILQ_INSERT_TAIL(&telnets, tn, list);
return (tn);
}
......@@ -575,6 +567,7 @@ telnet_accept(const struct vev *ev, int what)
{
struct sockaddr_storage addr;
socklen_t addrlen;
struct telnet *tn;
int i;
char abuf1[TCP_ADDRBUFSIZE], abuf2[TCP_ADDRBUFSIZE];
char pbuf1[TCP_PORTBUFSIZE], pbuf2[TCP_PORTBUFSIZE];
......@@ -594,9 +587,9 @@ telnet_accept(const struct vev *ev, int what)
assert(asprintf(&p, "telnet %s:%s %s:%s", abuf2, pbuf2, abuf1, pbuf1) > 0);
XXXAN(p);
(void)telnet_new(i);
tn = telnet_new(i);
mgt_cli_setup(i, i, 0, p);
mgt_cli_setup(i, i, 0, p, telnet_close, tn);
free(p);
return (0);
}
......
bin/varnishd/varnishd.c
View file @ 12852411
......@@ -38,6 +38,7 @@ SVNID("$Id$")
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
#include <signal.h>
#include <stdarg.h>
......@@ -477,6 +478,29 @@ Symbol_hack(const char *a0)
(void)pclose(fi);
}
/*--------------------------------------------------------------------
* This function is called when the CLI on stdin is closed.
*/
static void
cli_stdin_close(void *priv)
{
(void)priv;
(void)close(0);
(void)close(1);
(void)close(2);
assert(open("/dev/null", O_RDONLY) == 0);
assert(open("/dev/null", O_WRONLY) == 1);
assert(open("/dev/null", O_WRONLY) == 2);
if (d_flag == 2) {
mgt_stop_child();
mgt_cli_close_all();
exit(0);
}
}
/*--------------------------------------------------------------------*/
int
......@@ -728,7 +752,7 @@ main(int argc, char * const *argv)
XXXAN(mgt_evb);
if (d_flag)
mgt_cli_setup(0, 1, 1, "debug");
mgt_cli_setup(0, 1, 1, "debug", cli_stdin_close, NULL);
if (S_arg != NULL)
mgt_cli_secret(S_arg);
if (T_arg != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment