namespace libt2n
{
-socket_server::socket_server(int port, const char* ip)
+socket_server::socket_server(int port, const std::string& ip)
: server(), socket_handler(0,tcp_s)
{
// TODO
}
-socket_server::socket_server(const char* path, mode_t filemode, const char* user, const char* group)
+socket_server::socket_server(const std::string& path, mode_t filemode, const std::string& user, const std::string& group)
: server(), socket_handler(0,unix_s)
{
unix_path=path;
throw t2n_server_error(err);
}
- struct passwd *socket_user = getpwnam (user);
- if (socket_user == NULL)
+ if (!user.empty() && !group.empty())
{
- string err="error getting socket user: ";
- err+=strerror(errno);
- log(error, err);
- throw t2n_server_error(err);
- }
-
- struct group *socket_group = getgrnam (group);
- if (socket_group == NULL)
- {
- string err="error getting socket group: ";
- err+=strerror(errno);
- log(error, err);
- throw t2n_server_error(err);
- }
+ // TODO maybe use current user/group if one of them is empty
- if (chown (unix_name.sun_path, socket_user->pw_uid, socket_group->gr_gid) != 0)
- {
- string err="error changing socket ownership: ";
- err+=strerror(errno);
- log(error, err);
- throw t2n_server_error(err);
+ struct passwd *socket_user = getpwnam (user.c_str());
+ if (socket_user == NULL)
+ {
+ string err="error getting socket user: ";
+ err+=strerror(errno);
+ log(error, err);
+ throw t2n_server_error(err);
+ }
+
+ struct group *socket_group = getgrnam (group.c_str());
+ if (socket_group == NULL)
+ {
+ string err="error getting socket group: ";
+ err+=strerror(errno);
+ log(error, err);
+ throw t2n_server_error(err);
+ }
+
+ if (chown (unix_name.sun_path, socket_user->pw_uid, socket_group->gr_gid) != 0)
+ {
+ string err="error changing socket ownership: ";
+ err+=strerror(errno);
+ log(error, err);
+ throw t2n_server_error(err);
+ }
}
if (listen (sock, 5) < 0)
socket_server::~socket_server()
{
+ socket_handler::close();
+
if (get_type()==unix_s)
unlink(unix_path.c_str());
}
{
std::map<unsigned int, server_connection*>::iterator ie=connections.end();
for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
- if (!i->second->is_closed())
+ if (!i->second->server_connection::is_closed())
i->second->fill_buffer();
}
FD_CLR(sock, &connection_set);
}
+void socket_server_connection::log(log_level_values level, const char* message)
+{
+ if(my_server)
+ {
+ ostringstream msg;
+ msg << "connection id " << get_id() << ": " << message;
+ my_server->log(level,msg.str().c_str());
+ }
+}
+
void socket_server_connection::close()
{
- if (!is_closed())
+ if (!server_connection::is_closed())
{
socket_handler::close();
server_connection::close();