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
64c4096d
Commit
64c4096d
authored
Apr 22, 2008
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some trailing spaces
darcs-hash:20080422162808-4f0f6-84a59e52bc8309765d32b543b6596b70216d09f1.gz
parent
93ac1313
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
16 deletions
+18
-16
agent/agent.c
agent/agent.c
+5
-5
agent/agent.h
agent/agent.h
+3
-2
agent/candidate.c
agent/candidate.c
+5
-5
agent/conncheck.h
agent/conncheck.h
+1
-1
agent/stream.c
agent/stream.c
+3
-3
agent/stream.h
agent/stream.h
+1
-0
No files found.
agent/agent.c
View file @
64c4096d
...
@@ -77,7 +77,7 @@ enum
...
@@ -77,7 +77,7 @@ enum
PROP_COMPATIBILITY
,
PROP_COMPATIBILITY
,
PROP_STUN_SERVER
,
PROP_STUN_SERVER
,
PROP_STUN_SERVER_PORT
,
PROP_STUN_SERVER_PORT
,
PROP_TURN_SERVER
,
PROP_TURN_SERVER
,
PROP_TURN_SERVER_PORT
,
PROP_TURN_SERVER_PORT
,
PROP_CONTROLLING_MODE
,
PROP_CONTROLLING_MODE
,
PROP_FULL_MODE
,
PROP_FULL_MODE
,
...
@@ -177,7 +177,7 @@ nice_agent_class_init (NiceAgentClass *klass)
...
@@ -177,7 +177,7 @@ nice_agent_class_init (NiceAgentClass *klass)
gobject_class
->
dispose
=
nice_agent_dispose
;
gobject_class
->
dispose
=
nice_agent_dispose
;
/* install properties */
/* install properties */
g_object_class_install_property
(
gobject_class
,
PROP_SOCKET_FACTORY
,
g_object_class_install_property
(
gobject_class
,
PROP_SOCKET_FACTORY
,
g_param_spec_pointer
(
g_param_spec_pointer
(
"socket-factory"
,
"socket-factory"
,
...
@@ -1683,7 +1683,7 @@ nice_agent_g_source_cb (
...
@@ -1683,7 +1683,7 @@ nice_agent_g_source_cb (
/* note: dear compiler, these are for you: */
/* note: dear compiler, these are for you: */
(
void
)
source
;
(
void
)
source
;
len
=
_nice_agent_recv
(
agent
,
stream
,
component
,
ctx
->
socket
,
len
=
_nice_agent_recv
(
agent
,
stream
,
component
,
ctx
->
socket
,
MAX_STUN_DATAGRAM_PAYLOAD
,
buf
);
MAX_STUN_DATAGRAM_PAYLOAD
,
buf
);
if
(
len
>
0
)
if
(
len
>
0
)
...
@@ -1790,10 +1790,10 @@ nice_agent_attach_recv (
...
@@ -1790,10 +1790,10 @@ nice_agent_attach_recv (
* Sets the selected candidate pair for media transmission
* Sets the selected candidate pair for media transmission
* for given stream component. Calling this function will
* for given stream component. Calling this function will
* disable all further ICE processing (connection check,
* disable all further ICE processing (connection check,
* state machine updates, etc). Note that keepalives will
* state machine updates, etc). Note that keepalives will
* continue to be sent.
* continue to be sent.
*/
*/
NICEAPI_EXPORT
gboolean
NICEAPI_EXPORT
gboolean
nice_agent_set_selected_pair
(
nice_agent_set_selected_pair
(
NiceAgent
*
agent
,
NiceAgent
*
agent
,
guint
stream_id
,
guint
stream_id
,
...
...
agent/agent.h
View file @
64c4096d
...
@@ -85,9 +85,9 @@ typedef enum
...
@@ -85,9 +85,9 @@ typedef enum
NICE_COMPONENT_STATE_CONNECTED
,
/* at least one working candidate pair */
NICE_COMPONENT_STATE_CONNECTED
,
/* at least one working candidate pair */
NICE_COMPONENT_STATE_READY
,
/* ICE concluded, candidate pair
NICE_COMPONENT_STATE_READY
,
/* ICE concluded, candidate pair
selection is now final */
selection is now final */
NICE_COMPONENT_STATE_FAILED
,
/* connectivity checks have been completed,
NICE_COMPONENT_STATE_FAILED
,
/* connectivity checks have been completed,
but connectivity was not established */
but connectivity was not established */
NICE_COMPONENT_STATE_LAST
NICE_COMPONENT_STATE_LAST
}
NiceComponentState
;
}
NiceComponentState
;
typedef
enum
typedef
enum
...
@@ -129,6 +129,7 @@ struct _NiceAgentClass
...
@@ -129,6 +129,7 @@ struct _NiceAgentClass
GObjectClass
parent_class
;
GObjectClass
parent_class
;
};
};
GType
nice_agent_get_type
(
void
);
GType
nice_agent_get_type
(
void
);
NiceAgent
*
NiceAgent
*
...
...
agent/candidate.c
View file @
64c4096d
...
@@ -139,13 +139,13 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
...
@@ -139,13 +139,13 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
switch
(
candidate
->
type
)
switch
(
candidate
->
type
)
{
{
case
NICE_CANDIDATE_TYPE_HOST
:
case
NICE_CANDIDATE_TYPE_HOST
:
type_preference
=
NICE_CANDIDATE_TYPE_PREF_HOST
;
break
;
type_preference
=
NICE_CANDIDATE_TYPE_PREF_HOST
;
break
;
case
NICE_CANDIDATE_TYPE_PEER_REFLEXIVE
:
case
NICE_CANDIDATE_TYPE_PEER_REFLEXIVE
:
type_preference
=
NICE_CANDIDATE_TYPE_PREF_PEER_REFLEXIVE
;
break
;
type_preference
=
NICE_CANDIDATE_TYPE_PREF_PEER_REFLEXIVE
;
break
;
case
NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE
:
case
NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE
:
type_preference
=
NICE_CANDIDATE_TYPE_PREF_SERVER_REFLEXIVE
;
break
;
type_preference
=
NICE_CANDIDATE_TYPE_PREF_SERVER_REFLEXIVE
;
break
;
case
NICE_CANDIDATE_TYPE_RELAYED
:
case
NICE_CANDIDATE_TYPE_RELAYED
:
type_preference
=
NICE_CANDIDATE_TYPE_PREF_RELAYED
;
break
;
type_preference
=
NICE_CANDIDATE_TYPE_PREF_RELAYED
;
break
;
}
}
...
@@ -153,8 +153,8 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
...
@@ -153,8 +153,8 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
return
nice_candidate_ice_priority_full
(
type_preference
,
1
,
candidate
->
component_id
);
return
nice_candidate_ice_priority_full
(
type_preference
,
1
,
candidate
->
component_id
);
}
}
/**
/**
* Calculates the pair priority as specified in ICE
* Calculates the pair priority as specified in ICE
* sect 5.7.2. "Computing Pair Priority and Ordering Pairs" (ID-19).
* sect 5.7.2. "Computing Pair Priority and Ordering Pairs" (ID-19).
*/
*/
NICEAPI_EXPORT
guint64
NICEAPI_EXPORT
guint64
...
...
agent/conncheck.h
View file @
64c4096d
...
@@ -71,7 +71,7 @@ struct _CandidateCheckPair
...
@@ -71,7 +71,7 @@ struct _CandidateCheckPair
NiceCheckState
state
;
NiceCheckState
state
;
gboolean
nominated
;
gboolean
nominated
;
gboolean
controlling
;
gboolean
controlling
;
guint64
priority
;
guint64
priority
;
GTimeVal
next_tick
;
/* next tick timestamp */
GTimeVal
next_tick
;
/* next tick timestamp */
gboolean
traffic_after_tick
;
gboolean
traffic_after_tick
;
stun_bind_t
*
stun_ctx
;
stun_bind_t
*
stun_ctx
;
...
...
agent/stream.c
View file @
64c4096d
...
@@ -104,7 +104,7 @@ stream_find_component_by_id (const Stream *stream, guint id)
...
@@ -104,7 +104,7 @@ stream_find_component_by_id (const Stream *stream, guint id)
if
(
component
&&
component
->
id
==
id
)
if
(
component
&&
component
->
id
==
id
)
return
component
;
return
component
;
}
}
return
NULL
;
return
NULL
;
}
}
...
@@ -124,7 +124,7 @@ stream_all_components_ready (const Stream *stream)
...
@@ -124,7 +124,7 @@ stream_all_components_ready (const Stream *stream)
component
->
state
==
NICE_COMPONENT_STATE_READY
))
component
->
state
==
NICE_COMPONENT_STATE_READY
))
return
FALSE
;
return
FALSE
;
}
}
return
TRUE
;
return
TRUE
;
}
}
...
@@ -142,7 +142,7 @@ stream_find_component_by_fd (const Stream *stream, guint fd)
...
@@ -142,7 +142,7 @@ stream_find_component_by_fd (const Stream *stream, guint fd)
for
(
i
=
stream
->
components
;
i
;
i
=
i
->
next
)
{
for
(
i
=
stream
->
components
;
i
;
i
=
i
->
next
)
{
Component
*
component
=
i
->
data
;
Component
*
component
=
i
->
data
;
NiceUDPSocket
*
socket
=
NiceUDPSocket
*
socket
=
component_find_udp_socket_by_fd
(
component
,
fd
);
component_find_udp_socket_by_fd
(
component
,
fd
);
if
(
socket
)
if
(
socket
)
return
component
;
return
component
;
...
...
agent/stream.h
View file @
64c4096d
...
@@ -66,6 +66,7 @@ typedef enum
...
@@ -66,6 +66,7 @@ typedef enum
NICE_CHECKLIST_FAILED
NICE_CHECKLIST_FAILED
}
NiceCheckListState
;
}
NiceCheckListState
;
typedef
struct
_Stream
Stream
;
typedef
struct
_Stream
Stream
;
struct
_Stream
struct
_Stream
...
...
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