- Update to 1.0.7

Approved by:	miwi (mentor)

1 files changed, 45 insertions, 12 deletions

diff --git a/net/trickle/files/patch-trickle-overload.c b/net/trickle/files/patch-trickle-overload.c
index 268b73403a0c..443ef9abd9d7 100644
--- a/net/trickle/files/patch-trickle-overload.c
+++ b/net/trickle/files/patch-trickle-overload.c
@@ -1,11 +1,19 @@
-/*
- * Enable the recv() and send(), I am not sure why it was disabled on FreeBSD
- * only but allow other OSs. It works great as I have tested it with a few
- * of applications on FreeBSD 6.0. If anyone know why, please let me know.
- */
---- trickle-overload.c.orig	Sun May  7 23:05:43 2006
-+++ trickle-overload.c	Sun May  7 23:07:06 2006
-@@ -197,15 +197,11 @@
+--- trickle-overload.c.orig	2004-12-13 02:21:53.000000000 +0100
++++ trickle-overload.c	2008-04-15 21:44:29.000000000 +0200
+@@ -141,8 +141,12 @@
+ DECLARE(dup2, int, (int, int));
+ 
+ #ifdef HAVE_SENDFILE
++#ifdef __FreeBSD__
++DECLARE(sendfile, ssize_t, (int, int, off_t, size_t, struct sf_hdtr *, off_t *, int));
++#else
+ DECLARE(sendfile, ssize_t, (int, int, off_t *, size_t));
+ #endif
++#endif
+ 
+ static int             delay(int, ssize_t *, short);
+ static struct timeval *getdelay(struct sockdesc *, ssize_t *, short);
+@@ -202,15 +206,11 @@
  
  	GETADDR(read);
  	GETADDR(readv);
@@ -21,7 +29,7 @@
  	GETADDR(sendto);
  
  	GETADDR(select);
-@@ -627,7 +623,6 @@
+@@ -701,7 +701,6 @@
  	return (ret);
  }
  
@@ -29,7 +37,7 @@
  ssize_t
  recv(int sock, void *buf, size_t len, int flags)
  {
-@@ -649,7 +644,6 @@
+@@ -730,7 +729,6 @@
  
  	return (ret);
  }
@@ -37,7 +45,7 @@
  
  #ifdef __sun__
  ssize_t
-@@ -730,7 +724,6 @@
+@@ -832,7 +830,6 @@
  	return (ret);
  }
  
@@ -45,7 +53,7 @@
  ssize_t
  send(int sock, const void *buf, size_t len, int flags)
  {
-@@ -752,7 +745,6 @@
+@@ -862,7 +859,6 @@
  
  	return (ret);
  }
@@ -53,3 +61,28 @@
  
  ssize_t
  sendto(int sock, const void *buf, size_t len, int flags, const struct sockaddr *to,
+@@ -1005,7 +1001,11 @@
+ 
+ #ifdef HAVE_SENDFILE
+ ssize_t
++#ifdef __FreeBSD__
++sendfile(int out_fd, int in_fd, off_t offset, size_t count, struct sf_hdtr *hdtr, off_t *sbytes, int flags)
++#else
+ sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
++#endif
+ {
+ 	size_t inbytes = count, outbytes = count, bytes;
+ 	ssize_t ret = 0;
+@@ -1021,8 +1021,11 @@
+ 	/* This is a slightly ugly hack. */
+ 	bytes = MIN(inbytes, outbytes);
+ 	if (bytes > 0)
++#ifdef __FreeBSD__
++		ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes, hdtr, sbytes, flags);
++#else
+ 		ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes);
+-
++#endif
+ 	return (ret);
+ }
+ #endif	/* HAVE_SENDFILE */