rpms/telnet
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- added netkit-telnet-0.17-ipv6.diff from Marek Grác, which adds IPv6

Browse Source 
support to telnetd
This commit is contained in:
Harald Hoyer 2006-07-14 11:15:09 +00:00
parent 7a6ac1222c
commit dd9bb818d8
2 changed files with 275 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
netkit-telnet-0.17-ipv6.diff Normal file
View File

@ -0,0 +1,265 @@
diff -uNr netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17.ipv6/telnetd/telnetd.c
--- netkit-telnet-0.17/telnetd/telnetd.c 2006-07-13 08:37:18.000000000 +0200
+++ netkit-telnet-0.17.ipv6/telnetd/telnetd.c 2006-07-14 08:36:11.000000000 +0200
@@ -49,6 +49,7 @@
/* #include <netinet/ip.h> */ /* Don't think this is used at all here */
#include <arpa/inet.h>
#include <assert.h>
+#include <sys/poll.h>
#include "telnetd.h"
#include "pathnames.h"
#include "setproctitle.h"
@@ -68,7 +69,7 @@
#define HAS_IPPROTO_IP
#endif
-static void doit(struct sockaddr_in *who);
+static void doit(struct sockaddr *who, socklen_t wholen);
static int terminaltypeok(const char *s);
/*
@@ -90,7 +91,7 @@
int
main(int argc, char *argv[], char *env[])
{
- struct sockaddr_in from;
+ struct sockaddr from;
int on = 1;
socklen_t fromlen;
register int ch;
@@ -248,64 +249,89 @@
argc -= optind;
argv += optind;
- if (debug) {
- int s, ns;
- socklen_t foo;
- struct servent *sp;
- struct sockaddr_in sn;
+ int s = 0;
- memset(&sn, 0, sizeof(sn));
- sn.sin_family = AF_INET;
+ if (debug) {
+ struct addrinfo *ai;
+ unsigned int nfds = 0;
+ struct pollfd fds[2];
if (argc > 1) {
- usage();
- /* NOTREACHED */
- } else if (argc == 1) {
- if ((sp = getservbyname(*argv, "tcp"))!=NULL) {
- sn.sin_port = sp->s_port;
- }
- else {
- int pt = atoi(*argv);
- if (pt <= 0) {
- fprintf(stderr, "telnetd: %s: bad port number\n",
- *argv);
- usage();
- /* NOTREACHED */
- }
- sn.sin_port = htons(pt);
- }
+ usage();
+ /* NOTREACHED */
} else {
- sp = getservbyname("telnet", "tcp");
- if (sp == 0) {
- fprintf(stderr, "telnetd: tcp/telnet: unknown service\n");
- exit(1);
- }
- sn.sin_port = sp->s_port;
- }
+ struct addrinfo hints;
+
+ memset (&hints, '\0', sizeof (hints));
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
+ hints.ai_protocol = IPPROTO_TCP;
+
+ if (argc == 0) {
+ if (getaddrinfo(NULL, "telnet", &hints, &ai) != 0) {
+ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
+ usage();
+ /* NOTREACHED */
+ }
+ } else {
+ if (getaddrinfo(NULL, *argv, &hints, &ai) != 0) {
+ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
+ usage();
+ /* NOTREACHED */
+ }
+ }
+ }
- s = socket(AF_INET, SOCK_STREAM, 0);
- if (s < 0) {
+ struct addrinfo *runp;
+ int b = 0;
+ for (runp = ai; ((runp != NULL) && (nfds < sizeof (fds) / sizeof (fds[0]))); runp = runp->ai_next) {
+ fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
+ if (fds[nfds].fd < 0) {
perror("telnetd: socket");;
- exit(1);
+ exit(1);
+ }
+ fds[nfds].events = POLLIN;
+ (void) setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+
+ if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) != 0) {
+ // Unable to bind to given port. One of the reason can be
+ // that we can't bind to both IPv4 and IPv6
+ break;
+ } else {
+ b++;
+ }
+
+ if (listen(fds[nfds].fd, 1) < 0) {
+ perror("listen");
+ exit(1);
+ }
+ nfds++;
}
- (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
- if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
- perror("bind");
- exit(1);
- }
- if (listen(s, 1) < 0) {
- perror("listen");
- exit(1);
+ freeaddrinfo(ai);
+
+ if (b == 0) {
+ perror("bind");
+ exit(1);
}
- foo = sizeof(sn);
- ns = accept(s, (struct sockaddr *)&sn, &foo);
- if (ns < 0) {
- perror("accept");
- exit(1);
+
+ int n = poll (fds, nfds, -1);
+ if (n > 0) {
+ unsigned int i;
+ for (i = 0; i < nfds; i++) {
+ if (fds[i].revents & POLLIN) {
+ struct sockaddr_storage rem;
+ socklen_t remlen = sizeof(rem);
+ int fd = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen);
+
+ if (fd < 0) {
+ perror("accept");
+ exit(1);
+ }
+
+ s = fd;
+ }
+ }
}
- (void) dup2(ns, 0);
- (void) close(ns);
- (void) close(s);
} else if (argc > 0) {
usage();
/* NOT REACHED */
@@ -313,13 +339,13 @@
openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
fromlen = sizeof (from);
- if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
+ if (getpeername(s, &from, &fromlen) < 0) {
fprintf(stderr, "%s: ", progname);
perror("getpeername");
_exit(1);
}
if (keepalive &&
- setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
+ setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
}
@@ -333,13 +359,13 @@
if (tos < 0)
tos = 020; /* Low Delay bit */
if (tos
- && (setsockopt(0, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+ && (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
&& (errno != ENOPROTOOPT) )
syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
}
#endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
- net = 0;
- doit(&from);
+ net = s;
+ doit(&from, fromlen);
/* NOTREACHED */
return 0;
} /* end of main */
@@ -608,10 +634,9 @@
* Get a pty, scan input lines.
*/
static void
-doit(struct sockaddr_in *who)
+doit(struct sockaddr *who, socklen_t wholen)
{
const char *host;
- struct hostent *hp;
int level;
char user_name[256];
@@ -623,12 +648,18 @@
fatal(net, "All network ports in use");
/* get name of connected client */
- hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr),
- who->sin_family);
- if (hp)
- host = hp->h_name;
- else
- host = inet_ntoa(who->sin_addr);
+ int error = -1;
+ char namebuf[255];
+
+ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
+
+ if (error) {
+ perror("getnameinfo: localhost");
+ perror(gai_strerror(error));
+ exit(1);
+ }
+
+ host = namebuf;
/*
* We must make a copy because Kerberos is probably going
@@ -649,13 +680,21 @@
/* Get local host name */
{
- struct hostent *h;
+ struct addrinfo hints;
+ struct addrinfo *res;
+ int e;
+
+ memset(&hints, '\0', sizeof(hints));
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_ADDRCONFIG;
+
gethostname(host_name, sizeof(host_name));
- h = gethostbyname(host_name);
- if (h) {
- strncpy(host_name, h->h_name, sizeof(host_name));
- host_name[sizeof(host_name)-1] = 0;
+ if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
+ perror("getaddrinfo: localhost");
+ perror(gai_strerror(e));
+ exit(1);
}
+ freeaddrinfo(res);
}
#if defined(AUTHENTICATE) || defined(ENCRYPT)

14
telnet.spec
View File

@ -1,7 +1,7 @@
Summary: The client program for the telnet remote login protocol.
Name: telnet
Version: 0.17
Release: 36.1
Release: 37
Epoch: 1
License: BSD
Group: Applications/Internet
@ -24,6 +24,7 @@ Patch15: telnetd-0.17-pty_read.patch
Patch16: telnet-0.17-CAN-2005-468_469.patch
Patch17: telnet-0.17-linemode.patch
Patch18: telnet-gethostbyname.patch
Patch19: netkit-telnet-0.17-ipv6.diff
BuildPreReq: ncurses-devel
Buildroot: %{_tmppath}/%{name}-root
@ -64,6 +65,7 @@ mv telnet telnet-NETKIT
%patch16 -p1 -b .CAN-2005-468_469
#%patch17 -p1 -b .linemode
%patch18 -p1 -b .gethost
%patch19 -p1 -b .gethost
%build
export OPT_FLAGS="$RPM_OPT_FLAGS -g"
@ -129,6 +131,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/telnetd.8*
%changelog
* Fri Jul 14 2006 Harald Hoyer <harald@redhat.com> - 1:0.17-37
- added netkit-telnet-0.17-ipv6.diff from Marek Grác,
which adds IPv6 support to telnetd
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:0.17-36.1
- rebuild
@ -243,7 +249,7 @@ rm -rf ${RPM_BUILD_ROOT}
* Sat Dec 30 2000 Nalin Dahyabhai <nalin@redhat.com>
- mark the xinetd config file as config(noreplace)
* Fri Dec 01 2000 Trond Eivind Glomsrød <teg@redhat.com>
* Fri Dec 01 2000 Trond Eivind Glomsrød <teg@redhat.com>
- make sure the server is turned off by default
* Tue Jul 18 2000 Bill Nottingham <notting@redhat.com>
@ -256,10 +262,10 @@ rm -rf ${RPM_BUILD_ROOT}
- FHS packaging.
- update to 0.17-pre20000412.
* Tue May 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
* Tue May 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
- moved the xinet entry to the server
* Mon May 22 2000 Trond Eivind Glomsrød <teg@redhat.com>
* Mon May 22 2000 Trond Eivind Glomsrød <teg@redhat.com>
- add an entry to /etc/xinetd.d
* Tue May 16 2000 Jeff Johnson <jbj@redhat.com>