b0a070ce29
many bugs fixes, many more performance improvements. Submitted by: Danny Braniss M sbin/iscontrol/iscsi.conf.5 M sbin/iscontrol/iscontrol.8 M sbin/iscontrol/iscontrol.h M sbin/iscontrol/config.c M sbin/iscontrol/fsm.c M sbin/iscontrol/login.c M sbin/iscontrol/pdu.c M sbin/iscontrol/misc.c M sbin/iscontrol/auth_subr.c M sbin/iscontrol/iscontrol.c M sys/dev/iscsi/initiator/isc_cam.c M sys/dev/iscsi/initiator/iscsi.h M sys/dev/iscsi/initiator/isc_soc.c M sys/dev/iscsi/initiator/iscsi_subr.c M sys/dev/iscsi/initiator/iscsivar.h M sys/dev/iscsi/initiator/isc_subr.c M sys/dev/iscsi/initiator/iscsi.c M sys/dev/iscsi/initiator/isc_sm.c
175 lines
3.9 KiB
C
175 lines
3.9 KiB
C
/*-
|
|
* Copyright (c) 2005-2008 Daniel Braniss <danny@cs.huji.ac.il>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
*/
|
|
/*
|
|
| $Id: pdu.c,v 2.2 2006/12/01 09:11:56 danny Exp danny $
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <sys/uio.h>
|
|
#include <sys/ioctl.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <camlib.h>
|
|
|
|
#include "iscsi.h"
|
|
#include "iscontrol.h"
|
|
|
|
int
|
|
xmitpdu(isess_t *sess, pdu_t *pp)
|
|
{
|
|
if(ioctl(sess->fd, ISCSISEND, pp)) {
|
|
perror("xmitpdu");
|
|
return -1;
|
|
}
|
|
if(vflag)
|
|
pukeText("I-", pp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
recvpdu(isess_t *sess, pdu_t *pp)
|
|
{
|
|
if(ioctl(sess->fd, ISCSIRECV, pp)) {
|
|
perror("recvpdu");
|
|
return -1;
|
|
}
|
|
// XXX: return error if truncated via
|
|
// the FUDGE factor.
|
|
if(vflag)
|
|
pukeText("T-", pp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
sendPDU(isess_t *sess, pdu_t *pp, handler_t *hdlr)
|
|
{
|
|
if(xmitpdu(sess, pp))
|
|
return 0;
|
|
if(hdlr) {
|
|
int res;
|
|
|
|
pp->ahs_size = 8 * 1024;
|
|
if((pp->ahs = malloc(pp->ahs_size)) == NULL) {
|
|
fprintf(stderr, "out of mem!");
|
|
return -1;
|
|
}
|
|
pp->ds_size = 0;
|
|
if((res = recvpdu(sess, pp)) != 0) {
|
|
fprintf(stderr, "recvpdu failed\n");
|
|
return res;
|
|
}
|
|
res = hdlr(sess, pp);
|
|
freePDU(pp);
|
|
return res;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
|
|
#define FUDGE (512 * 8)
|
|
/*
|
|
| We use the same memory for the response
|
|
| so make enough room ...
|
|
| XXX: must find a better way.
|
|
*/
|
|
int
|
|
addText(pdu_t *pp, char *fmt, ...)
|
|
{
|
|
u_int len;
|
|
char *str;
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
len = vasprintf(&str, fmt, ap) + 1;
|
|
if((pp->ds_len + len) > 0xffffff) {
|
|
printf("ds overflow\n");
|
|
free(str);
|
|
return 0;
|
|
}
|
|
|
|
if((pp->ds_len + len) > pp->ds_size) {
|
|
u_char *np;
|
|
|
|
np = realloc(pp->ds, pp->ds_size + len + FUDGE);
|
|
if(np == NULL) {
|
|
free(str);
|
|
//XXX: out of memory!
|
|
return -1;
|
|
}
|
|
pp->ds = np;
|
|
pp->ds_size += len + FUDGE;
|
|
}
|
|
memcpy(pp->ds + pp->ds_len, str, len);
|
|
pp->ds_len += len;
|
|
free(str);
|
|
return len;
|
|
}
|
|
|
|
void
|
|
freePDU(pdu_t *pp)
|
|
{
|
|
if(pp->ahs_size)
|
|
free(pp->ahs);
|
|
if(pp->ds_size)
|
|
free(pp->ds);
|
|
bzero(&pp->ipdu, sizeof(union ipdu_u));
|
|
pp->ahs = NULL;
|
|
pp->ds = NULL;
|
|
pp->ahs_size = 0;
|
|
pp->ds_size = pp->ds_len = 0;
|
|
}
|
|
|
|
void
|
|
pukeText(char *it, pdu_t *pp)
|
|
{
|
|
char *ptr;
|
|
int cmd;
|
|
size_t len, n;
|
|
|
|
len = pp->ds_len;
|
|
ptr = (char *)pp->ds;
|
|
cmd = pp->ipdu.bhs.opcode;
|
|
|
|
printf("%s: cmd=0x%x len=%d\n", it, cmd, (int)len);
|
|
while(len > 0) {
|
|
printf("\t%s\n", ptr);
|
|
n = strlen(ptr) + 1;
|
|
len -= n;
|
|
ptr += n;
|
|
}
|
|
}
|