X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=fd903ce18fa4f69898da1516ae4d2acb5b2b2602;hb=7b652117d6c956edd17f84d7d22a96419e7eccdc;hp=063f3471c1afeca6595ee811d6d853032d1f768c;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp index 063f3471c1..fd903ce18f 100644 --- a/src/ServerSocket.cpp +++ b/src/ServerSocket.cpp @@ -3,11 +3,11 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author João Luis M. Assirati + * \author João Luis M. Assirati * * Full author contact details are available in file CREDITS. */ @@ -16,59 +16,64 @@ #include "ServerSocket.h" -#include "support/debug.h" +#include "DispatchResult.h" #include "FuncRequest.h" +#include "LyX.h" #include "LyXAction.h" -#include "LyXFunc.h" #include "frontends/Application.h" +#include "support/debug.h" #include "support/environment.h" #include "support/FileName.h" -#include "support/lyxlib.h" +#include "support/lassert.h" #include "support/socktools.h" -#include +#include #include +#include #include #if defined (_WIN32) # include #endif -using boost::shared_ptr; +#ifdef HAVE_UNISTD_H +# include +#endif using namespace std; +using namespace lyx::support; + namespace lyx { // Address is the unix address for the socket. // MAX_CLIENTS is the maximum number of clients // that can connect at the same time. -ServerSocket::ServerSocket(LyXFunc * f, support::FileName const & addr) - : func(f), - fd_(support::socktools::listen(addr, 3)), +ServerSocket::ServerSocket(FileName const & addr) + : fd_(socktools::listen(addr, 3)), address_(addr) { if (fd_ == -1) { - lyxerr << "lyx: Disabling LyX socket." << endl; + LYXERR(Debug::LYXSERVER, "lyx: Disabling LyX socket."); return; } // These env vars are used by DVI inverse search // Needed by xdvi - support::setEnv("XEDITOR", "lyxclient -g %f %l"); + setEnv("XEDITOR", "lyxclient -g %f %l"); // Needed by lyxclient - support::setEnv("LYXSOCKET", address_.absFilename()); + setEnv("LYXSOCKET", address_.absFileName()); theApp()->registerSocketCallback( fd_, - boost::bind(&ServerSocket::serverCallback, this) + bind(&ServerSocket::serverCallback, this) ); LYXERR(Debug::LYXSERVER, "lyx: New server socket " - << fd_ << ' ' << address_.absFilename()); + << fd_ << ' ' << address_.absFileName()); } @@ -80,7 +85,8 @@ ServerSocket::~ServerSocket() theApp()->unregisterSocketCallback(fd_); if (::close(fd_) != 0) lyxerr << "lyx: Server socket " << fd_ - << " IO error on closing: " << strerror(errno); + << " IO error on closing: " << strerror(errno) + << endl; } address_.removeFile(); LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting"); @@ -89,7 +95,7 @@ ServerSocket::~ServerSocket() string const ServerSocket::address() const { - return address_.absFilename(); + return address_.absFileName(); } @@ -97,24 +103,23 @@ string const ServerSocket::address() const // is OK and if the number of clients does not exceed MAX_CLIENTS void ServerSocket::serverCallback() { - int const client_fd = support::socktools::accept(fd_); - - if (fd_ == -1) { - LYXERR(Debug::LYXSERVER, "lyx: Failed to accept new client"); + if (clients.size() >= MAX_CLIENTS) { + writeln("BYE:Too many clients connected"); return; } - if (clients.size() >= MAX_CLIENTS) { - writeln("BYE:Too many clients connected"); + int const client_fd = socktools::accept(fd_); + + if (fd_ == -1) { + LYXERR(Debug::LYXSERVER, "lyx: Failed to accept new client"); return; } // Register the new client. - clients[client_fd] = - shared_ptr(new LyXDataSocket(client_fd)); + clients[client_fd] = make_shared(client_fd); theApp()->registerSocketCallback( client_fd, - boost::bind(&ServerSocket::dataCallback, + bind(&ServerSocket::dataCallback, this, client_fd) ); } @@ -124,14 +129,16 @@ void ServerSocket::serverCallback() // if the connection has been closed void ServerSocket::dataCallback(int fd) { - shared_ptr client = clients[fd]; - + map >::const_iterator it = clients.find(fd); + if (it == clients.end()) + return; + shared_ptr client = it->second; string line; - size_t pos; bool saidbye = false; while (!saidbye && client->readln(line)) { // The protocol must be programmed here // Split the key and the data + size_t pos; if ((pos = line.find(':')) == string::npos) { client->writeln("ERROR:" + line + ":malformed message"); continue; @@ -140,13 +147,15 @@ void ServerSocket::dataCallback(int fd) string const key = line.substr(0, pos); if (key == "LYXCMD") { string const cmd = line.substr(pos + 1); - func->dispatch(lyxaction.lookupFunc(cmd)); - string const rval = to_utf8(func->getMessage()); - if (func->errorStat()) { + FuncRequest fr(lyxaction.lookupFunc(cmd)); + fr.setOrigin(FuncRequest::LYXSERVER); + DispatchResult dr; + theApp()->dispatch(fr, dr); + string const rval = to_utf8(dr.message()); + if (dr.error()) client->writeln("ERROR:" + cmd + ':' + rval); - } else { + else client->writeln("INFO:" + cmd + ':' + rval); - } } else if (key == "HELLO") { // no use for client name! client->writeln("HELLO:"); @@ -188,7 +197,7 @@ void ServerSocket::writeln(string const & line) // void ServerSocket::dump() const // { // lyxerr << "ServerSocket debug dump.\n" -// << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n" +// << "fd = " << fd_ << ", address = " << address_.absFileName() << ".\n" // << "Clients: " << clients.size() << ".\n"; // map >::const_iterator client = clients.begin(); // map >::const_iterator end = clients.end();