Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/usr.sbin Pull up file removal (requested by itojun):
details: https://anonhg.NetBSD.org/src/rev/eeb897e1c72a
branches: netbsd-1-5
changeset: 491851:eeb897e1c72a
user: he <he%NetBSD.org@localhost>
date: Thu Jun 07 16:44:07 2001 +0000
description:
Pull up file removal (requested by itojun):
Remove pim6dd and pim6sd due to these programs having a more
restrictive license than we wish to deal with. The programs are
instead available through pkgsrc.
diffstat:
usr.sbin/pim6dd/LICENSE.mrouted | 48 -
usr.sbin/pim6dd/LICENSE.pimd | 47 -
usr.sbin/pim6dd/Makefile | 11 -
usr.sbin/pim6dd/VERSION | 1 -
usr.sbin/pim6dd/callout.c | 256 --
usr.sbin/pim6dd/config.c | 793 ------
usr.sbin/pim6dd/debug.c | 566 ----
usr.sbin/pim6dd/debug.h | 122 -
usr.sbin/pim6dd/defs.h | 606 -----
usr.sbin/pim6dd/inet6.c | 288 --
usr.sbin/pim6dd/kern.c | 416 ---
usr.sbin/pim6dd/main.c | 720 ------
usr.sbin/pim6dd/mld6.c | 549 ----
usr.sbin/pim6dd/mld6.h | 48 -
usr.sbin/pim6dd/mld6_proto.c | 524 ----
usr.sbin/pim6dd/mrt.c | 804 -------
usr.sbin/pim6dd/mrt.h | 229 -
usr.sbin/pim6dd/pathnames.h | 64 -
usr.sbin/pim6dd/pim6.c | 442 ---
usr.sbin/pim6dd/pim6_proto.c | 1597 -------------
usr.sbin/pim6dd/pim6dd.8 | 117 -
usr.sbin/pim6dd/pim6dd.conf.5 | 156 -
usr.sbin/pim6dd/pimdd.h | 554 ----
usr.sbin/pim6dd/route.c | 660 -----
usr.sbin/pim6dd/routesock.c | 374 ---
usr.sbin/pim6dd/timer.c | 337 --
usr.sbin/pim6dd/trace.c | 541 ----
usr.sbin/pim6dd/trace.h | 205 -
usr.sbin/pim6dd/vers.c | 3 -
usr.sbin/pim6dd/vif.c | 536 ----
usr.sbin/pim6dd/vif.h | 293 --
usr.sbin/pim6sd/BUGS.TODO | 125 -
usr.sbin/pim6sd/BUGS.V6 | 8 -
usr.sbin/pim6sd/LICENSE.mrouted | 48 -
usr.sbin/pim6sd/LICENSE.pim6dd | 30 -
usr.sbin/pim6sd/LICENSE.pim6sd | 46 -
usr.sbin/pim6sd/LICENSE.pimd | 47 -
usr.sbin/pim6sd/Makefile | 19 -
usr.sbin/pim6sd/README | 84 -
usr.sbin/pim6sd/README.first | 13 -
usr.sbin/pim6sd/callout.c | 318 --
usr.sbin/pim6sd/callout.h | 63 -
usr.sbin/pim6sd/cfparse.h | 55 -
usr.sbin/pim6sd/cfparse.y | 1023 --------
usr.sbin/pim6sd/cftoken.l | 671 -----
usr.sbin/pim6sd/config.c | 496 ----
usr.sbin/pim6sd/config.h | 74 -
usr.sbin/pim6sd/crc.c | 104 -
usr.sbin/pim6sd/crc.h | 48 -
usr.sbin/pim6sd/debug.c | 999 --------
usr.sbin/pim6sd/debug.h | 155 -
usr.sbin/pim6sd/defs.h | 82 -
usr.sbin/pim6sd/inet6.c | 293 --
usr.sbin/pim6sd/inet6.h | 77 -
usr.sbin/pim6sd/kern.c | 414 ---
usr.sbin/pim6sd/kern.h | 78 -
usr.sbin/pim6sd/main.c | 769 ------
usr.sbin/pim6sd/mld6.c | 567 ----
usr.sbin/pim6sd/mld6.h | 93 -
usr.sbin/pim6sd/mld6_proto.c | 620 -----
usr.sbin/pim6sd/mld6_proto.h | 72 -
usr.sbin/pim6sd/mrt.c | 1501 -------------
usr.sbin/pim6sd/mrt.h | 341 --
usr.sbin/pim6sd/pathnames.h | 81 -
usr.sbin/pim6sd/pim6.c | 519 ----
usr.sbin/pim6sd/pim6.h | 70 -
usr.sbin/pim6sd/pim6_proto.c | 4130 ------------------------------------
usr.sbin/pim6sd/pim6_proto.h | 103 -
usr.sbin/pim6sd/pim6sd.8 | 156 -
usr.sbin/pim6sd/pim6sd.conf.5 | 335 --
usr.sbin/pim6sd/pim6sd.conf.sample | 105 -
usr.sbin/pim6sd/pim6stat | 87 -
usr.sbin/pim6sd/pim6stat.1 | 92 -
usr.sbin/pim6sd/pimd.h | 527 ----
usr.sbin/pim6sd/route.c | 1180 ----------
usr.sbin/pim6sd/route.h | 85 -
usr.sbin/pim6sd/routesock.c | 429 ---
usr.sbin/pim6sd/routesock.h | 57 -
usr.sbin/pim6sd/rp.c | 1206 ----------
usr.sbin/pim6sd/rp.h | 123 -
usr.sbin/pim6sd/timer.c | 1302 -----------
usr.sbin/pim6sd/timer.h | 102 -
usr.sbin/pim6sd/trace.c | 559 ----
usr.sbin/pim6sd/trace.h | 211 -
usr.sbin/pim6sd/var.h | 62 -
usr.sbin/pim6sd/vers.c | 3 -
usr.sbin/pim6sd/vif.c | 825 -------
usr.sbin/pim6sd/vif.h | 278 --
usr.sbin/pim6sd/vmbuf.h | 48 -
89 files changed, 0 insertions(+), 33915 deletions(-)
diffs (truncated from 34271 to 300 lines):
diff -r 1751965a204d -r eeb897e1c72a usr.sbin/pim6dd/LICENSE.mrouted
--- a/usr.sbin/pim6dd/LICENSE.mrouted Thu Jun 07 16:17:50 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-
-The mrouted program is covered by the following license. Use of the
-mrouted program represents acceptance of these terms and conditions.
-
-1. STANFORD grants to LICENSEE a nonexclusive and nontransferable license
-to use, copy and modify the computer software ``mrouted'' (hereinafter
-called the ``Program''), upon the terms and conditions hereinafter set
-out and until Licensee discontinues use of the Licensed Program.
-
-2. LICENSEE acknowledges that the Program is a research tool still in
-the development state, that it is being supplied ``as is,'' without any
-accompanying services from STANFORD, and that this license is entered
-into in order to encourage scientific collaboration aimed at further
-development and application of the Program.
-
-3. LICENSEE may copy the Program and may sublicense others to use object
-code copies of the Program or any derivative version of the Program.
-All copies must contain all copyright and other proprietary notices found
-in the Program as provided by STANFORD. Title to copyright to the
-Program remains with STANFORD.
-
-4. LICENSEE may create derivative versions of the Program. LICENSEE
-hereby grants STANFORD a royalty-free license to use, copy, modify,
-distribute and sublicense any such derivative works. At the time
-LICENSEE provides a copy of a derivative version of the Program to a
-third party, LICENSEE shall provide STANFORD with one copy of the source
-code of the derivative version at no charge to STANFORD.
-
-5. STANFORD MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
-By way of example, but not limitation, STANFORD MAKES NO REPRESENTATION
-OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR
-THAT THE USE OF THE LICENSED PROGRAM WILL NOT INFRINGE ANY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. STANFORD shall not be held liable
-for any liability nor for any direct, indirect or consequential damages
-with respect to any claim by LICENSEE or any third party on account of or
-arising from this Agreement or use of the Program.
-
-6. This agreement shall be construed, interpreted and applied in
-accordance with the State of California and any legal action arising
-out of this Agreement or use of the Program shall be filed in a court
-in the State of California.
-
-7. Nothing in this Agreement shall be construed as conferring rights to
-use in advertising, publicity or otherwise any trademark or the name
-of ``Stanford''.
-
-The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
-Leland Stanford Junior University.
diff -r 1751965a204d -r eeb897e1c72a usr.sbin/pim6dd/LICENSE.pimd
--- a/usr.sbin/pim6dd/LICENSE.pimd Thu Jun 07 16:17:50 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998 by the University of Southern California.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation in source and binary forms for lawful
- * purposes and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both
- * the copyright notice and this permission notice appear in supporting
- * documentation, and that any documentation, advertising materials,
- * and other materials related to such distribution and use acknowledge
- * that the software was developed by the University of Southern
- * California and/or Information Sciences Institute.
- * The name of the University of Southern California may not
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THE UNIVERSITY OF SOUTHERN CALIFORNIA DOES NOT MAKE ANY REPRESENTATIONS
- * ABOUT THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE. THIS SOFTWARE IS
- * PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND
- * NON-INFRINGEMENT.
- *
- * IN NO EVENT SHALL USC, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT,
- * TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH,
- * THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Other copyrights might apply to parts of this software and are so
- * noted when applicable.
- */
-/*
- * Questions concerning this software should be directed to
- * Pavlin Ivanov Radoslavov (pavlin%catarina.usc.edu@localhost)
- *
- * KAME Id: LICENSE.pimd,v 1.1.1.1 1999/08/08 23:30:50 itojun Exp
- */
-/*
- * Part of this program has been derived from mrouted.
- * The mrouted program is covered by the license in the accompanying file
- * named "LICENSE.mrouted".
- *
- * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
- * Leland Stanford Junior University.
- *
- */
diff -r 1751965a204d -r eeb897e1c72a usr.sbin/pim6dd/Makefile
--- a/usr.sbin/pim6dd/Makefile Thu Jun 07 16:17:50 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2000/02/25 06:30:54 itojun Exp $
-
-PROG= pim6dd
-SRCS= mld6.c mld6_proto.c \
- inet6.c kern.c main.c config.c debug.c routesock.c vers.c callout.c \
- route.c vif.c timer.c mrt.c pim6.c pim6_proto.c trace.c
-MAN= pim6dd.8 pim6dd.conf.5
-
-CPPFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS
-
-.include <bsd.prog.mk>
diff -r 1751965a204d -r eeb897e1c72a usr.sbin/pim6dd/VERSION
--- a/usr.sbin/pim6dd/VERSION Thu Jun 07 16:17:50 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-0.2.1.0-alpha15
diff -r 1751965a204d -r eeb897e1c72a usr.sbin/pim6dd/callout.c
--- a/usr.sbin/pim6dd/callout.c Thu Jun 07 16:17:50 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-/* $NetBSD: callout.c,v 1.1 1999/07/17 14:06:24 itojun Exp $ */
-
-/*
- * The mrouted program is covered by the license in the accompanying file
- * named "LICENSE.mrouted". Use of the mrouted program represents acceptance
- * of the terms and conditions listed in that file.
- *
- * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
- * Leland Stanford Junior University.
- *
- *
- * callout.c,v 3.8.4.5 1997/05/16 20:18:25 fenner Exp
- */
-
-#include "defs.h"
-
-/* the code below implements a callout queue */
-static int id = 0;
-static struct timeout_q *Q = 0; /* pointer to the beginning of timeout queue */
-
-struct timeout_q {
- struct timeout_q *next; /* next event */
- int id;
- cfunc_t func; /* function to call */
- void *data; /* func's data */
- int time; /* time offset to next event*/
-};
-
-#ifdef CALLOUT_DEBUG
-static void print_Q __P((void));
-#else
-#define print_Q()
-#endif
-
-void
-callout_init()
-{
- if (Q) {
- log(LOG_ERR, 0, "timer used before callout_init()");
- exit(1);
- }
- Q = (struct timeout_q *) 0;
-}
-
-void
-free_all_callouts()
-{
- struct timeout_q *p;
-
- while (Q) {
- p = Q;
- Q = Q->next;
- free(p);
- }
-}
-
-
-/*
- * elapsed_time seconds have passed; perform all the events that should
- * happen.
- */
-void
-age_callout_queue(elapsed_time)
- int elapsed_time;
-{
- struct timeout_q *ptr, *expQ;
-
-#ifdef CALLOUT_DEBUG
- IF_DEBUG(DEBUG_TIMEOUT)
- log(LOG_DEBUG, 0, "aging queue (elapsed time %d):", elapsed_time);
- print_Q();
-#endif
-
- expQ = Q;
- ptr = NULL;
-
- while (Q) {
- if (Q->time > elapsed_time) {
- Q->time -= elapsed_time;
- if (ptr) {
- ptr->next = NULL;
- break;
- }
- return;
- } else {
- elapsed_time -= Q->time;
- ptr = Q;
- Q = Q->next;
- }
- }
-
- /* handle queue of expired timers */
- while (expQ) {
- ptr = expQ;
- if (ptr->func)
- ptr->func(ptr->data);
- expQ = expQ->next;
- free(ptr);
- }
-}
-
-/*
- * Return in how many seconds age_callout_queue() would like to be called.
- * Return -1 if there are no events pending.
- */
-int
-timer_nextTimer()
-{
- if (Q) {
- if (Q->time < 0) {
- log(LOG_WARNING, 0, "timer_nextTimer top of queue says %d",
- Q->time);
- return 0;
- }
- return Q->time;
- }
- return -1;
-}
-
-/*
- * sets the timer
- */
-int
-timer_setTimer(delay, action, data)
- int delay; /* number of units for timeout */
- cfunc_t action; /* function to be called on timeout */
- void *data; /* what to call the timeout function with */
-{
- struct timeout_q *ptr, *node, *prev;
-
-#ifdef CALLOUT_DEBUG
- IF_DEBUG(DEBUG_TIMEOUT)
- log(LOG_DEBUG, 0, "setting timer:");
- print_Q();
-#endif
-
- /* create a node */
- node = (struct timeout_q *)malloc(sizeof(struct timeout_q));
- if (node == 0) {
- log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
- return -1;
- }
- node->func = action;
- node->data = data;
- node->time = delay;
- node->next = 0;
- node->id = ++id;
-
- prev = ptr = Q;
-
- /* insert node in the queue */
-
- /* if the queue is empty, insert the node and return */
- if (!Q)
- Q = node;
- else {
- /* chase the pointer looking for the right place */
- while (ptr) {
-
- if (delay < ptr->time) {
- /* right place */
-
- node->next = ptr;
- if (ptr == Q)
- Q = node;
- else
- prev->next = node;
- ptr->time -= node->time;
- return node->id;
- } else {
- /* keep moving */
-
- delay -= ptr->time; node->time = delay;
Home |
Main Index |
Thread Index |
Old Index