admin/gotgt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14 from carmark/r2t_build

Browse Source 
add r2t response into iscsiExecR2T function
This commit is contained in:
Lei Xue
2016-10-04 12:10:09 +08:00
committed by GitHub
parent 89382bddb0 f8e74185a2
commit ec964881b5
1 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/port/iscsit/iscsid.go
View File

@@ -423,6 +423,31 @@ func iscsiExecReject(conn *iscsiConnection) error {
return nil return nil
} }
func iscsiExecR2T(conn *iscsiConnection) error {
conn.session.ExpCmdSN += 1
conn.txTask = &iscsiTask{conn: conn, cmd: conn.req, tag: conn.req.TaskTag, scmd: &api.SCSICommand{}}
conn.txIOState = IOSTATE_TX_BHS
conn.statSN += 1
task := conn.rxTask
resp := &ISCSICommand{
OpCode: OpReady,
Immediate: true,
Final: true,
StatSN: conn.req.ExpStatSN,
TaskTag: conn.req.TaskTag,
ExpCmdSN: conn.session.ExpCmdSN,
MaxCmdSN: conn.session.ExpCmdSN + 10,
R2TSN: task.r2tSN,
BufferOffset: uint32(task.offset),
DesiredLength: uint32(task.r2tCount),
}
if val := sessionKeys[ISCSI_PARAM_MAX_BURST].def; task.r2tCount > int(val) {
resp.DesiredLength = uint32(val)
}
conn.resp = resp
return nil
}
func (s *ISCSITargetService) txHandler(conn *iscsiConnection) { func (s *ISCSITargetService) txHandler(conn *iscsiConnection) {
var ( var (
hdigest uint = 0 hdigest uint = 0
@@ -532,30 +557,11 @@ func (s *ISCSITargetService) scsiCommandHandler(conn *iscsiConnection) (err erro
} }
task.scmd.OutSDBBuffer.Buffer.Write(conn.req.RawData) task.scmd.OutSDBBuffer.Buffer.Write(conn.req.RawData)
if task.r2tCount > 0 { if task.r2tCount > 0 {
conn.session.ExpCmdSN += 1
// prepare to receive more data // prepare to receive more data
task.state = taskPending task.state = taskPending
conn.session.PendingTasks.Push(task) conn.session.PendingTasks.Push(task)
//conn.rxTask = nil conn.rxTask = task
conn.txTask = &iscsiTask{conn: conn, cmd: conn.req, tag: conn.req.TaskTag, scmd: &api.SCSICommand{}} iscsiExecR2T(conn)
conn.txIOState = IOSTATE_TX_BHS
conn.statSN += 1
resp := &ISCSICommand{
OpCode: OpReady,
Immediate: true,
Final: true,
StatSN: req.ExpStatSN,
TaskTag: req.TaskTag,
ExpCmdSN: conn.session.ExpCmdSN,
MaxCmdSN: conn.session.ExpCmdSN + 10,
R2TSN: task.r2tSN,
BufferOffset: uint32(task.offset),
DesiredLength: uint32(task.r2tCount),
}
if val := sessionKeys[ISCSI_PARAM_MAX_BURST].def; task.r2tCount > int(val) {
resp.DesiredLength = uint32(val)
}
conn.resp = resp
break break
} }
} }
@@ -632,27 +638,9 @@ func (s *ISCSITargetService) scsiCommandHandler(conn *iscsiConnection) (err erro
return nil return nil
} else if task.r2tCount > 0 { } else if task.r2tCount > 0 {
// prepare to receive more data // prepare to receive more data
conn.rxTask = nil
conn.txTask = &iscsiTask{conn: conn, cmd: conn.req, tag: conn.req.TaskTag, scmd: &api.SCSICommand{}}
conn.txIOState = IOSTATE_TX_BHS
conn.statSN += 1
task.r2tSN += 1 task.r2tSN += 1
resp := &ISCSICommand{ conn.rxTask = task
OpCode: OpReady, iscsiExecR2T(conn)
Immediate: true,
Final: true,
StatSN: req.ExpStatSN,
TaskTag: req.TaskTag,
ExpCmdSN: conn.session.ExpCmdSN,
MaxCmdSN: conn.session.ExpCmdSN + 10,
R2TSN: task.r2tSN,
BufferOffset: uint32(task.offset),
DesiredLength: uint32(task.r2tCount),
}
if val := sessionKeys[ISCSI_PARAM_MAX_BURST].def; task.r2tCount > int(val) {
resp.DesiredLength = uint32(val)
}
conn.resp = resp
break break
} }
task.offset = 0 task.offset = 0