netperf/netperf.patch@300d43423c2e (annotated)
netperf/netperf.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- parent 312
- c71ec3f2c0da
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@584 | 1 | diff -Nau src/dscp.c.orig src/dscp.c |
| michael@584 | 2 | Index: src/dscp.c |
| michael@584 | 3 | --- src/dscp.c.orig 2012-08-21 12:14:56.541033514 +0200 |
| michael@584 | 4 | +++ src/dscp.c 2012-08-21 12:15:00.668991007 +0200 |
| michael@584 | 5 | @@ -50,6 +50,7 @@ |
| michael@584 | 6 | */ |
| michael@312 | 7 | |
| michael@584 | 8 | #if HAVE_NETINET_IN_SYSTM_H |
| michael@584 | 9 | +#include <stdint.h> |
| michael@584 | 10 | #include <netinet/in_systm.h> |
| michael@312 | 11 | #endif |
| michael@584 | 12 | #if HAVE_NETINET_IP_H |
| michael@312 | 13 | diff -Nau src/nettest_bsd.c.orig src/nettest_bsd.c |
| michael@312 | 14 | Index: src/nettest_bsd.c |
| michael@584 | 15 | --- src/nettest_bsd.c.orig 2012-06-19 22:32:47.000000000 +0200 |
| michael@584 | 16 | +++ src/nettest_bsd.c 2012-08-21 12:15:36.378376195 +0200 |
| michael@584 | 17 | @@ -106,6 +106,7 @@ |
| michael@584 | 18 | #include <netinet/tcp.h> |
| michael@312 | 19 | |
| michael@584 | 20 | #ifdef HAVE_NETINET_SCTP_H |
| michael@312 | 21 | +#include <sys/socket.h> |
| michael@312 | 22 | #include <netinet/sctp.h> |
| michael@312 | 23 | #endif |
| michael@312 | 24 | |
| michael@312 | 25 | diff -Nau src/nettest_sctp.c.orig src/nettest_sctp.c |
| michael@312 | 26 | Index: src/nettest_sctp.c |
| michael@584 | 27 | --- src/nettest_sctp.c.orig 2012-06-19 22:39:22.000000000 +0200 |
| michael@584 | 28 | +++ src/nettest_sctp.c 2012-08-21 12:16:25.314029201 +0200 |
| michael@312 | 29 | @@ -58,6 +58,7 @@ |
| michael@312 | 30 | #include <netinet/sctp.h> |
| michael@312 | 31 | #include <arpa/inet.h> |
| michael@312 | 32 | #include <netdb.h> |
| michael@312 | 33 | +#include <strings.h> |
| michael@312 | 34 | |
| michael@312 | 35 | /* would seem that not all sctp.h files define a MSG_EOF, but that |
| michael@312 | 36 | MSG_EOF can be the same as MSG_FIN so lets work with that |
