| ctl_frontend_iscsi.c (272101) | ctl_frontend_iscsi.c (273307) |
|---|---|
| 1/*- 2 * Copyright (c) 2012 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Edward Tomasz Napierala under sponsorship 6 * from the FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 12 unchanged lines hidden (view full) --- 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * | 1/*- 2 * Copyright (c) 2012 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Edward Tomasz Napierala under sponsorship 6 * from the FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 12 unchanged lines hidden (view full) --- 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * |
| 29 * $FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c 272101 2014-09-25 09:12:11Z mav $ | 29 * $FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c 273307 2014-10-20 07:28:18Z mav $ |
| 30 */ 31 32/* 33 * CTL frontend for the iSCSI protocol. 34 */ 35 36#include <sys/cdefs.h> | 30 */ 31 32/* 33 * CTL frontend for the iSCSI protocol. 34 */ 35 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c 272101 2014-09-25 09:12:11Z mav $"); | 37__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c 273307 2014-10-20 07:28:18Z mav $"); |
| 38 39#include <sys/param.h> 40#include <sys/capability.h> 41#include <sys/condvar.h> 42#include <sys/file.h> 43#include <sys/kernel.h> 44#include <sys/kthread.h> 45#include <sys/lock.h> --- 946 unchanged lines hidden (view full) --- 992 return; 993 994 callout_schedule(&cs->cs_callout, 1 * hz); 995 996 atomic_add_int(&cs->cs_timeout, 1); 997 998#ifdef ICL_KERNEL_PROXY 999 if (cs->cs_waiting_for_ctld || cs->cs_login_phase) { | 38 39#include <sys/param.h> 40#include <sys/capability.h> 41#include <sys/condvar.h> 42#include <sys/file.h> 43#include <sys/kernel.h> 44#include <sys/kthread.h> 45#include <sys/lock.h> --- 946 unchanged lines hidden (view full) --- 992 return; 993 994 callout_schedule(&cs->cs_callout, 1 * hz); 995 996 atomic_add_int(&cs->cs_timeout, 1); 997 998#ifdef ICL_KERNEL_PROXY 999 if (cs->cs_waiting_for_ctld || cs->cs_login_phase) { |
| 1000 if (cs->cs_timeout > login_timeout) { | 1000 if (login_timeout > 0 && cs->cs_timeout > login_timeout) { |
| 1001 CFISCSI_SESSION_WARN(cs, "login timed out after " 1002 "%d seconds; dropping connection", cs->cs_timeout); 1003 cfiscsi_session_terminate(cs); 1004 } 1005 return; 1006 } 1007#endif 1008 --- 1876 unchanged lines hidden --- | 1001 CFISCSI_SESSION_WARN(cs, "login timed out after " 1002 "%d seconds; dropping connection", cs->cs_timeout); 1003 cfiscsi_session_terminate(cs); 1004 } 1005 return; 1006 } 1007#endif 1008 --- 1876 unchanged lines hidden --- |