From owner-freebsd-bugs  Fri Oct 18 07:20:18 1996
Return-Path: owner-bugs
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id HAA25464
          for bugs-outgoing; Fri, 18 Oct 1996 07:20:18 -0700 (PDT)
Received: (from gnats@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id HAA25436;
          Fri, 18 Oct 1996 07:20:12 -0700 (PDT)
Resent-Date: Fri, 18 Oct 1996 07:20:12 -0700 (PDT)
Resent-Message-Id: <199610181420.HAA25436@freefall.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-bugs
Resent-Reply-To: FreeBSD-gnats@freefall.FreeBSD.org, jhs@freebsd.org
Received: from vector.jhs.no_domain (slip139-92-42-60.ut.nl.ibm.net [139.92.42.60])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id HAA24661;
          Fri, 18 Oct 1996 07:12:20 -0700 (PDT)
Received: (from jhs@localhost) by vector.jhs.no_domain (8.7.5/8.6.9) id PAA04311; Wed, 16 Oct 1996 15:26:26 +0100 (MET)
Message-Id: <199610161426.PAA04311@vector.jhs.no_domain>
Date: Wed, 16 Oct 1996 15:26:26 +0100 (MET)
From: jhs@freebsd.org
Reply-To: jhs@freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Cc: jhs@freebsd.org
X-Send-Pr-Version: 3.2
Subject: bin/1836: /usr/src/*/routed/table.c:	s/punt/abort/g
Sender: owner-bugs@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         1836
>Category:       bin
>Synopsis:       Punt is american only, use abort.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 07:20:09 PDT 1996
>Last-Modified:
>Originator:     Julian Stacey jhs@freebsd.org
>Organization:
Julian Stacey jhs@freebsd.org
>Release:        FreeBSD 2.2-CURRENT i386
>Environment:
Current

>Description:

	Routed American not understandable in English.

	/usr/src/*/routed/table.c
	creates console messages like this:
	  Oct 16 13:10:46 vector routed[63]: punt RTM_LOSING without gateway
	
	That's not English (I am :-)
	`punt'
	        in the Penguin English Dictionary ('85-86) refers to a verb & noun: 
	        to punt (propel) a punt (flat bottom boat) on a river (or fen).
	`punt'
	        in American (according to Jordan, years ago, so forgive any inaccuracy):
	                to abandon or give up on something, or decline an invitation
	
	The message is obscure,
	a more globaly understandable word would be better, patch follows
	(feel free to choose a better American to global English translation
	than mine, I don't know what `punt' is except by hearsay,
	but `abort' is nearly as short :-)


>How-To-Repeat:

	Run current, drop modem slip link

>Fix:
	

=========
*** old/src/sbin/routed/table.c	Wed Oct 16 16:10:35 1996
--- new/src/sbin/routed/table.c	Wed Oct 16 16:11:37 1996
***************
*** 281,287 ****
  
  	NTOHL(dst);
  
! 	/* Punt non-contiguous subnet masks.
  	 *
  	 * (X & -X) contains a single bit if and only if X is a power of 2.
  	 * (X + (X & -X)) == 0 if and only if X is a power of 2.
--- 281,287 ----
  
  	NTOHL(dst);
  
! 	/* Abort non-contiguous subnet masks.
  	 *
  	 * (X & -X) contains a single bit if and only if X is a power of 2.
  	 * (X + (X & -X)) == 0 if and only if X is a power of 2.
***************
*** 831,844 ****
  	} else if (INFO_MASK(info) != 0) {
  		mask = ntohl(S_ADDR(INFO_MASK(info)));
  	} else {
! 		msglog("punt %s without mask",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
  
  	if (INFO_GATE(info) == 0
  	    || INFO_GATE(info)->sa_family != AF_INET) {
! 		msglog("punt %s without gateway",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
--- 831,844 ----
  	} else if (INFO_MASK(info) != 0) {
  		mask = ntohl(S_ADDR(INFO_MASK(info)));
  	} else {
! 		msglog("abort %s without mask",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
  
  	if (INFO_GATE(info) == 0
  	    || INFO_GATE(info)->sa_family != AF_INET) {
! 		msglog("abort %s without gateway",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
***************
*** 916,922 ****
  {
  	if (INFO_GATE(info) == 0
  	    || INFO_GATE(info)->sa_family != AF_INET) {
! 		msglog("punt %s without gateway",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
--- 916,922 ----
  {
  	if (INFO_GATE(info) == 0
  	    || INFO_GATE(info)->sa_family != AF_INET) {
! 		msglog("abort %s without gateway",
  		       rtm_type_name(rtm->rtm_type));
  		return;
  	}
=========
>Audit-Trail:
>Unformatted: