Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Fix warning and workaround ABI compatibility due to ENABLE_EXPERIMENTAL_BONDING #1794

Merged
merged 2 commits into from
Feb 8, 2021
Merged

[core] Fix warning and workaround ABI compatibility due to ENABLE_EXPERIMENTAL_BONDING #1794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb80d6
[core] Fix warning of undefined ENABLE_EXPERIMENTAL_BONDING
quink-black Feb 7, 2021
ea37d14
[core] Workaround ABI compatibility due to ENABLE_EXPERIMENTAL_BONDING
quink-black Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion srtcore/srt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ static const int32_t SRTGROUP_MASK = (1 << 30);
typedef int SYSSOCKET;
#endif

#ifndef ENABLE_EXPERIMENTAL_BONDING
#define ENABLE_EXPERIMENTAL_BONDING 0
#endif

typedef SYSSOCKET UDPSOCKET;


Expand Down Expand Up @@ -235,12 +239,12 @@ typedef enum SRT_SOCKOPT {
SRTO_ENFORCEDENCRYPTION, // Connection to be rejected or quickly broken when one side encryption set or bad password
SRTO_IPV6ONLY, // IPV6_V6ONLY mode
SRTO_PEERIDLETIMEO, // Peer-idle timeout (max time of silence heard from peer) in [ms]
SRTO_BINDTODEVICE, // Forward the SOL_SOCKET/SO_BINDTODEVICE option on socket (pass packets only from that device)
#if ENABLE_EXPERIMENTAL_BONDING
SRTO_GROUPCONNECT, // Set on a listener to allow group connection
SRTO_GROUPSTABTIMEO, // Stability timeout (backup groups) in [us]
SRTO_GROUPTYPE, // Group type to which an accepted socket is about to be added, available in the handshake
#endif
SRTO_BINDTODEVICE, // Forward the SOL_SOCKET/SO_BINDTODEVICE option on socket (pass packets only from that device)
SRTO_PACKETFILTER = 60, // Add and configure a packet filter
SRTO_RETRANSMITALGO = 61 // An option to select packet retransmission algorithm
} SRT_SOCKOPT;
Expand Down