Page MenuHomeFreeBSD
Files F163272402

D8582.id.diff
No OneTemporary
Actions

D8582.id.diff
View Options

Index: share/doc/smm/18.net/6.t
===================================================================
--- share/doc/smm/18.net/6.t
+++ share/doc/smm/18.net/6.t
@@ -61,7 +61,7 @@
._f
struct socket {
short so_type; /* generic type */
- short so_options; /* from socket call */
+ int so_options; /* from socket call */
short so_linger; /* time to linger while closing */
short so_state; /* internal state flags */
caddr_t so_pcb; /* protocol control block */
Index: sys/kern/uipc_debug.c
===================================================================
--- sys/kern/uipc_debug.c
+++ sys/kern/uipc_debug.c
@@ -75,7 +75,7 @@
}
static void
-db_print_sooptions(short so_options)
+db_print_sooptions(int so_options)
{
int comma;
Index: sys/netinet/in_pcb.h
===================================================================
--- sys/netinet/in_pcb.h
+++ sys/netinet/in_pcb.h
@@ -488,7 +488,7 @@
inp_inpcbtotcpcb(struct inpcb *inp);
void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp,
uint32_t *faddr, uint16_t *fp);
-short inp_so_options(const struct inpcb *inp);
+int inp_so_options(const struct inpcb *inp);
#endif /* _KERNEL */
Index: sys/netinet/in_pcb.c
===================================================================
--- sys/netinet/in_pcb.c
+++ sys/netinet/in_pcb.c
@@ -493,10 +493,10 @@
/*
* Return cached socket options.
*/
-short
+int
inp_so_options(const struct inpcb *inp)
{
- short so_options;
+ int so_options;
so_options = 0;
Index: sys/netinet/tcp_var.h
===================================================================
--- sys/netinet/tcp_var.h
+++ sys/netinet/tcp_var.h
@@ -452,7 +452,7 @@
tcp_seq iss;
tcp_seq irs;
u_short last_win; /* cached window value */
- u_short tw_so_options; /* copy of so_options */
+ int tw_so_options; /* copy of so_options */
struct ucred *tw_cred; /* user credentials */
u_int32_t t_recent;
u_int32_t ts_offset; /* our timestamp offset */
Index: sys/sys/socketvar.h
===================================================================
--- sys/sys/socketvar.h
+++ sys/sys/socketvar.h
@@ -72,7 +72,7 @@
struct socket {
int so_count; /* (b) reference count */
short so_type; /* (a) generic type, see socket.h */
- short so_options; /* from socket call, see socket.h */
+ int so_options; /* from socket call, see socket.h */
short so_linger; /* time to linger while closing */
short so_state; /* (b) internal state flags SS_* */
int so_qstate; /* (e) internal state flags SQ_* */
@@ -167,7 +167,7 @@
size_t xso_len; /* length of this structure */
struct socket *xso_so; /* makes a convenient handle sometimes */
short so_type;
- short so_options;
+ int so_options;
short so_linger;
short so_state;
caddr_t so_pcb; /* another convenient handle */

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 3:25 PM (18 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35369508
Default Alt Text
D8582.id.diff (2 KB)

Event Timeline