Page MenuHomeFreeBSD
Files F107598721

D31656.diff
No OneTemporary
Actions

D31656.diff
View Options

diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h
--- a/sys/sys/sockbuf.h
+++ b/sys/sys/sockbuf.h
@@ -85,7 +85,8 @@
struct sx sb_sx; /* prevent I/O interlacing */
struct selinfo *sb_sel; /* process selecting read/write */
short sb_state; /* (a) socket state on sockbuf */
-#define sb_startzero sb_mb
+#define sb_startzero sb_flags
+ short sb_flags; /* (a) flags, see above */
struct mbuf *sb_mb; /* (a) the mbuf chain */
struct mbuf *sb_mbtail; /* (a) the last mbuf in the chain */
struct mbuf *sb_lastrecord; /* (a) first mbuf of last
@@ -109,7 +110,6 @@
struct ktls_session *sb_tls_info; /* (a + b) TLS state */
struct mbuf *sb_mtls; /* (a) TLS mbuf chain */
struct mbuf *sb_mtlstail; /* (a) last mbuf in TLS chain */
- short sb_flags; /* (a) flags, see above */
int (*sb_upcall)(struct socket *, void *, int); /* (a) */
void *sb_upcallarg; /* (a) */
TAILQ_HEAD(, kaiocb) sb_aiojobq; /* (a) pending AIO ops */
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -91,13 +91,13 @@
volatile u_int so_count; /* (b / refcount) */
struct selinfo so_rdsel; /* (b/cr) for so_rcv/so_comp */
struct selinfo so_wrsel; /* (b/cs) for so_snd */
- short so_type; /* (a) generic type, see socket.h */
int so_options; /* (b) from socket call, see socket.h */
- short so_linger; /* time to linger close(2) */
+ short so_type; /* (a) generic type, see socket.h */
short so_state; /* (b) internal state flags SS_* */
void *so_pcb; /* protocol control block */
struct vnet *so_vnet; /* (a) network stack instance */
struct protosw *so_proto; /* (a) protocol handle */
+ short so_linger; /* time to linger close(2) */
short so_timeo; /* (g) connection timeout */
u_short so_error; /* (f) error affecting connection */
u_short so_rerror; /* (f) error affecting connection */

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 17, 11:00 AM (21 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15838012
Default Alt Text
D31656.diff (1 KB)

Event Timeline