diff options
| author | Stefan Metzmacher <metze@samba.org> | 2020-06-19 23:25:40 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2020-06-19 23:25:40 +0200 |
| commit | 22cfac3bfca20eedbd0e3e428f085b24fb553047 (patch) | |
| tree | 5686ce91a8deace8b394911640b3fa17f924ace0 | |
| parent | f4fc52be79edc74bd24b3ee968c5358af81b17bd (diff) | |
| download | socket_wrapper-22cfac3bfca20eedbd0e3e428f085b24fb553047.tar.gz socket_wrapper-22cfac3bfca20eedbd0e3e428f085b24fb553047.tar.xz socket_wrapper-22cfac3bfca20eedbd0e3e428f085b24fb553047.zip | |
Revert "socket_wrapper.c: let swrap_vioctl() handle SIOCOUTQ/TIOCOUTQ/FIONWRITE explicitly"
This reverts commit f317ebcdcdd626ed9e06de2eb60031306994c803.
This got merged automatically by gitlab without review.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | src/socket_wrapper.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 333bdd4..e7a7a8a 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -4660,24 +4660,6 @@ static int swrap_vioctl(int s, unsigned long int r, va_list va) swrap_pcap_dump_packet(si, NULL, SWRAP_PENDING_RST, NULL, 0); } break; -#ifdef FIONWRITE - case FIONWRITE: - /* this is FreeBSD */ - FALL_THROUGH; /* to TIOCOUTQ */ -#endif /* FIONWRITE */ - case TIOCOUTQ: /* same as SIOCOUTQ on Linux */ - /* - * This may return more bytes then the application - * sent into the socket, for tcp it should - * return the number of unacked bytes. - * - * On AF_UNIX, all bytes are immediately acked! - */ - if (rc == 0) { - value_ptr = ((int *)va_arg(ap, int *)); - *value_ptr = 0; - } - break; } va_end(ap); |