Commit bbd5d85d authored by Seblu's avatar Seblu
Browse files

Utilisation de sll

parent 29e81753

slc/trunk/Makefile.am

+12 −8
Original line number Diff line number Diff line
@@ -16,18 +16,22 @@ 


bin_PROGRAMS=	slc



slc_SOURCES=	src/slc.hh		\

		src/slc.cc		\

slc_SOURCES=	src/slc.cc		\

		src/options.cc		\

		src/engine.cc		\

		src/screen.cc		\

		src/history.cc		\

		src/sll/connection.cc	\

		src/sll/error.cc



noinst_SOURCES=	src/slc.hh		\

		src/options.hh		\

		src/engine.hh		\

		src/screen.hh		\

		src/screen.cc		\

		src/connection.hh	\

		src/connection.cc	\

		src/history.hh		\

		src/history.cc		\

		src/error.hh		\

		src/error.cc

		src/sll/error.hh	\

		src/sll/connection.hh





CLEANFILES= *~ '\#*' .*.swp .*~

slc/trunk/src/connection.cc

deleted100644 → 0
+0 −179
Original line number Diff line number Diff line 
/*

  This file is part of SLC.

  Copyright (C) 2008 Sebastien LUTTRINGER <contact@seblu.net>



  SLC is free software; you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation; version 2 of the License.



  SLC is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  GNU General Public License for more details.



  You should have received a copy of the GNU General Public License

  along with SLC; if not, write to the Free Software

  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

*/



#include <sys/socket.h>

#include <netinet/in.h>

#include <arpa/inet.h>

#include <netdb.h>

#include <errno.h>

#include <poll.h>



#include "slc.hh"

#include "options.hh"

#include "connection.hh"

#include "screen.hh"

#include "error.hh"



pthread_mutex_t  mtx_socket = PTHREAD_MUTEX_INITIALIZER;



Connection::Connection() : socket_(0) {}



bool Connection::connected() const {

  return socket_ > 0;

}



void Connection::start() {

  if (connected())

    return;



  // make connection

  connect_(O.server.c_str(), O.port);



  // send login info



  // send pass info



  // Start reader thread

  pthread_create(&g_thread_reader, 0, thread_reader, 0);

}



void Connection::stop() {

  if (!connected())

    return;

  disconnect_();

}



void Connection::connect_(const char *addr, int port) {

  struct sockaddr_in daddr;

  struct hostent *h;



  // Check no existing connexion

  assert(socket_ == 0);



  // retrieve remote host info

  h = gethostbyname(addr);

  if (h == 0) {

    S << "Unable to resolve: " << addr  << ": " << hstrerror(h_errno) << ".\n";

    return;

  }



  // create socket

  pthread_mutex_lock(&mtx_socket);

  socket_ = socket(PF_INET, SOCK_STREAM, 0);

  if (socket_ == -1) {

    S << "Unable to create socket: " << strerror(errno) << ".\n";

    socket_ = 0;

    pthread_mutex_unlock(&mtx_socket);

    return;

  }

  pthread_mutex_unlock(&mtx_socket);



  daddr.sin_family = AF_INET;

  daddr.sin_port = htons(port);

  daddr.sin_addr = *((struct in_addr *) h->h_addr);

  memset(daddr.sin_zero, '\0', sizeof daddr.sin_zero);



  S << "Connecting to "  << h->h_name  << " (" << inet_ntoa(*(struct in_addr*)h->h_addr)

    << ") on port " << port << "...\n";



  // connect

  pthread_mutex_lock(&mtx_socket);

  int con = connect(socket_, (struct sockaddr *) &daddr, sizeof daddr);

  pthread_mutex_unlock(&mtx_socket);

  if (con == -1) {

    disconnect_();

    S << "Unable to connect: " << strerror(errno) << ".\n";

    return;

  }



  S << "Connected to " << h->h_name << " (" << inet_ntoa(*(struct in_addr*)h->h_addr)

    << ") on port " << port << ".\n";

}



void Connection::disconnect_() {

  assert(socket_ > 0);



  pthread_mutex_lock(&mtx_socket);

  close(socket_);

  socket_ = 0;

  pthread_mutex_unlock(&mtx_socket);

}





void Connection::send(const string &data) {

  send(data.c_str(), data.length());

}



void Connection::send(const char* buf, size_t len) {

  assert(socket_ > 0);

  pthread_mutex_lock(&mtx_socket);

  write(socket_, buf, len);

  pthread_mutex_unlock(&mtx_socket);

}



void Connection::sendln(const string &data) {

  sendln(data.c_str(), data.length());

}



void Connection::sendln(const char* buf, size_t len) {

  assert(socket_ > 0);



  pthread_mutex_lock(&mtx_socket);

  write(socket_, buf, len);

  write(socket_, "\n", 1);

  pthread_mutex_unlock(&mtx_socket);

}



string Connection::recvln() {

  assert(socket > 0);



  do {

    // check EOL char

    size_t offset = rbuf_.find('\n');

    if (offset != string::npos) {

      string s = rbuf_.substr(0, offset);

      rbuf_.erase(0, offset + 1);

      return s;

    }



    // wait incoming data

    static struct pollfd spfd[1] = {{socket_, POLLIN|POLLPRI|POLLHUP|POLLERR, 0}};

    poll(spfd, 1, -1);



    // lock before read

    pthread_mutex_lock(&mtx_socket);



    // read data

    static char local_buf[MAX_LINE_SIZE];

    int ret = ::recv(socket_, local_buf, MAX_LINE_SIZE, MSG_DONTWAIT);



    // unlock

    pthread_mutex_unlock(&mtx_socket);



    if (ret == -1) {

      disconnect_();

      *local_buf = 0;

    }

    else local_buf[ret] = 0;



    // add read data in buffer

    rbuf_ += local_buf;



  } while (1);

  assert(1);

}

slc/trunk/src/history.cc

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "slc.hh"

#include "history.hh"

#include "error.hh"



History::History() : max_size_(100) {}

slc/trunk/src/screen.cc

+3 −4
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 
#include "slc.hh"

#include "screen.hh"

#include "options.hh"

#include "error.hh"

#include "history.hh"

#include "connection.hh"

#include "sll/connection.hh"



/*

*********************************************************************************
@@ -529,11 +528,11 @@ void Screen::cmd_exec(const char *s) { 
    }

    else if (!strcmp(s, "/logout")) {

      S << s << "\n";

      C.stop();

      //C.stop();

    }

    else if (!strcmp(s, "/login")) {

      S << s << "\n";

      C.start();

      //C.start();

    }

    else

      S << s << ": Unkown command.\n";

slc/trunk/src/slc.cc

+9 −17
Original line number Diff line number Diff line
@@ -16,15 +16,16 @@ 
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

*/



#include <getopt.h>



#include "slc.hh"

#include "options.hh"

#include "screen.hh"

#include "history.hh"

#include "error.hh"

#include "connection.hh"

#include "sll/connection.hh"

#include "engine.hh"



#include <getopt.h>



Engine E;

Screen S;

Options O;

History H;
@@ -52,20 +53,11 @@ int main(int argc, char *argv[]) 
    // load cmd history

    H.load(O.history_file);



    // Create graphic env

    S.init();



    // Showing login screen. Retrieve user/pass.

    S.login();



    // Showing dialog screen

    S.dialog();



    // start connexion

    C.start();

    // Starting engine

    E.on();



    // Treat keyboards events

    S.eventsloop();

    // Stoping engine

    E.off();



    // Save history

    H.save(O.history_file);