aboutsummaryrefslogtreecommitdiff
path: root/net/asterisk10/files/patch-rtp.c
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2005-05-03 13:39:48 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2005-05-03 13:39:48 +0000
commit4382a63faf11cbd8183330f8ce2561b8add4f416 (patch)
tree5bfdc890761336c2db63529e61c1f9c07a451e35 /net/asterisk10/files/patch-rtp.c
parent7cafcc97552b4fb84a17673c4c352f3d7b2c189c (diff)
pbx_wilcalu.c:
new patch for this file, smooths the effects of an unhandled error Cexiting from poll() and resulting otherwise in this process taking 100% of the CPU rtp.c: updated patch for rtp.c, removes a misleading 'checksum error' message when in reality the recvfrom() just returned no data; chan_oss.c: replacement for the old chan_oss.c - the changes are so massive that having a patch would be completely unreadable. Among other things this lets you change many /dev/dsp parameters from the config file, to ease adapting to the idiosincracies of various sound cards and drivers. It also supports multiple soundcards on the same box, which might be useful in some cases. Submitted by: luigi Add WITHOUT_MYSQL knob. Suggested by: phantom
Notes
Notes: svn path=/head/; revision=134552
Diffstat (limited to 'net/asterisk10/files/patch-rtp.c')
-rw-r--r--net/asterisk10/files/patch-rtp.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/net/asterisk10/files/patch-rtp.c b/net/asterisk10/files/patch-rtp.c
index 06289f357208..36c4bea2f7ea 100644
--- a/net/asterisk10/files/patch-rtp.c
+++ b/net/asterisk10/files/patch-rtp.c
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- rtp.c.orig Sat Sep 18 16:56:28 2004
-+++ rtp.c Sun Oct 10 15:57:22 2004
+--- rtp.c.orig Tue Apr 26 10:00:28 2005
++++ rtp.c Tue Apr 26 10:06:35 2005
@@ -127,7 +127,7 @@
{
switch(buf & TYPE_MASK) {
@@ -12,7 +9,29 @@ $FreeBSD$
break;
case TYPE_SILENCE:
return 4;
-@@ -841,8 +841,10 @@
+@@ -351,9 +351,7 @@
+ 0, (struct sockaddr *)&sin, &len);
+
+ if (res < 0) {
+- if (errno == EAGAIN)
+- ast_log(LOG_NOTICE, "RTP: Received packet with bad UDP checksum\n");
+- else
++ if (errno != EAGAIN)
+ ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno));
+ if (errno == EBADF)
+ CRASH;
+@@ -431,9 +429,7 @@
+
+ rtpheader = (unsigned int *)(rtp->rawdata + AST_FRIENDLY_OFFSET);
+ if (res < 0) {
+- if (errno == EAGAIN)
+- ast_log(LOG_NOTICE, "RTP: Received packet with bad UDP checksum\n");
+- else
++ if (errno != EAGAIN)
+ ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno));
+ if (errno == EBADF)
+ CRASH;
+@@ -862,8 +858,10 @@
/* Must be an even port number by RTP spec */
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;