diff options
| -rw-r--r-- | net/ns/distinfo | 3 | ||||
| -rw-r--r-- | net/ns/patches/patch-mac_mac-802_11Exr.cc | 14 | ||||
| -rw-r--r-- | net/ortp/patches/patch-src_stun.c | 42 | ||||
| -rw-r--r-- | net/ortp/patches/patch-src_tests_rtprecv.c | 18 |
4 files changed, 76 insertions, 1 deletions
diff --git a/net/ns/distinfo b/net/ns/distinfo index 04a00e4771f..94d60c9fc2f 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2011/01/29 22:16:51 markd Exp $ +$NetBSD: distinfo,v 1.16 2012/03/10 22:05:03 markd Exp $ SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03 RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39 @@ -20,3 +20,4 @@ SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703 SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e SHA1 (patch-ar) = 64dafe254cfd28723422047aecb8086028d9f69e SHA1 (patch-as) = 5fdd4418db3ee4b189913f1110fb260af710f746 +SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84 diff --git a/net/ns/patches/patch-mac_mac-802_11Exr.cc b/net/ns/patches/patch-mac_mac-802_11Exr.cc new file mode 100644 index 00000000000..8f883cb48a9 --- /dev/null +++ b/net/ns/patches/patch-mac_mac-802_11Exr.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-mac_mac-802_11Exr.cc,v 1.1 2012/03/10 22:05:04 markd Exp $ + +Fix build with gcc4.6 + +--- mac/mac-802_11Ext.cc.orig 2008-04-01 02:00:23.000000000 +0000 ++++ mac/mac-802_11Ext.cc +@@ -55,6 +55,7 @@ + * http://dsn.tm.uni-karlsruhe.de/english/Overhaul_NS-2.php + */ + ++#include <stddef.h> + #include "delay.h" + #include "connector.h" + #include "packet.h" diff --git a/net/ortp/patches/patch-src_stun.c b/net/ortp/patches/patch-src_stun.c new file mode 100644 index 00000000000..865888d6cce --- /dev/null +++ b/net/ortp/patches/patch-src_stun.c @@ -0,0 +1,42 @@ +$NetBSD: patch-src_stun.c,v 1.1 2012/03/10 22:07:25 markd Exp $ + +Fix build with gcc 4.6 + +--- src/stun.c.orig 2012-02-13 09:03:33.121945876 +0000 ++++ src/stun.c +@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4 + + bool_t changePort=FALSE; + bool_t changeIP=FALSE; +- bool_t discard=FALSE; + + StunMessage req; + char buf[STUN_MAX_MESSAGE_SIZE]; +@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4 + changeIP=TRUE; + break; + case 5: +- discard=TRUE; + break; + default: + ortp_error("stun: Test %i is unkown\n", testNum); +@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest, + + bool_t respTestI=FALSE; + bool_t isNat=TRUE; +- StunAddress4 testIchangedAddr; ++ /* StunAddress4 testIchangedAddr; */ + StunAddress4 testImappedAddr; + bool_t respTestI2=FALSE; + bool_t mappedIpSame = TRUE; +@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest, + if ( !respTestI ) + { + +- testIchangedAddr.addr = resp.changedAddress.ipv4.addr; +- testIchangedAddr.port = resp.changedAddress.ipv4.port; ++ /* testIchangedAddr.addr = resp.changedAddress.ipv4.addr; */ ++ /* testIchangedAddr.port = resp.changedAddress.ipv4.port; */ + testImappedAddr.addr = resp.mappedAddress.ipv4.addr; + testImappedAddr.port = resp.mappedAddress.ipv4.port; + diff --git a/net/ortp/patches/patch-src_tests_rtprecv.c b/net/ortp/patches/patch-src_tests_rtprecv.c new file mode 100644 index 00000000000..62d4a753aa3 --- /dev/null +++ b/net/ortp/patches/patch-src_tests_rtprecv.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_tests_rtprecv.c,v 1.1 2012/03/10 22:07:25 markd Exp $ + +Fix build with gcc 4.6 + +--- src/tests/rtprecv.c.orig 2012-02-13 09:13:43.992297823 +0000 ++++ src/tests/rtprecv.c +@@ -162,9 +162,9 @@ int main(int argc, char*argv[]) + if (err>0) stream_received=1; + /* this is to avoid to write to disk some silence before the first RTP packet is returned*/ + if ((stream_received) && (err>0)) { +- size_t ret = fwrite(buffer,1,err,outfile); ++ fwrite(buffer,1,err,outfile); + if (sound_fd>0) +- ret = write(sound_fd,buffer,err); ++ write(sound_fd,buffer,err); + } + } + ts+=160; |