#include <sstream>
#include <iostream>
#include <fstream>
+#include <stdexcept>
#include "socket.h"
#include "inspircd.h"
#include "inspircd_io.h"
socket_ref[this->fd] = this;
}
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned long maxtime)
{
this->fd = -1;
+ this->host = ahost;
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
}
else
{
- if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
+ if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
{
this->Close();
this->fd = -1;
}
else
{
- this->host = host;
- this->port = port;
+ this->host = ahost;
+ this->port = aport;
if (!inet_aton(host.c_str(),&addy))
{
// and should be aborted.
int InspSocket::Write(std::string data)
{
- this->Buffer.append(data);
+ try
+ {
+ if ((data != "") && (this->Buffer.length() + data.length() < this->Buffer.max_size()))
+ this->Buffer.append(data);
+ }
+ catch (std::length_error)
+ {
+ log(DEBUG,"std::length_error exception caught while appending to socket buffer!");
+ return 0;
+ }
return data.length();
}
int incoming = -1;
bool n = true;
- log(DEBUG,"InspSocket::Poll()");
-
switch (this->state)
{
case I_RESOLVING:
return this->DoResolve();
break;
case I_CONNECTING:
- log(DEBUG,"State = I_CONNECTED");
+ log(DEBUG,"State = I_CONNECTING");
this->SetState(I_CONNECTED);
/* Our socket was in write-state, so delete it and re-add it
* in read-state.
return true;
break;
case I_CONNECTED:
- log(DEBUG,"State = I_CONNECTED");
n = this->OnDataReady();
- log(DEBUG,"State return: %d",(int)n);
/* Flush any pending, but not till after theyre done with the event
* so there are less write calls involved. */
this->FlushWriteBuffer();