Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
ortp
Commits
c8b487f3
Commit
c8b487f3
authored
Jan 18, 2011
by
Guillaume Beraudo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.linphone.org/ortp
parents
e9a0cc36
37c60a63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
autogen.sh
autogen.sh
+10
-0
include/ortp/stun_udp.h
include/ortp/stun_udp.h
+3
-1
src/rtpsession_inet.c
src/rtpsession_inet.c
+7
-5
No files found.
autogen.sh
View file @
c8b487f3
...
...
@@ -31,6 +31,16 @@ esac
if
test
-d
/opt/local/share/aclocal
;
then
ACLOCAL_ARGS
=
"-I /opt/local/share/aclocal"
fi
if
test
-d
/opt/local/share/aclocal
;
then
ACLOCAL_ARGS
=
"-I /opt/local/share/aclocal"
fi
if
test
-d
/usr/local/share/aclocal
;
then
ACLOCAL_ARGS
=
"
$ACLOCAL_ARGS
-I /usr/local/share/aclocal"
fi
if
test
-d
/share/aclocal
;
then
ACLOCAL_ARGS
=
"
$ACLOCAL_ARGS
-I /share/aclocal"
fi
set
-x
...
...
include/ortp/stun_udp.h
View file @
c8b487f3
...
...
@@ -94,8 +94,10 @@ typedef LONGLONG Int64;
#else
typedef
int
Socket
;
#ifndef INVALID_SOCKET
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
#ifndef SOCKET_ERROR
#define SOCKET_ERROR -1
#endif
...
...
src/rtpsession_inet.c
View file @
c8b487f3
...
...
@@ -997,17 +997,18 @@ rtp_session_rtp_recv (RtpSession * session, uint32_t user_ts)
else
{
int
errnum
=
getSocketErrorCode
();
if
(
error
==
0
){
if
(
error
==
0
||
(
error
==
-
1
&&
errnum
==
0
)
){
/*0 can be returned by RtpTransport functions in case of EWOULDBLOCK*/
/*we ignore it*/
/*ortp_warning
("rtp_recv: strange... recv() returned zero.");*/
/*(error == -1 && errnum==0) for buggy drivers*/
}
else
if
(
!
is_would_block_error
(
errnum
))
{
if
(
session
->
on_network_error
.
count
>
0
){
rtp_signal_table_emit3
(
&
session
->
on_network_error
,(
long
)
"Error receiving RTP packet"
,
INT_TO_POINTER
(
getSocketErrorCode
()));
}
else
ortp_warning
(
"Error receiving RTP packet: %s
.
"
,
getSocketError
());
}
else
ortp_warning
(
"Error receiving RTP packet: %s
, err num [%i],error [%i]
"
,
getSocketError
()
,
errnum
,
error
);
}
/* don't free the cached_mp, it will be reused next time */
return
-
1
;
/* avoids an infinite loop ! */
...
...
@@ -1085,10 +1086,11 @@ rtp_session_rtcp_recv (RtpSession * session)
{
int
errnum
=
getSocketErrorCode
();
if
(
error
==
0
)
if
(
error
==
0
||
(
error
=-
1
&&
errnum
==
0
)
)
{
ortp_warning
(
"rtcp_recv: strange... recv() returned zero."
);
/*ortp_warning
("rtcp_recv: strange... recv() returned zero.");*/
/*(error == -1 && errnum==0) for buggy drivers*/
}
else
if
(
!
is_would_block_error
(
errnum
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment