diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2015-01-27 15:58:30 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2015-01-27 15:58:30 -0500 |
| commit | 6b5e40c6c1f62ae1a1099f56ae70ed26b23c8a88 (patch) | |
| tree | 3fa9aec6843f0b8f9a1cccb373a85ac96a96a799 /farstream | |
| parent | 83199d96480cd7835adc9d290e537effc550b4ca (diff) | |
| parent | fb51436e0a6dcefac5506744a6be3fd236b1ca79 (diff) | |
| download | farstream-6b5e40c6c1f62ae1a1099f56ae70ed26b23c8a88.tar.gz | |
Merge branch 'branch-0.2.6'
Diffstat (limited to 'farstream')
| -rw-r--r-- | farstream/fs-candidate.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/farstream/fs-candidate.h b/farstream/fs-candidate.h index b8ad723f..5abedb93 100644 --- a/farstream/fs-candidate.h +++ b/farstream/fs-candidate.h @@ -59,14 +59,25 @@ typedef enum /** * FsNetworkProtocol: * @FS_NETWORK_PROTOCOL_UDP: A UDP based protocol - * @FS_NETWORK_PROTOCOL_TCP: A TCP based protocol + * @FS_NETWORK_PROTOCOL_TCP: A TCP based protocol, will listen for + * incoming connections + * @FS_NETWORK_PROTOCOL_TCP_PASSIVE: A TCP based protocol, will listen for + * incoming connections + * @FS_NETWORK_PROTOCOL_TCP_ACTIVE: A TCP based protocol, will attempt to + * open an outbound connection + * @FS_NETWORK_PROTOCOL_TCP_SO: A TCP based protocol, will listen for + * incoming connections and attempt an outbound connection at the same time + * as the peer (Simultanuous-Open) * * An enum for the base IP protocol */ typedef enum { FS_NETWORK_PROTOCOL_UDP, - FS_NETWORK_PROTOCOL_TCP + FS_NETWORK_PROTOCOL_TCP, + FS_NETWORK_PROTOCOL_TCP_PASSIVE = FS_NETWORK_PROTOCOL_TCP, + FS_NETWORK_PROTOCOL_TCP_ACTIVE, + FS_NETWORK_PROTOCOL_TCP_SO, } FsNetworkProtocol; /** |