#include "inspircd_util.h"
#include "inspstring.h"
#include "helperfuncs.h"
+#include "socketengine.h"
+
+extern SocketEngine* SE;
extern FILE *log_file;
extern int boundPortCount;
extern bool unlimitcore;
extern int MaxConn;
+InspSocket* socket_ref[65535];
+
InspSocket::InspSocket()
{
this->state = I_DISCONNECTED;
}
-InspSocket::InspSocket(int newfd)
+InspSocket::InspSocket(int newfd, char* ip)
{
this->fd = newfd;
this->state = I_CONNECTED;
+ this->IP = ip;
+ SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+ socket_ref[this->fd] = this;
}
InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
else
{
this->state = I_LISTENING;
+ SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+ socket_ref[this->fd] = this;
log(DEBUG,"New socket now in I_LISTENING state");
return;
}
}
}
this->state = I_CONNECTING;
+ SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+ socket_ref[this->fd] = this;
return;
}
}
this->OnClose();
shutdown(this->fd,2);
close(this->fd);
+ socket_ref[this->fd] = NULL;
this->fd = -1;
}
}
return written;
}
-bool InspSocket::Poll()
+bool InspSocket::Timeout(time_t current)
{
- if ((time(NULL) > timeout_end) && (this->state == I_CONNECTING))
+ if ((this->state == I_CONNECTING) && (current > timeout_end))
{
// for non-listening sockets, the timeout can occur
// which causes termination of the connection after
// connection.
this->OnTimeout();
this->OnError(I_ERR_TIMEOUT);
- timeout = true;
+ timeout = true;
this->state = I_ERROR;
- return false;
+ return true;
}
- polls.fd = this->fd;
- state == I_CONNECTING ? polls.events = POLLOUT : polls.events = POLLIN;
- int ret = poll(&polls,1,1);
+ return false;
+}
- if (ret > 0)
+bool InspSocket::Poll()
+{
+ int incoming = -1;
+
+ switch (this->state)
{
- int incoming = -1;
-
- switch (this->state)
- {
- case I_CONNECTING:
- this->SetState(I_CONNECTED);
- return this->OnConnected();
- break;
- case I_LISTENING:
- length = sizeof (client);
- incoming = accept (this->fd, (sockaddr*)&client,&length);
- this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
- return true;
- break;
- case I_CONNECTED:
- return this->OnDataReady();
- break;
- default:
- break;
- }
+ case I_CONNECTING:
+ this->SetState(I_CONNECTED);
+ /* Our socket was in write-state, so delete it and re-add it
+ * in read-state.
+ */
+ SE->DelFd(this->fd);
+ SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+ return this->OnConnected();
+ break;
+ case I_LISTENING:
+ length = sizeof (client);
+ incoming = accept (this->fd, (sockaddr*)&client,&length);
+ this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
+ return true;
+ break;
+ case I_CONNECTED:
+ return this->OnDataReady();
+ break;
+ default:
+ break;
}
+
return true;
}
return this->state;
}
+int InspSocket::GetFd()
+{
+ return this->fd;
+}
+
bool InspSocket::OnConnected() { return true; }
void InspSocket::OnError(InspSocketError e) { return; }
int InspSocket::OnDisconnect() { return 0; }