From 81ed50fd03ccd42f428fd1a69810cdd7b4656031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eckl=2C=20M=C3=A1t=C3=A9?= <ecklm94@gmail.com>
Date: Fri, 27 May 2016 14:36:29 +0200
Subject: [PATCH] =?UTF-8?q?Struct=20kulcsszavak=20elt=C5=B1ntet=C3=A9se=20?=
=?UTF-8?q?(#16)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
include/udp_socket_wp.h | 8 ++++----
main.cpp | 4 ++--
src/dns_server.cpp | 2 +-
src/udp_socket_wp.cpp | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/udp_socket_wp.h b/include/udp_socket_wp.h
index 1e5b7b6..7a5a102 100644
--- a/include/udp_socket_wp.h
+++ b/include/udp_socket_wp.h
@@ -55,7 +55,7 @@ public:
* @see bind()
* @throws socket_error if bind fails
*/
- void bind_wp(const struct sockaddr *__addr, size_t __len);
+ void bind_wp(const sockaddr *__addr, size_t __len);
/**
* More OO wrapper for bind() function.
@@ -70,14 +70,14 @@ public:
* @throw const char* exception if there is an error while receiving the packet.
* It contains the cause of the error.
*/
- udp_packet_wp recvfrom_wp(struct sockaddr *sender_address, socklen_t *sender_address_len);
+ udp_packet_wp recvfrom_wp(sockaddr *sender_address, socklen_t *sender_address_len);
/**
* Bare wrapper for sendto() function.
* @see sendto()
*/
void sendto_wp(const void *__buf, size_t __n,
- int __flags, const struct sockaddr *__addr,
+ int __flags, const sockaddr *__addr,
socklen_t __addr_len);
/**
@@ -93,7 +93,7 @@ public:
* @param msg The dns message to send to.
* @see sendto()
*/
- void sendto_wp(const dns_message_em &msg, int __flags, const struct sockaddr *__addr,
+ void sendto_wp(const dns_message_em &msg, int __flags, const sockaddr *__addr,
socklen_t __addr_len);
/**
diff --git a/main.cpp b/main.cpp
index 0431d4e..c1a77b9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -158,8 +158,8 @@ int main(int argc, char *argv[])
}
// Init server
- struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; //IN6ADDR_LOOPBACK_INIT;
- struct sockaddr_in6 server_address;
+ in6_addr in6_addr_any = IN6ADDR_ANY_INIT; //IN6ADDR_LOOPBACK_INIT;
+ sockaddr_in6 server_address;
memset(&server_address, 0, sizeof(server_address));
server_address.sin6_family = AF_INET6;
server_address.sin6_addr = in6_addr_any;
diff --git a/src/dns_server.cpp b/src/dns_server.cpp
index 1df2868..f6eb695 100644
--- a/src/dns_server.cpp
+++ b/src/dns_server.cpp
@@ -74,7 +74,7 @@ void dns_server::shutdown() {
}
void dns_server::serve_one_request() {
- struct sockaddr_in6 sender;
+ sockaddr_in6 sender;
socklen_t slen = sizeof(sender);
dns_message_em query;
udp_packet_wp received_packet;
diff --git a/src/udp_socket_wp.cpp b/src/udp_socket_wp.cpp
index 30c184a..ab8784e 100644
--- a/src/udp_socket_wp.cpp
+++ b/src/udp_socket_wp.cpp
@@ -31,7 +31,7 @@ void udp_socket_wp::setsockopt_wp(int __level, int __optname, const void* __optv
}
}
-void udp_socket_wp::bind_wp(const struct sockaddr* __addr, size_t __len) {
+void udp_socket_wp::bind_wp(const sockaddr* __addr, size_t __len) {
if (bind(fd, __addr, __len) < 0) {
throw socket_error(strerror(errno));
}
@@ -54,7 +54,7 @@ udp_packet_wp udp_socket_wp::recvfrom_wp(sockaddr *sender_address, socklen_t* se
}
void udp_socket_wp::sendto_wp(const void *__buf, size_t __n,
- int __flags, const struct sockaddr *__addr,
+ int __flags, const sockaddr *__addr,
socklen_t __addr_len) {
sendto(fd, __buf, __n, __flags, __addr, __addr_len);
}
@@ -63,7 +63,7 @@ void udp_socket_wp::sendto_wp(const void* __buf, size_t __n, int __flags, const
this->sendto_wp(__buf, __n, __flags, wrapped_sockaddr.get_sockaddr(), wrapped_sockaddr.get_addr_len());
}
-void udp_socket_wp::sendto_wp(const dns_message_em &msg, int __flags, const struct sockaddr *__addr, socklen_t __addr_len) {
+void udp_socket_wp::sendto_wp(const dns_message_em &msg, int __flags, const sockaddr *__addr, socklen_t __addr_len) {
udp_packet_wp pckt;
pckt.address.set_sockaddr(__addr, __addr_len);
pckt<<msg;
--
GitLab