socket_ref[this->fd] = this;
}
-InspSocket::InspSocket(std::string ahost, 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;
+ this->Buffer = "";
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
}
else
{
- if (BindSocket(this->fd,this->client,this->server,port,(char*)ahost.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 = ahost;
- this->port = port;
+ this->port = aport;
if (!inet_aton(host.c_str(),&addy))
{
void InspSocket::FlushWriteBuffer()
{
- int result = 0;
- if (this->Buffer.length())
+ if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
- if (result > 0)
+ int result = 0, v = 0;
+ const char* n = Buffer.c_str();
+ v = Buffer.length();
+ if (v > 0)
{
- if (result == (int)this->Buffer.length())
+ result = write(this->fd,n,v);
+ if (result > 0)
{
- this->Buffer = "";
- }
- else
- {
- /* If we wrote some, advance the buffer forwards */
- char* n = (char*)this->Buffer.c_str();
- n += result;
- this->Buffer = n;
+ if (result == v)
+ {
+ Buffer = "";
+ }
+ else
+ {
+ /* If we wrote some, advance the buffer forwards */
+ n += result;
+ Buffer = n;
+ }
}
}
}
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();