diff --git a/ConsoleSession.cpp b/ConsoleSession.cpp index a21affa..06627ee 100644 --- a/ConsoleSession.cpp +++ b/ConsoleSession.cpp @@ -10,6 +10,8 @@ namespace core { void ConsoleSession::protocol(coreutils::ZString &data) { + coreutils::Log(coreutils::LOG_DEBUG_1) << data; + coreutils::ZString blank(""); switch (status) { @@ -33,7 +35,7 @@ namespace core { out << "Password: "; status = WAIT_PASSWORD; break; - + case WAIT_PASSWORD: status = PROMPT; protocol(blank); diff --git a/Socket.cpp b/Socket.cpp index 0168536..02dcf9d 100644 --- a/Socket.cpp +++ b/Socket.cpp @@ -144,14 +144,13 @@ namespace core } } - int Socket::write(std::string data, Socket *sender) { + int Socket::write(std::string data) { outlock.lock(); fifo.emplace(data); outlock.unlock(); - if(sender && (sender != this)) - if(!inHandler) { - ePoll.resetSocket(this); - } + if(!inHandler) { + ePoll.resetSocket(this); + } return 1; } diff --git a/Socket.h b/Socket.h index 9f988df..bf70108 100644 --- a/Socket.h +++ b/Socket.h @@ -86,7 +86,7 @@ namespace core { /// Write data to the socket. /// - int write(std::string data, Socket *sender = NULL); + int write(std::string data); void write(char *buffer, int length); void output(std::stringstream &out); @@ -167,7 +167,6 @@ namespace core { std::string text; int descriptor = -1; std::mutex outlock; -// std::mutex lock; bool readHangup = false; volatile bool inHandler = false; diff --git a/Subscription.cpp b/Subscription.cpp index 1089193..006a37c 100644 --- a/Subscription.cpp +++ b/Subscription.cpp @@ -21,7 +21,7 @@ namespace core out << "cancel:" << id << std::endl; for (auto subscriber : subscribers) { - subscriber->write(out.str(), NULL); + subscriber->write(out.str()); } } @@ -62,7 +62,7 @@ namespace core int Subscription::event(std::stringstream &out) { for (auto subscriber = subscribers.begin(); subscriber < subscribers.end(); ++subscriber) - (*subscriber)->write(out.str(), NULL); + (*subscriber)->write(out.str()); return 1; } diff --git a/TCPSession.cpp b/TCPSession.cpp index f1a3c5b..6b58a08 100644 --- a/TCPSession.cpp +++ b/TCPSession.cpp @@ -58,17 +58,13 @@ namespace core void TCPSession::onConnected() {} - void TCPSession::onDataReceived(coreutils::ZString &data) - { - if (data.getLength() > 0) - { + void TCPSession::onDataReceived(coreutils::ZString &data) { + if (data.getLength() > 0) { lineBuffer = (char *)realloc(lineBuffer, lineBufferSize + data.getLength()); memcpy(lineBuffer + lineBufferSize, data.getData(), data.getLength()); lineBufferSize += data.getLength(); - while (lineBufferSize > 0) - { - if (blockSize == 0) - { + while (lineBufferSize > 0) { + if (blockSize == 0) { lineLength = strcspn(lineBuffer, "\r\n"); if (lineLength == lineBufferSize) break; @@ -118,7 +114,7 @@ namespace core void TCPSession::send() { if(out.tellp() > 0) - write(out.str(), this); + write(out.str()); out.str(""); } diff --git a/TCPSession2.cpp b/TCPSession2.cpp index bd17da6..af272aa 100644 --- a/TCPSession2.cpp +++ b/TCPSession2.cpp @@ -74,7 +74,7 @@ namespace core { void TCPSession2::send() { if(out.tellp() > 0) - TCPSocket::write(out.str(), this); + TCPSocket::write(out.str()); out.str(""); } diff --git a/compile b/compile index ca6498e..65f0717 100755 --- a/compile +++ b/compile @@ -31,4 +31,5 @@ echo -n "Building library documentation manual..." doxygen docs/latex/doxygen.sty >/dev/null 2>/dev/null echo "OK" -rm *.o \ No newline at end of file +rm *.o +rm *~ diff --git a/html/Socket_8h_source.html b/html/Socket_8h_source.html index 63d37de..5ccd101 100644 --- a/html/Socket_8h_source.html +++ b/html/Socket_8h_source.html @@ -99,8 +99,8 @@ $(function() {
83  bool eventReceived(struct epoll_event event, long long eventId);
84 
88 
-
89  int write(std::string data, Socket *sender = NULL);
-
90  void write(char *buffer, int length);
+
89  int write(std::string data);
+
90  void write(char *buffer, int length);
91 
92  void output(std::stringstream &out);
93 
@@ -147,49 +147,48 @@ $(function() {
167  std::string text;
168  int descriptor = -1;
169  std::mutex outlock;
-
170 // std::mutex lock;
-
171  bool readHangup = false;
-
172  volatile bool inHandler = false;
-
173 
-
174  //-------------------------------------------------------------------------------------
-
175  // the writeSocket is called when epoll has received a write request for a socket.
-
176  // Writing data to this socket is queued in the streambuf and permission is requested
-
177  // to write to the socket. This routine handles the writing of the streambuf data
-
178  // buffer to the socket.
-
179  //-------------------------------------------------------------------------------------
-
180 
-
181  void writeSocket();
-
182 
-
183  // int_type underflow();
-
184 // int_type uflow();
-
185 // int_type pbackfail(int_type ch);
-
186 // streamsize showmanyc();
-
187 
-
188  char *buffer; // This is a pointer to the managed buffer space.
-
189  int length; // This is the length of the buffer.
-
190 
-
191  std::queue<std::string> fifo;
-
192 
-
193  };
-
194 
-
195 }
-
196 
-
197 #endif
-
198 
+
170  bool readHangup = false;
+
171  volatile bool inHandler = false;
+
172 
+
173  //-------------------------------------------------------------------------------------
+
174  // the writeSocket is called when epoll has received a write request for a socket.
+
175  // Writing data to this socket is queued in the streambuf and permission is requested
+
176  // to write to the socket. This routine handles the writing of the streambuf data
+
177  // buffer to the socket.
+
178  //-------------------------------------------------------------------------------------
+
179 
+
180  void writeSocket();
+
181 
+
182  // int_type underflow();
+
183 // int_type uflow();
+
184 // int_type pbackfail(int_type ch);
+
185 // streamsize showmanyc();
+
186 
+
187  char *buffer; // This is a pointer to the managed buffer space.
+
188  int length; // This is the length of the buffer.
+
189 
+
190  std::queue<std::string> fifo;
+
191 
+
192  };
+
193 
+
194 }
+
195 
+
196 #endif
+
197 
core::EPoll
Definition: EPoll.h:31
core::Socket
Definition: Socket.h:34
core::Socket::getDescriptor
int getDescriptor()
Get the descriptor for the socket.
Definition: Socket.cpp:46
+
core::Socket::write
int write(std::string data)
Definition: Socket.cpp:147
core::Socket::eventReceived
bool eventReceived(struct epoll_event event, long long eventId)
Parse epoll event and call specified callbacks.
Definition: Socket.cpp:70
core::Socket::onRegistered
virtual void onRegistered()
Called after the socket has been registered with epoll processing.
Definition: Socket.cpp:64
core::Socket::receiveData
virtual void receiveData(coreutils::ZString &buffer)
Definition: Socket.cpp:102
core::Socket::Socket
Socket(EPoll &ePoll, std::string text="")
Definition: Socket.cpp:12
-
core::Socket::write
int write(std::string data, Socket *sender=NULL)
Definition: Socket.cpp:147
core::Socket::onRegister
virtual void onRegister()
Called before the socket has registered with the epoll processing.
Definition: Socket.cpp:62
core::Socket::~Socket
virtual ~Socket()
Definition: Socket.cpp:18
core::Socket::setDescriptor
void setDescriptor(int descriptor)
Set the descriptor for the socket.
Definition: Socket.cpp:30
core::Socket::onDataReceived
virtual void onDataReceived(std::string data)
Called when data is received from the socket.
Definition: Socket.cpp:92
core::Socket::onUnregistered
virtual void onUnregistered()
Called when the socket has finished unregistering for the epoll processing.
Definition: Socket.cpp:68
-
core::Socket::shutdown
void shutdown(std::string text="unknown")
Definition: Socket.cpp:168
+
core::Socket::shutdown
void shutdown(std::string text="unknown")
Definition: Socket.cpp:167
diff --git a/html/TCPSession_8h_source.html b/html/TCPSession_8h_source.html index 86ccc2d..78993d1 100644 --- a/html/TCPSession_8h_source.html +++ b/html/TCPSession_8h_source.html @@ -154,15 +154,15 @@ $(function() {
core::TCPServer
Definition: TCPServer.h:28
core::TCPSession
Definition: TCPSession.h:26
core::TCPSession::alias
void * alias
Definition: TCPSession.h:84
-
core::TCPSession::send
void send()
Definition: TCPSession.cpp:119
+
core::TCPSession::send
void send()
Definition: TCPSession.cpp:115
core::TCPSession::uuid
char uuid[37]
Definition: TCPSession.h:76
-
core::TCPSession::terminate
void terminate()
Definition: TCPSession.cpp:125
-
core::TCPSession::onLineReceived
virtual void onLineReceived(coreutils::ZString &line)
Definition: TCPSession.cpp:104
+
core::TCPSession::terminate
void terminate()
Definition: TCPSession.cpp:121
+
core::TCPSession::onLineReceived
virtual void onLineReceived(coreutils::ZString &line)
Definition: TCPSession.cpp:100
core::TCPSession::output
virtual void output(std::stringstream &data)
Definition: TCPSession.cpp:25
-
core::TCPSession::setBlockSize
void setBlockSize(int size=0)
Definition: TCPSession.cpp:99
+
core::TCPSession::setBlockSize
void setBlockSize(int size=0)
Definition: TCPSession.cpp:95
core::TCPSession::onConnected
virtual void onConnected()
Definition: TCPSession.cpp:59
core::TCPSession::protocol
virtual void protocol(coreutils::ZString &data)
Definition: TCPSession.cpp:30
-
core::TCPSession::onBlockReceived
virtual void onBlockReceived(coreutils::ZString &block)
Definition: TCPSession.cpp:112
+
core::TCPSession::onBlockReceived
virtual void onBlockReceived(coreutils::ZString &block)
Definition: TCPSession.cpp:108
core::TCPSession::out
std::stringstream out
Definition: TCPSession.h:68
core::TCPSession::onRegistered
virtual void onRegistered() override
Called after the socket has been registered with epoll processing.
Definition: TCPSession.cpp:49
core::TCPSession::onDataReceived
virtual void onDataReceived(coreutils::ZString &data) override
Definition: TCPSession.cpp:61
diff --git a/html/classcore_1_1ConsoleServer-members.html b/html/classcore_1_1ConsoleServer-members.html index 2807248..af95ebe 100644 --- a/html/classcore_1_1ConsoleServer-members.html +++ b/html/classcore_1_1ConsoleServer-members.html @@ -111,7 +111,7 @@ $(function() { TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket whiteListcore::TCPServer - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPServer()core::TCPServervirtual diff --git a/html/classcore_1_1ConsoleServer.html b/html/classcore_1_1ConsoleServer.html index e280b54..328968e 100644 --- a/html/classcore_1_1ConsoleServer.html +++ b/html/classcore_1_1ConsoleServer.html @@ -166,8 +166,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1ConsoleSession-members.html b/html/classcore_1_1ConsoleSession-members.html index 5975ec9..c5431c3 100644 --- a/html/classcore_1_1ConsoleSession-members.html +++ b/html/classcore_1_1ConsoleSession-members.html @@ -123,7 +123,7 @@ $(function() { TerminalSession(EPoll &ePoll, TCPServer &server) (defined in core::TerminalSession)core::TerminalSession terminate()core::TCPSession uuidcore::TCPSession - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket writeLog(std::string data) (defined in core::ConsoleSession)core::ConsoleSession ~ConsoleSession() (defined in core::ConsoleSession)core::ConsoleSession diff --git a/html/classcore_1_1ConsoleSession.html b/html/classcore_1_1ConsoleSession.html index 5b38db5..c7b5d4c 100644 --- a/html/classcore_1_1ConsoleSession.html +++ b/html/classcore_1_1ConsoleSession.html @@ -193,8 +193,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1Socket-members.html b/html/classcore_1_1Socket-members.html index 6bff55f..b64d45b 100644 --- a/html/classcore_1_1Socket-members.html +++ b/html/classcore_1_1Socket-members.html @@ -91,7 +91,7 @@ $(function() { shutDown (defined in core::Socket)core::Socket shutdown(std::string text="unknown")core::Socket Socket(EPoll &ePoll, std::string text="")core::Socket - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual diff --git a/html/classcore_1_1Socket.html b/html/classcore_1_1Socket.html index 801bd47..628caad 100644 --- a/html/classcore_1_1Socket.html +++ b/html/classcore_1_1Socket.html @@ -127,8 +127,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   @@ -452,8 +452,8 @@ Protected Attributes - -

◆ write()

+ +

◆ write()

@@ -462,18 +462,8 @@ Protected Attributes int core::Socket::write ( std::string  - data, - - - + data) - Socket *  - sender = NULL  - - - - ) -
diff --git a/html/classcore_1_1TCPServer-members.html b/html/classcore_1_1TCPServer-members.html index 0785a9f..40c7afa 100644 --- a/html/classcore_1_1TCPServer-members.html +++ b/html/classcore_1_1TCPServer-members.html @@ -109,7 +109,7 @@ $(function() { TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket whiteListcore::TCPServer - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPServer()core::TCPServervirtual diff --git a/html/classcore_1_1TCPServer.html b/html/classcore_1_1TCPServer.html index 3cd5698..f1d2a59 100644 --- a/html/classcore_1_1TCPServer.html +++ b/html/classcore_1_1TCPServer.html @@ -161,8 +161,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TCPSession-members.html b/html/classcore_1_1TCPSession-members.html index d7cec39..e9448ab 100644 --- a/html/classcore_1_1TCPSession-members.html +++ b/html/classcore_1_1TCPSession-members.html @@ -110,7 +110,7 @@ $(function() { TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket terminate()core::TCPSession uuidcore::TCPSession - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPSession() (defined in core::TCPSession)core::TCPSessionvirtual diff --git a/html/classcore_1_1TCPSession.html b/html/classcore_1_1TCPSession.html index ea9faf2..b31e596 100644 --- a/html/classcore_1_1TCPSession.html +++ b/html/classcore_1_1TCPSession.html @@ -152,8 +152,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TCPSession2-members.html b/html/classcore_1_1TCPSession2-members.html index c11d4dc..aafdbb4 100644 --- a/html/classcore_1_1TCPSession2-members.html +++ b/html/classcore_1_1TCPSession2-members.html @@ -105,7 +105,7 @@ $(function() { TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket terminate()core::TCPSession2 - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPSession2() (defined in core::TCPSession2)core::TCPSession2virtual diff --git a/html/classcore_1_1TCPSession2.html b/html/classcore_1_1TCPSession2.html index 3ba201e..2bf5875 100644 --- a/html/classcore_1_1TCPSession2.html +++ b/html/classcore_1_1TCPSession2.html @@ -139,8 +139,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TCPSocket-members.html b/html/classcore_1_1TCPSocket-members.html index 624af1f..1fd3007 100644 --- a/html/classcore_1_1TCPSocket-members.html +++ b/html/classcore_1_1TCPSocket-members.html @@ -95,7 +95,7 @@ $(function() { Socket(EPoll &ePoll, std::string text="")core::Socket TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPSocket() (defined in core::TCPSocket)core::TCPSocketvirtual diff --git a/html/classcore_1_1TCPSocket.html b/html/classcore_1_1TCPSocket.html index 167f4fd..97058ad 100644 --- a/html/classcore_1_1TCPSocket.html +++ b/html/classcore_1_1TCPSocket.html @@ -136,8 +136,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TLSServer-members.html b/html/classcore_1_1TLSServer-members.html index a582346..69dcc75 100644 --- a/html/classcore_1_1TLSServer-members.html +++ b/html/classcore_1_1TLSServer-members.html @@ -112,7 +112,7 @@ $(function() { TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket TLSServer(EPoll &ePoll, IPAddress address)core::TLSServer whiteListcore::TCPServer - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPServer()core::TCPServervirtual diff --git a/html/classcore_1_1TLSServer.html b/html/classcore_1_1TLSServer.html index 5819224..825f68d 100644 --- a/html/classcore_1_1TLSServer.html +++ b/html/classcore_1_1TLSServer.html @@ -168,8 +168,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TLSSession-members.html b/html/classcore_1_1TLSSession-members.html index f7ca38a..88d6b06 100644 --- a/html/classcore_1_1TLSSession-members.html +++ b/html/classcore_1_1TLSSession-members.html @@ -111,7 +111,7 @@ $(function() { terminate()core::TCPSession TLSSession(EPoll &ePoll, TCPServer &server) (defined in core::TLSSession)core::TLSSession uuidcore::TCPSession - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPSession() (defined in core::TCPSession)core::TCPSessionvirtual diff --git a/html/classcore_1_1TLSSession.html b/html/classcore_1_1TLSSession.html index 704e028..3ca5c7a 100644 --- a/html/classcore_1_1TLSSession.html +++ b/html/classcore_1_1TLSSession.html @@ -156,8 +156,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1TerminalSession-members.html b/html/classcore_1_1TerminalSession-members.html index 94aff08..c4bfb99 100644 --- a/html/classcore_1_1TerminalSession-members.html +++ b/html/classcore_1_1TerminalSession-members.html @@ -122,7 +122,7 @@ $(function() { TerminalSession(EPoll &ePoll, TCPServer &server) (defined in core::TerminalSession)core::TerminalSession terminate()core::TCPSession uuidcore::TCPSession - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~TCPSession() (defined in core::TCPSession)core::TCPSessionvirtual diff --git a/html/classcore_1_1TerminalSession.html b/html/classcore_1_1TerminalSession.html index 192c234..4893ddf 100644 --- a/html/classcore_1_1TerminalSession.html +++ b/html/classcore_1_1TerminalSession.html @@ -182,8 +182,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1UDPServerSocket-members.html b/html/classcore_1_1UDPServerSocket-members.html index 19e5781..af07dc4 100644 --- a/html/classcore_1_1UDPServerSocket-members.html +++ b/html/classcore_1_1UDPServerSocket-members.html @@ -97,7 +97,7 @@ $(function() { Socket(EPoll &ePoll, std::string text="")core::Socket UDPServerSocket(EPoll &ePoll, std::string url, short int port, std::string commandName) (defined in core::UDPServerSocket)core::UDPServerSocket UDPSocket(EPoll &ePoll) (defined in core::UDPSocket)core::UDPSocket - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~UDPServerSocket() (defined in core::UDPServerSocket)core::UDPServerSocket diff --git a/html/classcore_1_1UDPServerSocket.html b/html/classcore_1_1UDPServerSocket.html index 0008882..065a439 100644 --- a/html/classcore_1_1UDPServerSocket.html +++ b/html/classcore_1_1UDPServerSocket.html @@ -126,8 +126,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/classcore_1_1UDPSocket-members.html b/html/classcore_1_1UDPSocket-members.html index f473fbd..3c77a6d 100644 --- a/html/classcore_1_1UDPSocket-members.html +++ b/html/classcore_1_1UDPSocket-members.html @@ -92,7 +92,7 @@ $(function() { shutDown (defined in core::Socket)core::Socket Socket(EPoll &ePoll, std::string text="")core::Socket UDPSocket(EPoll &ePoll) (defined in core::UDPSocket)core::UDPSocket - write(std::string data, Socket *sender=NULL)core::Socket + write(std::string data)core::Socket write(char *buffer, int length) (defined in core::Socket)core::Socket ~Socket()core::Socketvirtual ~UDPSocket() (defined in core::UDPSocket)core::UDPSocket diff --git a/html/classcore_1_1UDPSocket.html b/html/classcore_1_1UDPSocket.html index 46f0f8f..2fd01b1 100644 --- a/html/classcore_1_1UDPSocket.html +++ b/html/classcore_1_1UDPSocket.html @@ -116,8 +116,8 @@ int bool eventReceived (struct epoll_event event, long long eventId)  Parse epoll event and call specified callbacks. More...
  -int write (std::string data, Socket *sender=NULL) -  +int write (std::string data) +  void write (char *buffer, int length)   diff --git a/html/functions.html b/html/functions.html index 9d4341c..62104b0 100644 --- a/html/functions.html +++ b/html/functions.html @@ -309,7 +309,7 @@ $(function() { : core::TCPServer
  • write() -: core::Socket +: core::Socket
    • diff --git a/html/functions_func.html b/html/functions_func.html index a8f8659..01b1ff1 100644 --- a/html/functions_func.html +++ b/html/functions_func.html @@ -272,7 +272,7 @@ $(function() {

    - w -

    diff --git a/html/search/all_d.js b/html/search/all_d.js index 3f5c41d..bb19872 100644 --- a/html/search/all_d.js +++ b/html/search/all_d.js @@ -1,5 +1,5 @@ var searchData= [ ['whitelist_74',['whiteList',['../classcore_1_1TCPServer.html#abad6300b6234ca8b69cef9128755342e',1,'core::TCPServer']]], - ['write_75',['write',['../classcore_1_1Socket.html#a542ef2d6be9997aa98cfae3e72c66b4a',1,'core::Socket']]] + ['write_75',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]] ]; diff --git a/html/search/functions_b.js b/html/search/functions_b.js index 72ecbb9..f59c408 100644 --- a/html/search/functions_b.js +++ b/html/search/functions_b.js @@ -1,4 +1,4 @@ var searchData= [ - ['write_150',['write',['../classcore_1_1Socket.html#a542ef2d6be9997aa98cfae3e72c66b4a',1,'core::Socket']]] + ['write_150',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]] ]; diff --git a/latex/classcore_1_1Socket.tex b/latex/classcore_1_1Socket.tex index c217f24..8855979 100644 --- a/latex/classcore_1_1Socket.tex +++ b/latex/classcore_1_1Socket.tex @@ -38,7 +38,7 @@ int \mbox{\hyperlink{classcore_1_1Socket_a06ba54744530439d4131e6aba4623d08}{get\ \begin{DoxyCompactList}\small\item\em Get the descriptor for the socket. \end{DoxyCompactList}\item bool \mbox{\hyperlink{classcore_1_1Socket_a1a045e15fb5851d666a21be05ac4c5d7}{event\+Received}} (struct epoll\+\_\+event event, long long event\+Id) \begin{DoxyCompactList}\small\item\em Parse epoll event and call specified callbacks. \end{DoxyCompactList}\item -int \mbox{\hyperlink{classcore_1_1Socket_a542ef2d6be9997aa98cfae3e72c66b4a}{write}} (std\+::string data, \mbox{\hyperlink{classcore_1_1Socket}{Socket}} $\ast$sender=NULL) +int \mbox{\hyperlink{classcore_1_1Socket_a1413c826307ef0f29d7457770af675e3}{write}} (std\+::string data) \item \mbox{\Hypertarget{classcore_1_1Socket_a4855594af113428eacdaa7448d661121}\label{classcore_1_1Socket_a4855594af113428eacdaa7448d661121}} void {\bfseries write} (char $\ast$buffer, int length) @@ -215,11 +215,11 @@ set\+Descriptor establishes the file descriptor for the socket and registers the \doxysubsubsection{\texorpdfstring{shutdown()}{shutdown()}} {\footnotesize\ttfamily void core\+::\+Socket\+::shutdown (\begin{DoxyParamCaption}\item[{std\+::string}]{text = {\ttfamily \char`\"{}unknown\char`\"{}} }\end{DoxyParamCaption})} -Use the \mbox{\hyperlink{classcore_1_1Socket_af2d1b6de7a64a9d446b0305b6ec47b31}{shutdown()}} method to terminate the socket connection and remove resources. This method is provided to ensure that all destructors are called for all inherited objects with a virtual destructor. \mbox{\Hypertarget{classcore_1_1Socket_a542ef2d6be9997aa98cfae3e72c66b4a}\label{classcore_1_1Socket_a542ef2d6be9997aa98cfae3e72c66b4a}} +Use the \mbox{\hyperlink{classcore_1_1Socket_af2d1b6de7a64a9d446b0305b6ec47b31}{shutdown()}} method to terminate the socket connection and remove resources. This method is provided to ensure that all destructors are called for all inherited objects with a virtual destructor. \mbox{\Hypertarget{classcore_1_1Socket_a1413c826307ef0f29d7457770af675e3}\label{classcore_1_1Socket_a1413c826307ef0f29d7457770af675e3}} \index{core::Socket@{core::Socket}!write@{write}} \index{write@{write}!core::Socket@{core::Socket}} \doxysubsubsection{\texorpdfstring{write()}{write()}} -{\footnotesize\ttfamily int core\+::\+Socket\+::write (\begin{DoxyParamCaption}\item[{std\+::string}]{data, }\item[{\mbox{\hyperlink{classcore_1_1Socket}{Socket}} $\ast$}]{sender = {\ttfamily NULL} }\end{DoxyParamCaption})} +{\footnotesize\ttfamily int core\+::\+Socket\+::write (\begin{DoxyParamCaption}\item[{std\+::string}]{data }\end{DoxyParamCaption})} Write data to the socket.