mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 12:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

States cleanup and fix related login problem

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1650 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-04-23 11:26:39 +00:00
parent a4cfff4882
commit 7d218fb344
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
iscsi-scst/usr/iscsi_scstd.c
View File

@@ -342,7 +342,7 @@ static void event_conn(struct connection *conn, struct pollfd *pollfd)
res = read(pollfd->fd, conn->buffer, conn->rwsize);
if (res <= 0) {
if (res == 0 || (errno != EINTR && errno != EAGAIN))
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
else if (errno == EINTR)
goto read_again;
break;
@@ -364,15 +364,15 @@ static void event_conn(struct connection *conn, struct pollfd *pollfd)
log_warning("Recv PDU with invalid size %d "
"(max: %d)", conn->rwsize,
INCOMING_BUFSIZE);
conn->state = STATE_CLOSE;
goto out;
conn->state = STATE_EXIT;
goto out;
}
if (conn->rwsize) {
if (!conn->req_buffer) {
conn->req_buffer = malloc(INCOMING_BUFSIZE);
if (!conn->req_buffer) {
log_error("Failed to alloc recv buffer");
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
goto out;
}
}
@@ -388,7 +388,7 @@ static void event_conn(struct connection *conn, struct pollfd *pollfd)
log_pdu(2, &conn->req);
if (!cmnd_execute(conn))
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
break;
}
break;
@@ -402,7 +402,7 @@ static void event_conn(struct connection *conn, struct pollfd *pollfd)
res = write(pollfd->fd, conn->buffer, conn->rwsize);
if (res < 0) {
if (errno != EINTR && errno != EAGAIN)
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
else if (errno == EINTR)
goto write_again;
break;
@@ -556,7 +556,8 @@ static void event_loop(void)
event_conn(conn, pollfd);
if (conn->state == STATE_CLOSE) {
if ((conn->state == STATE_CLOSE) ||
(conn->state == STATE_EXIT)) {
struct session *sess = conn->sess;
log_debug(1, "closing conn %p", conn);
conn_free_pdu(conn);
@@ -564,15 +565,19 @@ static void event_loop(void)
pollfd->fd = -1;
incoming[i] = NULL;
incoming_cnt--;
if (conn->passed_to_kern) {
kernel_conn_destroy(conn->tid,
conn->sess->sid.id64, conn->cid);
} else {
conn_free(conn);
log_debug(1, "conn %p freed (sess %p, empty %d)",
conn, sess, sess ? list_empty(&sess->conn_list) : -1);
if (sess && list_empty(&sess->conn_list))
session_free(sess);
if (conn->state == STATE_EXIT) {
if (conn->passed_to_kern) {
kernel_conn_destroy(conn->tid,
conn->sess->sid.id64,
conn->cid);
} else {
conn_free(conn);
log_debug(1, "conn %p freed (sess %p, empty %d)",
conn, sess,
sess ? list_empty(&sess->conn_list) : -1);
if (sess && list_empty(&sess->conn_list))
session_free(sess);
}
}
}
}

5
iscsi-scst/usr/iscsid.c
View File

@@ -545,7 +545,7 @@ static void login_start(struct connection *conn)
log_info("Connect from %s to disabled target %s refused",
name, target_name);
login_rsp_tgt_err(conn, 0);
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
return;
}
@@ -583,7 +583,7 @@ static void login_start(struct connection *conn)
"reached (%d)", name, target_name,
target->target_params[key_max_sessions]);
login_rsp_tgt_err(conn, ISCSI_STATUS_NO_RESOURCES);
conn->state = STATE_CLOSE;
conn->state = STATE_EXIT;
return;
}
}
@@ -1060,7 +1060,6 @@ void cmnd_finish(struct connection *conn)
switch (conn->state) {
case STATE_EXIT:
conn->state = STATE_CLOSE;
break;
case STATE_SECURITY_LOGIN:
conn->state = STATE_LOGIN;