| @@ -1,28 +1,40 @@ | | | @@ -1,28 +1,40 @@ |
1 | $NetBSD: patch-src_stun.c,v 1.2 2012/06/25 11:49:10 joerg Exp $ | | 1 | $NetBSD: patch-src_stun.c,v 1.3 2012/06/28 04:50:12 dholland Exp $ |
2 | | | 2 | |
3 | Fix build with gcc 4.6 | | 3 | - Fix a wrong memset call. |
| | | 4 | - Always seed with /dev/random on NetBSD instead of relying on a |
| | | 5 | configure test. |
| | | 6 | - Fix build with gcc 4.6 |
4 | | | 7 | |
5 | --- src/stun.c.orig 2009-06-16 10:49:48.000000000 +0000 | | 8 | --- src/stun.c.orig 2009-06-16 10:49:48.000000000 +0000 |
6 | +++ src/stun.c | | 9 | +++ src/stun.c |
7 | @@ -398,7 +398,7 @@ stunParseMessage( char* buf, unsigned in | | 10 | @@ -398,7 +398,7 @@ stunParseMessage( char* buf, unsigned in |
8 | char* body; | | 11 | char* body; |
9 | unsigned int size; | | 12 | unsigned int size; |
10 | ortp_debug("stun: Received stun message: %i bytes\n", bufLen); | | 13 | ortp_debug("stun: Received stun message: %i bytes\n", bufLen); |
11 | - memset(msg, 0, sizeof(msg)); | | 14 | - memset(msg, 0, sizeof(msg)); |
12 | + memset(msg, 0, sizeof(*msg)); | | 15 | + memset(msg, 0, sizeof(*msg)); |
13 | | | 16 | |
14 | if (sizeof(StunMsgHdr) > bufLen) | | 17 | if (sizeof(StunMsgHdr) > bufLen) |
15 | { | | 18 | { |
| | | 19 | @@ -1185,7 +1185,7 @@ stunRand(void) |
| | | 20 | read(fd,&tick,sizeof(tick)); |
| | | 21 | closesocket(fd); |
| | | 22 | } |
| | | 23 | -#elif defined(__linux) || defined(HAVE_DEV_RANDOM) |
| | | 24 | +#elif defined(__linux) || defined(__NetBSD__) || defined(HAVE_DEV_RANDOM) |
| | | 25 | { |
| | | 26 | fd_set fdSet; |
| | | 27 | int maxFd=0; |
16 | @@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4 | | 28 | @@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4 |
17 | | | 29 | |
18 | bool_t changePort=FALSE; | | 30 | bool_t changePort=FALSE; |
19 | bool_t changeIP=FALSE; | | 31 | bool_t changeIP=FALSE; |
20 | - bool_t discard=FALSE; | | 32 | - bool_t discard=FALSE; |
21 | | | 33 | |
22 | StunMessage req; | | 34 | StunMessage req; |
23 | char buf[STUN_MAX_MESSAGE_SIZE]; | | 35 | char buf[STUN_MAX_MESSAGE_SIZE]; |
24 | @@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4 | | 36 | @@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4 |
25 | changeIP=TRUE; | | 37 | changeIP=TRUE; |
26 | break; | | 38 | break; |
27 | case 5: | | 39 | case 5: |
28 | - discard=TRUE; | | 40 | - discard=TRUE; |