Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/games/hunt/huntd Rip out the code that broadcasts talk reque...
details: https://anonhg.NetBSD.org/src/rev/5d0bf1dbe0e2
branches: trunk
changeset: 328237:5d0bf1dbe0e2
user: dholland <dholland%NetBSD.org@localhost>
date: Sat Mar 29 20:32:04 2014 +0000
description:
Rip out the code that broadcasts talk requests to the local
hunt-players mailing list.
In this day and age it doesn't even begin to work: even if you were to
have such a mailing list locally, sendmail wouldn't expand it for you,
the addresses you got back wouldn't be talk-requestable addresses,
talk requests don't cross NAT or firewalls safely, talk doesn't
support ipv6, and nobody runs talkd anyway.
It doesn't make sense to try to replace it with some other kind of
notify scheme either; there might still be a multiuser machine
somewhere with enough simultaneous users that broadcasting something
akin to talk requests locally might make sense, and where a nontrivial
number of the users actually play hunt, but probably not, and if so
those users are likely to be better off using wall(1) anyway. Nowadays
games will be set up by looking for people in chat or by emailing or
texting friends.
Theoretically someone could set up an internet hunt metaserver for
finding hunt games, but that would be something entirely different
anyway and I doubt there's demand.
diffstat:
games/hunt/huntd/Makefile | 6 +-
games/hunt/huntd/ctl.c | 85 -----------------
games/hunt/huntd/ctl_transact.c | 128 -------------------------
games/hunt/huntd/faketalk.c | 199 +---------------------------------------
games/hunt/huntd/get_names.c | 174 ----------------------------------
games/hunt/huntd/huntd.6 | 16 +--
games/hunt/huntd/talk_ctl.h | 106 ---------------------
7 files changed, 7 insertions(+), 707 deletions(-)
diffs (truncated from 795 to 300 lines):
diff -r 8b80c002cfc9 -r 5d0bf1dbe0e2 games/hunt/huntd/Makefile
--- a/games/hunt/huntd/Makefile Sat Mar 29 20:22:16 2014 +0000
+++ b/games/hunt/huntd/Makefile Sat Mar 29 20:32:04 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1997/10/04 09:11:21 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/29 20:32:04 dholland Exp $
PROG= huntd
-SRCS= answer.c ctl.c ctl_transact.c draw.c driver.c execute.c expl.c \
- extern.c faketalk.c get_names.c makemaze.c pathname.c shots.c terminal.c
+SRCS= answer.c draw.c driver.c execute.c expl.c \
+ extern.c faketalk.c makemaze.c pathname.c shots.c terminal.c
MAN= huntd.6
.include <bsd.prog.mk>
diff -r 8b80c002cfc9 -r 5d0bf1dbe0e2 games/hunt/huntd/ctl.c
--- a/games/hunt/huntd/ctl.c Sat Mar 29 20:22:16 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/* $NetBSD: ctl.c,v 1.7 2014/03/29 20:16:09 dholland Exp $ */
-/*
- * Copyright (c) 1983-2003, Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * + Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * + Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * + Neither the name of the University of California, San Francisco nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(TALK_43) || defined(TALK_42)
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctl.c 5.2 (Berkeley) 3/13/86";
-#else
-__RCSID("$NetBSD: ctl.c,v 1.7 2014/03/29 20:16:09 dholland Exp $");
-#endif
-#endif /* not lint */
-
-/*
- * This file handles haggling with the various talk daemons to
- * get a socket to talk to. sockt is opened and connected in
- * the progress
- */
-
-#include "hunt.h"
-#include "talk_ctl.h"
-
-struct sockaddr_in daemon_addr;
-struct sockaddr_in ctl_addr;
-
-/* inet addresses of the two machines */
-struct in_addr my_machine_addr;
-struct in_addr his_machine_addr;
-
-u_short daemon_port; /* port number of the talk daemon */
-
-int ctl_sockt;
-
-CTL_MSG msg;
-
-/* open the ctl socket */
-void
-open_ctl(void)
-{
- socklen_t length;
-
- ctl_addr.sin_family = AF_INET;
- ctl_addr.sin_port = 0;
- ctl_addr.sin_addr = my_machine_addr;
- ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
- if (ctl_sockt <= 0)
- p_error("Bad socket");
- if (bind(ctl_sockt, (struct sockaddr *)&ctl_addr,
- sizeof(ctl_addr)) != 0)
- p_error("Couldn't bind to control socket");
- length = sizeof(ctl_addr);
- if (getsockname(ctl_sockt, (struct sockaddr *) &ctl_addr, &length) < 0)
- p_error("Bad address for ctl socket");
-}
-#endif
diff -r 8b80c002cfc9 -r 5d0bf1dbe0e2 games/hunt/huntd/ctl_transact.c
--- a/games/hunt/huntd/ctl_transact.c Sat Mar 29 20:22:16 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/* $NetBSD: ctl_transact.c,v 1.11 2014/03/29 20:16:09 dholland Exp $ */
-/*
- * Copyright (c) 1983-2003, Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * + Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * + Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * + Neither the name of the University of California, San Francisco nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(TALK_43) || defined(TALK_42)
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctl_transact.c 5.2 (Berkeley) 3/13/86";
-#else
-__RCSID("$NetBSD: ctl_transact.c,v 1.11 2014/03/29 20:16:09 dholland Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/time.h>
-#include <unistd.h>
-#include "hunt.h"
-#include "talk_ctl.h"
-
-#define CTL_WAIT 2 /* time to wait for a response, in seconds */
-#define MAX_RETRY 5
-
-/*
- * SOCKDGRAM is unreliable, so we must repeat messages if we have
- * not received an acknowledgement within a reasonable amount
- * of time
- */
-void
-ctl_transact(struct in_addr target, CTL_MSG tmsg, int type, CTL_RESPONSE *rp)
-{
- struct pollfd set[1];
- int nready, cc, retries;
-
- nready = 0;
- tmsg.type = type;
- daemon_addr.sin_family = AF_INET;
- daemon_addr.sin_addr = target;
- daemon_addr.sin_port = daemon_port;
- set[0].fd = ctl_sockt;
- set[0].events = POLLIN;
-
- /*
- * Keep sending the message until a response of
- * the proper type is obtained.
- */
- do {
- /* resend message until a response is obtained */
- for (retries = MAX_RETRY; retries > 0; retries -= 1) {
- cc = sendto(ctl_sockt, &tmsg, sizeof (tmsg), 0,
- (struct sockaddr *) &daemon_addr,
- sizeof(daemon_addr));
- if (cc != sizeof (tmsg)) {
- if (errno == EINTR)
- continue;
- p_error("Error on write to talk daemon");
- }
- nready = poll(set, 1, CTL_WAIT * 1000);
- if (nready < 0) {
- if (errno == EINTR)
- continue;
- p_error("Error waiting for daemon response");
- }
- if (nready != 0)
- break;
- }
- if (retries <= 0)
- break;
- /*
- * Keep reading while there are queued messages
- * (this is not necessary, it just saves extra
- * request/acknowledgements being sent)
- */
- do {
- cc = recv(ctl_sockt, rp, sizeof (*rp), 0);
- if (cc < 0) {
- if (errno == EINTR)
- continue;
- p_error("Error on read from talk daemon");
- }
- /* an immediate poll */
- nready = poll(set, 1, 0);
- } while (nready > 0 && (
-#ifdef TALK_43
- rp->vers != TALK_VERSION ||
-#endif
- rp->type != type));
- } while (
-#ifdef TALK_43
- rp->vers != TALK_VERSION ||
-#endif
- rp->type != type);
- rp->id_num = ntohl(rp->id_num);
-#ifdef TALK_43
- rp->addr.sa_family = ntohs(rp->addr.sa_family);
-#else
- rp->addr.sin_family = ntohs(rp->addr.sin_family);
-#endif
-}
-#endif
diff -r 8b80c002cfc9 -r 5d0bf1dbe0e2 games/hunt/huntd/faketalk.c
--- a/games/hunt/huntd/faketalk.c Sat Mar 29 20:22:16 2014 +0000
+++ b/games/hunt/huntd/faketalk.c Sat Mar 29 20:32:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: faketalk.c,v 1.23 2014/03/29 20:16:09 dholland Exp $ */
+/* $NetBSD: faketalk.c,v 1.24 2014/03/29 20:32:04 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,209 +32,14 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.23 2014/03/29 20:16:09 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.24 2014/03/29 20:32:04 dholland Exp $");
#endif /* not lint */
#include "hunt.h"
-#if defined(TALK_43) || defined(TALK_42)
-
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <ctype.h>
-#include <netdb.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "talk_ctl.h"
-
-/* defines for fake talk message to announce start of game */
-#ifdef TALK_43
-#define MASQUERADE "\"Hunt Game\""
-#else
-#define MASQUERADE "HuntGame"
-#endif
-#define RENDEZVOUS "hunt-players"
-#define ARGV0 "HUNT-ANNOUNCE"
-
-extern char *my_machine_name;
-
-static void do_announce(char *);
-void exorcise(int);
-
-/*
- * exorcise - disspell zombies
- */
-
-void
-exorcise(int dummy __unused)
-{
- (void) wait(0);
-}
-
-/*
- * query the local SMTP daemon to expand the RENDEZVOUS mailing list
- * and fake a talk request to each address thus found.
- */
-
-void
-faketalk(void)
-{
Home |
Main Index |
Thread Index |
Old Index