github-repos/rinetd
1
0
Fork 0
mirror of https://github.com/samhocevar/rinetd.git synced 2025-03-22 15:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of useless fromProtocol struct member.

Browse Source
This commit is contained in:
Sam Hocevar 2021-02-14 08:24:08 +01:00
parent f58db7ea8d
commit 26b0e63bf5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rinetd.c
View File

@ -259,7 +259,6 @@ void addServer(char *bindAddress, char *bindPort, int bindProtocol,
{ {
ServerInfo si = { ServerInfo si = {
.fromHost = bindAddress, .fromHost = bindAddress,
.fromProtocol = bindProtocol,
.toHost = connectAddress, .toHost = connectAddress,
.toPort = connectPort, .toPort = connectPort,
.toProtocol = connectProtocol, .toProtocol = connectProtocol,
@ -649,7 +648,7 @@ static void handleAccept(ServerInfo const *srv)
SOCKLEN_T addrlen = sizeof(addr); SOCKLEN_T addrlen = sizeof(addr);
SOCKET nfd; SOCKET nfd;
if (srv->fromProtocol == IPPROTO_TCP) { if (srv->fromAddrInfo->ai_protocol == IPPROTO_TCP) {
/* In TCP mode, get remote address using accept(). */ /* In TCP mode, get remote address using accept(). */
// FIXME IPv6: need to reuse addrlen from the bind() call // FIXME IPv6: need to reuse addrlen from the bind() call
nfd = accept(srv->fd, &addr, &addrlen); nfd = accept(srv->fd, &addr, &addrlen);
@ -660,7 +659,7 @@ static void handleAccept(ServerInfo const *srv)
} }
setSocketDefaults(nfd); setSocketDefaults(nfd);
} else /* if (srv->fromProtocol == IPPROTO_UDP) */ { } else /* if (srv->fromAddrInfo->ai_protocol == IPPROTO_UDP) */ {
/* In UDP mode, get remote address using recvfrom() and check /* In UDP mode, get remote address using recvfrom() and check
for an existing connection from this client. We need for an existing connection from this client. We need
to read a lot of data otherwise the datagram contents to read a lot of data otherwise the datagram contents
@ -707,11 +706,11 @@ static void handleAccept(ServerInfo const *srv)
cnx->local.totalBytesIn = cnx->local.totalBytesOut = 0; cnx->local.totalBytesIn = cnx->local.totalBytesOut = 0;
cnx->remote.fd = nfd; cnx->remote.fd = nfd;
cnx->remote.protocol = srv->fromProtocol; cnx->remote.protocol = srv->fromAddrInfo->ai_protocol;
cnx->remote.recvPos = cnx->remote.sentPos = 0; cnx->remote.recvPos = cnx->remote.sentPos = 0;
cnx->remote.totalBytesIn = cnx->remote.totalBytesOut = 0; cnx->remote.totalBytesIn = cnx->remote.totalBytesOut = 0;
cnx->remoteAddress = *(struct sockaddr_in *)&addr; cnx->remoteAddress = *(struct sockaddr_in *)&addr;
if (srv->fromProtocol == IPPROTO_UDP) if (srv->fromAddrInfo->ai_protocol == IPPROTO_UDP)
cnx->remoteTimeout = time(NULL) + srv->serverTimeout; cnx->remoteTimeout = time(NULL) + srv->serverTimeout;
cnx->coClosing = 0; cnx->coClosing = 0;
@ -733,6 +732,7 @@ static void handleAccept(ServerInfo const *srv)
This, too, is nonblocking. Why wait This, too, is nonblocking. Why wait
for anything when you don't have to? */ for anything when you don't have to? */
struct sockaddr_in saddr; struct sockaddr_in saddr;
/* FIXME: don’t forget to switch to PF_INET6 for IPv6. */
cnx->local.fd = socket(PF_INET, getSocketType(srv->toProtocol), srv->toProtocol); cnx->local.fd = socket(PF_INET, getSocketType(srv->toProtocol), srv->toProtocol);
if (cnx->local.fd == INVALID_SOCKET) { if (cnx->local.fd == INVALID_SOCKET) {
syslog(LOG_ERR, "socket(): %m\n"); syslog(LOG_ERR, "socket(): %m\n");
@ -788,7 +788,7 @@ static void handleAccept(ServerInfo const *srv)
} }
/* Send UDP data to the other socket */ /* Send UDP data to the other socket */
if (srv->fromProtocol == IPPROTO_UDP) { if (srv->fromAddrInfo->ai_protocol == IPPROTO_UDP) {
handleUdpRead(cnx, globalUdpBuffer, udpBytes); handleUdpRead(cnx, globalUdpBuffer, udpBytes);
} }

2
src/types.h
View File

@ -37,7 +37,7 @@ struct _server_info {
char *fromHost, *toHost; char *fromHost, *toHost;
struct addrinfo *fromAddrInfo; struct addrinfo *fromAddrInfo;
int16_t toPort; int16_t toPort;
int fromProtocol, toProtocol; int toProtocol;
/* Offset and count into list of allow and deny rules. Any rules /* Offset and count into list of allow and deny rules. Any rules
prior to globalAllowRules and globalDenyRules are global rules. */ prior to globalAllowRules and globalDenyRules are global rules. */