Skip to content

Commit f159da4

Browse files
ThalhammerThalhammer
committed
🐛 Remove interface keyword
1 parent 39a1608 commit f159da4

File tree

6 files changed

+34
-26
lines changed

6 files changed

+34
-26
lines changed

‎include/asyncpp/io/detail/io_engine.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ namespace asyncpp::io::detail {
7979
virtual endpoint socket_local_endpoint(socket_handle_t socket) = 0;
8080
virtual endpoint socket_remote_endpoint(socket_handle_t socket) = 0;
8181
virtual void socket_enable_broadcast(socket_handle_t socket, bool enable) = 0;
82-
virtual void socket_multicast_join(socket_handle_t socket, address group, address interface) = 0;
83-
virtual void socket_multicast_drop(socket_handle_t socket, address group, address interface) = 0;
84-
virtual void socket_multicast_set_send_interface(socket_handle_t socket, address interface) = 0;
82+
virtual void socket_multicast_join(socket_handle_t socket, address group, address iface) = 0;
83+
virtual void socket_multicast_drop(socket_handle_t socket, address group, address iface) = 0;
84+
virtual void socket_multicast_set_send_interface(socket_handle_t socket, address iface) = 0;
8585
virtual void socket_multicast_set_ttl(socket_handle_t socket, size_t ttl) = 0;
8686
virtual void socket_multicast_set_loopback(socket_handle_t socket, bool enabled) = 0;
8787
virtual void socket_shutdown(socket_handle_t socket, bool receive, bool send) = 0;

‎include/asyncpp/io/socket.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ namespace asyncpp::io {
9797
void listen(std::uint32_t backlog = 0);
9898

9999
void allow_broadcast(bool enable);
100-
void multicast_join(address group, address interface);
100+
void multicast_join(address group, address iface);
101101
void multicast_join(address group);
102-
void multicast_drop(address group, address interface);
102+
void multicast_drop(address group, address iface);
103103
void multicast_drop(address group);
104-
void multicast_set_send_interface(address interface);
104+
void multicast_set_send_interface(address iface);
105105
void multicast_set_ttl(size_t ttl);
106106
void multicast_set_loopback(bool enabled);
107107

‎src/io_engine_generic_unix.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,20 @@ namespace asyncpp::io::detail {
137137
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
138138
}
139139

140-
void io_engine_generic_unix::socket_multicast_join(socket_handle_t socket, address group, address interface) {
141-
if (group.type() != interface.type())
140+
void io_engine_generic_unix::socket_multicast_join(socket_handle_t socket, address group, address iface) {
141+
if (group.type() != iface.type())
142142
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
143143
"group and interface need to be of the same type");
144144
if (group.is_ipv4()) {
145145
struct ip_mreq mc_req{};
146146
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
147-
mc_req.imr_interface = interface.ipv4().to_sockaddr_in().first.sin_addr;
147+
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
148148
auto res = setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mc_req, sizeof(mc_req));
149149
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
150150
} else if (group.is_ipv6()) {
151151
struct ipv6_mreq mc_req{};
152152
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
153-
mc_req.ipv6mr_interface = interface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
153+
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
154154
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mc_req, sizeof(mc_req));
155155
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
156156
} else {
@@ -159,20 +159,20 @@ namespace asyncpp::io::detail {
159159
}
160160
}
161161

162-
void io_engine_generic_unix::socket_multicast_drop(socket_handle_t socket, address group, address interface) {
163-
if (group.type() != interface.type())
162+
void io_engine_generic_unix::socket_multicast_drop(socket_handle_t socket, address group, address iface) {
163+
if (group.type() != iface.type())
164164
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
165165
"group and interface need to be of the same type");
166166
if (group.is_ipv4()) {
167167
struct ip_mreq mc_req{};
168168
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
169-
mc_req.imr_interface = interface.ipv4().to_sockaddr_in().first.sin_addr;
169+
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
170170
auto res = setsockopt(socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mc_req, sizeof(mc_req));
171171
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
172172
} else if (group.is_ipv6()) {
173173
struct ipv6_mreq mc_req{};
174174
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
175-
mc_req.ipv6mr_interface = interface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
175+
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
176176
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mc_req, sizeof(mc_req));
177177
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
178178
} else {
@@ -181,13 +181,13 @@ namespace asyncpp::io::detail {
181181
}
182182
}
183183

184-
void io_engine_generic_unix::socket_multicast_set_send_interface(socket_handle_t socket, address interface) {
185-
if (interface.is_ipv4()) {
186-
auto addr = interface.ipv4().to_sockaddr_in().first.sin_addr.s_addr;
184+
void io_engine_generic_unix::socket_multicast_set_send_interface(socket_handle_t socket, address iface) {
185+
if (iface.is_ipv4()) {
186+
auto addr = iface.ipv4().to_sockaddr_in().first.sin_addr.s_addr;
187187
auto res = setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF, reinterpret_cast<char*>(&addr), sizeof(addr));
188188
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
189-
} else if (interface.is_ipv6()) {
190-
auto scope = interface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
189+
} else if (iface.is_ipv6()) {
190+
auto scope = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
191191
auto res =
192192
setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF, reinterpret_cast<char*>(&scope), sizeof(scope));
193193
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");

‎src/io_engine_generic_unix.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace asyncpp::io::detail {
1414
endpoint socket_local_endpoint(socket_handle_t socket) override;
1515
endpoint socket_remote_endpoint(socket_handle_t socket) override;
1616
void socket_enable_broadcast(socket_handle_t socket, bool enable) override;
17-
void socket_multicast_join(socket_handle_t socket, address group, address interface) override;
18-
void socket_multicast_drop(socket_handle_t socket, address group, address interface) override;
19-
void socket_multicast_set_send_interface(socket_handle_t socket, address interface) override;
17+
void socket_multicast_join(socket_handle_t socket, address group, address iface) override;
18+
void socket_multicast_drop(socket_handle_t socket, address group, address iface) override;
19+
void socket_multicast_set_send_interface(socket_handle_t socket, address iface) override;
2020
void socket_multicast_set_ttl(socket_handle_t socket, size_t ttl) override;
2121
void socket_multicast_set_loopback(socket_handle_t socket, bool enabled) override;
2222
void socket_shutdown(socket_handle_t socket, bool receive, bool send) override;

‎src/io_engine_iocp.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ namespace asyncpp::io::detail {
8484
endpoint socket_local_endpoint(socket_handle_t socket) override;
8585
endpoint socket_remote_endpoint(socket_handle_t socket) override;
8686
void socket_enable_broadcast(socket_handle_t socket, bool enable) override;
87-
void socket_multicast_join(socket_handle_t socket, address group, address interface) override;
88-
void socket_multicast_drop(socket_handle_t socket, address group, address interface) override;
89-
void socket_multicast_set_send_interface(socket_handle_t socket, address interface) override;
87+
void socket_multicast_join(socket_handle_t socket, address group, address iface) override;
88+
void socket_multicast_drop(socket_handle_t socket, address group, address iface) override;
89+
void socket_multicast_set_send_interface(socket_handle_t socket, address iface) override;
9090
void socket_multicast_set_ttl(socket_handle_t socket, size_t ttl) override;
9191
void socket_multicast_set_loopback(socket_handle_t socket, bool enabled) override;
9292
void socket_shutdown(socket_handle_t socket, bool receive, bool send) override;
@@ -635,7 +635,7 @@ namespace asyncpp::io::detail {
635635
address_type io_engine_iocp::get_handle_type(socket_handle_t socket) {
636636
WSAPROTOCOL_INFO info{};
637637
socklen_t length = sizeof(info);
638-
auto res = getsockopt(socket, SOL_SOCKET, SO_PROTOCOL_INFO, &info, &length);
638+
auto res = getsockopt(socket, SOL_SOCKET, SO_PROTOCOL_INFO, reinterpret_cast<char*>(&info), &length);
639639
if (res < 0) throw std::system_error(WSAGetLastError(), std::system_category(), "getsockopt failed");
640640
switch (info.iAddressFamily) {
641641
case AF_INET: return address_type::ipv4;

‎src/io_engine_uring.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ namespace asyncpp::io::detail {
1717
#include <sys/time.h>
1818
#include <unistd.h>
1919

20+
#ifndef __NR_io_uring_register
21+
#ifdef __alpha__
22+
#define __NR_io_uring_register 537
23+
#else
24+
#define __NR_io_uring_register 427
25+
#endif
26+
#endif
27+
2028
namespace asyncpp::io::detail {
2129

2230
class io_engine_uring : public io_engine_generic_unix {

0 commit comments

Comments
 (0)