mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused tcp module from tools

Browse Source
This commit is contained in:
matt335672 2022-02-14 14:51:44 +00:00
parent 32f644a907
commit a952ff8542
5 changed files with 1 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sesman/tools/Makefile.am
View File

@ -20,9 +20,7 @@ noinst_PROGRAMS = \
xrdp_sesrun_SOURCES = \
config.c \
sesrun.c \
tcp.c \
tcp.h
sesrun.c
xrdp_sesadmin_SOURCES = \
sesadmin.c

1
sesman/tools/sesadmin.c
View File

@ -22,7 +22,6 @@
#endif
#include "arch.h"
#include "tcp.h"
#include "libscp.h"
#include "parse.h"
#include "log.h"

1
sesman/tools/sesrun.c
View File

@ -36,7 +36,6 @@
#include "os_calls.h"
#include "config.h"
#include "log.h"
#include "tcp.h"
#include "string_calls.h"
#include "guid.h"

150
sesman/tools/tcp.c
View File

@ -1,150 +0,0 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
* Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
*
* @file tcp.c
* @brief Tcp stream functions
* @author Jay Sorg, Simone Fedele
*
*/
#if defined(HAVE_CONFIG_H)
#include <config_ac.h>
#endif
#include "sesman.h"
#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <stdlib.h>
#include <string.h>
/*****************************************************************************/
int
tcp_force_recv(int sck, char *data, int len)
{
int rcvd;
//#ifndef LIBSCP_CLIENT
// int block;
// block = lock_fork_critical_section_start();
//#endif
while (len > 0)
{
rcvd = g_tcp_recv(sck, data, len, 0);
if (rcvd == -1)
{
if (g_tcp_last_error_would_block(sck))
{
g_sleep(1);
}
else
{
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 1;
}
}
else if (rcvd == 0)
{
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 1;
}
else
{
data += rcvd;
len -= rcvd;
}
}
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 0;
}
/*****************************************************************************/
int
tcp_force_send(int sck, char *data, int len)
{
int sent;
//#ifndef LIBSCP_CLIENT
// int block;
// block = lock_fork_critical_section_start();
//#endif
while (len > 0)
{
sent = g_tcp_send(sck, data, len, 0);
if (sent == -1)
{
if (g_tcp_last_error_would_block(sck))
{
g_sleep(1);
}
else
{
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 1;
}
}
else if (sent == 0)
{
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 1;
}
else
{
data += sent;
len -= sent;
}
}
//#ifndef LIBSCP_CLIENT
// lock_fork_critical_section_end(block);
//#endif
return 0;
}
/*****************************************************************************/
int
tcp_bind(int sck, char *addr, char *port)
{
struct sockaddr_in s;
memset(&s, 0, sizeof(struct sockaddr_in));
s.sin_family = AF_INET;
s.sin_port = htons(atoi(port));
s.sin_addr.s_addr = inet_addr(addr);
return bind(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_in));
}

66
sesman/tools/tcp.h
View File

@ -1,66 +0,0 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
* Copyright (C) Jay Sorg 2004-2013
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
*
* @file tcp.h
* @brief Tcp stream functions declarations
* @author Jay Sorg, Simone Fedele
*
*/
#ifndef TCP_H
#define TCP_H
/**
*
* @brief Force receiving data from tcp stream
* @param sck The socket to read from
* @param data Data buffer
* @param len Data buffer size
* @return 0 on success, 1 on error
*
*/
int
tcp_force_recv(int sck, char *data, int len);
/**
*
* @brief Force sending data to tcp stream
* @param sck the socket to write to
* @param data Data buffer
* @param len Data buffer size
* @return 0 on success, 1 on error
*
*/
int
tcp_force_send(int sck, char *data, int len);
/**
*
* @brief Binds the listening socket
* @param sck Listening socket
* @param addr Listening address
* @param port Listening port
* @return 0 on success, -1 on error
*
*/
int
tcp_bind(int sck, char *addr, char *port);
#endif