Commit 1ff488c7 authored by Seblu's avatar Seblu

fix probleme de mauvaise connexion

makefile.am utiliser _HEADERS
parent bbd5d85d
......@@ -30,6 +30,7 @@ noinst_SOURCES= src/slc.hh \
src/screen.hh \
src/history.hh \
src/sll/error.hh \
src/sll/connection.hxx \
src/sll/connection.hh
......
This diff is collapsed.
......@@ -2,17 +2,17 @@
This file is part of SLS.
Copyright (C) 2008 Sebastien LUTTRINGER <contact@seblu.net>
SLS is free software; you can redistribute it and/or modify
SLL 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.
SLS is distributed in the hope that it will be useful,
SLL 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 SLS; if not, write to the Free Software
along with SLL; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
......@@ -61,14 +61,14 @@ public:
// protected methods
protected:
void socket_();
void disconnect_();
inline void setallinfo_();
void setlocalip_();
void setlocalport_();
void setremoteip_();
void setremoteport_();
inline void socket_();
inline void disconnect_();
inline void setconninfo_();
inline void setlocalip_();
inline void setlocalport_();
inline void setremoteip_();
inline void setremoteport_();
// Protected datas
protected:
......
......@@ -16,6 +16,13 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
# include "error.hh"
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
/*******************************************************************************
** Public method
******************************************************************************/
......@@ -41,9 +48,84 @@ void Connection::sendln(const string &data) {
/**
* Set all information about a connection
*/
void Connection::setallinfo_() {
void Connection::setconninfo_() {
setlocalip_();
setlocalport_();
setremoteip_();
setremoteport_();
}
/**
* Free a socket
* No mutex used !
*/
void Connection::disconnect_() {
if (socket_fd_ == -1)
return;
close(socket_fd_);
socket_fd_ = -1;
}
/**
* Reserve a socket
* No mutex used !
*/
void Connection::socket_() {
assert(socket_fd_ == -1);
int yes = 1;
if ((socket_fd_ = ::socket(AF_INET, SOCK_STREAM, 0)) == -1)
throw Error(ERR_NET, (string) "Unable to open socket: " + strerror(errno));
if (::setsockopt(socket_fd_, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1)
throw Error(ERR_NET, (string) "Unable to set socket options: " + strerror(errno));
}
/**
* Set local ip
* No mutex used !
*/
void Connection::setlocalip_() {
struct sockaddr_in addr;
socklen_t len = sizeof addr;
::getsockname(socket_fd_, (struct sockaddr*) &addr, &len);
local_ip_ = inet_ntoa(addr.sin_addr);
}
/**
* Set local port
* No mutex used !
*/
void Connection::setlocalport_() {
struct sockaddr_in addr;
socklen_t len = sizeof addr;
::getsockname(socket_fd_, (struct sockaddr*) &addr, &len);
local_port_ = ntohs(addr.sin_port);
}
/**
* Set remote ip
* No mutex used !
*/
void Connection::setremoteip_() {
struct sockaddr_in addr;
socklen_t len = sizeof addr;
::getpeername(socket_fd_, (struct sockaddr*) &addr, &len);
remote_ip_ = inet_ntoa(addr.sin_addr);
}
/**
* Set remote port
* No mutex used !
*/
void Connection::setremoteport_() {
struct sockaddr_in addr;
socklen_t len = sizeof addr;
::getpeername(socket_fd_, (struct sockaddr*) &addr, &len);
remote_port_ = ntohs(addr.sin_port);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment