Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
f1a115c1
Commit
f1a115c1
authored
Apr 22, 2008
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes to trailing spaces
darcs-hash:20080422192524-4f0f6-e16e7dddec8c9ecdfa196536e6cc940bad934b32.gz
parent
a3885c16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
agent/agent.c
agent/agent.c
+6
-6
agent/conncheck.c
agent/conncheck.c
+5
-5
No files found.
agent/agent.c
View file @
f1a115c1
...
@@ -1250,7 +1250,7 @@ nice_agent_recv (
...
@@ -1250,7 +1250,7 @@ nice_agent_recv (
socket
=
component_find_udp_socket_by_fd
(
component
,
j
);
socket
=
component_find_udp_socket_by_fd
(
component
,
j
);
g_assert
(
socket
);
g_assert
(
socket
);
len
=
_nice_agent_recv
(
agent
,
stream
,
component
,
socket
,
len
=
_nice_agent_recv
(
agent
,
stream
,
component
,
socket
,
buf_len
,
buf
);
buf_len
,
buf
);
...
@@ -1339,11 +1339,11 @@ nice_agent_poll_read (
...
@@ -1339,11 +1339,11 @@ nice_agent_poll_read (
for
(
k
=
stream
->
components
;
k
;
k
=
k
->
next
)
for
(
k
=
stream
->
components
;
k
;
k
=
k
->
next
)
{
{
Component
*
component
=
k
->
data
;
Component
*
component
=
k
->
data
;
for
(
j
=
component
->
sockets
;
j
;
j
=
j
->
next
)
for
(
j
=
component
->
sockets
;
j
;
j
=
j
->
next
)
{
{
NiceUDPSocket
*
sockptr
=
j
->
data
;
NiceUDPSocket
*
sockptr
=
j
->
data
;
FD_SET
(
sockptr
->
fileno
,
&
fds
);
FD_SET
(
sockptr
->
fileno
,
&
fds
);
max_fd
=
MAX
(
sockptr
->
fileno
,
max_fd
);
max_fd
=
MAX
(
sockptr
->
fileno
,
max_fd
);
}
}
...
@@ -1398,7 +1398,7 @@ nice_agent_poll_read (
...
@@ -1398,7 +1398,7 @@ nice_agent_poll_read (
break
;
break
;
}
}
}
}
if
(
socket
==
NULL
||
stream
==
NULL
||
component
==
NULL
)
if
(
socket
==
NULL
||
stream
==
NULL
||
component
==
NULL
)
break
;
break
;
...
@@ -1420,9 +1420,9 @@ nice_agent_poll_read (
...
@@ -1420,9 +1420,9 @@ nice_agent_poll_read (
/**
/**
* Sends a data payload over a stream component.
* Sends a data payload over a stream component.
*
*
* @pre component state MUST be NICE_COMPONENT_STATE_READY,
* @pre component state MUST be NICE_COMPONENT_STATE_READY,
* or as a special case, in any state if component was
* or as a special case, in any state if component was
* in READY state before and was then restarted
* in READY state before and was then restarted
*
*
* @return number of bytes sent, or negative error code
* @return number of bytes sent, or negative error code
...
...
agent/conncheck.c
View file @
f1a115c1
...
@@ -424,10 +424,10 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
...
@@ -424,10 +424,10 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
CandidatePair
*
p
=
&
component
->
selected_pair
;
CandidatePair
*
p
=
&
component
->
selected_pair
;
struct
sockaddr
sockaddr
;
struct
sockaddr
sockaddr
;
int
res
;
int
res
;
memset
(
&
sockaddr
,
0
,
sizeof
(
sockaddr
));
memset
(
&
sockaddr
,
0
,
sizeof
(
sockaddr
));
nice_address_copy_to_sockaddr
(
&
p
->
remote
->
addr
,
&
sockaddr
);
nice_address_copy_to_sockaddr
(
&
p
->
remote
->
addr
,
&
sockaddr
);
res
=
stun_bind_keepalive
(
p
->
local
->
sockptr
->
fileno
,
res
=
stun_bind_keepalive
(
p
->
local
->
sockptr
->
fileno
,
&
sockaddr
,
sizeof
(
sockaddr
));
&
sockaddr
,
sizeof
(
sockaddr
));
g_debug
(
"stun_bind_keepalive for pair %p res %d (%s)."
,
p
,
res
,
strerror
(
res
));
g_debug
(
"stun_bind_keepalive for pair %p res %d (%s)."
,
p
,
res
,
strerror
(
res
));
...
@@ -437,7 +437,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
...
@@ -437,7 +437,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
component
->
media_after_tick
=
FALSE
;
component
->
media_after_tick
=
FALSE
;
}
}
}
}
/* case 2: connectivity establishment ongoing
/* case 2: connectivity establishment ongoing
* (ref ICE sect 4.1.1.4 "Keeping Candidates Alive" ID-19) */
* (ref ICE sect 4.1.1.4 "Keeping Candidates Alive" ID-19) */
for
(
i
=
agent
->
streams
;
i
;
i
=
i
->
next
)
{
for
(
i
=
agent
->
streams
;
i
;
i
=
i
->
next
)
{
...
@@ -445,7 +445,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
...
@@ -445,7 +445,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
if
(
stream
->
conncheck_state
==
NICE_CHECKLIST_RUNNING
)
{
if
(
stream
->
conncheck_state
==
NICE_CHECKLIST_RUNNING
)
{
for
(
i
=
stream
->
conncheck_list
;
i
;
i
=
i
->
next
)
{
for
(
i
=
stream
->
conncheck_list
;
i
;
i
=
i
->
next
)
{
CandidateCheckPair
*
p
=
i
->
data
;
CandidateCheckPair
*
p
=
i
->
data
;
if
(
p
->
traffic_after_tick
!=
TRUE
)
{
if
(
p
->
traffic_after_tick
!=
TRUE
)
{
g_debug
(
"resending STUN-CC to keep the candidate alive (pair %p)."
,
p
);
g_debug
(
"resending STUN-CC to keep the candidate alive (pair %p)."
,
p
);
conn_check_send
(
agent
,
p
);
conn_check_send
(
agent
,
p
);
...
@@ -454,7 +454,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
...
@@ -454,7 +454,7 @@ static gboolean priv_conn_keepalive_tick (gpointer pointer)
}
}
}
}
}
}
if
(
errors
)
{
if
(
errors
)
{
g_debug
(
"%s: stopping keepalive timer"
,
G_STRFUNC
);
g_debug
(
"%s: stopping keepalive timer"
,
G_STRFUNC
);
goto
done
;
goto
done
;
...
...
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