summaryrefslogtreecommitdiffstats
path: root/usr.sbin/iscsid
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2016-04-05 00:52:35 +0000
committeryasuoka <yasuoka@openbsd.org>2016-04-05 00:52:35 +0000
commita9e4bd1a4fae489ddff740ffb98aa66252d134d4 (patch)
treedf8096a1bb3ce323f0d62fa4f12ddace3c5e2408 /usr.sbin/iscsid
parentget* can change *lineptr on failure (diff)
downloadwireguard-openbsd-a9e4bd1a4fae489ddff740ffb98aa66252d134d4.tar.xz
wireguard-openbsd-a9e4bd1a4fae489ddff740ffb98aa66252d134d4.zip
Remove the iterator for control connections unfinished and unused.
ok claudio
Diffstat (limited to 'usr.sbin/iscsid')
-rw-r--r--usr.sbin/iscsid/control.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/usr.sbin/iscsid/control.c b/usr.sbin/iscsid/control.c
index 47743fc326f..e2e0044e832 100644
--- a/usr.sbin/iscsid/control.c
+++ b/usr.sbin/iscsid/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.8 2014/04/21 17:41:52 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.9 2016/04/05 00:52:35 yasuoka Exp $ */
/*
* Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -34,7 +34,6 @@
#include "log.h"
struct control {
- TAILQ_ENTRY(control) entry;
struct event ev;
struct pduq channel;
int fd;
@@ -46,8 +45,6 @@ struct control_state {
int fd;
} *control_state;
-TAILQ_HEAD(, control) controls;
-
#define CONTROL_BACKLOG 5
void control_accept(int, short, void *);
@@ -112,7 +109,6 @@ control_init(char *path)
socket_setblockmode(fd, 1);
control_state->fd = fd;
- TAILQ_INIT(&controls);
return 0;
}
@@ -120,15 +116,9 @@ control_init(char *path)
void
control_cleanup(char *path)
{
- struct control *c;
-
if (path)
unlink(path);
- while ((c = TAILQ_FIRST(&controls)) != NULL) {
- TAILQ_REMOVE(&controls, c, entry);
- control_close(c);
- }
event_del(&control_state->ev);
event_del(&control_state->evt);
close(control_state->fd);