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
69c2015c
Commit
69c2015c
authored
Nov 01, 2021
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove g_assert_cmp* macros outside of the unit tests
parent
01e2de64
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
42 additions
and
42 deletions
+42
-42
agent/agent.c
agent/agent.c
+8
-8
agent/candidate.c
agent/candidate.c
+7
-7
agent/component.c
agent/component.c
+2
-2
agent/conncheck.c
agent/conncheck.c
+5
-5
agent/outputstream.c
agent/outputstream.c
+1
-1
agent/pseudotcp.c
agent/pseudotcp.c
+12
-12
gst/gstnicesink.c
gst/gstnicesink.c
+1
-1
socket/http.c
socket/http.c
+1
-1
socket/socket.c
socket/socket.c
+1
-1
socket/udp-turn.c
socket/udp-turn.c
+4
-4
No files found.
agent/agent.c
View file @
69c2015c
...
...
@@ -4407,7 +4407,7 @@ agent_recv_message_unlocked (
retval
=
sockret
;
}
g_assert
_cmpint
(
retval
,
!=
,
RECV_OOB
);
g_assert
(
retval
!=
RECV_OOB
);
if
(
message
->
length
==
0
)
{
retval
=
RECV_OOB
;
nice_debug_verbose
(
"%s: Agent %p: message handled out-of-band"
,
G_STRFUNC
,
...
...
@@ -4800,7 +4800,7 @@ pending_io_messages_recv_messages (NiceComponent *component, gboolean reliable,
IOCallbackData
*
data
;
NiceInputMessage
*
message
=
&
messages
[
iter
->
message
];
g_assert
_cmpuint
(
component
->
io_callback_id
,
==
,
0
);
g_assert
(
component
->
io_callback_id
==
0
);
data
=
g_queue_peek_head
(
&
component
->
pending_io_messages
);
if
(
data
==
NULL
)
...
...
@@ -5079,7 +5079,7 @@ done:
if
(
messages_orig
)
{
for
(
i
=
0
;
i
<
n_messages
;
i
++
)
{
if
(
messages
[
i
].
buffers
!=
messages_orig
[
i
].
buffers
)
{
g_assert
_cmpint
(
messages
[
i
].
n_buffers
,
==
,
1
);
g_assert
(
messages
[
i
].
n_buffers
==
1
);
memcpy_buffer_to_input_message
(
&
messages_orig
[
i
],
messages
[
i
].
buffers
[
0
].
buffer
,
messages
[
i
].
length
);
...
...
@@ -5360,7 +5360,7 @@ nice_agent_send_messages_nonblocking_internal (
g_set_error
(
&
child_error
,
G_IO_ERROR
,
G_IO_ERROR_FAILED
,
"Error writing data to socket."
);
}
else
if
(
n_sent
>
0
&&
allow_partial
)
{
g_assert
_cmpuint
(
n_messages
,
==
,
1
);
g_assert
(
n_messages
==
1
);
n_sent
=
output_message_get_size
(
messages
);
}
}
...
...
@@ -5381,7 +5381,7 @@ nice_agent_send_messages_nonblocking_internal (
done:
g_assert
((
child_error
!=
NULL
)
==
(
n_sent
==
-
1
));
g_assert
_cmpint
(
n_sent
,
!=
,
0
);
g_assert
(
n_sent
!=
0
);
g_assert
(
n_sent
<
0
||
(
!
allow_partial
&&
(
guint
)
n_sent
<=
n_messages
)
||
(
allow_partial
&&
n_messages
==
1
&&
...
...
@@ -5781,7 +5781,7 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data)
/* Don’t expect any valid messages to escape pseudo_tcp_socket_readable()
* when in reliable mode. */
g_assert
_cmpint
(
retval
,
!=
,
RECV_SUCCESS
);
g_assert
(
retval
!=
RECV_SUCCESS
);
if
(
retval
==
RECV_WOULD_BLOCK
)
{
/* EWOULDBLOCK. */
...
...
@@ -5839,8 +5839,8 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data)
RecvStatus
retval
;
/* Don’t want to trample over partially-valid buffers. */
g_assert
_cmpuint
(
component
->
recv_messages_iter
.
buffer
,
==
,
0
);
g_assert
_cmpint
(
component
->
recv_messages_iter
.
offset
,
==
,
0
);
g_assert
(
component
->
recv_messages_iter
.
buffer
==
0
);
g_assert
(
component
->
recv_messages_iter
.
offset
==
0
);
while
(
!
nice_input_message_iter_is_at_end
(
&
component
->
recv_messages_iter
,
component
->
recv_messages
,
component
->
n_recv_messages
))
{
...
...
agent/candidate.c
View file @
69c2015c
...
...
@@ -148,9 +148,9 @@ nice_candidate_ice_local_preference_full (guint direction_preference,
* 9-12: <unused>
* 13-15: direction_preference
*/
g_assert
_cmpuint
(
other_preference
,
<
,
NICE_CANDIDATE_MAX_LOCAL_ADDRESSES
);
g_assert
_cmpuint
(
turn_preference
,
<
,
NICE_CANDIDATE_MAX_TURN_SERVERS
);
g_assert
_cmpuint
(
direction_preference
,
<
,
8
);
g_assert
(
other_preference
<
NICE_CANDIDATE_MAX_LOCAL_ADDRESSES
);
g_assert
(
turn_preference
<
NICE_CANDIDATE_MAX_TURN_SERVERS
);
g_assert
(
direction_preference
<
8
);
return
(
direction_preference
<<
13
)
+
(
turn_preference
<<
6
)
+
...
...
@@ -255,10 +255,10 @@ nice_candidate_ms_ice_local_preference_full (guint transport_preference,
* 9-11: direction_preference
* 12-15: transport_preference
*/
g_assert
_cmpuint
(
other_preference
,
<
,
NICE_CANDIDATE_MAX_LOCAL_ADDRESSES
);
g_assert
_cmpuint
(
turn_preference
,
<
,
NICE_CANDIDATE_MAX_TURN_SERVERS
);
g_assert
_cmpuint
(
direction_preference
,
<
,
8
);
g_assert
_cmpuint
(
transport_preference
,
<
,
16
);
g_assert
(
other_preference
<
NICE_CANDIDATE_MAX_LOCAL_ADDRESSES
);
g_assert
(
turn_preference
<
NICE_CANDIDATE_MAX_TURN_SERVERS
);
g_assert
(
direction_preference
<
8
);
g_assert
(
transport_preference
<
16
);
return
(
transport_preference
<<
12
)
+
(
direction_preference
<<
9
)
+
...
...
agent/component.c
View file @
69c2015c
...
...
@@ -953,8 +953,8 @@ nice_component_emit_io_callback (NiceAgent *agent, NiceComponent *component,
return
;
g_assert
(
NICE_IS_AGENT
(
agent
));
g_assert
_cmpuint
(
stream_id
,
>
,
0
);
g_assert
_cmpuint
(
component_id
,
>
,
0
);
g_assert
(
stream_id
>
0
);
g_assert
(
component_id
>
0
);
g_assert
(
io_callback
!=
NULL
);
/* Only allocate a closure if the callback is being deferred to an idle
...
...
agent/conncheck.c
View file @
69c2015c
...
...
@@ -977,10 +977,10 @@ priv_conn_check_tick_stream_nominate (NiceAgent *agent, NiceStream *stream)
* to test its parent pair instead.
*/
if
(
p
->
succeeded_pair
!=
NULL
)
{
g_assert
_cmpint
(
p
->
state
,
==
,
NICE_CHECK_DISCOVERED
);
g_assert
(
p
->
state
==
NICE_CHECK_DISCOVERED
);
p
=
p
->
succeeded_pair
;
}
g_assert
_cmpint
(
p
->
state
,
==
,
NICE_CHECK_SUCCEEDED
);
g_assert
(
p
->
state
==
NICE_CHECK_SUCCEEDED
);
if
(
this_component_pair
==
NULL
)
/* highest priority pair */
...
...
@@ -2137,7 +2137,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStre
for
(
i
=
stream
->
conncheck_list
;
i
;
i
=
i
->
next
)
{
CandidateCheckPair
*
p
=
i
->
data
;
g_assert
_cmpuint
(
p
->
stream_id
,
==
,
stream
->
id
);
g_assert
(
p
->
stream_id
==
stream
->
id
);
if
(
p
->
component_id
==
(
c
+
1
))
{
if
(
p
->
nominated
)
...
...
@@ -2243,7 +2243,7 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
if
(
pair
->
state
==
NICE_CHECK_SUCCEEDED
&&
pair
->
discovered_pair
!=
NULL
)
{
pair
=
pair
->
discovered_pair
;
g_assert
_cmpint
(
pair
->
state
,
==
,
NICE_CHECK_DISCOVERED
);
g_assert
(
pair
->
state
==
NICE_CHECK_DISCOVERED
);
}
/* If the received Binding request triggered a new check to be
...
...
@@ -3102,7 +3102,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
* use the parent succeeded pair instead */
if
(
p
->
succeeded_pair
!=
NULL
)
{
g_assert
_cmpint
(
p
->
state
,
==
,
NICE_CHECK_DISCOVERED
);
g_assert
(
p
->
state
==
NICE_CHECK_DISCOVERED
);
p
=
p
->
succeeded_pair
;
}
...
...
agent/outputstream.c
View file @
69c2015c
...
...
@@ -466,7 +466,7 @@ nice_output_stream_write (GOutputStream *stream, const void *buffer, gsize count
write_data_unref
(
write_data
);
g_object_unref
(
agent
);
g_assert
_cmpint
(
len
,
!=
,
0
);
g_assert
(
len
!=
0
);
return
len
;
}
...
...
agent/pseudotcp.c
View file @
69c2015c
...
...
@@ -328,7 +328,7 @@ pseudo_tcp_fifo_set_capacity (PseudoTcpFifo *b, gsize size)
static
void
pseudo_tcp_fifo_consume_read_data
(
PseudoTcpFifo
*
b
,
gsize
size
)
{
g_assert
_cmpint
(
size
,
<=
,
b
->
data_length
);
g_assert
(
size
<=
b
->
data_length
);
b
->
read_position
=
(
b
->
read_position
+
size
)
%
b
->
buffer_length
;
b
->
data_length
-=
size
;
...
...
@@ -337,7 +337,7 @@ pseudo_tcp_fifo_consume_read_data (PseudoTcpFifo *b, gsize size)
static
void
pseudo_tcp_fifo_consume_write_buffer
(
PseudoTcpFifo
*
b
,
gsize
size
)
{
g_assert
_cmpint
(
size
,
<=
,
b
->
buffer_length
-
b
->
data_length
);
g_assert
(
size
<=
b
->
buffer_length
-
b
->
data_length
);
b
->
data_length
+=
size
;
}
...
...
@@ -1073,14 +1073,14 @@ pseudo_tcp_socket_notify_message (PseudoTcpSocket *self,
{
gboolean
retval
;
g_assert
_cmpuint
(
message
->
n_buffers
,
>
,
0
);
g_assert
(
message
->
n_buffers
>
0
);
if
(
message
->
n_buffers
==
1
)
return
pseudo_tcp_socket_notify_packet
(
self
,
message
->
buffers
[
0
].
buffer
,
message
->
buffers
[
0
].
size
);
g_assert
_cmpuint
(
message
->
n_buffers
,
==
,
2
);
g_assert
_cmpuint
(
message
->
buffers
[
0
].
size
,
==
,
HEADER_SIZE
);
g_assert
(
message
->
n_buffers
==
2
);
g_assert
(
message
->
buffers
[
0
].
size
==
HEADER_SIZE
);
if
(
message
->
length
>
MAX_PACKET
)
{
//LOG_F(WARNING) << "packet too large";
...
...
@@ -1376,7 +1376,7 @@ queue (PseudoTcpSocket *self, const gchar * data, guint32 len, TcpFlags flags)
available_space
=
pseudo_tcp_fifo_get_write_remaining
(
&
priv
->
sbuf
);
if
(
len
>
available_space
)
{
g_assert
_cmpint
(
flags
,
==
,
FLAG_NONE
);
g_assert
(
flags
==
FLAG_NONE
);
len
=
available_space
;
}
...
...
@@ -1422,7 +1422,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags,
}
buffer
;
PseudoTcpWriteResult
wres
=
WR_SUCCESS
;
g_assert
_cmpuint
(
HEADER_SIZE
+
len
,
<=
,
MAX_PACKET
);
g_assert
(
HEADER_SIZE
+
len
<=
MAX_PACKET
);
*
buffer
.
u32
=
htonl
(
priv
->
conv
);
*
(
buffer
.
u32
+
1
)
=
htonl
(
seq
);
...
...
@@ -1441,7 +1441,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags,
bytes_read
=
pseudo_tcp_fifo_read_offset
(
&
priv
->
sbuf
,
buffer
.
u8
+
HEADER_SIZE
,
len
,
offset
);
g_assert
_cmpint
(
bytes_read
,
==
,
len
);
g_assert
(
bytes_read
==
len
);
}
DEBUG
(
PSEUDO_TCP_DEBUG_VERBOSE
,
"Sending <CONV=%u><FLG=%u><SEQ=%u:%u><ACK=%u>"
...
...
@@ -1713,7 +1713,7 @@ process(PseudoTcpSocket *self, Segment *seg)
for
(
nFree
=
nAcked
;
nFree
>
0
;
)
{
SSegment
*
data
;
g_assert
_cmpuint
(
g_queue_get_length
(
&
priv
->
slist
),
!=
,
0
);
g_assert
(
g_queue_get_length
(
&
priv
->
slist
)
!=
0
);
data
=
(
SSegment
*
)
g_queue_peek_head
(
&
priv
->
slist
);
if
(
nFree
<
data
->
len
)
{
...
...
@@ -1995,7 +1995,7 @@ process(PseudoTcpSocket *self, Segment *seg)
res
=
pseudo_tcp_fifo_write_offset
(
&
priv
->
rbuf
,
(
guint8
*
)
seg
->
data
,
seg
->
len
,
nOffset
);
g_assert
_cmpint
(
res
,
==
,
seg
->
len
);
g_assert
(
res
==
seg
->
len
);
if
(
seg
->
seq
==
priv
->
rcv_nxt
)
{
GList
*
iter
=
NULL
;
...
...
@@ -2077,7 +2077,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now)
PseudoTcpWriteResult
wres
;
/* The packet must not have already been acknowledged. */
g_assert
_cmpuint
(
segment
->
seq
-
priv
->
snd_una
,
<=
,
1024
*
1024
*
64
);
g_assert
(
segment
->
seq
-
priv
->
snd_una
<=
1024
*
1024
*
64
);
/* Write out the packet. */
wres
=
packet
(
self
,
seq
,
flags
,
...
...
@@ -2091,7 +2091,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now)
return
ECONNABORTED
;
/* FIXME: This error code doesn’t quite seem right */
}
g_assert
_cmpint
(
wres
,
==
,
WR_TOO_LARGE
);
g_assert
(
wres
==
WR_TOO_LARGE
);
while
(
TRUE
)
{
if
(
PACKET_MAXIMUMS
[
priv
->
msslevel
+
1
]
==
0
)
{
...
...
gst/gstnicesink.c
View file @
69c2015c
...
...
@@ -226,7 +226,7 @@ fill_vectors (GOutputVector * vecs, GstMapInfo * maps, guint n, GstBuffer * buf)
gsize
size
=
0
;
guint
i
;
g_assert
_cmpuint
(
gst_buffer_n_memory
(
buf
),
==
,
n
);
g_assert
(
gst_buffer_n_memory
(
buf
)
==
n
);
for
(
i
=
0
;
i
<
n
;
++
i
)
{
mem
=
gst_buffer_peek_memory
(
buf
,
i
);
...
...
socket/http.c
View file @
69c2015c
...
...
@@ -203,7 +203,7 @@ socket_close (NiceSocket *sock)
static
void
assert_ring_buffer_valid
(
HttpPriv
*
priv
)
{
g_assert
_cmpint
(
priv
->
recv_buf_fill
,
<=
,
priv
->
recv_buf_length
);
g_assert
(
priv
->
recv_buf_fill
<=
priv
->
recv_buf_length
);
g_assert
(
priv
->
recv_buf_pos
==
0
||
priv
->
recv_buf_pos
<
priv
->
recv_buf_length
);
g_assert
(
priv
->
recv_buf_length
==
0
||
priv
->
recv_buf
!=
NULL
);
...
...
socket/socket.c
View file @
69c2015c
...
...
@@ -333,7 +333,7 @@ nice_socket_queue_send (GQueue *send_queue, const NiceAddress *to,
offset
+=
len
;
}
g_assert
_cmpint
(
offset
,
==
,
tbs
->
length
);
g_assert
(
offset
==
tbs
->
length
);
}
}
...
...
socket/udp-turn.c
View file @
69c2015c
...
...
@@ -671,10 +671,10 @@ _socket_send_messages_wrapped (NiceSocket *sock, const NiceAddress *to,
guint
i
;
gint
ret
;
g_assert
_cmpuint
(
n_messages
,
==
,
1
);
g_assert
(
n_messages
==
1
);
message
=
&
messages
[
0
];
message_len
=
output_message_get_size
(
message
);
g_assert
_cmpint
(
message_len
,
<=
,
G_MAXUINT16
);
g_assert
(
message_len
<=
G_MAXUINT16
);
/* ICE-TCP requires that all packets be framed with RFC4571 */
...
...
@@ -1246,7 +1246,7 @@ nice_udp_turn_socket_cache_realm_nonce_locked (NiceSocket *sock,
UdpTurnPriv
*
priv
=
sock
->
priv
;
gconstpointer
tmp
;
g_assert
_cmpint
(
sock
->
type
,
==
,
NICE_SOCKET_TYPE_UDP_TURN
);
g_assert
(
sock
->
type
==
NICE_SOCKET_TYPE_UDP_TURN
);
g_free
(
priv
->
cached_realm
);
priv
->
cached_realm
=
NULL
;
...
...
@@ -1293,7 +1293,7 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
message
->
from
,
message
->
length
,
message
->
buffers
[
0
].
buffer
,
message
->
from
,
message
->
buffers
[
0
].
buffer
,
message
->
length
);
g_assert
_cmpuint
(
len
,
<=
,
message
->
length
);
g_assert
(
len
<=
message
->
length
);
message
->
length
=
len
;
...
...
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