Print this page
NEX-16824 SMB client connection setup rework
NEX-17232 SMB client reconnect failures
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (improve debug)
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/smbclnt/netsmb/smb_trantcp.h
+++ new/usr/src/uts/common/fs/smbclnt/netsmb/smb_trantcp.h
1 1 /*
2 2 * Copyright (c) 2000-2001, Boris Popov
3 3 * All rights reserved.
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
7 7 * are met:
8 8 * 1. Redistributions of source code must retain the above copyright
9 9 * notice, this list of conditions and the following disclaimer.
10 10 * 2. Redistributions in binary form must reproduce the above copyright
11 11 * notice, this list of conditions and the following disclaimer in the
12 12 * documentation and/or other materials provided with the distribution.
13 13 * 3. All advertising materials mentioning features or use of this software
14 14 * must display the following acknowledgement:
15 15 * This product includes software developed by Boris Popov.
16 16 * 4. Neither the name of the author nor the names of any co-contributors
17 17 * may be used to endorse or promote products derived from this software
18 18 * without specific prior written permission.
19 19 *
20 20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
21 21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
24 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
↓ open down ↓ |
24 lines elided |
↑ open up ↑ |
25 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 30 * SUCH DAMAGE.
31 31 *
32 32 * $Id: smb_trantcp.h,v 1.8 2004/08/03 23:50:01 lindak Exp $
33 33 */
34 34 /*
35 - * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
35 + * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
36 36 */
37 37 #ifndef _NETSMB_SMB_TRANTCP_H_
38 38 #define _NETSMB_SMB_TRANTCP_H_
39 39
40 40 enum nbstate {
41 41 NBST_CLOSED,
42 + NBST_IDLE,
42 43 NBST_RQSENT,
43 44 NBST_SESSION,
44 45 NBST_RETARGET,
45 46 NBST_REFUSED
46 47 };
47 48
48 49
49 50 /*
50 51 * socket specific data
51 52 */
52 53 struct nbpcb {
53 54 struct smb_vc *nbp_vc;
54 55 struct tiuser *nbp_tiptr; /* KTLI transport handle... */
55 56 mblk_t *nbp_frag; /* left-over from last recv */
56 57
57 58 struct sockaddr_nb *nbp_laddr; /* local address */
58 59 struct sockaddr_nb *nbp_paddr; /* peer address */
59 60 void *nbp_selectid;
60 61 cred_t *nbp_cred;
61 62
62 63 int nbp_flags;
63 64 #define NBF_LOCADDR 0x0001 /* has local addr */
64 65 #define NBF_CONNECTED 0x0002
65 66 #define NBF_RECVLOCK 0x0004
66 67 #define NBF_SENDLOCK 0x0008
67 68 #define NBF_LOCKWAIT 0x0010
68 69
69 70 ushort_t nbp_fmode;
70 71 enum nbstate nbp_state;
71 72 struct timespec nbp_timo;
72 73 int nbp_sndbuf;
73 74 int nbp_rcvbuf;
74 75 kmutex_t nbp_lock;
75 76 kcondvar_t nbp_cv;
76 77 };
77 78 typedef struct nbpcb nbpcb_t;
78 79
79 80 /*
80 81 * Nominal space allocated per a NETBIOS socket.
81 82 */
82 83 #define NB_SNDQ (10 * 1024)
83 84 #define NB_RCVQ (20 * 1024)
84 85
85 86 /*
86 87 * TCP slowstart presents a problem in conjunction with large
87 88 * reads. To ensure a steady stream of ACKs while reading using
88 89 * large transaction sizes, we call soreceive() with a smaller
89 90 * buffer size. See nbssn_recv().
90 91 */
91 92 #define NB_SORECEIVE_CHUNK (8 * 1024)
92 93
93 94 #define SMBSBTIMO 15 /* seconds for sockbuf timeouts */
94 95
95 96 #endif /* !_NETSMB_SMB_TRANTCP_H_ */
|
↓ open down ↓ |
44 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX