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
f6f71768
Commit
f6f71768
authored
Dec 18, 2018
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pseudotcp: Rename state enums to not clash with system ones
parent
fe55ca06
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
157 additions
and
160 deletions
+157
-160
agent/pseudotcp.c
agent/pseudotcp.c
+119
-119
agent/pseudotcp.h
agent/pseudotcp.h
+22
-22
tests/test-pseudotcp-fin.c
tests/test-pseudotcp-fin.c
+16
-16
tests/test-udp-turn-fragmentation.c
tests/test-udp-turn-fragmentation.c
+0
-3
No files found.
agent/pseudotcp.c
View file @
f6f71768
This diff is collapsed.
Click to expand it.
agent/pseudotcp.h
View file @
f6f71768
...
@@ -141,24 +141,24 @@ typedef enum {
...
@@ -141,24 +141,24 @@ typedef enum {
/**
/**
* PseudoTcpState:
* PseudoTcpState:
* @TCP_LISTEN: The socket's initial state. The socket isn't connected and is
* @
PSEUDO_
TCP_LISTEN: The socket's initial state. The socket isn't connected and is
* listening for an incoming connection
* listening for an incoming connection
* @TCP_SYN_SENT: The socket has sent a connection request (SYN) packet and is
* @
PSEUDO_
TCP_SYN_SENT: The socket has sent a connection request (SYN) packet and is
* waiting for an answer
* waiting for an answer
* @TCP_SYN_RECEIVED: The socket has received a connection request (SYN) packet.
* @
PSEUDO_
TCP_SYN_RECEIVED: The socket has received a connection request (SYN) packet.
* @TCP_ESTABLISHED: The socket is connected
* @
PSEUDO_
TCP_ESTABLISHED: The socket is connected
* @TCP_CLOSED: The socket has been closed
* @
PSEUDO_
TCP_CLOSED: The socket has been closed
* @TCP_FIN_WAIT_1: The socket has been closed locally but not remotely
* @
PSEUDO_
TCP_FIN_WAIT_1: The socket has been closed locally but not remotely
* (Since: 0.1.8)
* (Since: 0.1.8)
* @TCP_FIN_WAIT_2: The socket has been closed locally but not remotely
* @
PSEUDO_
TCP_FIN_WAIT_2: The socket has been closed locally but not remotely
* (Since: 0.1.8)
* (Since: 0.1.8)
* @TCP_CLOSING: The socket has been closed locally and remotely
* @
PSEUDO_
TCP_CLOSING: The socket has been closed locally and remotely
* (Since: 0.1.8)
* (Since: 0.1.8)
* @TCP_TIME_WAIT: The socket has been closed locally and remotely
* @
PSEUDO_
TCP_TIME_WAIT: The socket has been closed locally and remotely
* (Since: 0.1.8)
* (Since: 0.1.8)
* @TCP_CLOSE_WAIT: The socket has been closed remotely but not locally
* @
PSEUDO_
TCP_CLOSE_WAIT: The socket has been closed remotely but not locally
* (Since: 0.1.8)
* (Since: 0.1.8)
* @TCP_LAST_ACK: The socket has been closed locally and remotely
* @
PSEUDO_
TCP_LAST_ACK: The socket has been closed locally and remotely
* (Since: 0.1.8)
* (Since: 0.1.8)
*
*
* An enum representing the state of the #PseudoTcpSocket. These states
* An enum representing the state of the #PseudoTcpSocket. These states
...
@@ -168,17 +168,17 @@ typedef enum {
...
@@ -168,17 +168,17 @@ typedef enum {
* Since: 0.0.11
* Since: 0.0.11
*/
*/
typedef
enum
{
typedef
enum
{
TCP_LISTEN
,
PSEUDO_
TCP_LISTEN
,
TCP_SYN_SENT
,
PSEUDO_
TCP_SYN_SENT
,
TCP_SYN_RECEIVED
,
PSEUDO_
TCP_SYN_RECEIVED
,
TCP_ESTABLISHED
,
PSEUDO_
TCP_ESTABLISHED
,
TCP_CLOSED
,
PSEUDO_
TCP_CLOSED
,
TCP_FIN_WAIT_1
,
PSEUDO_
TCP_FIN_WAIT_1
,
TCP_FIN_WAIT_2
,
PSEUDO_
TCP_FIN_WAIT_2
,
TCP_CLOSING
,
PSEUDO_
TCP_CLOSING
,
TCP_TIME_WAIT
,
PSEUDO_
TCP_TIME_WAIT
,
TCP_CLOSE_WAIT
,
PSEUDO_
TCP_CLOSE_WAIT
,
TCP_LAST_ACK
,
PSEUDO_
TCP_LAST_ACK
,
}
PseudoTcpState
;
}
PseudoTcpState
;
/**
/**
...
...
tests/test-pseudotcp-fin.c
View file @
f6f71768
...
@@ -367,8 +367,8 @@ expect_socket_state (PseudoTcpSocket *socket, PseudoTcpState expected_state)
...
@@ -367,8 +367,8 @@ expect_socket_state (PseudoTcpSocket *socket, PseudoTcpState expected_state)
static
void
static
void
expect_sockets_connected
(
Data
*
data
)
expect_sockets_connected
(
Data
*
data
)
{
{
expect_socket_state
(
data
->
left
,
TCP_ESTABLISHED
);
expect_socket_state
(
data
->
left
,
PSEUDO_
TCP_ESTABLISHED
);
expect_socket_state
(
data
->
right
,
TCP_ESTABLISHED
);
expect_socket_state
(
data
->
right
,
PSEUDO_
TCP_ESTABLISHED
);
}
}
static
void
static
void
...
@@ -376,8 +376,8 @@ expect_sockets_closed (Data *data)
...
@@ -376,8 +376,8 @@ expect_sockets_closed (Data *data)
{
{
guint8
buf
[
100
];
guint8
buf
[
100
];
expect_socket_state
(
data
->
left
,
TCP_CLOSED
);
expect_socket_state
(
data
->
left
,
PSEUDO_
TCP_CLOSED
);
expect_socket_state
(
data
->
right
,
TCP_CLOSED
);
expect_socket_state
(
data
->
right
,
PSEUDO_
TCP_CLOSED
);
g_assert_cmpint
(
pseudo_tcp_socket_send
(
data
->
left
,
"foo"
,
3
),
==
,
-
1
);
g_assert_cmpint
(
pseudo_tcp_socket_send
(
data
->
left
,
"foo"
,
3
),
==
,
-
1
);
g_assert_cmpint
(
pseudo_tcp_socket_get_error
(
data
->
left
),
==
,
EPIPE
);
g_assert_cmpint
(
pseudo_tcp_socket_get_error
(
data
->
left
),
==
,
EPIPE
);
...
@@ -784,46 +784,46 @@ pseudotcp_close_normal_recovery_data (void)
...
@@ -784,46 +784,46 @@ pseudotcp_close_normal_recovery_data (void)
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
right
),
==
,
0
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
right
),
==
,
0
);
close_socket
(
data
.
left
);
close_socket
(
data
.
left
);
expect_socket_state
(
data
.
left
,
TCP_FIN_WAIT_1
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_FIN_WAIT_1
);
expect_fin
(
data
.
left
,
data
.
left_sent
,
10
,
7
);
expect_fin
(
data
.
left
,
data
.
left_sent
,
10
,
7
);
forward_segment_ltr
(
&
data
);
forward_segment_ltr
(
&
data
);
expect_socket_state
(
data
.
right
,
TCP_ESTABLISHED
);
expect_socket_state
(
data
.
right
,
PSEUDO_
TCP_ESTABLISHED
);
expect_ack
(
data
.
right
,
data
.
right_sent
,
7
,
7
);
expect_ack
(
data
.
right
,
data
.
right_sent
,
7
,
7
);
forward_segment_rtl
(
&
data
);
forward_segment_rtl
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_FIN_WAIT_1
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_FIN_WAIT_1
);
assert_empty_queues
(
&
data
);
assert_empty_queues
(
&
data
);
/* Close the RHS. */
/* Close the RHS. */
close_socket
(
data
.
right
);
close_socket
(
data
.
right
);
expect_socket_state
(
data
.
right
,
TCP_FIN_WAIT_1
);
expect_socket_state
(
data
.
right
,
PSEUDO_
TCP_FIN_WAIT_1
);
expect_fin
(
data
.
right
,
data
.
right_sent
,
7
,
7
);
expect_fin
(
data
.
right
,
data
.
right_sent
,
7
,
7
);
forward_segment_rtl
(
&
data
);
forward_segment_rtl
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_CLOSING
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_CLOSING
);
expect_ack
(
data
.
left
,
data
.
left_sent
,
11
,
8
);
expect_ack
(
data
.
left
,
data
.
left_sent
,
11
,
8
);
forward_segment_ltr
(
&
data
);
forward_segment_ltr
(
&
data
);
expect_socket_state
(
data
.
right
,
TCP_FIN_WAIT_2
);
expect_socket_state
(
data
.
right
,
PSEUDO_
TCP_FIN_WAIT_2
);
expect_data
(
data
.
right
,
data
.
right_sent
,
8
,
7
,
0
);
expect_data
(
data
.
right
,
data
.
right_sent
,
8
,
7
,
0
);
forward_segment_rtl
(
&
data
);
forward_segment_rtl
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_CLOSING
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_CLOSING
);
expect_data
(
data
.
left
,
data
.
left_sent
,
7
,
8
,
3
);
expect_data
(
data
.
left
,
data
.
left_sent
,
7
,
8
,
3
);
forward_segment_ltr
(
&
data
);
forward_segment_ltr
(
&
data
);
expect_socket_state
(
data
.
right
,
TCP_TIME_WAIT
);
expect_socket_state
(
data
.
right
,
PSEUDO_
TCP_TIME_WAIT
);
increment_time_both
(
&
data
,
100
);
/* Delayed ACK */
increment_time_both
(
&
data
,
100
);
/* Delayed ACK */
expect_ack
(
data
.
right
,
data
.
right_sent
,
8
,
11
);
expect_ack
(
data
.
right
,
data
.
right_sent
,
8
,
11
);
forward_segment_rtl
(
&
data
);
forward_segment_rtl
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_TIME_WAIT
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_TIME_WAIT
);
increment_time_both
(
&
data
,
10
);
/* TIME-WAIT */
increment_time_both
(
&
data
,
10
);
/* TIME-WAIT */
...
@@ -1171,8 +1171,8 @@ pseudotcp_close_recv_queued (void)
...
@@ -1171,8 +1171,8 @@ pseudotcp_close_recv_queued (void)
expect_fin
(
data
.
left
,
data
.
left_sent
,
10
,
7
);
expect_fin
(
data
.
left
,
data
.
left_sent
,
10
,
7
);
forward_segment_ltr
(
&
data
);
forward_segment_ltr
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_FIN_WAIT_1
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_FIN_WAIT_1
);
expect_socket_state
(
data
.
right
,
TCP_CLOSE_WAIT
);
expect_socket_state
(
data
.
right
,
PSEUDO_
TCP_CLOSE_WAIT
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
left
),
==
,
0
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
left
),
==
,
0
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_send_space
(
data
.
left
),
==
,
g_assert_cmpint
(
pseudo_tcp_socket_get_available_send_space
(
data
.
left
),
==
,
...
@@ -1181,7 +1181,7 @@ pseudotcp_close_recv_queued (void)
...
@@ -1181,7 +1181,7 @@ pseudotcp_close_recv_queued (void)
expect_ack
(
data
.
right
,
data
.
right_sent
,
7
,
11
);
expect_ack
(
data
.
right
,
data
.
right_sent
,
7
,
11
);
forward_segment_rtl
(
&
data
);
forward_segment_rtl
(
&
data
);
expect_socket_state
(
data
.
left
,
TCP_FIN_WAIT_2
);
expect_socket_state
(
data
.
left
,
PSEUDO_
TCP_FIN_WAIT_2
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
right
),
==
,
3
);
g_assert_cmpint
(
pseudo_tcp_socket_get_available_bytes
(
data
.
right
),
==
,
3
);
...
...
tests/test-udp-turn-fragmentation.c
View file @
f6f71768
...
@@ -32,9 +32,6 @@
...
@@ -32,9 +32,6 @@
# include "config.h"
# include "config.h"
#endif
#endif
// With _GNU_SOURCE, enumeration in netinet/tcp.h and PseudoTcpState clash
#undef _GNU_SOURCE
#define _POSIX_SOURCE 1
#include <gio/gnetworking.h>
#include <gio/gnetworking.h>
#include "agent-priv.h"
#include "agent-priv.h"
...
...
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