Page MenuHomeFreeBSD
Files F140828158

D24333.id70321.diff
No OneTemporary
Actions

D24333.id70321.diff
View Options

Index: sys/kern/uipc_sockbuf.c
===================================================================
--- sys/kern/uipc_sockbuf.c
+++ sys/kern/uipc_sockbuf.c
@@ -1101,11 +1101,11 @@
void
sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0,
- struct mbuf *control)
+ struct mbuf *control, int flags)
{
struct mbuf *m, *mlast;
- m_clrprotoflags(m0);
+ sbm_clrprotoflags(m0, flags);
m_last(control)->m_next = m0;
SBLASTRECORDCHK(sb);
@@ -1123,11 +1123,12 @@
}
void
-sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, struct mbuf *control)
+sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, struct mbuf *control,
+ int flags)
{
SOCKBUF_LOCK(sb);
- sbappendcontrol_locked(sb, m0, control);
+ sbappendcontrol_locked(sb, m0, control, flags);
SOCKBUF_UNLOCK(sb);
}
Index: sys/kern/uipc_usrreq.c
===================================================================
--- sys/kern/uipc_usrreq.c
+++ sys/kern/uipc_usrreq.c
@@ -1190,7 +1190,7 @@
case SOCK_STREAM:
if (control != NULL) {
sbappendcontrol_locked(&so2->so_rcv, m,
- control);
+ control, flags);
control = NULL;
} else
sbappend_locked(&so2->so_rcv, m, flags);
Index: sys/sys/sockbuf.h
===================================================================
--- sys/sys/sockbuf.h
+++ sys/sys/sockbuf.h
@@ -145,9 +145,9 @@
int sbappendaddr_nospacecheck_locked(struct sockbuf *sb,
const struct sockaddr *asa, struct mbuf *m0, struct mbuf *control);
void sbappendcontrol(struct sockbuf *sb, struct mbuf *m0,
- struct mbuf *control);
+ struct mbuf *control, int flags);
void sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0,
- struct mbuf *control);
+ struct mbuf *control, int flags);
void sbappendrecord(struct sockbuf *sb, struct mbuf *m0);
void sbappendrecord_locked(struct sockbuf *sb, struct mbuf *m0);
void sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n);

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 29, 1:26 PM (15 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27360669
Default Alt Text
D24333.id70321.diff (1 KB)

Event Timeline