mirror of
https://git.freebsd.org/ports.git
synced 2025-06-25 06:30:29 -04:00
4382a63faf
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
45 lines
1.3 KiB
C
45 lines
1.3 KiB
C
--- 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) {
|
|
case TYPE_DONTSEND:
|
|
- return 0;
|
|
+ return 2;
|
|
break;
|
|
case TYPE_SILENCE:
|
|
return 4;
|
|
@@ -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;
|
|
- if (rtp->rtcp)
|
|
+ if (rtp->rtcp) {
|
|
rtp->rtcp->us.sin_port = htons(x + 1);
|
|
+ rtp->rtcp->us.sin_addr = addr;
|
|
+ }
|
|
if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
|
|
(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
|
|
break;
|