summaryrefslogtreecommitdiff
path: root/src/socket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/socket.cpp')
-rw-r--r--src/socket.cpp78
1 files changed, 49 insertions, 29 deletions
diff --git a/src/socket.cpp b/src/socket.cpp
index 160f0f652..9c2f5a362 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -88,50 +88,67 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
}
}
} else {
- char* ip;
this->host = host;
- hostent* hoste = gethostbyname(host.c_str());
- if (!hoste) {
- ip = (char*)host.c_str();
- } else {
- struct in_addr* ia = (in_addr*)hoste->h_addr;
- ip = inet_ntoa(*ia);
+
+ if (this->dns.ForwardLookupWithFD(host,fd))
+ {
+ timeout_end = time(NULL)+maxtime;
+ timeout = false;
+ this->state = I_RESOLVING;
}
+ else
+ {
+ this->state = I_ERROR;
+ this->OnError(I_ERR_RESOLVE);
+ return;
+ }
+}
- this->IP = ip;
+bool InspSocket::DoResolve()
+{
+ if (this->dns.HasResult())
+ {
+ std::string res_ip = dns.GetResultIP();
+
+ if (res_ip != "")
+ {
+ this->IP = ip;
+ }
+ else
+ {
+ this->IP = this->host;
+ }
- timeout_end = time(NULL)+maxtime;
- timeout = false;
- if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+ if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
- return;
+ return false;
}
this->port = port;
- inet_aton(ip,&addy);
- addr.sin_family = AF_INET;
- addr.sin_addr = addy;
- addr.sin_port = htons(this->port);
+ inet_aton(ip,&addy);
+ addr.sin_family = AF_INET;
+ addr.sin_addr = addy;
+ addr.sin_port = htons(this->port);
- int flags;
- flags = fcntl(this->fd, F_GETFL, 0);
- fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+ int flags;
+ flags = fcntl(this->fd, F_GETFL, 0);
+ fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
- if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
- {
- if (errno != EINPROGRESS)
- {
+ if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+ {
+ if (errno != EINPROGRESS)
+ {
this->Close();
this->OnError(I_ERR_CONNECT);
this->state = I_ERROR;
- return;
- }
- }
- this->state = I_CONNECTING;
+ return false;
+ }
+ }
+ this->state = I_CONNECTING;
ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
socket_ref[this->fd] = this;
- return;
+ return true;
}
}
@@ -203,7 +220,7 @@ void InspSocket::FlushWriteBuffer()
bool InspSocket::Timeout(time_t current)
{
- if ((this->state == I_CONNECTING) && (current > timeout_end))
+ if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
{
// for non-listening sockets, the timeout can occur
// which causes termination of the connection after
@@ -226,6 +243,9 @@ bool InspSocket::Poll()
switch (this->state)
{
+ case I_RESOLVING:
+ return this->DoResolve();
+ break;
case I_CONNECTING:
this->SetState(I_CONNECTED);
/* Our socket was in write-state, so delete it and re-add it