1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-28 00:49:42 +03:00

26 Commits

Author SHA1 Message Date
Zach Loafman
863a6aa07e Fix warnings on FreeBSD-based platforms
Fix two shadowed declaration warnings on FreeBSD-based platform:
'reboot' is a 4.0BSD syscall in unistd.h and 'tcp_seq' is a typedef in
netinet/tcp.h.
(This used to be commit 14d2a4da1da38d6f69c63505d35990322f253e5d)
2008-07-22 15:00:48 +02:00
Stefan Metzmacher
5380fd800d socket_wrapper: truncate packets to a 1500 byte payload
Truncate sendto(), recvfrom(), send() and recv() to 1500 bytes
so that're getting a correctly formatted pcap file and the result
look more like real network traffic.

metze
(cherry picked from commit 5b01206f1bb2e62c08bda34b45904ec4f83ac5de)
(This used to be commit eb8c37a1ca97b41de00ec937a90bfdbe9cd21531)
2008-06-10 11:38:11 +02:00
Stefan Metzmacher
d57b8280d6 socket_wrapper: sync missing stuff from v4-0-test
metze
(This used to be commit b03c2793548834a1dc0483b03081d872ab1e17f0)
2008-06-10 11:38:05 +02:00
Jelmer Vernooij
e2fe170423 Factor out IP marshalling into separate function.
(cherry picked from commit 2548c2a1e7dab8abc00f8f49374a08cc0b427552)
(This used to be commit e4e015caac88f6e31ca6d8fcda5a97a11aee226d)
2008-06-10 11:36:39 +02:00
Stefan Metzmacher
a7967bc84c r25783: socket_wrapper: don't include "includes.h"
metze
(cherry picked from commit 47f865165e772540334dcbcf80cfc1999b0132fa)
(This used to be commit 4d5bfcc731b44267e2c30fccdca72b6058b16bfb)
2008-06-10 11:36:39 +02:00
Stefan Metzmacher
9b7b444e35 r23420: try to make the IBM checker happy
metze
(cherry picked from commit 96f1a0dfaa18a432fca4b5432d929d8daed0abb1)
(This used to be commit 801ed0b79956133f2baa6b2db4a7dd5a68060edc)
2008-06-10 11:36:39 +02:00
Stefan Metzmacher
c8eccf5381 r22236: Update to Heimdal's socket_wrapper, which supports IPv6.
To make this pass, I needed to add support for 6 and 17 as valid
protocol values to socket().

Andrew Bartlett
(partly cherry picked from commit 2254e61a1e5b29a64c5a24aac029ace193057e24)

metze
(This used to be commit 66b9f6f3722defd0863b055916b302478715704b)
2008-06-10 11:36:38 +02:00
Jelmer Vernooij
2359150639 r21729: Some more tests
(cherry picked from commit d2baa8218cf504d6631d610f9fd393ad8c61574c)
(This used to be commit cf6d815ba82a25c1e1f1dfdb8548cc588d44d1aa)
2008-06-10 11:36:38 +02:00
Stefan Metzmacher
bd793fb235 r21671: Add initial simple tests for socket wrapper
(partly cherry picked from commit 872e2ad541478597191ca9e31872d5c8e2bbb832)

metze
(This used to be commit 8003f00a28bb7237ec1b1f4eb9687c542a86c2b2)
2008-06-10 11:36:38 +02:00
Love Hörnquist Åstrand
1410d8e799 r19409: Pull in <sys/time.h> for struct timeval for non samba build (don't
depend on namespace pollution)
(cherry picked from commit 5052d2d10693e67f1b7c6c71277c8d1bc9c8b612)
(This used to be commit d22701b196bded3294776b144a7a990de23741e9)
2008-06-10 11:36:37 +02:00
Love Hörnquist Åstrand
4084b467c5 r19367: Solaris needs <sys/filio.h> for FIONREAD.
(cherry picked from commit e2866ce78851a84c937408c0781fcc1e7107f663)
(This used to be commit 3db8b246c8abfc4efed08d7630e61a81b9d8bf48)
2008-06-10 11:36:37 +02:00
Stefan Metzmacher
8e308b64c0 socket_wrapper: make pcap code more portable
Now the pcap support works on x86_64.

metze
(cherry picked from commit 61a87bed61ef661d98131239976be95c6a8b4d96)
(This used to be commit c22204aa85d4bb33534b6974dcfed9aad0c28cc4)
2008-03-17 16:41:02 +01:00
Jeremy Allison
0c3f431aba Fix initialization warnings.
Jeremy.
(This used to be commit 832c093830cb3978641be3d87670fa900105da25)
2007-12-21 12:11:23 -08:00
Volker Lendecke
addf598cde Some C++ warnings
(This used to be commit 5ab82d4f574f2a2e2761e9e414c66a70aeffb05d)
2007-12-21 09:58:20 +01:00
Stefan Metzmacher
354ddf6c57 r19179: remove difference with samba4
metze
(This used to be commit e97e1ffea8e124c8001cf33ecac7500ae875f42f)
2007-10-10 12:15:20 -05:00
Stefan Metzmacher
ebc2f440e7 r19177: merge from samba4:
fix the standalone build of socket_wrapper by not using
samba's DLIST_ macros

metze
(This used to be commit bc7b2e8db8fb34d6f321cd6b13b74e58945d7124)
2007-10-10 12:15:19 -05:00
Stefan Metzmacher
e4e3dc064d r19172: merge from samba4:
change the socket wrapper license to
what heimdal uses...

metze
(This used to be commit d19c19ae4be3f3ad349b72ba3181051bb4da335e)
2007-10-10 12:15:19 -05:00
Volker Lendecke
43141d64ca r19126: Fix some uninitialized variable warnings
(This used to be commit 90bfa3461038f5d179525dec0cf5b3f137e927e0)
2007-10-10 12:15:14 -05:00
Stefan Metzmacher
f9449b752f r19099: merge socket wrapper changes from samba4
including SOCKET_WRAPPER_PCAP_FILE support

but I just noticed that samba don't use recv()/send()
on the socket, so the capture only contain connect()/close()

metze
(This used to be commit b894e33023738b5d6121c56e9c0b34b12f3e0005)
2007-10-10 12:15:12 -05:00
Stefan Metzmacher
5b77d0a856 r19085: merge from samba4:
- source and destination address handling
- tcp handling

metze
(This used to be commit 98154fd43350f3edae54423756620a48e089f96d)
2007-10-10 12:15:10 -05:00
Stefan Metzmacher
da6c811eca r18993: merge from samba4:
prepare SOCKET_WRAPPER_PCAP_FILE support

metze
(This used to be commit 372471cbad34b1d0d2159e75994c481de6eaed05)
2007-10-10 12:14:54 -05:00
Stefan Metzmacher
cb99b612f8 r18953: sync socket_wrapper with samba4
metze
(This used to be commit 77b0af43f0f7e52b9040a1d3edfb556a232e64f1)
2007-10-10 12:14:50 -05:00
Stefan Metzmacher
52d45a51d3 r18920: merge socket_wrapper changes from samba4
metze
(This used to be commit b36d47c698b01a577af04205c9bdf0d588bd20e6)
2007-10-10 12:14:46 -05:00
Volker Lendecke
4d451bd213 r18661: C++ warnings
(This used to be commit 6004b8025de3207f5af2d62087ec13c5e444fec7)
2007-10-10 11:52:20 -05:00
Stefan Metzmacher
0638207bc4 r18646: now we can have the socket_wrapper.c completely in sync with samba4
metze
(This used to be commit d4d9b7e02614e30ab410a26654db3ca66ffe06e6)
2007-10-10 11:52:18 -05:00
Stefan Metzmacher
47e6b7733a r18640: move to socket_wrapper to lib/socket_wrapper/
and sync it with samba4

metze
(This used to be commit 9c0e5b29f1451a90605cce7e1e032e5516b6970d)
2007-10-10 11:52:03 -05:00