From 9007d99cd409fa114edf5a4c1329c769fb8a9fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eckl=2C=20M=C3=A1t=C3=A9?= <ecklm94@gmail.com>
Date: Thu, 7 Jul 2016 18:18:55 +0200
Subject: [PATCH] =?UTF-8?q?Konstruktordeleg=C3=A1ci=C3=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
C++11-esítés
---
include/dns_db.h | 2 +-
include/dns_server.h | 1 -
include/udp_socket_wp.h | 2 +-
src/dns_db.cpp | 3 +--
src/dns_server.cpp | 8 ++------
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/include/dns_db.h b/include/dns_db.h
index 6055550..9bf9758 100644
--- a/include/dns_db.h
+++ b/include/dns_db.h
@@ -28,6 +28,7 @@ class dns_db
* Initializes the readable_DNS_types lut if it has not been yet.
*/
void init_lut();
+ dns_db(const dns_db& other);
protected:
/**
* Stores the readable c string values for all the DNS query types
@@ -44,7 +45,6 @@ public:
* @param filename The database file to open.
*/
explicit dns_db(const char *filename);
- dns_db(const dns_db& other);
/**
* Opens database file referred by filename;
diff --git a/include/dns_server.h b/include/dns_server.h
index 27140aa..7b1fd9f 100644
--- a/include/dns_server.h
+++ b/include/dns_server.h
@@ -50,7 +50,6 @@ public:
dns_server();
dns_server(const general_sockaddr_wp& addr);
dns_server(const general_sockaddr_wp& addr, const char *db_path);
- dns_server(const general_sockaddr_wp& addr, const dns_db& __db);
/**
* Opens an sqlite database.
diff --git a/include/udp_socket_wp.h b/include/udp_socket_wp.h
index 7a5a102..c24bb1f 100644
--- a/include/udp_socket_wp.h
+++ b/include/udp_socket_wp.h
@@ -34,7 +34,7 @@ public:
* Creates a new SOCK_DGRAM socket in given domain.
* @param __domain Address family of the socket
*/
- explicit udp_socket_wp(int __domain): fd(-1), domain(-1) { create_socket(__domain); }
+ explicit udp_socket_wp(int __domain): udp_socket_wp() { create_socket(__domain); }
/**
* Sets the domain of the socket.
diff --git a/src/dns_db.cpp b/src/dns_db.cpp
index 03d716f..d725263 100644
--- a/src/dns_db.cpp
+++ b/src/dns_db.cpp
@@ -43,8 +43,7 @@ dns_db::dns_db(): db(NULL) {
init_lut();
}
-dns_db::dns_db(const char* filename): db(NULL) {
- init_lut();
+dns_db::dns_db(const char* filename): dns_db() {
this->open(filename);
}
diff --git a/src/dns_server.cpp b/src/dns_server.cpp
index fedbaa3..61481f9 100644
--- a/src/dns_server.cpp
+++ b/src/dns_server.cpp
@@ -14,19 +14,15 @@ extern bool verbose;
dns_server::dns_server(): running(false), threads(NULL), thread_num(0) { }
-dns_server::dns_server(const general_sockaddr_wp& addr): running(false), threads(NULL), thread_num(0) {
+dns_server::dns_server(const general_sockaddr_wp& addr): dns_server() {
init(addr);
}
-dns_server::dns_server(const general_sockaddr_wp& addr, const char *db_path): running(false), threads(NULL), thread_num(0) {
+dns_server::dns_server(const general_sockaddr_wp& addr, const char *db_path): dns_server() {
init(addr);
connect_db(db_path);
}
-dns_server::dns_server(const general_sockaddr_wp& addr, const dns_db& __db): db(__db), running(false), threads(NULL), thread_num(0) {
- init(addr);
-}
-
void dns_server::init(const general_sockaddr_wp& addr) {
pthread_mutex_lock(&mutex);
this->socket.close_socket(); // in case it's being changed
--
GitLab