From owner-p4-projects@FreeBSD.ORG Sun Feb 15 09:34:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6A4416A4D0; Sun, 15 Feb 2004 09:34:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1E1C16A4CE for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DB2D43D2D for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1FHYWGe029205 for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1FHYW27029202 for perforce@freebsd.org; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 15 Feb 2004 09:34:32 -0800 (PST) Message-Id: <200402151734.i1FHYW27029202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 46995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2004 17:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=46995 Change 46995 by rwatson@rwatson_fledge on 2004/02/15 09:34:15 Copyright update, whitespace consistency cleanup, style cleanup. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#2 (text+ko) ==== @@ -1,11 +1,11 @@ /*- - * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2003, 2004 Networks Associates Technology, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project by NAI Labs, the - * Security Research Division of Network Associates, Inc. under - * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA - * CHATS research program. + * This software was developed for the FreeBSD Project by McAfee + * Research, the Security Research Division of Network Associates, Inc. + * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the + * DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -136,21 +136,21 @@ int cap_check_cred(struct ucred *cred, struct thread *td, cap_value_t cap, int jailflags) { - int error; + int error; #ifdef MAC - error = mac_check_cap (cred, cap); - if (error) - return error; + error = mac_check_cap(cred, cap); + if (error) + return error; #endif - error = suser_cred (cred, jailflags); + error = suser_cred(cred, jailflags); - return error; + return error; } int cap_check(struct thread *td, cap_value_t cap) { - return cap_check_cred (td->td_ucred, td, cap, 0); + return cap_check_cred(td->td_ucred, td, cap, 0); } From owner-p4-projects@FreeBSD.ORG Sun Feb 15 17:10:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6583216A4D1; Sun, 15 Feb 2004 17:10:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F8EC16A4D0 for ; Sun, 15 Feb 2004 17:10:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B04043D2D for ; Sun, 15 Feb 2004 17:10:01 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1G1A1Ge044507 for ; Sun, 15 Feb 2004 17:10:01 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1G1A0Yd044504 for perforce@freebsd.org; Sun, 15 Feb 2004 17:10:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 15 Feb 2004 17:10:00 -0800 (PST) Message-Id: <200402160110.i1G1A0Yd044504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 47016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 01:10:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=47016 Change 47016 by rwatson@rwatson_paprika on 2004/02/15 17:09:14 Parts of this code were written (and released) in 2001 by NETA; backdate copyright. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003, 2004 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2003, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by McAfee From owner-p4-projects@FreeBSD.ORG Mon Feb 16 08:57:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E5C16A4E0; Mon, 16 Feb 2004 08:57:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 874E716A4CF for ; Mon, 16 Feb 2004 08:57:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7952643D31 for ; Mon, 16 Feb 2004 08:57:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GGvBGe082982 for ; Mon, 16 Feb 2004 08:57:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GGvBFl082975 for perforce@freebsd.org; Mon, 16 Feb 2004 08:57:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Feb 2004 08:57:11 -0800 (PST) Message-Id: <200402161657.i1GGvBFl082975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 47032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 16:57:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=47032 Change 47032 by rwatson@rwatson_paprika on 2004/02/16 08:56:12 mkdir requried on /.attributes/system before initattr will succeed. Submitted by: James.Nix@ngc.com Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#26 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#26 (text+ko) ==== @@ -316,6 +316,7 @@ insert the same directory in front of "/.attribute/system/sebsd" to store the attributes in that file system. + mkdir -p /.attribute/system sudo extattrctl initattr -p / 256 /.attribute/system/sebsd Step 17: Install mac.conf From owner-p4-projects@FreeBSD.ORG Mon Feb 16 09:01:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0624D16A4D0; Mon, 16 Feb 2004 09:01:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6D7C16A4CE; Mon, 16 Feb 2004 09:01:14 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40A1F43D2D; Mon, 16 Feb 2004 09:01:14 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id i1GH1DnJ000166; Mon, 16 Feb 2004 10:01:13 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 16 Feb 2004 10:00:46 -0700 (MST) Message-Id: <20040216.100046.128174065.imp@bsdimp.com> To: rwatson@freebsd.org From: "M. Warner Losh" In-Reply-To: <200402160110.i1G1A0Yd044504@repoman.freebsd.org> References: <200402160110.i1G1A0Yd044504@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 47016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 17:01:15 -0000 In message: <200402160110.i1G1A0Yd044504@repoman.freebsd.org> Robert Watson writes: : Parts of this code were written (and released) in 2001 by NETA; : backdate copyright. ... : - * Copyright (c) 2003, 2004 Networks Associates Technology, Inc. : + * Copyright (c) 2001, 2003, 2004 Networks Associates Technology, Inc. Most IP lawyers recommend using the form 2001-2004 in cases like this. Warner From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:35:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB0116A4D0; Mon, 16 Feb 2004 14:35:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A87616A4CE for ; Mon, 16 Feb 2004 14:35:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0047843D1F for ; Mon, 16 Feb 2004 14:35:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMZBGe067043 for ; Mon, 16 Feb 2004 14:35:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMZBZ2067040 for perforce@freebsd.org; Mon, 16 Feb 2004 14:35:11 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:35:11 -0800 (PST) Message-Id: <200402162235.i1GMZBZ2067040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:35:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=47053 Change 47053 by sam@sam_ebb on 2004/02/16 14:34:46 expose ieee80211_find_instance for use by the 802.1x code Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#16 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#16 (text+ko) ==== @@ -390,7 +390,7 @@ #undef IEEERATE } -static struct ieee80211com * +struct ieee80211com * ieee80211_find_instance(struct ifnet *ifp) { struct ieee80211com *ic; From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:36:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 186F116A4D7; Mon, 16 Feb 2004 14:36:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E50CD16A4CE for ; Mon, 16 Feb 2004 14:36:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E227843D1D for ; Mon, 16 Feb 2004 14:36:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMaDGe067124 for ; Mon, 16 Feb 2004 14:36:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMaDPt067121 for perforce@freebsd.org; Mon, 16 Feb 2004 14:36:13 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:36:13 -0800 (PST) Message-Id: <200402162236.i1GMaDPt067121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:36:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=47054 Change 47054 by sam@sam_ebb on 2004/02/16 14:35:16 add get_random_bytes to ease portability Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_freebsd.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_freebsd.c#3 (text+ko) ==== @@ -60,6 +60,28 @@ return m; } +void +get_random_bytes(void *data, u_int len) +{ + int i = len / sizeof(u_int32_t); + + KASSERT((len % sizeof(u_int32_t)) == 0, + ("len %u not a multiple of word size", len)); + if (!ALIGNED_POINTER(data, u_int32_t)) { + u_int8_t *bp; + + for (bp = data; --i >= 0; bp += sizeof(u_int32_t)) { + u_int32_t v = arc4random(); + memcpy(bp, &v, sizeof(v)); + } + } else { + u_int32_t *dp = data; + + while (--i >= 0) + *dp++ = arc4random(); + } +} + /* * Module glue. * From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:37:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7CB16A4D0; Mon, 16 Feb 2004 14:37:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 492B816A4CE for ; Mon, 16 Feb 2004 14:37:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3064743D2D for ; Mon, 16 Feb 2004 14:37:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMbGGe067200 for ; Mon, 16 Feb 2004 14:37:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMbFEO067196 for perforce@freebsd.org; Mon, 16 Feb 2004 14:37:15 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:37:15 -0800 (PST) Message-Id: <200402162237.i1GMbFEO067196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:37:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=47056 Change 47056 by sam@sam_ebb on 2004/02/16 14:36:48 o add locking directives for 802.1x and radius client code o add ALIGNED_POINTER definition o add ieee80211_node_refcnt portability wrapper o add get_random_bytes portability wrapper Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_freebsd.h#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_freebsd.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ #define NBPFILTER 1 /* always enabled */ /* - * Locking definitions. + * Node locking definitions. */ typedef struct mtx ieee80211_node_lock_t; #define IEEE80211_NODE_LOCK_INIT(_ic, _name) \ @@ -41,8 +41,32 @@ #define IEEE80211_NODE_LOCK(_ic) mtx_lock(&(_ic)->ic_nodelock) #define IEEE80211_NODE_UNLOCK(_ic) mtx_unlock(&(_ic)->ic_nodelock) +/* + * 802.1x state locking definitions. + */ +typedef struct mtx eapol_node_lock_t; +#define EAPOL_LOCK_INIT(_ec, _name) \ + mtx_init(&(_ec)->ec_lock, _name, "802.1x node table", MTX_DEF) +#define EAPOL_LOCK_DESTROY(_ec) mtx_destroy(&(_ec)->ec_lock) +#define EAPOL_LOCK(_ec) mtx_lock(&(_ec)->ec_lock) +#define EAPOL_UNLOCK(_ec) mtx_unlock(&(_ec)->ec_lock) +#define EAPOL_LOCK_ASSERT(_ec) mtx_assert((_ec)->ec_lock, MTX_OWNED) + +/* + * Radius state locking definitions. + */ +typedef struct mtx radius_lock_t; +#define RADIUS_LOCK_INIT(_rc, _name) \ + mtx_init(&(_rc)->rc_lock, _name, "802.1x radius client", MTX_DEF) +#define RADIUS_LOCK_DESTROY(_rc) mtx_destroy(&(_rc)->rc_lock) +#define RADIUS_LOCK(_rc) mtx_lock(&(_rc)->rc_lock) +#define RADIUS_UNLOCK(_rc) mtx_unlock(&(_rc)->rc_lock) +#define RADIUS_LOCK_ASSERT(_rc) mtx_assert((_rc)->rc_lock, MTX_OWNED) + #define M_LINK0 M_PROTO1 #define ALTQ_DECL(_x) +/* NB: this assumes the alignement is a pow2 */ +#define ALIGNED_POINTER(p,a) ((((uintptr_t)(p)) & ((a)-1)) == 0) /* * Node reference counting definitions: @@ -52,10 +76,12 @@ * ieee80211_node_decref remove a reference * ieee80211_node_dectestref remove a reference and return 1 if this * is the last reference, otherwise 0 + * ieee80211_node_refcnt reference count for printing (only) */ #define ieee80211_node_initref(_ni) ((_ni)->ni_refcnt = 1) #define ieee80211_node_incref(_ni) atomic_add_int(&(_ni)->ni_refcnt,1) #define ieee80211_node_decref(_ni) atomic_subtract_int(&(_ni)->ni_refcnt,1) +#define ieee80211_node_refcnt(_ni) (_ni)->ni_refcnt /* XXX handle circularity required by inline function */ #include @@ -73,5 +99,6 @@ } extern struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen); +extern void get_random_bytes(void *data, u_int len); #endif /* _NET80211_IEEE80211_FREEBSD_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:44:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E41316A4D0; Mon, 16 Feb 2004 14:44:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 734D716A4CE for ; Mon, 16 Feb 2004 14:44:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DF4D43D1D for ; Mon, 16 Feb 2004 14:44:25 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMiPGe069267 for ; Mon, 16 Feb 2004 14:44:25 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMiOwl069264 for perforce@freebsd.org; Mon, 16 Feb 2004 14:44:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:44:24 -0800 (PST) Message-Id: <200402162244.i1GMiOwl069264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:44:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=47057 Change 47057 by sam@sam_ebb on 2004/02/16 14:44:05 backport madwifi work for 802.1x and 11g: o redo pspoll receive handling to eliminate extra node lookup (already had the node in hand) o pull out doprint logic into a separate function o redo input path so pspoll control frames are not discarded because of frame length o correct authorized port check o correct refcnt reclamation when doing internal bridge work o replace uess of ieee80211_alloc_node with ieee80211_dup_bss so new nodes properly inherit state o correct problem where existing nodes weren't having their rssi+rstamp updated on reassociation and the like o pull out shared key challenge allocation work into a routine o replace explicit arc4random usage with get_random_bytes portability wrapper o move is_rx_nodealloc counter to the node allocation routines o use new privacy capability flag instead of WEP usage o move aid management code to ieee80211_node_leave o correct check for running out of aid's o add callbacks to the authenticator when stations associate and deassociate (this kicks the 802.1x state machine) o fix two refcnt leaks that could occur in error conditions Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#17 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#17 (text+ko) ==== @@ -73,8 +73,28 @@ static struct mbuf *ieee80211_defrag(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *); -static void ieee80211_recv_pspoll(struct ieee80211com *, struct mbuf *, - int rssi, u_int32_t rstamp); +static void ieee80211_recv_pspoll(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); + +#ifdef IEEE80211_DEBUG +/* + * Decide if a received frame management frame should + * printed when debugging is enabled. This filters some + * of the less interesting frames that come frequently + * (e.g. beacons). + */ +static __inline int +doprint(struct ieee80211com *ic, int subtype) +{ + switch (subtype) { + case IEEE80211_FC0_SUBTYPE_BEACON: + return (ic->ic_state == IEEE80211_S_SCAN); + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + return (ic->ic_opmode == IEEE80211_M_IBSS); + } + return 1; +} +#endif /* * Process a received frame. The node associated with the sender @@ -93,7 +113,6 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_frame *wh; struct ether_header *eh; - struct mbuf *m1; int len; u_int8_t dir, type, subtype; u_int8_t *bssid; @@ -109,16 +128,30 @@ KASSERT(m->m_pkthdr.len >= sizeof(struct ieee80211_frame_min), ("frame length too short: %u", m->m_pkthdr.len)); + /* * In monitor mode, send everything directly to bpf. * Also do not process frames w/o i_addr2 any further. * XXX may want to include the CRC */ - if (ic->ic_opmode == IEEE80211_M_MONITOR || - m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) + if (ic->ic_opmode == IEEE80211_M_MONITOR) goto out; + if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + ("%s: frame too short, len %u\n", + __func__, m->m_pkthdr.len)); + ic->ic_stats.is_rx_tooshort++; + goto out; + } + /* + * Bit of a cheat here, we use a pointer for a 3-address + * frame format but don't reference fields past outside + * ieee80211_frame_min w/o first validating the data is + * present. + */ wh = mtod(m, struct ieee80211_frame *); + if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != IEEE80211_FC0_VERSION_0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, @@ -130,19 +163,7 @@ dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; - /* - * NB: We are not yet prepared to handle control frames, - * but permitting drivers to send them to us allows - * them to go through bpf tapping at the 802.11 layer. - */ - if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { - /* XXX statistic */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - ("%s: frame too short, len %u\n", - __func__, m->m_pkthdr.len)); - ic->ic_stats.is_rx_tooshort++; - goto out; /* XXX */ - } + subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; if (ic->ic_state != IEEE80211_S_SCAN) { switch (ic->ic_opmode) { case IEEE80211_M_STA: @@ -160,9 +181,17 @@ case IEEE80211_M_IBSS: case IEEE80211_M_AHDEMO: case IEEE80211_M_HOSTAP: - if (dir == IEEE80211_FC1_DIR_NODS) + if (dir == IEEE80211_FC1_DIR_NODS) { + if (m->m_pkthdr.len < + sizeof(struct ieee80211_frame)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + ("%s: frame too short, len %u\n", + __func__, m->m_pkthdr.len)); + ic->ic_stats.is_rx_tooshort++; + goto out; + } bssid = wh->i_addr3; - else + } else bssid = wh->i_addr1; if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr) && @@ -170,15 +199,13 @@ IEEE80211_FC0_TYPE_DATA) { /* not interested in */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - ("[%s] discard frame from bss %s\n", - ieee80211_state_name[ic->ic_state], - ether_sprintf(bssid))); + ("[%s] discard frame from bss %s\n", + ieee80211_state_name[ic->ic_state], + ether_sprintf(bssid))); ic->ic_stats.is_rx_wrongbss++; goto out; } break; - case IEEE80211_M_MONITOR: - goto out; default: /* XXX catch bad values */ goto out; @@ -202,7 +229,7 @@ ic->ic_stats.is_rx_dup++; /* XXX per-station stat */ goto out; } - ni->ni_inact = 0; + ni->ni_inact = 0; /* XXX move up? */ } /* @@ -237,6 +264,13 @@ switch (type) { case IEEE80211_FC0_TYPE_DATA: + if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + ("%s: data frame too short, len %u\n", + __func__, m->m_pkthdr.len)); + ic->ic_stats.is_rx_tooshort++; + goto out; /* XXX */ + } switch (ic->ic_opmode) { case IEEE80211_M_STA: if (dir != IEEE80211_FC1_DIR_FROMDS) { @@ -275,7 +309,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, ("%s: data from unknown src %s\n", __func__, ether_sprintf(wh->i_addr2))); - /* NB: caller deals with reference */ + /* NB: caller deals with reference to ic_bss */ ni = ieee80211_dup_bss(ic, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, @@ -296,22 +330,9 @@ ic->ic_stats.is_rx_notassoc++; goto err; } - /* - * When station is to be authenticated with 802.1x - * deny any data frames until authentication has - * been completed. - */ - if (ni->ni_authmode == IEEE80211_AUTH_8021X && - (ni->ni_flags & IEEE80211_NODE_AUTH) == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - ("%s: data from unauthenticated src %s\n", - __func__, ether_sprintf(wh->i_addr2))); - ic->ic_stats.is_rx_not1xauth++; - /* XXX node statistic */ - goto err; - } break; - case IEEE80211_M_MONITOR: + default: + /* XXX here to keep compiler happy */ break; } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { @@ -351,12 +372,28 @@ ic->ic_stats.is_rx_decap++; goto err; } + eh = mtod(m, struct ether_header *); + /* + * Deny any non-PAE frames received prior to authorization. + * For open/shared-key authentication the port is mark + * authorized after authentication completes. For 802.1x + * the port is not marked authorized by the authenticator. + */ + if ((ni->ni_flags & IEEE80211_NODE_AUTH) == 0 && + eh->ether_type != htons(ETHERTYPE_PAE)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, + ("%s: discard data from %s on unauthorized port\n", + __func__, ether_sprintf(wh->i_addr2))); + ic->ic_stats.is_rx_unauth++; + /* XXX node statistic */ + goto err; + } ifp->if_ipackets++; /* perform as a bridge within the AP */ - m1 = NULL; if (ic->ic_opmode == IEEE80211_M_HOSTAP) { - eh = mtod(m, struct ether_header *); + struct mbuf *m1 = NULL; + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { m1 = m_copypacket(m, M_DONTWAIT); if (m1 == NULL) @@ -364,6 +401,8 @@ else m1->m_flags |= M_MCAST; } else { + /* XXX this dups work done in ieee80211_encap */ + /* check if destination is associated */ struct ieee80211_node *ni1 = ieee80211_find_node(ic, eh->ether_dhost); if (ni1 != NULL) { @@ -371,7 +410,8 @@ m1 = m; m = NULL; } - ieee80211_unref_node(&ni1); + /* XXX statistic? */ + ieee80211_free_node(ic, ni1); } } if (m1 != NULL) { @@ -405,7 +445,6 @@ ic->ic_stats.is_rx_ahdemo_mgt++; goto out; } - subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; /* drop frames without interest */ if (ic->ic_state == IEEE80211_S_SCAN) { @@ -421,30 +460,22 @@ goto out; } } - - if (ieee80211_msg_debug(ic)) { - /* avoid to print too many frames */ - int doprint = 0; - - switch (subtype) { - case IEEE80211_FC0_SUBTYPE_BEACON: - if (ic->ic_state == IEEE80211_S_SCAN) - doprint = 1; - break; - case IEEE80211_FC0_SUBTYPE_PROBE_REQ: - if (ic->ic_opmode == IEEE80211_M_IBSS) - doprint = 1; - break; - default: - doprint = 1; - break; - } - if (doprint || ieee80211_msg_dumppkts(ic)) - if_printf(ifp, "received %s from %s rssi %d\n", - ieee80211_mgt_subtype_name[subtype - >> IEEE80211_FC0_SUBTYPE_SHIFT], - ether_sprintf(wh->i_addr2), rssi); + if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + ("%s: mgt data frame too short, len %u\n", + __func__, m->m_pkthdr.len)); + ic->ic_stats.is_rx_tooshort++; + goto out; + } +#ifdef IEEE80211_DEBUG + if ((ieee80211_msg_debug(ic) && doprint(ic, subtype)) || + ieee80211_msg_dumppkts(ic)) { + if_printf(ifp, "received %s from %s rssi %d\n", + ieee80211_mgt_subtype_name[subtype + >> IEEE80211_FC0_SUBTYPE_SHIFT], + ether_sprintf(wh->i_addr2), rssi); } +#endif if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m); (*ic->ic_recv_mgmt)(ic, m, ni, subtype, rssi, rstamp); @@ -455,19 +486,18 @@ ic->ic_stats.is_rx_ctl++; if (ic->ic_opmode != IEEE80211_M_HOSTAP) goto out; - subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) { /* XXX statistic */ /* Dump out a single packet from the host */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, ("got power save probe from %s\n", ether_sprintf(wh->i_addr2))); - ieee80211_recv_pspoll(ic, m, rssi, rstamp); + ieee80211_recv_pspoll(ic, ni, m); } goto out; default: IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - ("%s: bad type %x\n", __func__, type)); + ("%s: bad frame type %x\n", __func__, type)); /* should not come here */ break; } @@ -736,19 +766,17 @@ ic->ic_stats.is_rx_bad_auth++; return; } + /* always accept open authentication requests */ if (ni == ic->ic_bss) { - ni = ieee80211_alloc_node(ic, wh->i_addr2); - if (ni == NULL) { - ic->ic_stats.is_rx_nodealloc++; + ni = ieee80211_dup_bss(ic, wh->i_addr2); + if (ni == NULL) return; - } IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_bss->ni_bssid); - ni->ni_rssi = rssi; - ni->ni_rstamp = rstamp; - ni->ni_chan = ic->ic_bss->ni_chan; allocbs = 1; } else allocbs = 0; + ni->ni_rssi = rssi; + ni->ni_rstamp = rstamp; IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, @@ -782,14 +810,28 @@ } } +static int +alloc_challenge(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + if (ni->ni_challenge == NULL) + MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, + M_DEVBUF, M_NOWAIT); + if (ni->ni_challenge == NULL) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, + ("%s: challenge alloc failed\n", __func__)); + /* XXX statistic */ + } + return (ni->ni_challenge != NULL); +} + /* XXX TODO: add statistics */ static void ieee80211_auth_shared(struct ieee80211com *ic, struct ieee80211_frame *wh, u_int8_t *frm, u_int8_t *efrm, struct ieee80211_node *ni, int rssi, u_int32_t rstamp, u_int16_t seq, u_int16_t status) { - u_int8_t *challenge = NULL; - int allocbs, i, estatus; + u_int8_t *challenge; + int allocbs, estatus; /* * NB: this can happen as we allow pre-shared key @@ -820,6 +862,7 @@ goto bad; } + challenge = NULL; if (frm + 1 < efrm) { if ((frm[1] + 2) > (efrm - frm)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, @@ -871,35 +914,24 @@ switch (seq) { case IEEE80211_AUTH_SHARED_REQUEST: if (ni == ic->ic_bss) { - ni = ieee80211_alloc_node(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic, wh->i_addr2); if (ni == NULL) { - ic->ic_stats.is_rx_nodealloc++; /* NB: no way to return an error */ return; } IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_bss->ni_bssid); - ni->ni_rssi = rssi; - ni->ni_rstamp = rstamp; - ni->ni_chan = ic->ic_bss->ni_chan; allocbs = 1; } else allocbs = 0; - if (ni->ni_challenge == NULL) - MALLOC(ni->ni_challenge, u_int32_t*, - IEEE80211_CHALLENGE_LEN, - M_DEVBUF, M_NOWAIT); - if (ni->ni_challenge == NULL) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - ("%s: challenge alloc failed\n", - __func__)); - /* XXX statistic */ + ni->ni_rssi = rssi; + ni->ni_rstamp = rstamp; + if (!alloc_challenge(ic, ni)) { /* NB: don't return error so they rexmit */ return; } - for (i = IEEE80211_CHALLENGE_LEN / sizeof(u_int32_t); - --i >= 0; ) - ni->ni_challenge[i] = arc4random(); + get_random_bytes(ni->ni_challenge, + IEEE80211_CHALLENGE_LEN); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ("shared key %sauth request from station %s\n", @@ -913,7 +945,6 @@ /* NB: don't send a response */ return; } - allocbs = 1; if (ni->ni_challenge == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, ("%s: no challenge recorded\n", __func__)); @@ -961,6 +992,7 @@ ("%s: auth failed (reason %d) for %s\n", __func__, status, ether_sprintf(wh->i_addr3))); + /* XXX can this happen? */ if (ni != ic->ic_bss) ni->ni_fails++; ic->ic_stats.is_rx_auth_fail++; @@ -970,16 +1002,9 @@ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; case IEEE80211_AUTH_SHARED_CHALLENGE: - if (ni->ni_challenge == NULL) - MALLOC(ni->ni_challenge, u_int32_t *, - challenge[1], M_DEVBUF, M_NOWAIT); - if (ni->ni_challenge == NULL) { - IEEE80211_DPRINTF(ic, - IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - ("%s: challenge alloc failed\n", __func__)); - /* XXX statistic */ + if (!alloc_challenge(ic, ni)) return; - } + /* XXX could optimize by passing recvd challenge */ memcpy(ni->ni_challenge, &challenge[2], challenge[1]); IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); @@ -1216,10 +1241,8 @@ #endif if (ni == NULL) { ni = ieee80211_alloc_node(ic, wh->i_addr2); - if (ni == NULL) { - ic->ic_stats.is_rx_nodealloc++; + if (ni == NULL) return; - } ni->ni_esslen = ssid[1]; memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); memcpy(ni->ni_essid, ssid + 2, ssid[1]); @@ -1260,7 +1283,7 @@ } /* NB: must be after ni_chan is setup */ ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT); - ieee80211_unref_node(&ni); + ieee80211_unref_node(&ni); /* NB: do not free */ break; } @@ -1311,12 +1334,10 @@ if (ni == ic->ic_bss) { ni = ieee80211_dup_bss(ic, wh->i_addr2); - if (ni == NULL) { - ic->ic_stats.is_rx_nodealloc++; + if (ni == NULL) return; - } IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("%s: new req from %s\n", + ("%s: new probe req from %s\n", __func__, ether_sprintf(wh->i_addr2))); allocbs = 1; } else @@ -1335,7 +1356,18 @@ IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); } if (allocbs) { - /* XXX just use free? */ + /* + * When operating as an AP we discard the node's + * state until the station requests authentication. + * This may be better done by holding it and setting + * a short timer for reclaiming it but reduces the + * possibility of stations flooding us with probe + * requests causing our memory use to grow quickly + * (though this can still happen if they send + * authentication requests). When operating in ibss + * mode we hold the node but with a zero reference + * count; this is the current convention (XXX). + */ if (ic->ic_opmode == IEEE80211_M_HOSTAP) ieee80211_free_node(ic, ni); else @@ -1388,7 +1420,7 @@ u_int16_t capinfo, bintval; if (ic->ic_opmode != IEEE80211_M_HOSTAP || - (ic->ic_state != IEEE80211_S_RUN)) + ic->ic_state != IEEE80211_S_RUN) return; if (subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { @@ -1410,7 +1442,8 @@ IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4)); if (!IEEE80211_ADDR_EQ(wh->i_addr3, ic->ic_bss->ni_bssid)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - ("%s: ignore assoc request from other bss %s\n", + ("%s: ignore assoc request with bss %s not " + "our own\n", __func__, ether_sprintf(wh->i_addr2))); ic->ic_stats.is_rx_assoc_bss++; return; @@ -1470,17 +1503,16 @@ /* XXX per-node cipher suite */ /* XXX some stations use the privacy bit for handling APs that suport both encrypted and unencrypted traffic */ + /* NB: PRIVACY flag bits are assumed to match */ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0 || - (capinfo & IEEE80211_CAPINFO_PRIVACY) != - ((ic->ic_flags & IEEE80211_F_WEPON) ? - IEEE80211_CAPINFO_PRIVACY : 0)) { + (capinfo & IEEE80211_CAPINFO_PRIVACY) ^ + (ic->ic_flags & IEEE80211_F_PRIVACY)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, ("%s: capability mismatch %x for %s\n", __func__, capinfo, ether_sprintf(wh->i_addr2))); - IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap); - ni->ni_associd = 0; IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_CAPINFO); + ieee80211_node_leave(ic, ni); ic->ic_stats.is_rx_assoc_capmismatch++; return; } @@ -1491,10 +1523,9 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, ("%s: rate mismatch for %s\n", __func__, ether_sprintf(wh->i_addr2))); - IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap); - ni->ni_associd = 0; IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE); + ieee80211_node_leave(ic, ni); ic->ic_stats.is_rx_assoc_norate++; return; } @@ -1509,7 +1540,7 @@ u_int16_t aid; /* - * It would be clever to search the bitmap + * It would be good to search the bitmap * more efficiently, but this will do for now. */ for (aid = 1; aid < ic->ic_max_aid; aid++) { @@ -1517,10 +1548,10 @@ ic->ic_aid_bitmap)) break; } - - if (ic->ic_bss->ni_associd >= ic->ic_max_aid) { + if (aid >= ic->ic_max_aid) { IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_REASON_ASSOC_TOOMANY); + ieee80211_node_leave(ic, ni); return; } ni->ni_associd = aid | 0xc000; @@ -1574,7 +1605,6 @@ ni->ni_flags |= IEEE80211_NODE_ERP; } else newassoc = 0; - IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS); IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ("station %s %s associated at aid %d\n", (newassoc ? "newly" : "already"), @@ -1583,6 +1613,11 @@ /* give driver a chance to setup state like ni_txrate */ if (ic->ic_newassoc) (*ic->ic_newassoc)(ic, ni, newassoc); + IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS); + /* XXX may need a delay here? */ + /* tell the authenticator about new station */ + if (ni->ni_authmode == IEEE80211_AUTH_8021X) + (*ic->ic_node_join)(ic, ni); break; } @@ -1605,6 +1640,7 @@ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); ni = ic->ic_bss; ni->ni_capinfo = le16toh(*(u_int16_t *)frm); + frm += 2; if (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ic->ic_flags |= IEEE80211_F_SHPREAMBLE; else @@ -1613,7 +1649,6 @@ ic->ic_flags |= IEEE80211_F_SHSLOT; else ic->ic_flags &= ~IEEE80211_F_SHSLOT; - frm += 2; status = le16toh(*(u_int16_t *)frm); frm += 2; @@ -1673,8 +1708,6 @@ "peer (reason %d)\n", ether_sprintf(ni->ni_macaddr), reason)); ieee80211_node_leave(ic, ni); - /* node will be free'd on return */ - ieee80211_unref_node(&ni); } break; default: @@ -1703,11 +1736,7 @@ ("station %s disassociated by " "peer (reason %d)\n", ether_sprintf(ni->ni_macaddr), reason)); - IEEE80211_AID_CLR(ni->ni_associd, - ic->ic_aid_bitmap); - ni->ni_associd = 0; ieee80211_node_leave(ic, ni); - ieee80211_unref_node(&ni); /* XXX??? */ } break; default: @@ -1728,27 +1757,25 @@ #undef IEEE80211_VERIFY_ELEMENT static void -ieee80211_recv_pspoll(struct ieee80211com *ic, struct mbuf *m0, int rssi, - u_int32_t rstamp) +ieee80211_recv_pspoll(struct ieee80211com *ic, + struct ieee80211_node *ni, struct mbuf *m0) { struct ifnet *ifp = ic->ic_ifp; - struct ieee80211_frame *wh; - struct ieee80211_node *ni; + struct ieee80211_frame_min *wh; struct mbuf *m; u_int16_t aid; if (ic->ic_set_tim == NULL) /* No powersaving functionality */ return; - - wh = mtod(m0, struct ieee80211_frame *); - - if ((ni = ieee80211_find_node(ic, wh->i_addr2)) == NULL) { + if (ni == ic->ic_bss) { + wh = mtod(m0, struct ieee80211_frame_min *); IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, ("station %s sent bogus power save poll\n", ether_sprintf(wh->i_addr2))); - /* XXX statistic */ return; } + + wh = mtod(m0, struct ieee80211_frame_min *); memcpy(&aid, wh->i_dur, sizeof(wh->i_dur)); if ((aid & 0xc000) != 0xc000) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, @@ -1774,7 +1801,7 @@ /* XXX statistic */ return; } - wh = mtod(m, struct ieee80211_frame *); + wh = mtod(m, struct ieee80211_frame_min *); /* * If this is the last packet, turn off the TIM fields. From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:45:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 907E616A4D0; Mon, 16 Feb 2004 14:45:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F19516A4CE for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BA8043D1F for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMjRGe069359 for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMjQ90069356 for perforce@freebsd.org; Mon, 16 Feb 2004 14:45:26 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:45:26 -0800 (PST) Message-Id: <200402162245.i1GMjQ90069356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=47058 Change 47058 by sam@sam_ebb on 2004/02/16 14:44:31 change 802.1x-specific stat names to be generic Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#11 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#11 (text+ko) ==== @@ -57,7 +57,7 @@ u_int32_t ns_rx_disassoc; /* rx disassociation */ u_int32_t ns_rx_deauth; /* rx deauthentication */ u_int32_t ns_rx_decryptcrc; /* rx decrypt failed on crc */ - u_int32_t ns_rx_not1xauth; /* rx data before 802.1x auth */ + u_int32_t ns_rx_unauth; /* rx on unauthorized port */ u_int32_t ns_tx_data; /* tx data frames */ u_int32_t ns_tx_mgmt; /* tx management frames */ @@ -117,7 +117,7 @@ u_int32_t is_rx_decryptcrc; /* rx decrypt failed on crc */ u_int32_t is_rx_ahdemo_mgt; /* rx discard ahdemo mgt frame*/ u_int32_t is_rx_bad_auth; /* rx bad auth request */ - u_int32_t is_rx_not1xauth; /* rx data before 802.1x auth */ + u_int32_t is_rx_unauth; /* rx on unauthorized port */ u_int32_t is_tx_nobuf; /* tx failed for lack of buf */ u_int32_t is_tx_nonode; /* tx failed for no node */ u_int32_t is_tx_unknownmgt; /* tx of unknown mgt frame */ From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:45:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A17416A4D0; Mon, 16 Feb 2004 14:45:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1E0216A4DD for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B496C43D1D for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMjRGe069366 for ; Mon, 16 Feb 2004 14:45:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMjRAp069362 for perforce@freebsd.org; Mon, 16 Feb 2004 14:45:27 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:45:27 -0800 (PST) Message-Id: <200402162245.i1GMjRAp069362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:45:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=47059 Change 47059 by sam@sam_ebb on 2004/02/16 14:45:03 sync with madwifi Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ #define _NET80211_IEEE80211_LINUX_H_ /* - * Locking definitions. + * Node locking definitions. */ typedef rwlock_t ieee80211_node_lock_t; #define IEEE80211_NODE_LOCK_INIT(_ic, _name) rwlock_init(&(_ic)->ic_nodelock) @@ -42,10 +42,28 @@ #define IEEE80211_NODE_LOCK_ASSERT(_ic) \ KASSERT(rwlock_is_locked(&(_ic)->ic_nodelock), ("node not locked!")) +/* + * 802.1x state locking definitions. + */ +typedef spinlock_t eapol_node_lock_t; +#define EAPOL_LOCK_INIT(_ec, _name) spin_lock_init(&(_ec)->ec_lock) +#define EAPOL_LOCK_DESTROY(_ec) +#define EAPOL_LOCK(_ec) spin_lock_bh(&(_ec)->ec_lock) +#define EAPOL_UNLOCK(_ec) spin_unlock_bh(&(_ec)->ec_lock) +#define EAPOL_LOCK_ASSERT(_ec) \ + KASSERT(spin_is_locked(&(_ec)->ec_lock), ("node not locked!")) + #define M_LINK0 0x01 /* frame needs WEP encryption */ /* * Node reference counting definitions. + * + * ieee80211_node_initref initialize the reference count to 1 + * ieee80211_node_incref add a reference + * ieee80211_node_decref remove a reference + * ieee80211_node_dectestref remove a reference and return 1 if this + * is the last reference, otherwise 0 + * ieee80211_node_refcnt reference count for printing (only) */ #define ieee80211_node_initref(_ni) \ atomic_set(&(_ni)->ni_refcnt, 1) @@ -55,6 +73,7 @@ atomic_dec(&(_ni)->ni_refcnt) #define ieee80211_node_dectestref(_ni) \ atomic_dec_and_test(&(_ni)->ni_refcnt) +#define ieee80211_node_refcnt(_ni) (_ni)->ni_refcnt.counter #define le16toh(_x) le16_to_cpu(_x) #define htole16(_x) cpu_to_le16(_x) From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:51:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58EB116A4D0; Mon, 16 Feb 2004 14:51:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1427D16A4CE for ; Mon, 16 Feb 2004 14:51:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED55D43D2F for ; Mon, 16 Feb 2004 14:51:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMpbGe070599 for ; Mon, 16 Feb 2004 14:51:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMpbk0070590 for perforce@freebsd.org; Mon, 16 Feb 2004 14:51:37 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:51:37 -0800 (PST) Message-Id: <200402162251.i1GMpbk0070590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:51:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=47060 Change 47060 by sam@sam_ebb on 2004/02/16 14:51:00 o add ieee80211_node_authorize and ieee80211_node_unauthorize to mark ports authorized/unauthorized for data traffic; for use by the 802.1x authenticator o add ieee80211_node_makekey to create and install a unicast key for a station; for use by the authenticator o use new privacy flag bit instead of "wep is on" flag bit o use get_random_bytes portability wrapper instead of explicit arc4random call o record node allocation failures where they occur rather in all the call sites o make ieee80211_dup_bss properly inherit state from ic_bss o use ieee80211_node_leave instead of ieee80211_free_node when timing out a node for inactivty so 11g and .1x state is maintained o add ieee80211_dump_node and ieee80211_dump_nodes for dumping the state of the node table o move ieee80211_node_leave from elsewhere and expand it to notify the authenticator and to reclaim the refcnt on the node (and possibly the resources too) Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#9 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#9 (text+ko) ==== @@ -126,6 +126,52 @@ IEEE80211_NODE_LOCK_DESTROY(ic); } +/* + * Port authorize/unauthorize interfaces for use by an authenticator. + */ + +void +ieee80211_node_authorize(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + ni->ni_flags |= IEEE80211_NODE_AUTH; +} + +void +ieee80211_node_unauthorize(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + ni->ni_flags &= ~IEEE80211_NODE_AUTH; +} + +/* + * Construct and install a unicast key for the node. + * This is typically called by the 802.1x authenticator + * as part of arranging key state after a station has + * been authorized. + */ +int +ieee80211_node_makekey(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + /* XXX use maximally-sized keys; may want to match mcast key length */ + ni->ni_ucastkey.wk_len = sizeof(ni->ni_ucastkey.wk_key) * NBBY; + /* XXX just use random data for now; probably want something better */ + get_random_bytes(ni->ni_ucastkey.wk_key, + sizeof(ni->ni_ucastkey.wk_key)); + /* + * Hand the new key to the driver so it can be installed + * and so it can allocate a hardware key index. + */ + ni->ni_ucastkeyix = (*ic->ic_key_add)(ic, &ni->ni_ucastkey); + if (ni->ni_ucastkeyix == IEEE80211_KEYIX_NONE) { + /* + * Driver has no room or support for this algorithm; + * fallback to doing crypto in the host. + */ + /* XXX */ + return 0; + } + return 1; +} + /* * AP scanning support. */ @@ -233,7 +279,7 @@ memset(ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); ni->ni_intval = ic->ic_lintval; ni->ni_capinfo = IEEE80211_CAPINFO_IBSS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) ni->ni_capinfo |= IEEE80211_CAPINFO_PRIVACY; if (ic->ic_phytype == IEEE80211_T_FH) { ni->ni_fhdwell = 200; /* XXX */ @@ -261,10 +307,11 @@ if ((ni->ni_capinfo & IEEE80211_CAPINFO_ESS) == 0) fail |= 0x02; } - if (ic->ic_flags & IEEE80211_F_WEPON) { + if (ic->ic_flags & IEEE80211_F_PRIVACY) { if ((ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) == 0) fail |= 0x04; } else { + /* XXX does this mean privacy is supported or required? */ if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= 0x04; } @@ -337,7 +384,8 @@ if (isset(ic->ic_chan_active, i) && isclr(occupied, i)) break; if (i == IEEE80211_CHAN_MAX) { - fail = arc4random() & 3; /* random 0-3 */ + get_random_bytes(&fail, sizeof(fail)); + fail &= 3; /* random 0-3 */ for (i = 0; i < IEEE80211_CHAN_MAX; i++) if (isset(ic->ic_chan_active, i) && fail-- == 0) break; @@ -454,6 +502,8 @@ { int hash; + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + ("%s %s\n", __func__, ether_sprintf(macaddr))); IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); hash = IEEE80211_NODE_HASH(macaddr); /* XXX */ @@ -482,6 +532,8 @@ struct ieee80211_node *ni = (*ic->ic_node_alloc)(ic); if (ni != NULL) ieee80211_setup_node(ic, ni, macaddr); + else + ic->ic_stats.is_rx_nodealloc++; return ni; } @@ -490,9 +542,17 @@ { struct ieee80211_node *ni = (*ic->ic_node_alloc)(ic); if (ni != NULL) { - memcpy(ni, ic->ic_bss, sizeof(struct ieee80211_node)); ieee80211_setup_node(ic, ni, macaddr); - } + /* + * Inherit from ic_bss. + */ + ni->ni_authmode = ic->ic_bss->ni_authmode; + ni->ni_txpower = ic->ic_bss->ni_txpower; + ni->ni_vlan = ic->ic_bss->ni_vlan; /* XXX?? */ + IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_bss->ni_bssid); + ni->ni_chan = ic->ic_bss->ni_chan; + } else + ic->ic_stats.is_rx_nodealloc++; return ni; } @@ -527,7 +587,8 @@ hash = IEEE80211_NODE_HASH(macaddr); IEEE80211_NODE_LOCK(ic); LIST_FOREACH(ni, &ic->ic_hash[hash], ni_hash) { - if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_chan == chan) { + if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && + ni->ni_chan == chan) { ieee80211_node_incref(ni);/* mark referenced */ break; } @@ -544,8 +605,12 @@ KASSERT(ni != ic->ic_bss, ("freeing bss node")); + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + ("%s %s\n", __func__, ether_sprintf(ni->ni_macaddr))); IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap); TAILQ_REMOVE(&ic->ic_node, ni, ni_list); + if (TAILQ_EMPTY(&ic->ic_node)) + ic->ic_inact_timer = 0; LIST_REMOVE(ni, ni_hash); if (_IF_QLEN(&ni->ni_savedq) != 0) { /* @@ -556,8 +621,6 @@ ic->ic_set_tim(ic, ni->ni_associd, 0); } mtx_destroy(&ni->ni_savedq.ifq_mtx); /* XXX */ - if (TAILQ_EMPTY(&ic->ic_node)) - ic->ic_inact_timer = 0; for (i = 0; i < N(ni->ni_rxfrag); i++) if (ni->ni_rxfrag[i] != NULL) m_freem(ni->ni_rxfrag[i]); @@ -570,6 +633,9 @@ { KASSERT(ni != ic->ic_bss, ("freeing ic_bss")); + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + ("%s %s refcnt %d\n", __func__, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni))); if (ieee80211_node_dectestref(ni)) { IEEE80211_NODE_LOCK(ic); _ieee80211_free_node(ic, ni); @@ -582,6 +648,7 @@ { struct ieee80211_node *ni; + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, ("free all nodes\n")); IEEE80211_NODE_LOCK(ic); while ((ni = TAILQ_FIRST(&ic->ic_node)) != NULL) _ieee80211_free_node(ic, ni); @@ -623,7 +690,6 @@ ("station %s timed out due to inactivity (%u secs)\n", ether_sprintf(ni->ni_macaddr), ni->ni_inact)); - ieee80211_node_leave(ic, ni); /* * Send a deauthenticate frame. * @@ -636,7 +702,7 @@ IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, IEEE80211_REASON_AUTH_EXPIRE); - ieee80211_free_node(ic, ni); + ieee80211_node_leave(ic, ni); ic->ic_stats.is_node_timeout++; goto restart; } @@ -656,3 +722,107 @@ (*f)(arg, ni); IEEE80211_NODE_UNLOCK(ic); } + +void +ieee80211_dump_node(struct ieee80211_node *ni) +{ + printf("0x%p: mac %s refcnt %d\n", ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); + printf("\tscangen %u fragno %u authmode %u flags 0x%x\n", + ni->ni_scangen, ni->ni_fragno, ni->ni_authmode, ni->ni_flags); + printf("\tassocid 0x%x txpower %u vlan %u\n", + ni->ni_associd, ni->ni_txpower, ni->ni_vlan); + printf("\ttxseq %u rxseq %u rxfragstamp %u\n", + ni->ni_txseq, ni->ni_rxseq, ni->ni_rxfragstamp); + printf("\trstamp %u rssi %u intval %u capinfo 0x%x\n", + ni->ni_rstamp, ni->ni_rssi, ni->ni_intval, ni->ni_capinfo); + printf("\tbssid %s essid \"%.*s\" channel %u:0x%x\n", + ether_sprintf(ni->ni_bssid), + ni->ni_esslen, ni->ni_essid, + ni->ni_chan->ic_freq, ni->ni_chan->ic_flags); + printf("\tfails %u inact %u txrate %u\n", + ni->ni_fails, ni->ni_inact, ni->ni_txrate); +} + +void +ieee80211_dump_nodes(struct ieee80211com *ic) +{ + struct ieee80211_node *ni; + + IEEE80211_NODE_LOCK(ic); + TAILQ_FOREACH(ni, &ic->ic_node, ni_list) + ieee80211_dump_node(ni); + IEEE80211_NODE_UNLOCK(ic); +} + +/* + * Handle bookkeeping for station deauthentication/disassociation + * when operating as an ap. + */ +void +ieee80211_node_leave(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP, + ("not in ap mode, mode %u", ic->ic_opmode)); + /* + * If node wasn't previously associated all + * we need to do is reclaim the reference. + */ + if (ni->ni_associd == 0) + goto done; + IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap); + ni->ni_associd = 0; + + /* + * If a long slot station do the slot time bookkeeping. + */ + if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) == 0) { + KASSERT(ic->ic_longslotsta > 0, + ("bogus long slot station count %d", ic->ic_longslotsta)); + ic->ic_longslotsta--; + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + ("long slot time station %s leaves, count now %d\n", + ether_sprintf(ni->ni_macaddr), ic->ic_longslotsta)); + if (ic->ic_longslotsta == 0 && + ic->ic_curmode == IEEE80211_MODE_11G) { + /* + * Re-enable use of short slot time if supported + * and not operating in IBSS mode (per spec). + */ + if ((ic->ic_caps & IEEE80211_C_SHSLOT) && + ic->ic_opmode != IEEE80211_M_IBSS) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + ("re-enable use of short slot time\n")); + ic->ic_flags |= IEEE80211_F_SHSLOT; + } + } + } + /* + * If a non-ERP station do the protection-related bookkeeping. + */ + if ((ni->ni_flags & IEEE80211_NODE_ERP) == 0) { + KASSERT(ic->ic_nonerpsta > 0, + ("bogus non-ERP station count %d", ic->ic_nonerpsta)); + ic->ic_nonerpsta--; + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + ("non-ERP station %s leaves, count now %d\n", + ether_sprintf(ni->ni_macaddr), ic->ic_nonerpsta)); + if (ic->ic_nonerpsta == 0) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + ("disable use of protection\n")); + ic->ic_flags &= ~IEEE80211_F_USEPROT; + /* XXX verify mode? */ + if (ic->ic_caps & IEEE80211_C_SHPREAMBLE) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + ("re-enable use of short preamble\n")); + ic->ic_flags |= IEEE80211_F_SHPREAMBLE; + ic->ic_flags &= ~IEEE80211_F_USEBARKER; + } + } + } +done: + /* tell the authenticator the station is leaving */ + if (ni->ni_authmode == IEEE80211_AUTH_8021X) + (*ic->ic_node_leave)(ic, ni); + ieee80211_free_node(ic, ni); +} From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:51:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AC2016A4D4; Mon, 16 Feb 2004 14:51:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A218216A4F8 for ; Mon, 16 Feb 2004 14:51:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86AD843D2D for ; Mon, 16 Feb 2004 14:51:38 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMpcGe070615 for ; Mon, 16 Feb 2004 14:51:38 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMpbZS070606 for perforce@freebsd.org; Mon, 16 Feb 2004 14:51:37 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:51:37 -0800 (PST) Message-Id: <200402162251.i1GMpbZS070606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:51:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=47061 Change 47061 by sam@sam_ebb on 2004/02/16 14:51:34 o add unicast key state o add declarations for various new routines Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#9 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#9 (text+ko) ==== @@ -35,6 +35,7 @@ #ifndef _NET80211_IEEE80211_NODE_H_ #define _NET80211_IEEE80211_NODE_H_ +#include /* for ieee80211_wepkey */ #include /* for ieee80211_nodestats */ #define IEEE80211_PSCAN_WAIT 5 /* passive scan wait */ @@ -69,7 +70,7 @@ u_int8_t ni_fragno; /* frag # of previous frame */ u_int8_t ni_authmode; /* authentication algorithm */ u_int16_t ni_flags; /* special-purpose state */ -#define IEEE80211_NODE_AUTH 0x0001 /* 802.1x auth complete */ +#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_WPA 0x0002 /* WPA enabled */ #define IEEE80211_NODE_QOS 0x0004 /* QoS enabled */ #define IEEE80211_NODE_ERP 0x0008 /* ERP enabled */ @@ -84,6 +85,8 @@ u_int16_t ni_rxseqs[16]; /* seq previous for qos frames*/ u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */ + u_int16_t ni_ucastkeyix; /* unicast key index */ + struct ieee80211_wepkey ni_ucastkey; /* unicast key */ /* hardware */ u_int32_t ni_rstamp; /* recv timestamp */ @@ -144,6 +147,11 @@ extern void ieee80211_node_lateattach(struct ieee80211com *); extern void ieee80211_node_detach(struct ieee80211com *); +extern void ieee80211_node_authorize(struct ieee80211com *, + struct ieee80211_node *); +extern void ieee80211_node_unauthorize(struct ieee80211com *, + struct ieee80211_node *); + extern void ieee80211_begin_scan(struct ieee80211com *); extern void ieee80211_next_scan(struct ieee80211com *); extern void ieee80211_end_scan(struct ieee80211com *); @@ -159,9 +167,15 @@ struct ieee80211_node *); extern void ieee80211_free_allnodes(struct ieee80211com *); typedef void ieee80211_iter_func(void *, struct ieee80211_node *); -extern void ieee80211_iterate_nodes(struct ieee80211com *ic, +extern void ieee80211_iterate_nodes(struct ieee80211com *, ieee80211_iter_func *, void *); +extern void ieee80211_dump_node(struct ieee80211_node *); +extern void ieee80211_dump_nodes(struct ieee80211com *); extern void ieee80211_timeout_nodes(struct ieee80211com *); +extern void ieee80211_node_leave(struct ieee80211com *, + struct ieee80211_node *); +extern int ieee80211_node_makekey(struct ieee80211com *, + struct ieee80211_node *); extern void ieee80211_create_ibss(struct ieee80211com* , struct ieee80211_channel *); From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:53:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF58216A4D4; Mon, 16 Feb 2004 14:53:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B725716A4CE for ; Mon, 16 Feb 2004 14:53:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E2C943D1D for ; Mon, 16 Feb 2004 14:53:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMrfGe071475 for ; Mon, 16 Feb 2004 14:53:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMrfdH071472 for perforce@freebsd.org; Mon, 16 Feb 2004 14:53:41 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:53:41 -0800 (PST) Message-Id: <200402162253.i1GMrfdH071472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=47062 Change 47062 by sam@sam_ebb on 2004/02/16 14:52:40 o use privacy flag bit instead of "wep is on" bit o do port authorization/unauthorization when not using 802.1x Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#17 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#17 (text+ko) ==== @@ -426,7 +426,7 @@ capinfo = IEEE80211_CAPINFO_IBSS; else capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) @@ -511,6 +511,14 @@ m->m_flags |= M_LINK0; /* WEP-encrypt, please */ } } + /* + * When 802.1x is not in use mark the port + * authorized at this point so traffic can flow. + */ + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + status == IEEE80211_STATUS_SUCCESS && + ni->ni_authmode != IEEE80211_AUTH_8021X) + ieee80211_node_authorize(ic, ni); if (ic->ic_opmode == IEEE80211_M_STA) timer = IEEE80211_TRANS_WAIT; break; @@ -523,6 +531,7 @@ if (m == NULL) senderr(ENOMEM, is_tx_nobuf); *(u_int16_t *)frm = htole16(arg); /* reason */ + ieee80211_node_unauthorize(ic, ni); /* port closed */ break; case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: @@ -551,7 +560,7 @@ capinfo |= IEEE80211_CAPINFO_IBSS; else /* IEEE80211_M_STA */ capinfo |= IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; /* * NB: Some 11a AP's reject the request when @@ -601,7 +610,7 @@ senderr(ENOMEM, is_tx_nobuf); capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) @@ -720,7 +729,7 @@ capinfo = IEEE80211_CAPINFO_IBSS; else capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) @@ -784,7 +793,7 @@ capinfo = IEEE80211_CAPINFO_IBSS; else capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) + if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:53:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346C516A4D4; Mon, 16 Feb 2004 14:53:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A09B116A509 for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79B6A43D31 for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMrgGe071488 for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMrgRY071485 for perforce@freebsd.org; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:53:42 -0800 (PST) Message-Id: <200402162253.i1GMrgRY071485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:53:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=47064 Change 47064 by sam@sam_ebb on 2004/02/16 14:53:19 o ieee80211_node_leave moved elsewhere o add port authorization for station mode operation Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.c#9 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.c#9 (text+ko) ==== @@ -334,66 +334,6 @@ #undef N } -/* - * Handle bookkeeping for station deauthentication/disassociation - * when operating as an ap. - */ -void -ieee80211_node_leave(struct ieee80211com *ic, struct ieee80211_node *ni) -{ - KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP, - ("not in ap mode, mode %u", ic->ic_opmode)); - - /* - * If a long slot station do the slot time bookkeeping. - */ - if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) == 0) { - KASSERT(ic->ic_longslotsta > 0, - ("bogus long slot station count %d", ic->ic_longslotsta)); - ic->ic_longslotsta--; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("long slot time station %s leaves, count now %d\n", - ether_sprintf(ni->ni_macaddr), ic->ic_longslotsta)); - /* XXX auto mode? */ - if (ic->ic_longslotsta == 0 && - ic->ic_curmode == IEEE80211_MODE_11G) { - /* - * Re-enable use of short slot time if supported - * and not operating in IBSS mode (per spec). - */ - if ((ic->ic_caps & IEEE80211_C_SHSLOT) && - ic->ic_opmode != IEEE80211_M_IBSS) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("re-enable use of short slot time\n")); - ic->ic_flags |= IEEE80211_F_SHSLOT; - } - } - } - /* - * If a non-ERP station do the protection-related bookkeeping. - */ - if ((ni->ni_flags & IEEE80211_NODE_ERP) == 0) { - KASSERT(ic->ic_nonerpsta > 0, - ("bogus non-ERP station count %d", ic->ic_nonerpsta)); - ic->ic_nonerpsta--; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("non-ERP station %s leaves, count now %d\n", - ether_sprintf(ni->ni_macaddr), ic->ic_nonerpsta)); - if (ic->ic_nonerpsta == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("disable use of protection\n")); - ic->ic_flags &= ~IEEE80211_F_USEPROT; - /* XXX verify mode? */ - if (ic->ic_caps & IEEE80211_C_SHPREAMBLE) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - ("re-enable use of short preamble\n")); - ic->ic_flags |= IEEE80211_F_SHPREAMBLE; - ic->ic_flags &= ~IEEE80211_F_USEBARKER; - } - } - } -} - static int ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int mgt) { @@ -555,6 +495,12 @@ } break; } + /* + * When 802.1x is not in use mark the port + * authorized at this point so traffic can flow. + */ + if (ni->ni_authmode != IEEE80211_AUTH_8021X) + ieee80211_node_authorize(ic, ni); break; case IEEE80211_S_ASSOC: switch (ostate) { From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:53:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 822C816A512; Mon, 16 Feb 2004 14:53:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E567F16A4CF for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E213043D1D for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMrgGe071495 for ; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMrgZP071491 for perforce@freebsd.org; Mon, 16 Feb 2004 14:53:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:53:42 -0800 (PST) Message-Id: <200402162253.i1GMrgZP071491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=47065 Change 47065 by sam@sam_ebb on 2004/02/16 14:53:35 ieee80211_node_leave moved elsewhere Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.h#7 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.h#7 (text+ko) ==== @@ -71,8 +71,6 @@ struct ieee80211_node *, int); extern int ieee80211_iserp_rateset(struct ieee80211com *, struct ieee80211_rateset *); -extern void ieee80211_node_leave(struct ieee80211com *, - struct ieee80211_node *); #define ieee80211_new_state(_ic, _nstate, _arg) \ (((_ic)->ic_newstate)((_ic), (_nstate), (_arg))) extern void ieee80211_print_essid(u_int8_t *, int); From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:56:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91F6416A4D1; Mon, 16 Feb 2004 14:56:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C27216A4CE for ; Mon, 16 Feb 2004 14:56:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68B4F43D1F for ; Mon, 16 Feb 2004 14:56:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMulGe071734 for ; Mon, 16 Feb 2004 14:56:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMukc9071731 for perforce@freebsd.org; Mon, 16 Feb 2004 14:56:46 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:56:46 -0800 (PST) Message-Id: <200402162256.i1GMukc9071731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:56:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=47066 Change 47066 by sam@sam_ebb on 2004/02/16 14:56:24 o add methods for key management o add glue to the 802.1x authenticator o redo flag bits to support additional ciphers o add IEEE80211_F_PRIVACY to signify "privacy" separately from any particular cipher o move flag bits around so IEEE80211_F_PRIVACY lines up with the IEEE 802.11 capability bit o do similar machinations for capabilities o add debug message flags for the 802.1x authenticator and the radius client Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#11 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#11 (text+ko) ==== @@ -169,6 +169,8 @@ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ +struct eapolcom; + struct ieee80211com { SLIST_ENTRY(ieee80211com) ic_next; struct ifnet *ic_ifp; @@ -240,43 +242,69 @@ int ic_wep_txkey; /* default tx key index */ void *ic_wep_ctx; /* wep crypt context */ u_int32_t ic_iv; /* initial vector for wep */ + int (*ic_key_add)(struct ieee80211com *, + struct ieee80211_wepkey *); + int (*ic_key_delete)(struct ieee80211com *, + u_int keyix); + int (*ic_key_set)(struct ieee80211com *, + u_int keyix, struct ieee80211_wepkey *); + /* + * 802.1x glue. When an authenticator attaches it + * fills in this section. We assume that when ic_ec + * is setup that the methods are safe to call. + */ + struct eapolcom *ic_ec; + void (*ic_node_join)(struct ieee80211com *, + struct ieee80211_node *); + void (*ic_node_leave)(struct ieee80211com *, + struct ieee80211_node *); }; #define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0) #define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN) /* ic_flags */ -#define IEEE80211_F_ASCAN 0x00000001 /* STATUS: active scan */ -#define IEEE80211_F_SIBSS 0x00000002 /* STATUS: start IBSS */ -#define IEEE80211_F_WEPON 0x00000100 /* CONF: WEP enabled */ -#define IEEE80211_F_IBSSON 0x00000200 /* CONF: IBSS creation enable */ -#define IEEE80211_F_PMGTON 0x00000400 /* CONF: Power mgmt enable */ -#define IEEE80211_F_DESBSSID 0x00000800 /* CONF: des_bssid is set */ -#define IEEE80211_F_SCANAP 0x00001000 /* CONF: Scanning AP */ -#define IEEE80211_F_ROAMING 0x00002000 /* CONF: roaming enabled */ -#define IEEE80211_F_SWRETRY 0x00004000 /* CONF: sw tx retry enabled */ -#define IEEE80211_F_TXPOW_FIXED 0x00008000 /* TX Power: fixed rate */ -#define IEEE80211_F_SHSLOT 0x00010000 /* CONF: short slot time */ -#define IEEE80211_F_SHPREAMBLE 0x00020000 /* CONF: short preamble */ -#define IEEE80211_F_DATAPAD 0x00040000 /* CONF: do alignment pad */ -#define IEEE80211_F_USEPROT 0x00080000 /* STATUS: protection enabled */ -#define IEEE80211_F_USEBARKER 0x00100000 /* STATUS: use barker preamble*/ -#define IEEE80211_F_TIMUPDATE 0x00200000 /* STATUS: update beacon tim */ +#define IEEE80211_F_WEPON 0x00000001 /* CONF: WEP enabled */ +#define IEEE80211_F_AESON 0x00000002 /* CONF: AES enabled */ +#define IEEE80211_F_CKIPON 0x00000004 /* CONF: CKIP enabled */ +/* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */ +#define IEEE80211_F_PRIVACY 0x00000010 /* CONF: privacy enabled */ +#define IEEE80211_F_ASCAN 0x00000100 /* STATUS: active scan */ +#define IEEE80211_F_SIBSS 0x00000200 /* STATUS: start IBSS */ +#define IEEE80211_F_IBSSON 0x00000400 /* CONF: IBSS creation enable */ +#define IEEE80211_F_PMGTON 0x00000800 /* CONF: Power mgmt enable */ +#define IEEE80211_F_DESBSSID 0x00001000 /* CONF: des_bssid is set */ +#define IEEE80211_F_SCANAP 0x00002000 /* CONF: Scanning AP */ +#define IEEE80211_F_ROAMING 0x00004000 /* CONF: roaming enabled */ +#define IEEE80211_F_SWRETRY 0x00008000 /* CONF: sw tx retry enabled */ +#define IEEE80211_F_TXPOW_FIXED 0x00010000 /* TX Power: fixed rate */ +#define IEEE80211_F_SHSLOT 0x00020000 /* CONF: short slot time */ +#define IEEE80211_F_SHPREAMBLE 0x00040000 /* CONF: short preamble */ +#define IEEE80211_F_DATAPAD 0x00080000 /* CONF: do alignment pad */ +#define IEEE80211_F_USEPROT 0x00100000 /* STATUS: protection enabled */ +#define IEEE80211_F_USEBARKER 0x00200000 /* STATUS: use barker preamble*/ +#define IEEE80211_F_TIMUPDATE 0x00400000 /* STATUS: update beacon tim */ + +#define IEEE80211_F_CRYPTON 0x0000000f /* CONF: crypto alg's enabled */ /* ic_caps */ #define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */ -#define IEEE80211_C_IBSS 0x00000002 /* CAPABILITY: IBSS available */ -#define IEEE80211_C_PMGT 0x00000004 /* CAPABILITY: Power mgmt */ -#define IEEE80211_C_HOSTAP 0x00000008 /* CAPABILITY: HOSTAP avail */ -#define IEEE80211_C_AHDEMO 0x00000010 /* CAPABILITY: Old Adhoc Demo */ -#define IEEE80211_C_SWRETRY 0x00000020 /* CAPABILITY: sw tx retry */ -#define IEEE80211_C_TXPMGT 0x00000040 /* CAPABILITY: tx power mgmt */ -#define IEEE80211_C_SHSLOT 0x00000080 /* CAPABILITY: short slottime */ -#define IEEE80211_C_SHPREAMBLE 0x00000100 /* CAPABILITY: short preamble */ -#define IEEE80211_C_MONITOR 0x00000200 /* CAPABILITY: monitor mode */ -#define IEEE80211_C_RCVMGT 0x00000400 /* CAPABILITY: rcv mgt frames */ +#define IEEE80211_C_AES 0x00000002 /* CAPABILITY: AES available */ +#define IEEE80211_C_CKIP 0x00000004 /* CAPABILITY: CKIP available */ +#define IEEE80211_C_IBSS 0x00000100 /* CAPABILITY: IBSS available */ +#define IEEE80211_C_PMGT 0x00000200 /* CAPABILITY: Power mgmt */ +#define IEEE80211_C_HOSTAP 0x00000400 /* CAPABILITY: HOSTAP avail */ +#define IEEE80211_C_AHDEMO 0x00000800 /* CAPABILITY: Old Adhoc Demo */ +#define IEEE80211_C_SWRETRY 0x00001000 /* CAPABILITY: sw tx retry */ +#define IEEE80211_C_TXPMGT 0x00002000 /* CAPABILITY: tx power mgmt */ +#define IEEE80211_C_SHSLOT 0x00004000 /* CAPABILITY: short slottime */ +#define IEEE80211_C_SHPREAMBLE 0x00008000 /* CAPABILITY: short preamble */ +#define IEEE80211_C_MONITOR 0x00010000 /* CAPABILITY: monitor mode */ +#define IEEE80211_C_RCVMGT 0x00020000 /* CAPABILITY: rcv mgt frames */ /* XXX protection/barker? */ +#define IEEE80211_C_CRYPTO 0x0000000f /* CAPABILITY: crypto alg's */ + /* flags for ieee80211_fix_rate() */ #define IEEE80211_F_DOSORT 0x00000001 /* sort rate list */ #define IEEE80211_F_DOFRATE 0x00000002 /* use fixed rate */ @@ -287,6 +315,7 @@ void ieee80211_ifdetach(struct ieee80211com *); void ieee80211_media_init(struct ieee80211com *, ifm_change_cb_t, ifm_stat_cb_t); +struct ieee80211com *ieee80211_find_instance(struct ifnet *); int ieee80211_media_change(struct ifnet *); void ieee80211_media_status(struct ifnet *, struct ifmediareq *); int ieee80211_ioctl(struct ieee80211com *, u_long, caddr_t); @@ -317,6 +346,8 @@ #define IEEE80211_MSG_OUTPUT 0x00100000 /* output handling */ #define IEEE80211_MSG_STATE 0x00080000 /* state machine */ #define IEEE80211_MSG_POWER 0x00040000 /* power save handling */ +#define IEEE80211_MSG_DOT1X 0x00020000 /* 802.1x authenticator */ +#define IEEE80211_MSG_RADIUS 0x00010000 /* 802.1x radius client */ #define IEEE80211_MSG_ANY 0xffffffff /* anything */ From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:57:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BF5516A4D0; Mon, 16 Feb 2004 14:57:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AA9716A4CE for ; Mon, 16 Feb 2004 14:57:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40E7143D2F for ; Mon, 16 Feb 2004 14:57:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMvnGe071764 for ; Mon, 16 Feb 2004 14:57:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMvm6A071761 for perforce@freebsd.org; Mon, 16 Feb 2004 14:57:48 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:57:48 -0800 (PST) Message-Id: <200402162257.i1GMvm6A071761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:57:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=47067 Change 47067 by sam@sam_ebb on 2004/02/16 14:57:18 checkpoint backport of 802.1x authenticator from madwifi: this compiles but is untested Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/eapol.h#1 add .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_dot1x.c#1 add .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_dot1x.h#1 add .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radius.c#1 add .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radius.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 16 14:58:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4986116A4D0; Mon, 16 Feb 2004 14:58:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20EA116A4CE for ; Mon, 16 Feb 2004 14:58:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E32A43D1F for ; Mon, 16 Feb 2004 14:58:51 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMwoGe071843 for ; Mon, 16 Feb 2004 14:58:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMwoXA071840 for perforce@freebsd.org; Mon, 16 Feb 2004 14:58:50 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 16 Feb 2004 14:58:50 -0800 (PST) Message-Id: <200402162258.i1GMwoXA071840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2004 22:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=47068 Change 47068 by sam@sam_ebb on 2004/02/16 14:57:57 add glue for 802.1x authenticator and associated radius client Affected files ... .. //depot/projects/netperf+sockets/sys/conf/files#8 edit Differences ... ==== //depot/projects/netperf+sockets/sys/conf/files#8 (text+ko) ==== @@ -1273,6 +1273,8 @@ net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan net80211/ieee80211_proto.c optional wlan +net80211/ieee80211_dot1x.c optional wlanauth +net80211/ieee80211_radius.c optional wlanradius netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk From owner-p4-projects@FreeBSD.ORG Tue Feb 17 02:14:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E7FE16A4CE; Tue, 17 Feb 2004 02:14:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1869116A4CE for ; Tue, 17 Feb 2004 02:14:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F06D743D1D for ; Tue, 17 Feb 2004 02:14:01 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1HAE1Ge080671 for ; Tue, 17 Feb 2004 02:14:01 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1HAE1ed080668 for perforce@freebsd.org; Tue, 17 Feb 2004 02:14:01 -0800 (PST) (envelope-from des@freebsd.org) Date: Tue, 17 Feb 2004 02:14:01 -0800 (PST) Message-Id: <200402171014.i1HAE1ed080668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 47094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2004 10:14:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=47094 Change 47094 by des@des.at.c4is.org on 2004/02/17 02:13:13 Make the ENTER*() and RETURN*() macros safe from side-effects, and solve the "dereferencing NULL pointer" warning. Affected files ... .. //depot/projects/openpam/lib/openpam_impl.h#29 edit Differences ... ==== //depot/projects/openpam/lib/openpam_impl.h#29 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#28 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#29 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -137,45 +137,52 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define ENTERI(i) do { \ - if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ - openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + int _i = (i); \ + if (_i > 0 && _i < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[_i]); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _i); \ } while (0) #define ENTERN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _n); \ } while (0) #define ENTERS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", _s); \ } while (0) #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ - openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ + int _c = (c); \ + if (_c >= 0 && _c < PAM_NUM_ERRORS) \ + openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[_c]); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ - return (c); \ + openpam_log(PAM_LOG_DEBUG, "returning %d!", _c); \ + return (_c); \ } while (0) #define RETURNN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "returning %d", _n); \ + return (_n); \ } while (0) #define RETURNP(p) do { \ - if ((p) == NULL) \ + const void *_p = (p); \ + if (_p == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %p", (p)); \ + openpam_log(PAM_LOG_DEBUG, "returning %p", _p); \ return (p); \ } while (0) #define RETURNS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning '%s'", (s)); \ - return (s); \ + openpam_log(PAM_LOG_DEBUG, "returning '%s'", _s); \ + return (_s); \ } while (0) #else #define ENTER() From owner-p4-projects@FreeBSD.ORG Tue Feb 17 21:08:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 488B416A4D1; Tue, 17 Feb 2004 21:08:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CA5416A4CE for ; Tue, 17 Feb 2004 21:08:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18E4143D39 for ; Tue, 17 Feb 2004 21:08:05 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1I584Ge070301 for ; Tue, 17 Feb 2004 21:08:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1I584qv070298 for perforce@freebsd.org; Tue, 17 Feb 2004 21:08:04 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 17 Feb 2004 21:08:04 -0800 (PST) Message-Id: <200402180508.i1I584qv070298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 47119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2004 05:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=47119 Change 47119 by marcel@marcel_nfs on 2004/02/17 21:07:17 Add user-regs.c. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#3 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#3 (text+ko) ==== @@ -37,8 +37,8 @@ ser-tcp.c ser-unix.c serial.c signals.c solib.c solib-legacy.c \ solib-svr4.c source.c stabsread.c stack.c std-regs.c symfile.c \ symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ - trad-frame.c typeprint.c ui-file.c ui-out.c utils.c valarith.c \ - valops.c valprint.c values.c varobj.c wrapper.c ${GENSRCS} + trad-frame.c typeprint.c ui-file.c ui-out.c user-regs.c utils.c \ + valarith.c valops.c valprint.c values.c varobj.c wrapper.c ${GENSRCS} CLEANFILES+= ${GENSRCS} From owner-p4-projects@FreeBSD.ORG Tue Feb 17 21:10:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FAF716A4D0; Tue, 17 Feb 2004 21:10:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BE8C16A4CE for ; Tue, 17 Feb 2004 21:10:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F62C43D1F for ; Tue, 17 Feb 2004 21:10:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1I5A8Ge070343 for ; Tue, 17 Feb 2004 21:10:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1I5A7RM070340 for perforce@freebsd.org; Tue, 17 Feb 2004 21:10:07 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Tue, 17 Feb 2004 21:10:07 -0800 (PST) Message-Id: <200402180510.i1I5A7RM070340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 47120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2004 05:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=47120 Change 47120 by marcel@marcel_nfs on 2004/02/17 21:09:40 Add display drivers. Skeletal. Affected files ... .. //depot/projects/tty/sys/conf/files#13 edit Differences ... ==== //depot/projects/tty/sys/conf/files#13 (text+ko) ==== @@ -30,6 +30,41 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local +# +crt-vesa_timings.c optional kgi \ + dependency "$S/dev/display/monitor/crt/VESA.t" \ + compile-with "awk -v timingset=VESA -f $S/dev/display/monitor/crt/vesa2c.awk $S/dev/display/monitor/crt/VESA.t > ${.TARGET}" \ + no-obj no-implicit-rule before-depend local \ + clean "crt-vesa_timings.c" +crt-vesa_timings.o optional kgi \ + dependency "crt-vesa_timings.c" \ + compile-with "${NORMAL_C}" \ + no-implicit-rule +crt-vga_timings.c optional kgi \ + dependency "$S/dev/display/monitor/crt/VGA.t" \ + compile-with "awk -v timingset=VGA -f $S/dev/display/monitor/crt/vga2c.awk $S/dev/display/monitor/crt/VGA.t > ${.TARGET}" \ + no-obj no-implicit-rule before-depend local \ + clean "crt-vga_timings.c" +crt-vga_timings.o optional kgi \ + dependency "crt-vga_timings.c" \ + compile-with "${NORMAL_C}" \ + no-implicit-rule +monitor-bind.spec optional kgi \ + dependency "$S/dev/display/monitor/Standard/SVGA.spec" \ + compile-with "cp $S/dev/display/monitor/Standard/SVGA.spec ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "monitor-bind.spec" +fixed-bind.spec optional kgi \ + dependency "$S/dev/display/clock/IBM/VGA.spec" \ + compile-with "cp $S/dev/display/clock/IBM/VGA.spec ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "fixed-bind.spec" +board-bind.spec optional kgi \ + dependency "$S/dev/display/board/IBM/VGA.spec" \ + compile-with "cp $S/dev/display/board/IBM/VGA.spec ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "board-bind.spec" +# miidevs.h standard \ dependency "$S/tools/devlist2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs" \ @@ -364,6 +399,25 @@ dev/digi/Xe.c optional digi_Xe dev/digi/Xem.c optional digi_Xem dev/digi/Xr.c optional digi_Xr +# +dev/display/chipset/IBM/VGA-bind.c optional kgi +dev/display/chipset/IBM/VGA-meta.c optional kgi +dev/display/monitor/crt/DDC.c optional kgi +dev/display/monitor/crt/I2C.c optional kgi +dev/display/monitor/crt/crt-bind.c optional kgi +dev/display/monitor/crt/crt-meta.c optional kgi +dev/display/monitor/crt/fixed.c optional kgi +dev/display/monitor/crt/gtf.c optional kgi +dev/display/ramdac/IBM/VGA-bind.c optional kgi +dev/display/ramdac/IBM/VGA-meta.c optional kgi +dev/display/system/FreeBSD/board-bind.c optional kgi +dev/display/system/FreeBSD/monitor-crt.c optional kgi +dev/display/chipset/IBM/VGA-text-meta.c optional kgi +dev/display/clock/fixed-bind.c optional kgi +dev/display/clock/fixed-meta.c optional kgi +dev/display/clock/pll-meta.c optional kgi +dev/display/system/FreeBSD/kgim.c optional kgi +# #dev/dpt/dpt_control.c optional dpt dev/dpt/dpt_eisa.c optional dpt eisa dev/dpt/dpt_pci.c optional dpt pci From owner-p4-projects@FreeBSD.ORG Wed Feb 18 11:52:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F3E16A4CE; Wed, 18 Feb 2004 11:52:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48F6716A4CE for ; Wed, 18 Feb 2004 11:52:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4350543D2D for ; Wed, 18 Feb 2004 11:52:54 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1IJqsGe089023 for ; Wed, 18 Feb 2004 11:52:54 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1IJqr3j089020 for perforce@freebsd.org; Wed, 18 Feb 2004 11:52:53 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Wed, 18 Feb 2004 11:52:53 -0800 (PST) Message-Id: <200402181952.i1IJqr3j089020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 47141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2004 19:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=47141 Change 47141 by areisse@areisse_ibook on 2004/02/18 11:52:53 Message trailers contain a label handle reference instead of a string. Tasks use label handles instead of inline label structures. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.h#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_labelh.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_labelh.h#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_notify.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/mach_msg.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/ipc_tt.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.c#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/mach_types.defs#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/message.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.c#3 (text+ko) ==== @@ -199,6 +199,9 @@ if (kmsg != IKM_NULL) { ikm_init(kmsg, msg_and_trailer_size); } + + kmsg->ikm_sender = (ipc_labelh_t)IO_NULL; + return(kmsg); } @@ -221,6 +224,16 @@ mach_msg_size_t size = kmsg->ikm_size; ipc_port_t port; + if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) == + IOT_LABELH) { + ipc_object_release (&kmsg->ikm_sender->lh_object); + kmsg->ikm_sender = IO_NULL; + } + else if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) + != IOT_LABELH) + printf ("strange otype in message label: %d\n", io_otype (&kmsg->ikm_sender->lh_object)); + + /* * Check to see if the message is bound to the port. If so, * mark it not in use. If the port isn't already dead, then @@ -585,6 +598,16 @@ body = (mach_msg_body_t *) (&kmsg->ikm_header + 1); ipc_kmsg_clean_body(kmsg, body->msgh_descriptor_count); } + + if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) == + IOT_LABELH) { + ipc_object_release (&kmsg->ikm_sender->lh_object); + kmsg->ikm_sender = IO_NULL; + } + else if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) + != IOT_LABELH) + printf ("strange otype in message label: %d\n", io_otype (&kmsg->ikm_sender->lh_object)); + } /* @@ -680,17 +703,18 @@ trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; +#if 1 task_t cur = current_thread()->top_act->task; if (cur) { - tasklabel_lock (cur); - mac_externalize_task_label (&cur->maclabel, - "sebsd", trailer->msgh_labels.slabel, - 64, 0); - tasklabel_unlock (cur); + ipc_object_reference (&cur->label->lh_object); + /*trailer->msgh_labels.sender = (mach_port_name_t)cur->label;*/ + + kmsg->ikm_sender = cur->label; } else - strcpy (trailer->msgh_labels.slabel, "system_u:system_r:kernel_t"); +#endif + trailer->msgh_labels.sender = 0; *kmsgp = kmsg; return MACH_MSG_SUCCESS; @@ -774,6 +798,10 @@ trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + trailer->msgh_labels.sender = 0; + + kmsg->ikm_sender = (ipc_labelh_t)IO_NULL; + *kmsgp = kmsg; return MACH_MSG_SUCCESS; } ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_kmsg.h#2 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include /* * This structure is only the header for a kmsg buffer; @@ -88,6 +89,7 @@ struct ipc_kmsg *ikm_prev; ipc_port_t ikm_prealloc; /* port we were preallocated from */ mach_msg_size_t ikm_size; + ipc_labelh_t ikm_sender; mach_msg_header_t ikm_header; } *ipc_kmsg_t; @@ -135,6 +137,7 @@ MACRO_BEGIN \ (kmsg)->ikm_size = (size); \ (kmsg)->ikm_prealloc = IP_NULL; \ + (kmsg)->ikm_sender = IO_NULL; \ assert((kmsg)->ikm_prev = (kmsg)->ikm_next = IKM_BOGUS); \ MACRO_END ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_labelh.c#2 (text+ko) ==== @@ -25,3 +25,38 @@ return 0; } +ipc_labelh_t labelh_new () +{ + ipc_labelh_t lh = (ipc_labelh_t) io_alloc (IOT_LABELH); + io_lock_init (&(lh->lh_object)); + lh->lh_object.io_references = 1; + lh->lh_object.io_bits = io_makebits (TRUE, IOT_LABELH, 0); + return lh; +} + +/* call with old locked */ + +ipc_labelh_t labelh_duplicate (ipc_labelh_t old) +{ + ipc_labelh_t lh = (ipc_labelh_t) io_alloc (IOT_LABELH); + io_lock_init (&(lh->lh_object)); + lh->lh_object.io_references = 1; + lh->lh_object.io_bits = io_makebits (TRUE, IOT_LABELH, 0); + + mac_init_port_label (&lh->lh_label); + mac_copy_port_label (&old->lh_label, &lh->lh_label); + return lh; +} + +/* call with old locked; returns a locked object */ + +ipc_labelh_t labelh_modify (ipc_labelh_t old) +{ + if (old->lh_object.io_references == 1) + return old; + ipc_labelh_t lh = labelh_duplicate (old); + io_release (&old->lh_object); + io_unlock (&old->lh_object); + io_lock (&lh->lh_object); + return lh; +} ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_labelh.h#2 (text+ko) ==== @@ -1,4 +1,7 @@ +#ifndef _IPC_LABELH_H_ +#define _IPC_LABELH_H_ + #include #include #include @@ -9,3 +12,8 @@ struct label lh_label; } *ipc_labelh_t; + +ipc_labelh_t labelh_duplicate (ipc_labelh_t old); +ipc_labelh_t labelh_modify (ipc_labelh_t old); + +#endif ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_notify.c#2 (text+ko) ==== @@ -117,6 +117,7 @@ n->trailer.msgh_sender = KERNEL_SECURITY_TOKEN; n->trailer.msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; n->trailer.msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + n->trailer.msgh_labels.sender = 0; } /* @@ -146,6 +147,7 @@ n->trailer.msgh_sender = KERNEL_SECURITY_TOKEN; n->trailer.msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; n->trailer.msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + n->trailer.msgh_labels.sender = 0; } /* @@ -171,6 +173,7 @@ n->trailer.msgh_sender = KERNEL_SECURITY_TOKEN; n->trailer.msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; n->trailer.msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + n->trailer.msgh_labels.sender = 0; n->not_count = 0; } @@ -195,6 +198,7 @@ n->trailer.msgh_sender = KERNEL_SECURITY_TOKEN; n->trailer.msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; n->trailer.msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + n->trailer.msgh_labels.sender = 0; } /* @@ -221,6 +225,7 @@ n->trailer.msgh_sender = KERNEL_SECURITY_TOKEN; n->trailer.msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0; n->trailer.msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE; + n->trailer.msgh_labels.sender = 0; } /* ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.c#4 (text+ko) ==== @@ -986,7 +986,6 @@ return NULL; } -#if MACH_ASSERT /* * Check whether the object is a port if so, free it. But * keep track of that fact. @@ -1005,7 +1004,10 @@ #endif /* MACH_ASSERT */ #ifdef MAC - mac_destroy_port_label (&port->ip_label); + /* XXX: This was never getting called before, + and calling it now causes problems. */ + + /*mac_destroy_port_label (&port->ip_label);*/ } else if (otype == IOT_LABELH) { ipc_labelh_t lh = (ipc_labelh_t) object; @@ -1014,7 +1016,6 @@ } zfree(ipc_object_zones[otype], (vm_offset_t) object); } -#endif /* MACH_ASSERT */ #include #if MACH_KDB ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/ipc_object.h#3 (text+ko) ==== @@ -141,19 +141,14 @@ #define io_alloc(otype) \ ((ipc_object_t) zalloc(ipc_object_zones[(otype)])) -#if MACH_ASSERT /* * Call the routine for io_free so that checking can be performed. + * It is also responsible for freeing labels. */ extern void io_free( unsigned int otype, ipc_object_t object); -#else /* MACH_ASSERT */ -#define io_free(otype, io) \ - zfree(ipc_object_zones[(otype)], (vm_offset_t) (io)) -#endif /* MACH_ASSERT */ - /* * Here we depend on the ipc_object being first within the ipc_common_data, * which is first within the rpc_common_data, which in turn must be first ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/ipc/mach_msg.c#3 (text+ko) ==== @@ -262,6 +262,33 @@ if (option & MACH_RCV_TRAILER_MASK) { trailer->msgh_seqno = seqno; trailer->msgh_trailer_size = REQUESTED_TRAILER_SIZE(option); + +#if 1 + if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_LABELS)) { + if (kmsg->ikm_sender != IO_NULL) { + ipc_object_t lh = &kmsg->ikm_sender->lh_object; + ipc_entry_t entry; + kern_return_t kr; + + io_lock (lh); + kr = ipc_entry_alloc (space, &trailer->msgh_labels.sender, &entry); + if (kr != KERN_SUCCESS) { + trailer->msgh_labels.sender = 0; + /*ipc_object_release (lh);*/ + } + else { + entry->ie_bits |= (1 | MACH_PORT_TYPE_LABELH); + entry->ie_object = lh; + io_reference (lh); + io_unlock (lh); + is_write_unlock (space); + } + } + else { + trailer->msgh_labels.sender = 0; + } + } +#endif } /* ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/ipc_tt.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.c#4 (text+ko) ==== @@ -402,7 +402,8 @@ eml_task_reference(new_task, parent_task); #ifdef MAC - mutex_init(&new_task->labellock, ETAP_NO_TRACE); + /*mutex_init(&new_task->labellock, ETAP_NO_TRACE);*/ + new_task->label = labelh_new (); mac_init_task_label (&new_task->maclabel); #endif @@ -554,7 +555,7 @@ task_prof_deallocate(task); #ifdef MAC - mac_destroy_task_label (&task->maclabel); + ipc_object_release (&task->label->lh_object); #endif zfree(task_zone, (vm_offset_t) task); @@ -1757,6 +1758,7 @@ void mac_update_task_label (struct label *pl, struct task *t) { tasklabel_lock (t); + t->label = labelh_modify (t->label); mac_copy_cred_to_task (pl, &t->maclabel); tasklabel_unlock (t); ip_lock (t->itk_self); ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/kern/task.h#3 (text+ko) ==== @@ -105,6 +105,7 @@ #include #include #include +#include typedef struct task { /* Synchronization/destruction information */ @@ -212,8 +213,11 @@ vm_offset_t dynamic_working_set; #ifdef MAC + /* decl_mutex_data(,labellock) struct label maclabel; + */ + ipc_labelh_t label; #endif } Task; @@ -223,40 +227,13 @@ #ifdef MAC -#define tasklabel_lock(task) mutex_lock(&(task)->labellock) -#define tasklabel_unlock(task) mutex_unlock(&(task)->labellock) +#define maclabel label->lh_label -extern inline void tasklabel_lock2 (task_t a, task_t b) -{ - if (a == b) - tasklabel_lock (a); - else if (a < b) - { - tasklabel_lock (a); - tasklabel_lock (b); - } - else - { - tasklabel_lock (b); - tasklabel_lock (a); - } -} +#define tasklabel_lock(task) io_lock(&(task)->label->lh_object) +#define tasklabel_unlock(task) io_unlock(&(task)->label->lh_object) -extern inline void tasklabel_unlock2 (task_t a, task_t b) -{ - if (a == b) - tasklabel_unlock (a); - else if (a < b) - { - tasklabel_unlock (b); - tasklabel_unlock (a); - } - else - { - tasklabel_unlock (a); - tasklabel_unlock (b); - } -} +#define tasklabel_lock2(a,b) io_lock2 (&(a)->label->lh_object, &(b)->label->lh_object) +#define tasklabel_unlock2(a,b) io_unlock2 (&(a)->label->lh_object, &(b)->label->lh_object) #endif ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/mach_types.defs#3 (text+ko) ==== @@ -358,7 +358,7 @@ type security_token_t = MACH_MSG_TYPE_INTEGER_64; -type msg_labels_t = c_string[64]; +type msg_labels_t = mach_port_t; /* memory_object_info_t: variable-size inline array: * memory_object_attr_info_t (5 ints) ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/osfmk/mach/message.h#3 (text+ko) ==== @@ -305,7 +305,7 @@ typedef struct { - char slabel[64]; + mach_port_name_t sender; } msg_labels_t; typedef struct @@ -462,7 +462,7 @@ #define MACH_RCV_TRAILER_NULL 0 #define MACH_RCV_TRAILER_SEQNO 1 #define MACH_RCV_TRAILER_SENDER 2 -#define MACH_RCV_TRAILER_LABELS 3 +#define MACH_RCV_TRAILER_LABELS 4 #define MACH_RCV_TRAILER_TYPE(x) (((x) & 0xf) << 28) #define MACH_RCV_TRAILER_ELEMENTS(x) (((x) & 0xf) << 24) From owner-p4-projects@FreeBSD.ORG Wed Feb 18 13:15:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8DA516A4DE; Wed, 18 Feb 2004 13:15:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3CA116A4E6 for ; Wed, 18 Feb 2004 13:15:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88AD943D1D for ; Wed, 18 Feb 2004 13:15:36 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1ILFaGe014499 for ; Wed, 18 Feb 2004 13:15:36 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1ILFad9014496 for perforce@freebsd.org; Wed, 18 Feb 2004 13:15:36 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Wed, 18 Feb 2004 13:15:36 -0800 (PST) Message-Id: <200402182115.i1ILFad9014496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 47145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2004 21:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=47145 Change 47145 by areisse@areisse_ibook on 2004/02/18 13:15:33 Uses label handle message trailer format for bootstrap security checks. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#3 (text+ko) ==== @@ -1015,6 +1015,7 @@ server_t *serverp; kern_return_t result; mig_reply_error_t *reply; + mach_msg_mac_trailer_t *trailer = (mach_msg_mac_trailer_t *) (((char*)Request)+Request->msgh_size); debug("received message on port %x\n", Request->msgh_local_port); @@ -1195,8 +1196,11 @@ else { /* must be a service request */ debug("Handled request."); - return bootstrap_server(Request, Reply); + boolean_t result = bootstrap_server(Request, Reply); + mach_port_destroy(mach_task_self(), trailer->msgh_labels.sender); + return result; } + mach_port_destroy(mach_task_self(), trailer->msgh_labels.sender); return TRUE; } ==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#3 (text+ko) ==== @@ -99,9 +99,9 @@ return BOOTSTRAP_NOT_PRIVILEGED; } - kern_return_t kr = mac_check_name_port_access + kern_return_t kr = mac_check_port_access (mach_task_self(), - labels.slabel, bootstrap_port, + labels.sender, bootstrap_port, "mach_names", "create_server"); if (kr) return BOOTSTRAP_NOT_PRIVILEGED; @@ -297,9 +297,9 @@ debug("Register attempt for service %s port %x", service_name, service_port); - result = mac_check_name_port_access (mach_task_self(), - labels.slabel, bootstrap_port, - "mach_names", "register"); + result = mac_check_port_access (mach_task_self(), + labels.sender, bootstrap_port, + "mach_names", "register"); if (result) return result; @@ -419,13 +419,13 @@ servicep = lookup_service_by_name(bootstrap, service_name); mach_port_t sp = servicep ? servicep->port : MACH_PORT_NULL; - kern_return_t kr = mac_check_name_port_access + kern_return_t kr = mac_check_port_access (mach_task_self(), - labels.slabel, sp == MACH_PORT_NULL ? bootstrap_port : sp, + labels.sender, sp == MACH_PORT_NULL ? bootstrap_port : sp, "mach_names", "look_up"); if (kr) { - log("bootstrap denied %s :%d", labels.slabel, kr); + log("bootstrap denied %d :%d", labels.sender, kr); return KERN_NO_ACCESS; } @@ -746,8 +746,8 @@ if (!bootstrap || !active_bootstrap(bootstrap)) return BOOTSTRAP_NOT_PRIVILEGED; - kern_return_t kr = mac_check_name_port_access - (mach_task_self(), labels.slabel, bootstrap_port, + kern_return_t kr = mac_check_port_access + (mach_task_self(), labels.sender, bootstrap_port, "mach_names", "makesubset"); if (kr) return BOOTSTRAP_NOT_PRIVILEGED; @@ -774,13 +774,22 @@ if (result != KERN_SUCCESS) kern_fatal(result, "port_set_add"); + char slabel[512]; char *nslabel; - result = security_change_context2 (labels.slabel+6, labels.slabel+6, "mach_names", + + result = mach_get_port_label (mach_task_self(), labels.sender, slabel); + if (result) + { + log ("error getting port label"); + } + else { + + result = security_change_context2 (slabel+6, slabel+6, "mach_names", &nslabel); if (result) { - log ("error changing context for %s", labels.slabel); - nslabel = labels.slabel; + log ("error changing context for %s", slabel); + nslabel = slabel; } else { @@ -795,6 +804,7 @@ nslabel); if (result != KERN_SUCCESS) kern_fatal(result, "mach_set_port_label"); + } subset = new_bootstrap(bootstrap, new_bootstrap_port, requestor_port); From owner-p4-projects@FreeBSD.ORG Thu Feb 19 09:29:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ABE16A4D0; Thu, 19 Feb 2004 09:29:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A508516A4CE for ; Thu, 19 Feb 2004 09:29:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A1F243D1F for ; Thu, 19 Feb 2004 09:29:14 -0800 (PST) (envelope-from emoe@cox.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1JHTEGe020379 for ; Thu, 19 Feb 2004 09:29:14 -0800 (PST) (envelope-from emoe@cox.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1JHTEMI020376 for perforce@freebsd.org; Thu, 19 Feb 2004 09:29:14 -0800 (PST) (envelope-from emoe@cox.net) Date: Thu, 19 Feb 2004 09:29:14 -0800 (PST) Message-Id: <200402191729.i1JHTEMI020376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to emoe@cox.net using -f From: Erik Hughes Moe To: Perforce Change Reviews Subject: PERFORCE change 47228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2004 17:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=47228 Change 47228 by emoe@emoe_s390 on 2004/02/19 09:29:10 Fixed infinite loop in pmap_pinit. Affected files ... .. //depot/projects/s390/sys/s390/s390/pmap.c#17 edit Differences ... ==== //depot/projects/s390/sys/s390/s390/pmap.c#17 (text+ko) ==== @@ -1030,6 +1030,7 @@ vm_page_flag_clear(stpg, PG_BUSY); stpg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); + break; } } From owner-p4-projects@FreeBSD.ORG Fri Feb 20 11:29:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF1B716A4D0; Fri, 20 Feb 2004 11:29:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 97DC616A4CE for ; Fri, 20 Feb 2004 11:29:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E2E043D31 for ; Fri, 20 Feb 2004 11:29:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1KJTpGe012892 for ; Fri, 20 Feb 2004 11:29:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1KJTn8H012889 for perforce@freebsd.org; Fri, 20 Feb 2004 11:29:49 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 20 Feb 2004 11:29:49 -0800 (PST) Message-Id: <200402201929.i1KJTn8H012889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 47284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2004 19:29:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=47284 Change 47284 by jhb@jhb_slimer on 2004/02/20 11:29:17 IFC @47282. Affected files ... .. //depot/projects/smpng/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/boot/alpha/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#4 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/alpha/loader/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/efi/Makefile.inc#6 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/efi/loader/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.s#7 delete .. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/ia64/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.s#4 delete .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.s#3 delete .. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/smpng/sys/boot/sparc64/boot1/_start.s#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#48 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#19 integrate .. //depot/projects/smpng/sys/conf/files.i386#54 integrate .. //depot/projects/smpng/sys/conf/files.pc98#52 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#18 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#34 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#29 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#27 integrate .. //depot/projects/smpng/sys/conf/ldscript.alpha#4 integrate .. //depot/projects/smpng/sys/conf/majors#36 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#9 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#35 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#18 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#22 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#59 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#38 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#12 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#15 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#9 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/smpng/sys/dev/cx/ng_cx.h#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#13 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#13 integrate .. //depot/projects/smpng/sys/dev/ida/idavar.h#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#28 integrate .. //depot/projects/smpng/sys/dev/led/led.c#5 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/mlx/mlxvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#10 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#9 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#12 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#26 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#35 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#18 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#46 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#46 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#46 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#20 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#10 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#31 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#5 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#8 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#13 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/smpng/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/smpng/sys/geom/geom.h#35 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#33 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#3 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#37 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#12 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#29 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#38 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#20 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#24 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#14 integrate .. //depot/projects/smpng/sys/isa/fd.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#16 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#33 integrate .. //depot/projects/smpng/sys/kern/tty.c#40 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#24 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#68 integrate .. //depot/projects/smpng/sys/libkern/bcmp.c#4 integrate .. //depot/projects/smpng/sys/modules/Makefile#70 integrate .. //depot/projects/smpng/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/geom_concat/Makefile#1 branch .. //depot/projects/smpng/sys/modules/harp/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/lnc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/osf1/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/patm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/pecoff/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#31 integrate .. //depot/projects/smpng/sys/net/bridge.c#23 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.h#3 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#48 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#51 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#19 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#36 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#48 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#43 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#39 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#28 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#8 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#29 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#30 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#15 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.h#10 integrate .. //depot/projects/smpng/sys/netinet6/ipsec6.h#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#27 integrate .. //depot/projects/smpng/sys/netipsec/key.c#9 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#3 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#14 integrate .. //depot/projects/smpng/sys/pci/agp.c#17 integrate .. //depot/projects/smpng/sys/powerpc/include/floatingpoint.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#1 branch .. //depot/projects/smpng/sys/sys/jail.h#9 integrate .. //depot/projects/smpng/sys/sys/kernel.h#22 integrate .. //depot/projects/smpng/sys/sys/libkern.h#13 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#34 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#50 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#18 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#56 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#47 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#42 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -3,71 +3,32 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# (XXX from i386:NOTES,v 1.1106; merge in updates) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.3 2004/02/08 00:39:38 peter Exp $ +# +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $ # -# We don't have modules on amd64. -makeoptions NO_MODULES=not_yet - # # This directive is mandatory; it defines the architecture to be # configured for; in this case, the 386 family based IBM-PC and # compatibles. # machine amd64 +cpu HAMMER # # We want LINT to cover profiling as well -#X#profile 2 +profile 2 -##################################################################### -# SMP OPTIONS: -# -# The apic device enables the use of the I/O APIC for interrupt delivery. -# The apic device can be used in both UP and SMP kernels, but is required -# for SMP kernels. Thus, the apic device is not strictly an SMP option, -# but it is a prerequisite for SMP. -# -# Notes: -# -# Be sure to disable 'cpu I386_CPU' for SMP kernels. -# -# By default, mixed mode is used to route IRQ0 from the AT timer via -# the 8259A master PIC through the ExtINT pin on the first I/O APIC. -# This can be disabled via the NO_MIXED_MODE option. In that case, -# IRQ0 will be routed via an intpin on the first I/O APIC. Not all -# motherboards hook IRQ0 up to the first I/O APIC even though their -# MP table or MADT may claim to do so. That is why mixed mode is -# enabled by default. -# +# Debug options +options NPX_DEBUG # enable npx debugging (FPU/math emu) + #new math emulator -# Optional: -device atpic -device mptable -options NO_MIXED_MODE # Disable use of mixed mode - - -##################################################################### -# CPU OPTIONS - -# -# You must specify at least one CPU (the one you intend to run on); -# deleting the specification for CPUs you don't need to use may make -# parts of the system run faster. -# -cpu HAMMER - -# -# Options for CPU features. # - -# # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -#X#options PERFMON +options PERFMON ##################################################################### @@ -104,17 +65,14 @@ options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - -options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION - ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +hint.speaker.0.at="isa" +hint.speaker.0.port="0x61" device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! +device apm_saver # Requires APM ##################################################################### @@ -151,9 +109,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options AUTO_EOI_1 -#options AUTO_EOI_2 - options MAXMEM=(128*1024) #options BROKEN_KEYBOARD_RESET @@ -178,19 +133,7 @@ # Optional devices: # -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. # -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -#X#options TDFX_LINUX # Enable Linuxulator support - -# # ACPI support using the Intel ACPI Component Architecture reference # implementation. # @@ -199,29 +142,17 @@ # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). # -# ACPI_MAX_THREADS sets the number of task threads started. -# -# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. -# -# ACPICA_PEDANTIC enables strict checking of AML. Our default is to -# relax these checks to allow code generated by the Microsoft compiler -# to still execute. -# # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # device acpi options ACPI_DEBUG -options ACPI_MAX_THREADS=1 -#!options ACPI_NO_SEMAPHORES -#!options ACPICA_PEDANTIC # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # r128drm: ATI Rage 128 # radeondrm: ATI Radeon up to 9000/9100 -# sisdrm: SiS 300/305,540,630 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # DRM_DEBUG: include debug printfs, very slow # # mga requires AGP in the kernel, and it is recommended @@ -230,30 +161,70 @@ device mgadrm device "r128drm" device radeondrm -device sisdrm device tdfxdrm options DRM_DEBUG +# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README +###device fla +###hint.fla.0.at="isa" + # # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 +# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) +# (requires miibus) +# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; +# Intel EtherExpress +# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and +# Am79C960) +# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). + +# Order for ISA/EISA devices is important here -#X#device ath -#X#device ath_hal # Atheros HAL (includes binary component) -device wlan # 802.11 layer +device ed +#options ED_NO_MIIBUS # Disable ed miibus support +hint.ed.0.at="isa" +hint.ed.0.port="0x280" +hint.ed.0.irq="5" +hint.ed.0.maddr="0xd8000" +device lnc +hint.lnc.0.at="isa" +hint.lnc.0.port="0x280" +hint.lnc.0.irq="10" +hint.lnc.0.drq="0" +device sr +hint.sr.0.at="isa" +hint.sr.0.port="0x300" +hint.sr.0.irq="5" +hint.sr.0.maddr="0xd0000" +device wl +hint.wl.0.at="isa" +hint.wl.0.port="0x300" +options WLCACHE # enables the signal-strength cache +options WLDEBUG # enables verbose debugging output # # ATA raid adapters # -#XXX this stores pointers in a 32bit field that is defined by the hardware -#device pst +device pst # # SCSI host adapters: -# +# +# ncv: NCR 53C500 based SCSI host adapters. +# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. +# stg: TMC 18C30, 18C50 based SCSI host adapters. + +device ncv +device nsp +device stg +hint.stg.0.at="isa" +hint.stg.0.port="0x140" +hint.stg.0.port="11" # # Adaptec FSA RAID controllers, including integrated DELL controllers, @@ -278,7 +249,12 @@ # # Miscellaneous hardware: # +# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # digi: Digiboard driver +# gsc: Genius GS-4500 hand scanner. +# spic: Sony Programmable I/O controller (VAIO notebooks) +# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) +# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -286,6 +262,15 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. +# Notes on the Digiboard PC/Xi and PC/Xe series driver +# +# The NDGBPORTS option specifies the number of ports controlled by the +# dgb(4) driver. The default value is 16 ports per device. +# +# The following flag values have special meanings in dgb: +# 0x01 - alternate layout of pins +# 0x02 - use the windowed PC/Xe in 64K mode + device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -304,13 +289,20 @@ # # Laptop/Notebook options: # +# See also: +# apm under `Miscellaneous hardware' +# above. - +# PCI bus Cards: +# -------------- # -# I2C Bus -# - -#--------------------------------------------------------------------------- +# Cyclades Cyclom-Y PCI serial driver +device cy +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#hint.cy.0.at="isa" +#hint.cy.0.irq="10" +#hint.cy.0.maddr="0xd4000" +#hint.cy.0.msize="0x2000" # # Set the number of PV entries per process. Increasing this can @@ -323,52 +315,48 @@ # # The value below is the one more than the default. # -options PMAP_SHPGPERPROC=201 +#options PMAP_SHPGPERPROC=201 + +# +# Change the size of the kernel virtual address space. Due to +# constraints in loader(8) on i386, this must be a multiple of 4. +# 256 = 1 GB of kernel address space. Increasing this also causes +# a reduction of the address space in user processes. 512 splits +# the 4GB cpu address space in half (2GB user, 2GB kernel). +# +options KVA_PAGES=260 ##################################################################### # ABI Emulation -#XXX keep these here for now and reactivate when support for emulating -#XXX these 32 bit binaries is added. - -# Enable iBCS2 runtime support for SCO and ISC binaries -#X#options IBCS2 - -# Emulate spx device for client side of SVR3 local X interface -#X#options SPX_HACK - # Enable Linux ABI emulation -#X#options COMPAT_LINUX +#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#X#options LINPROCFS +#options LINPROCFS -# -# SysVR4 ABI emulation -# -# The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a -# module. If loaded as a module, it must be loaded before the svr4 module -# (the /usr/sbin/svr4 script does this for you). If compiling statically, -# the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured -# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 -# script understands that it doesn't need to load the `streams' module under -# those circumstances. -# Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). -# -#X#options COMPAT_SVR4 # build emulator statically -#X#options DEBUG_SVR4 # enable verbose debugging -#X#device streams # STREAMS network driver (required for svr4). - ##################################################################### # VM OPTIONS +# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the +# kernel to use a 4 MByte pages to map the kernel instead of 4k pages. +# This saves on the amount of memory needed for page tables needed to +# map the kernel. You should only disable this feature as a temporary +# workaround if you are having problems with it enabled. +# +#options DISABLE_PSE + +# Disable the global pages PGE CPU feature. The PGE feature allows pages +# to be marked with the PG_G bit. TLB entries for these pages are not +# flushed from the cache when %cr3 is reloaded. This can make context +# switches less expensive. You should only disable this feature as a +# temporary workaround if you are having problems with it enabled. +# +#options DISABLE_PG_G + # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. @@ -381,10 +369,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT -#X#options PECOFF_DEBUG - options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 @@ -398,25 +382,3 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE - -############################################################### -# Broken stuff that shouldn't really be broken - -# machine/ioctl_meteor.h and machine/bt848.h -nodevice bktr - -# pointer/int stuff -nodevice mgadrm -nodevice "r128drm" -nodevice radeondrm -nodevice sisdrm -nodevice tdfxdrm - -# missing conf lines (must be fixed ASAP) -nooption SC_DFLT_FONT -nooption UKBD_DFLT_KEYMAP -nooption ATKBD_DFLT_KEYMAP -nooption PMAP_SHPGPERPROC -nooption CLK_USE_I8254_CALIBRATION -# XXX dead option -nooption CLK_USE_TSC_CALIBRATION ==== //depot/projects/smpng/sys/boot/alpha/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,12 @@ -# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.8 2000/10/27 09:36:34 dfr Exp $ +# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.9 2004/02/11 22:01:16 ru Exp $ # Options used when building app-specific libalpha components + +BINDIR?= /boot + +CFLAGS+= -ffreestanding -mno-fp-regs +LDFLAGS+= -nostdlib PRIMARY_LOAD_ADDRESS= 0x20000000 # "Region 1 start" SECONDARY_LOAD_ADDRESS= 0x2000c000 # "Region 1 start" + 48k HEAP_LIMIT= 0x20040000 # "Region 1 start" + 256k -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#7 (text+ko) ==== @@ -1,44 +1,29 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.16 2003/01/26 14:32:53 phk Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $ -.include <../Makefile.inc> +PROG= boot1.sym +INTERNALPROG= +NOMAN= +LINKS= ${BINDIR}/boot1 ${BINDIR}/boot -PROG = boot1 -LINKS = ${BINDIR}/${PROG} ${BINDIR}/boot - -.PATH: ${.CURDIR}/../libalpha +.PATH: ${.CURDIR}/../libalpha SRCS= start.S boot1.c -CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${LIBSTANDDIR} -CFLAGS+= -I${.CURDIR}/.. -NOMAN=1 -STRIP= -BINDIR?= /boot +CFLAGS+= -I${.CURDIR}/../../common BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS} -CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${PROG}.list +CLEANFILES= boot1 -all: ${PROG} +FILES= boot1 -${PROG}.nosym: ${PROG}.sym - cp ${PROG}.sym ${PROG}.nosym - strip ${PROG}.nosym +boot1: boot1.sym + objcopy -S -O binary boot1.sym ${.TARGET} -${PROG}: ${PROG}.nosym - objcopy -O binary ${PROG}.nosym ${PROG} +LDFLAGS=-Ttext ${BOOT_RELOC} -N -e start +DPADD= ${LIBALPHA} ${LIBSTAND} +LDADD= ${LIBALPHA} -lstand .include - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -${PROG}.sym: ${OBJS} ${LIBKERN} - ${LD} -M -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym ${OBJS} \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBSTAND} \ - > ${.OBJDIR}/${PROG}.list - size ${PROG}.sym ==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#4 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.7 2002/05/10 09:26:28 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= cdboot -PROG= ${BASE} +BOOT= cdboot NOMAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} -CFLAGS+= -ffreestanding -DLOADER_CDROM_SUPPORT +CFLAGS+= -DLOADER_CDROM_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#4 (text+ko) ==== @@ -1,95 +1,69 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.17 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.18 2004/02/11 22:01:17 ru Exp $ # # Common Alpha loader build rules -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR}/../common + +PROG= ${BOOT}.sym +INTERNALPROG= # Alpha-specific bootstrap sources -SRCS+= main.c conf.c -.if ${BASE} == netboot +SRCS= start.S main.c conf.c vers.c +.if ${BOOT} == "netboot" SRCS+= dev_net.c .endif +.PATH: ${.CURDIR}/../libalpha + .if !defined(NOFORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha -.if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.else -LIBFICL= ${.CURDIR}/../../ficl/libficl.a -.endif .endif # Always add MI sources -.PATH: ${.CURDIR}/../../common -.include <${.CURDIR}/../../common/Makefile.inc> -CFLAGS+= -mno-fp-regs -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../.. -I. +.PATH: ${.CURDIR}/../../common +.include "${.CURDIR}/../../common/Makefile.inc" +CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS} \ -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \ - vers.c vers.o ${BASE} ${BASE}.sym ${BASE}.list +CLEANFILES+= vers.c ${BOOT} ${BOOT}.sym CFLAGS+= -Wall CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CRT= start.o -STRIP= -BINDIR?= /boot -INSTALLFLAGS?= -b + +vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version + sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} + +LDFLAGS=-e start -N -Ttext ${LOAD_ADDRESS} -all: ${BASE} ${BASE}.help +FILES= ${BOOT} +# XXX INSTALLFLAGS_${BOOT}= -b +FILESMODE_${BOOT}= ${BINMODE} -b -vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version - sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} - ${CC} -c vers.c +${BOOT}: ${BOOT}.sym + objcopy -O binary ${BOOT}.sym ${.TARGET} -${BASE}: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o - ${LD} -o ${BASE}.sym -M -e start -N -Ttext ${LOAD_ADDRESS} \ - ${CRT} ${OBJS} vers.o \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBFICL} ${LIBSTAND} \ - >${.OBJDIR}/${BASE}.list - objcopy -O binary ${BASE}.sym ${BASE} +DPADD= ${LIBALPHA} ${LIBFICL} ${LIBSTAND} +LDADD= ${LIBALPHA} ${LIBFICL} -lstand -CLEANFILES+= ${BASE}.help -${BASE}.help: help.common help.alpha +.if defined(INSTALL_HELP) +FILES+= ${BOOT}.help +CLEANFILES+= ${BOOT}.help +${BOOT}.help: help.common help.alpha cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.endif -beforeinstall: -.ifdef INSTALL_HELP -.if exists(${.OBJDIR}/${BASE}.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif -.endif +.PATH: ${.CURDIR}/../../forth .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults +FILES+= loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - -CLEANFILES+= machine - .include - -beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#4 (text+ko) ==== @@ -1,29 +1,17 @@ -# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.13 2002/05/13 10:53:24 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.14 2004/02/11 22:01:17 ru Exp $ LIB= alpha INTERNALLIB= true -CFLAGS+= -ffreestanding #CFLAGS+= -DDISK_DEBUG -#CPPFLAGS+= -DNO_DISKLABEL -#CPPFLAGS+= -DSAVE_MEMORY -# XXX hack to pick up stand.h -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -CFLAGS+= -DDEBUG CFLAGS+= -I${LIBSTANDDIR} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ - -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${.CURDIR}/../../common SRCS= OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S \ pal.S reboot.c delay.c time.c alpha_module.c devicename.c \ srmdisk.c srmnet.c getsecs.c alpha_copy.c bootinfo.c -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - .include - -beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/alpha/loader/Makefile#3 (text+ko) ==== @@ -1,12 +1,11 @@ -# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.7 2002/05/10 09:26:29 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= loader -PROG= ${BASE} +BOOT= loader NEWVERSWHAT= "SRM disk boot" alpha INSTALL_HELP= yes LOAD_ADDRESS= ${SECONDARY_LOAD_ADDRESS} # Only disk support -CFLAGS+= -ffreestanding -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT +CFLAGS+= -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#3 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.10 2002/05/10 09:26:29 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.11 2004/02/11 22:01:17 ru Exp $ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ -BASE= netboot -PROG= ${BASE} +BOOT= netboot NOMAN= NEWVERSWHAT= "SRM net boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} -CFLAGS+= -ffreestanding -DLOADER_NET_SUPPORT +CFLAGS+= -DLOADER_NET_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> - +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#6 (text+ko) ==== @@ -1,4 +1,7 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.6 2002/12/10 04:20:15 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.7 2004/02/12 08:10:33 ru Exp $ + +BINDIR?= /boot # Options used when building app-specific efi components CFLAGS+= -ffreestanding -fshort-wchar -Wformat +LDFLAGS+= -nostdlib ==== //depot/projects/smpng/sys/boot/efi/libefi/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.12 2003/07/02 11:53:55 ru Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.14 2004/02/13 04:43:41 marcel Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} @@ -12,28 +12,16 @@ SRCS+= efifpswa.c .endif -CFLAGS+= -ffreestanding -fpic CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 20 21:21:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C078716A4D0; Fri, 20 Feb 2004 21:21:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9376E16A4CE for ; Fri, 20 Feb 2004 21:21:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B52E43D31 for ; Fri, 20 Feb 2004 21:21:52 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1L5LqGe065486 for ; Fri, 20 Feb 2004 21:21:52 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1L5LoJt065456 for perforce@freebsd.org; Fri, 20 Feb 2004 21:21:50 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Fri, 20 Feb 2004 21:21:50 -0800 (PST) Message-Id: <200402210521.i1L5LoJt065456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 47296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2004 05:21:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=47296 Change 47296 by scottl@scottl-newint on 2004/02/20 21:21:29 IFC. Also test out doing this via the p4p server. Affected files ... .. //depot/projects/newint/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/newint/sys/boot/alpha/Makefile.inc#2 integrate .. //depot/projects/newint/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/newint/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/newint/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/newint/sys/boot/alpha/libalpha/Makefile#2 integrate .. //depot/projects/newint/sys/boot/alpha/loader/Makefile#2 integrate .. //depot/projects/newint/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/newint/sys/boot/efi/Makefile.inc#2 integrate .. //depot/projects/newint/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/newint/sys/boot/efi/loader/Makefile#2 integrate .. //depot/projects/newint/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/newint/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/newint/sys/boot/i386/boot2/boot1.s#2 delete .. //depot/projects/newint/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/newint/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/newint/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/newint/sys/boot/i386/btx/btx/btx.s#2 delete .. //depot/projects/newint/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/newint/sys/boot/i386/btx/btxldr/btxldr.s#2 delete .. //depot/projects/newint/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/newint/sys/boot/i386/pxeldr/pxeldr.s#2 delete .. //depot/projects/newint/sys/boot/ia64/Makefile.inc#2 integrate .. //depot/projects/newint/sys/boot/ia64/libski/Makefile#2 integrate .. //depot/projects/newint/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/newint/sys/boot/pc98/btx/btx/btx.s#2 delete .. //depot/projects/newint/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/newint/sys/boot/pc98/btx/btxldr/btxldr.s#2 delete .. //depot/projects/newint/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/newint/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/newint/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/newint/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/newint/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/newint/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/newint/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/newint/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/newint/sys/conf/files#2 integrate .. //depot/projects/newint/sys/conf/files.i386#2 integrate .. //depot/projects/newint/sys/conf/files.pc98#2 integrate .. //depot/projects/newint/sys/conf/files.powerpc#2 integrate .. //depot/projects/newint/sys/conf/kern.post.mk#2 integrate .. //depot/projects/newint/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/newint/sys/conf/kmod.mk#2 integrate .. //depot/projects/newint/sys/conf/ldscript.alpha#2 integrate .. //depot/projects/newint/sys/conf/majors#2 integrate .. //depot/projects/newint/sys/conf/options#2 integrate .. //depot/projects/newint/sys/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aac.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/newint/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/newint/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/newint/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/newint/sys/dev/cx/ng_cx.h#2 integrate .. //depot/projects/newint/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/newint/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/newint/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/newint/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/newint/sys/dev/em/if_em.c#2 integrate .. //depot/projects/newint/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/newint/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/newint/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/newint/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/newint/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/newint/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/newint/sys/dev/iir/iir.h#2 integrate .. //depot/projects/newint/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/newint/sys/dev/ips/ips.c#2 integrate .. //depot/projects/newint/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/newint/sys/dev/ips/ips_disk.h#2 integrate .. //depot/projects/newint/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/newint/sys/dev/led/led.c#2 integrate .. //depot/projects/newint/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/newint/sys/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/newint/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/newint/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/newint/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/newint/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/newint/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/newint/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/newint/sys/dev/trm/trm.c#2 integrate .. //depot/projects/newint/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/newint/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/newint/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/newint/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/newint/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/newint/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/newint/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/newint/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/newint/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/newint/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/newint/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/newint/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/newint/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/newint/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/newint/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/newint/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/newint/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/newint/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/newint/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/newint/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/newint/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/newint/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/newint/sys/geom/geom.h#2 integrate .. //depot/projects/newint/sys/geom/geom_aes.c#2 integrate .. //depot/projects/newint/sys/geom/geom_apple.c#2 integrate .. //depot/projects/newint/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/newint/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/newint/sys/geom/geom_dev.c#2 integrate .. //depot/projects/newint/sys/geom/geom_disk.c#2 integrate .. //depot/projects/newint/sys/geom/geom_disk.h#2 integrate .. //depot/projects/newint/sys/geom/geom_event.c#2 integrate .. //depot/projects/newint/sys/geom/geom_fox.c#2 integrate .. //depot/projects/newint/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/newint/sys/geom/geom_io.c#2 integrate .. //depot/projects/newint/sys/geom/geom_kern.c#2 integrate .. //depot/projects/newint/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/newint/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/newint/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/newint/sys/geom/geom_slice.c#2 integrate .. //depot/projects/newint/sys/geom/geom_subr.c#2 integrate .. //depot/projects/newint/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/newint/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/newint/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/newint/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/newint/sys/i386/isa/npx.c#2 integrate .. //depot/projects/newint/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/newint/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/newint/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/newint/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/newint/sys/isa/fd.c#2 integrate .. //depot/projects/newint/sys/kern/kern_conf.c#2 integrate .. //depot/projects/newint/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/newint/sys/kern/kern_event.c#2 integrate .. //depot/projects/newint/sys/kern/kern_exec.c#2 integrate .. //depot/projects/newint/sys/kern/kern_exit.c#2 integrate .. //depot/projects/newint/sys/kern/kern_jail.c#2 integrate .. //depot/projects/newint/sys/kern/kern_resource.c#2 integrate .. //depot/projects/newint/sys/kern/kern_sx.c#2 integrate .. //depot/projects/newint/sys/kern/subr_prf.c#2 integrate .. //depot/projects/newint/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/newint/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/newint/sys/kern/sys_process.c#2 integrate .. //depot/projects/newint/sys/kern/tty.c#2 integrate .. //depot/projects/newint/sys/kern/tty_cons.c#2 integrate .. //depot/projects/newint/sys/kern/tty_pty.c#2 integrate .. //depot/projects/newint/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/newint/sys/kern/vfs_init.c#2 integrate .. //depot/projects/newint/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/newint/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/newint/sys/libkern/bcmp.c#2 integrate .. //depot/projects/newint/sys/modules/Makefile#2 integrate .. //depot/projects/newint/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/newint/sys/modules/firewire/Makefile.inc#2 integrate .. //depot/projects/newint/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/newint/sys/modules/geom/geom_concat/Makefile#1 branch .. //depot/projects/newint/sys/modules/harp/Makefile#2 integrate .. //depot/projects/newint/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/newint/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/newint/sys/modules/osf1/Makefile#2 integrate .. //depot/projects/newint/sys/modules/patm/Makefile#2 integrate .. //depot/projects/newint/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/newint/sys/modules/uscanner/Makefile#2 integrate .. //depot/projects/newint/sys/net/bpf.c#2 integrate .. //depot/projects/newint/sys/net/bridge.c#2 integrate .. //depot/projects/newint/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/newint/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/newint/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/newint/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/newint/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/newint/sys/netgraph/ng_one2many.h#2 integrate .. //depot/projects/newint/sys/netinet/in_proto.c#2 integrate .. //depot/projects/newint/sys/netinet/ip.h#2 integrate .. //depot/projects/newint/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/newint/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/newint/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_input.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_output.c#2 integrate .. //depot/projects/newint/sys/netinet/ip_var.h#2 integrate .. //depot/projects/newint/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp.h#2 integrate .. //depot/projects/newint/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/newint/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/newint/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/newint/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/newint/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/newint/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/newint/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/newint/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/newint/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/newint/sys/netinet6/ipsec.h#2 integrate .. //depot/projects/newint/sys/netinet6/ipsec6.h#2 integrate .. //depot/projects/newint/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/newint/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/newint/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/newint/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/newint/sys/netipsec/key.c#2 integrate .. //depot/projects/newint/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/newint/sys/netsmb/smb_dev.h#2 integrate .. //depot/projects/newint/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/newint/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/newint/sys/pc98/pc98/wd.c#2 integrate .. //depot/projects/newint/sys/pci/agp.c#2 integrate .. //depot/projects/newint/sys/powerpc/include/floatingpoint.h#1 branch .. //depot/projects/newint/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/newint/sys/powerpc/include/param.h#2 integrate .. //depot/projects/newint/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/newint/sys/powerpc/include/sr.h#2 integrate .. //depot/projects/newint/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/newint/sys/powerpc/ofw/ofw_pci.c#2 integrate .. //depot/projects/newint/sys/powerpc/powermac/ata_kauai.c#1 branch .. //depot/projects/newint/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/critical.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/db_memrw.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/newint/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/newint/sys/powerpc/psim/ata_iobus.c#2 integrate .. //depot/projects/newint/sys/sys/jail.h#2 integrate .. //depot/projects/newint/sys/sys/kernel.h#2 integrate .. //depot/projects/newint/sys/sys/libkern.h#2 integrate .. //depot/projects/newint/sys/sys/mbuf.h#2 integrate .. //depot/projects/newint/sys/sys/msgbuf.h#2 integrate .. //depot/projects/newint/sys/sys/param.h#2 integrate .. //depot/projects/newint/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/newint/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/newint/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/newint/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/newint/sys/vm/swap_pager.c#2 integrate .. //depot/projects/newint/sys/vm/vm_contig.c#2 integrate .. //depot/projects/newint/sys/vm/vm_fault.c#2 integrate .. //depot/projects/newint/sys/vm/vm_kern.c#2 integrate .. //depot/projects/newint/sys/vm/vm_map.c#2 integrate .. //depot/projects/newint/sys/vm/vm_page.c#2 integrate .. //depot/projects/newint/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/newint/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -3,71 +3,32 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# (XXX from i386:NOTES,v 1.1106; merge in updates) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.3 2004/02/08 00:39:38 peter Exp $ +# +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $ # -# We don't have modules on amd64. -makeoptions NO_MODULES=not_yet - # # This directive is mandatory; it defines the architecture to be # configured for; in this case, the 386 family based IBM-PC and # compatibles. # machine amd64 +cpu HAMMER # # We want LINT to cover profiling as well -#X#profile 2 +profile 2 -##################################################################### -# SMP OPTIONS: -# -# The apic device enables the use of the I/O APIC for interrupt delivery. -# The apic device can be used in both UP and SMP kernels, but is required -# for SMP kernels. Thus, the apic device is not strictly an SMP option, -# but it is a prerequisite for SMP. -# -# Notes: -# -# Be sure to disable 'cpu I386_CPU' for SMP kernels. -# -# By default, mixed mode is used to route IRQ0 from the AT timer via -# the 8259A master PIC through the ExtINT pin on the first I/O APIC. -# This can be disabled via the NO_MIXED_MODE option. In that case, -# IRQ0 will be routed via an intpin on the first I/O APIC. Not all -# motherboards hook IRQ0 up to the first I/O APIC even though their -# MP table or MADT may claim to do so. That is why mixed mode is -# enabled by default. -# +# Debug options +options NPX_DEBUG # enable npx debugging (FPU/math emu) + #new math emulator -# Optional: -device atpic -device mptable -options NO_MIXED_MODE # Disable use of mixed mode - - -##################################################################### -# CPU OPTIONS - -# -# You must specify at least one CPU (the one you intend to run on); -# deleting the specification for CPUs you don't need to use may make -# parts of the system run faster. -# -cpu HAMMER - -# -# Options for CPU features. # - -# # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -#X#options PERFMON +options PERFMON ##################################################################### @@ -104,17 +65,14 @@ options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - -options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION - ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +hint.speaker.0.at="isa" +hint.speaker.0.port="0x61" device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! +device apm_saver # Requires APM ##################################################################### @@ -151,9 +109,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options AUTO_EOI_1 -#options AUTO_EOI_2 - options MAXMEM=(128*1024) #options BROKEN_KEYBOARD_RESET @@ -178,19 +133,7 @@ # Optional devices: # -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. # -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -#X#options TDFX_LINUX # Enable Linuxulator support - -# # ACPI support using the Intel ACPI Component Architecture reference # implementation. # @@ -199,29 +142,17 @@ # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). # -# ACPI_MAX_THREADS sets the number of task threads started. -# -# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. -# -# ACPICA_PEDANTIC enables strict checking of AML. Our default is to -# relax these checks to allow code generated by the Microsoft compiler -# to still execute. -# # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # device acpi options ACPI_DEBUG -options ACPI_MAX_THREADS=1 -#!options ACPI_NO_SEMAPHORES -#!options ACPICA_PEDANTIC # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # r128drm: ATI Rage 128 # radeondrm: ATI Radeon up to 9000/9100 -# sisdrm: SiS 300/305,540,630 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # DRM_DEBUG: include debug printfs, very slow # # mga requires AGP in the kernel, and it is recommended @@ -230,30 +161,70 @@ device mgadrm device "r128drm" device radeondrm -device sisdrm device tdfxdrm options DRM_DEBUG +# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README +###device fla +###hint.fla.0.at="isa" + # # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 +# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) +# (requires miibus) +# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; +# Intel EtherExpress +# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and +# Am79C960) +# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). + +# Order for ISA/EISA devices is important here -#X#device ath -#X#device ath_hal # Atheros HAL (includes binary component) -device wlan # 802.11 layer +device ed +#options ED_NO_MIIBUS # Disable ed miibus support +hint.ed.0.at="isa" +hint.ed.0.port="0x280" +hint.ed.0.irq="5" +hint.ed.0.maddr="0xd8000" +device lnc +hint.lnc.0.at="isa" +hint.lnc.0.port="0x280" +hint.lnc.0.irq="10" +hint.lnc.0.drq="0" +device sr +hint.sr.0.at="isa" +hint.sr.0.port="0x300" +hint.sr.0.irq="5" +hint.sr.0.maddr="0xd0000" +device wl +hint.wl.0.at="isa" +hint.wl.0.port="0x300" +options WLCACHE # enables the signal-strength cache +options WLDEBUG # enables verbose debugging output # # ATA raid adapters # -#XXX this stores pointers in a 32bit field that is defined by the hardware -#device pst +device pst # # SCSI host adapters: -# +# +# ncv: NCR 53C500 based SCSI host adapters. +# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. +# stg: TMC 18C30, 18C50 based SCSI host adapters. + +device ncv +device nsp +device stg +hint.stg.0.at="isa" +hint.stg.0.port="0x140" +hint.stg.0.port="11" # # Adaptec FSA RAID controllers, including integrated DELL controllers, @@ -278,7 +249,12 @@ # # Miscellaneous hardware: # +# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # digi: Digiboard driver +# gsc: Genius GS-4500 hand scanner. +# spic: Sony Programmable I/O controller (VAIO notebooks) +# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) +# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -286,6 +262,15 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. +# Notes on the Digiboard PC/Xi and PC/Xe series driver +# +# The NDGBPORTS option specifies the number of ports controlled by the +# dgb(4) driver. The default value is 16 ports per device. +# +# The following flag values have special meanings in dgb: +# 0x01 - alternate layout of pins +# 0x02 - use the windowed PC/Xe in 64K mode + device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -304,13 +289,20 @@ # # Laptop/Notebook options: # +# See also: +# apm under `Miscellaneous hardware' +# above. - +# PCI bus Cards: +# -------------- # -# I2C Bus -# - -#--------------------------------------------------------------------------- +# Cyclades Cyclom-Y PCI serial driver +device cy +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#hint.cy.0.at="isa" +#hint.cy.0.irq="10" +#hint.cy.0.maddr="0xd4000" +#hint.cy.0.msize="0x2000" # # Set the number of PV entries per process. Increasing this can @@ -323,52 +315,48 @@ # # The value below is the one more than the default. # -options PMAP_SHPGPERPROC=201 +#options PMAP_SHPGPERPROC=201 + +# +# Change the size of the kernel virtual address space. Due to +# constraints in loader(8) on i386, this must be a multiple of 4. +# 256 = 1 GB of kernel address space. Increasing this also causes +# a reduction of the address space in user processes. 512 splits +# the 4GB cpu address space in half (2GB user, 2GB kernel). +# +options KVA_PAGES=260 ##################################################################### # ABI Emulation -#XXX keep these here for now and reactivate when support for emulating -#XXX these 32 bit binaries is added. - -# Enable iBCS2 runtime support for SCO and ISC binaries -#X#options IBCS2 - -# Emulate spx device for client side of SVR3 local X interface -#X#options SPX_HACK - # Enable Linux ABI emulation -#X#options COMPAT_LINUX +#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#X#options LINPROCFS +#options LINPROCFS -# -# SysVR4 ABI emulation -# -# The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a -# module. If loaded as a module, it must be loaded before the svr4 module -# (the /usr/sbin/svr4 script does this for you). If compiling statically, -# the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured -# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 -# script understands that it doesn't need to load the `streams' module under -# those circumstances. -# Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). -# -#X#options COMPAT_SVR4 # build emulator statically -#X#options DEBUG_SVR4 # enable verbose debugging -#X#device streams # STREAMS network driver (required for svr4). - ##################################################################### # VM OPTIONS +# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the +# kernel to use a 4 MByte pages to map the kernel instead of 4k pages. +# This saves on the amount of memory needed for page tables needed to +# map the kernel. You should only disable this feature as a temporary +# workaround if you are having problems with it enabled. +# +#options DISABLE_PSE + +# Disable the global pages PGE CPU feature. The PGE feature allows pages +# to be marked with the PG_G bit. TLB entries for these pages are not +# flushed from the cache when %cr3 is reloaded. This can make context +# switches less expensive. You should only disable this feature as a +# temporary workaround if you are having problems with it enabled. +# +#options DISABLE_PG_G + # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. @@ -381,10 +369,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT -#X#options PECOFF_DEBUG - options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 @@ -398,25 +382,3 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE - -############################################################### -# Broken stuff that shouldn't really be broken - -# machine/ioctl_meteor.h and machine/bt848.h -nodevice bktr - -# pointer/int stuff -nodevice mgadrm -nodevice "r128drm" -nodevice radeondrm -nodevice sisdrm -nodevice tdfxdrm - -# missing conf lines (must be fixed ASAP) -nooption SC_DFLT_FONT -nooption UKBD_DFLT_KEYMAP -nooption ATKBD_DFLT_KEYMAP -nooption PMAP_SHPGPERPROC -nooption CLK_USE_I8254_CALIBRATION -# XXX dead option -nooption CLK_USE_TSC_CALIBRATION ==== //depot/projects/newint/sys/boot/alpha/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,12 @@ -# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.8 2000/10/27 09:36:34 dfr Exp $ +# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.9 2004/02/11 22:01:16 ru Exp $ # Options used when building app-specific libalpha components + +BINDIR?= /boot + +CFLAGS+= -ffreestanding -mno-fp-regs +LDFLAGS+= -nostdlib PRIMARY_LOAD_ADDRESS= 0x20000000 # "Region 1 start" SECONDARY_LOAD_ADDRESS= 0x2000c000 # "Region 1 start" + 48k HEAP_LIMIT= 0x20040000 # "Region 1 start" + 256k -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a ==== //depot/projects/newint/sys/boot/alpha/boot1/Makefile#2 (text+ko) ==== @@ -1,44 +1,29 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.16 2003/01/26 14:32:53 phk Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $ -.include <../Makefile.inc> +PROG= boot1.sym +INTERNALPROG= +NOMAN= +LINKS= ${BINDIR}/boot1 ${BINDIR}/boot -PROG = boot1 -LINKS = ${BINDIR}/${PROG} ${BINDIR}/boot - -.PATH: ${.CURDIR}/../libalpha +.PATH: ${.CURDIR}/../libalpha SRCS= start.S boot1.c -CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${LIBSTANDDIR} -CFLAGS+= -I${.CURDIR}/.. -NOMAN=1 -STRIP= -BINDIR?= /boot +CFLAGS+= -I${.CURDIR}/../../common BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS} -CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${PROG}.list +CLEANFILES= boot1 -all: ${PROG} +FILES= boot1 -${PROG}.nosym: ${PROG}.sym - cp ${PROG}.sym ${PROG}.nosym - strip ${PROG}.nosym +boot1: boot1.sym + objcopy -S -O binary boot1.sym ${.TARGET} -${PROG}: ${PROG}.nosym - objcopy -O binary ${PROG}.nosym ${PROG} +LDFLAGS=-Ttext ${BOOT_RELOC} -N -e start +DPADD= ${LIBALPHA} ${LIBSTAND} +LDADD= ${LIBALPHA} -lstand .include - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -${PROG}.sym: ${OBJS} ${LIBKERN} - ${LD} -M -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym ${OBJS} \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBSTAND} \ - > ${.OBJDIR}/${PROG}.list - size ${PROG}.sym ==== //depot/projects/newint/sys/boot/alpha/cdboot/Makefile#2 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.7 2002/05/10 09:26:28 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= cdboot -PROG= ${BASE} +BOOT= cdboot NOMAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} -CFLAGS+= -ffreestanding -DLOADER_CDROM_SUPPORT +CFLAGS+= -DLOADER_CDROM_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/newint/sys/boot/alpha/common/Makefile.common#2 (text+ko) ==== @@ -1,95 +1,69 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.17 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.18 2004/02/11 22:01:17 ru Exp $ # # Common Alpha loader build rules -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR}/../common + +PROG= ${BOOT}.sym +INTERNALPROG= # Alpha-specific bootstrap sources -SRCS+= main.c conf.c -.if ${BASE} == netboot +SRCS= start.S main.c conf.c vers.c +.if ${BOOT} == "netboot" SRCS+= dev_net.c .endif +.PATH: ${.CURDIR}/../libalpha + .if !defined(NOFORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha -.if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.else -LIBFICL= ${.CURDIR}/../../ficl/libficl.a -.endif .endif # Always add MI sources -.PATH: ${.CURDIR}/../../common -.include <${.CURDIR}/../../common/Makefile.inc> -CFLAGS+= -mno-fp-regs -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../.. -I. +.PATH: ${.CURDIR}/../../common +.include "${.CURDIR}/../../common/Makefile.inc" +CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS} \ -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \ - vers.c vers.o ${BASE} ${BASE}.sym ${BASE}.list +CLEANFILES+= vers.c ${BOOT} ${BOOT}.sym CFLAGS+= -Wall CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CRT= start.o -STRIP= -BINDIR?= /boot -INSTALLFLAGS?= -b + +vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version + sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} + +LDFLAGS=-e start -N -Ttext ${LOAD_ADDRESS} -all: ${BASE} ${BASE}.help +FILES= ${BOOT} +# XXX INSTALLFLAGS_${BOOT}= -b +FILESMODE_${BOOT}= ${BINMODE} -b -vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version - sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} - ${CC} -c vers.c +${BOOT}: ${BOOT}.sym + objcopy -O binary ${BOOT}.sym ${.TARGET} -${BASE}: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o - ${LD} -o ${BASE}.sym -M -e start -N -Ttext ${LOAD_ADDRESS} \ - ${CRT} ${OBJS} vers.o \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBFICL} ${LIBSTAND} \ - >${.OBJDIR}/${BASE}.list - objcopy -O binary ${BASE}.sym ${BASE} +DPADD= ${LIBALPHA} ${LIBFICL} ${LIBSTAND} +LDADD= ${LIBALPHA} ${LIBFICL} -lstand -CLEANFILES+= ${BASE}.help -${BASE}.help: help.common help.alpha +.if defined(INSTALL_HELP) +FILES+= ${BOOT}.help +CLEANFILES+= ${BOOT}.help +${BOOT}.help: help.common help.alpha cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.endif -beforeinstall: -.ifdef INSTALL_HELP -.if exists(${.OBJDIR}/${BASE}.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif -.endif +.PATH: ${.CURDIR}/../../forth .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults +FILES+= loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - -CLEANFILES+= machine - .include - -beforedepend ${OBJS}: machine ==== //depot/projects/newint/sys/boot/alpha/libalpha/Makefile#2 (text+ko) ==== @@ -1,29 +1,17 @@ -# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.13 2002/05/13 10:53:24 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.14 2004/02/11 22:01:17 ru Exp $ LIB= alpha INTERNALLIB= true -CFLAGS+= -ffreestanding #CFLAGS+= -DDISK_DEBUG -#CPPFLAGS+= -DNO_DISKLABEL -#CPPFLAGS+= -DSAVE_MEMORY -# XXX hack to pick up stand.h -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -CFLAGS+= -DDEBUG CFLAGS+= -I${LIBSTANDDIR} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ - -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${.CURDIR}/../../common SRCS= OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S \ pal.S reboot.c delay.c time.c alpha_module.c devicename.c \ srmdisk.c srmnet.c getsecs.c alpha_copy.c bootinfo.c -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - .include - -beforedepend ${OBJS}: machine ==== //depot/projects/newint/sys/boot/alpha/loader/Makefile#2 (text+ko) ==== @@ -1,12 +1,11 @@ -# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.7 2002/05/10 09:26:29 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= loader -PROG= ${BASE} +BOOT= loader NEWVERSWHAT= "SRM disk boot" alpha INSTALL_HELP= yes LOAD_ADDRESS= ${SECONDARY_LOAD_ADDRESS} # Only disk support -CFLAGS+= -ffreestanding -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT +CFLAGS+= -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 20 23:32:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FDB416A4D0; Fri, 20 Feb 2004 23:32:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0574916A4CE for ; Fri, 20 Feb 2004 23:32:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0AC643D1D for ; Fri, 20 Feb 2004 23:32:03 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1L7W3Ge094814 for ; Fri, 20 Feb 2004 23:32:03 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1L7VnYk094624 for perforce@freebsd.org; Fri, 20 Feb 2004 23:31:49 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Fri, 20 Feb 2004 23:31:49 -0800 (PST) Message-Id: <200402210731.i1L7VnYk094624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 47299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2004 07:32:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=47299 Change 47299 by marcel@marcel_nfs on 2004/02/20 23:31:28 IFC @47297 Affected files ... .. //depot/projects/gdb/MAINTAINERS#2 integrate .. //depot/projects/gdb/Makefile#2 integrate .. //depot/projects/gdb/Makefile.inc1#2 integrate .. //depot/projects/gdb/UPDATING#2 integrate .. //depot/projects/gdb/bin/Makefile#2 integrate .. //depot/projects/gdb/bin/chflags/chflags.c#2 integrate .. //depot/projects/gdb/bin/df/df.c#2 integrate .. //depot/projects/gdb/bin/kill/kill.c#2 integrate .. //depot/projects/gdb/bin/ls/print.c#2 integrate .. //depot/projects/gdb/bin/ps/keyword.c#2 integrate .. //depot/projects/gdb/bin/ps/ps.1#2 integrate .. //depot/projects/gdb/bin/sh/Makefile#2 integrate .. //depot/projects/gdb/bin/sh/eval.c#2 integrate .. //depot/projects/gdb/bin/sh/input.c#2 integrate .. //depot/projects/gdb/bin/sh/jobs.c#2 integrate .. //depot/projects/gdb/bin/sh/parser.c#2 integrate .. //depot/projects/gdb/bin/sh/redir.c#2 integrate .. //depot/projects/gdb/bin/sh/redir.h#2 integrate .. //depot/projects/gdb/bin/sh/trap.c#2 integrate .. //depot/projects/gdb/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/bc/bc/main.c#2 integrate .. //depot/projects/gdb/contrib/bc/h/getopt.h#2 delete .. //depot/projects/gdb/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/gdb/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/gdb/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/gdb/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/gdb/contrib/bsnmp/README#2 integrate .. //depot/projects/gdb/contrib/bsnmp/TODO#2 integrate .. //depot/projects/gdb/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/gdb/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/gdb/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/cpio/getopt.c#2 delete .. //depot/projects/gdb/contrib/cpio/getopt.h#2 delete .. //depot/projects/gdb/contrib/cpio/getopt1.c#2 delete .. //depot/projects/gdb/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/gdb/contrib/cvs/src/server.c#2 integrate .. //depot/projects/gdb/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/diff/diff.h#2 integrate .. //depot/projects/gdb/contrib/diff/getopt.c#2 delete .. //depot/projects/gdb/contrib/diff/getopt.h#2 delete .. //depot/projects/gdb/contrib/diff/getopt1.c#2 delete .. //depot/projects/gdb/contrib/gcc/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/gcc/FREEBSD-deletelist#2 integrate .. //depot/projects/gdb/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/gdb/contrib/gcc/getopt.c#2 delete .. //depot/projects/gdb/contrib/gcc/getopt.h#2 delete .. //depot/projects/gdb/contrib/gcc/getopt1.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-wince.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/wince.mt#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/ChangeLog#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-file.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-file.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiCommand.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiCommand.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiData.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiData.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiDataWin.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiDataWin.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiDisassem.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiDisassem.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiGeneralWin.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiGeneralWin.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiIO.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiIO.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiLayout.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiLayout.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiRegs.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiRegs.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiSource.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiSource.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiSourceWin.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiSourceWin.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiStack.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiStack.h#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiWin.c#2 delete .. //depot/projects/gdb/contrib/gdb/gdb/tui/tuiWin.h#2 delete .. //depot/projects/gdb/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/gdb/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/getopt.c#2 delete .. //depot/projects/gdb/contrib/gnu-sort/lib/getopt.h#2 delete .. //depot/projects/gdb/contrib/gnu-sort/lib/getopt1.c#2 delete .. //depot/projects/gdb/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/gdb/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/gdb/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/gdb/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/gdb/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/gdb/contrib/groff/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/groff/src/include/getopt.h#2 delete .. //depot/projects/gdb/contrib/groff/src/libs/libgroff/getopt.c#2 delete .. //depot/projects/gdb/contrib/groff/src/libs/libgroff/getopt1.c#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/gdb/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/libreadline/bind.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/complete.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/display.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/gdb/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/readline.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/readline.h#2 integrate .. //depot/projects/gdb/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/gdb/contrib/libreadline/shell.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/util.c#2 integrate .. //depot/projects/gdb/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/lex.c#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/gdb/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/gdb/contrib/openpam/CREDITS#2 integrate .. //depot/projects/gdb/contrib/openpam/HISTORY#2 integrate .. //depot/projects/gdb/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/gdb/contrib/openpam/configure#2 integrate .. //depot/projects/gdb/contrib/openpam/configure.in#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/gdb/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/gdb/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/gdb/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/gdb/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/gdb/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/gdb/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/gdb/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/gdb/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/gdb/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/gdb/contrib/sendmail/cf/README#2 integrate .. //depot/projects/gdb/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/gdb/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/gdb/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/gdb/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/gdb/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/gdb/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/include/libmilter/milter.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/include/sm/cdefs.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/signal.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/assert.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/smrsh/smrsh.8#2 integrate .. //depot/projects/gdb/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/README#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/gdb/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/gdb/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/gdb/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/texinfo/lib/getopt.c#2 delete .. //depot/projects/gdb/contrib/texinfo/lib/getopt.h#2 delete .. //depot/projects/gdb/contrib/texinfo/lib/getopt1.c#2 delete .. //depot/projects/gdb/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/gdb/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/gdb/crypto/openssh/servconf.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/gdb/etc/Makefile#2 integrate .. //depot/projects/gdb/etc/defaults/devfs.rules#2 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#2 integrate .. //depot/projects/gdb/etc/devd.conf#2 integrate .. //depot/projects/gdb/etc/etc.powerpc/ttys#1 branch .. //depot/projects/gdb/etc/isdn/Makefile#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/gdb/etc/namedb/named.root#2 integrate .. //depot/projects/gdb/etc/netstart#2 integrate .. //depot/projects/gdb/etc/pam.d/xdm#2 integrate .. //depot/projects/gdb/etc/pccard_ether#2 integrate .. //depot/projects/gdb/etc/rc.d/DAEMON#2 integrate .. //depot/projects/gdb/etc/rc.d/LOGIN#2 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#2 integrate .. //depot/projects/gdb/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/gdb/etc/rc.d/SERVERS#2 integrate .. //depot/projects/gdb/etc/rc.d/accounting#2 integrate .. //depot/projects/gdb/etc/rc.d/amd#2 integrate .. //depot/projects/gdb/etc/rc.d/apmd#2 integrate .. //depot/projects/gdb/etc/rc.d/bootparams#2 integrate .. //depot/projects/gdb/etc/rc.d/ccd#2 integrate .. //depot/projects/gdb/etc/rc.d/cleartmp#2 integrate .. //depot/projects/gdb/etc/rc.d/cron#2 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#2 integrate .. //depot/projects/gdb/etc/rc.d/dumpon#2 integrate .. //depot/projects/gdb/etc/rc.d/fsck#2 integrate .. //depot/projects/gdb/etc/rc.d/gbde#2 integrate .. //depot/projects/gdb/etc/rc.d/gbde_swap#1 branch .. //depot/projects/gdb/etc/rc.d/inetd#2 integrate .. //depot/projects/gdb/etc/rc.d/ip6fw#2 integrate .. //depot/projects/gdb/etc/rc.d/ipfilter#2 integrate .. //depot/projects/gdb/etc/rc.d/ipfs#2 integrate .. //depot/projects/gdb/etc/rc.d/ipmon#2 integrate .. //depot/projects/gdb/etc/rc.d/ipnat#2 integrate .. //depot/projects/gdb/etc/rc.d/ipsec#2 integrate .. //depot/projects/gdb/etc/rc.d/isdnd#2 integrate .. //depot/projects/gdb/etc/rc.d/jail#2 integrate .. //depot/projects/gdb/etc/rc.d/ldconfig#2 integrate .. //depot/projects/gdb/etc/rc.d/local#2 integrate .. //depot/projects/gdb/etc/rc.d/lpd#2 integrate .. //depot/projects/gdb/etc/rc.d/motd#2 integrate .. //depot/projects/gdb/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/gdb/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/gdb/etc/rc.d/mountd#2 integrate .. //depot/projects/gdb/etc/rc.d/moused#2 integrate .. //depot/projects/gdb/etc/rc.d/mrouted#2 integrate .. //depot/projects/gdb/etc/rc.d/named#2 integrate .. //depot/projects/gdb/etc/rc.d/nfsd#2 integrate .. //depot/projects/gdb/etc/rc.d/nfslocking#2 integrate .. //depot/projects/gdb/etc/rc.d/ntpd#2 integrate .. //depot/projects/gdb/etc/rc.d/ntpdate#2 integrate .. //depot/projects/gdb/etc/rc.d/pwcheck#2 integrate .. //depot/projects/gdb/etc/rc.d/random#2 integrate .. //depot/projects/gdb/etc/rc.d/rarpd#2 integrate .. //depot/projects/gdb/etc/rc.d/root#2 integrate .. //depot/projects/gdb/etc/rc.d/route6d#2 integrate .. //depot/projects/gdb/etc/rc.d/routed#2 integrate .. //depot/projects/gdb/etc/rc.d/rpcbind#2 integrate .. //depot/projects/gdb/etc/rc.d/rtadvd#2 integrate .. //depot/projects/gdb/etc/rc.d/rwho#2 integrate .. //depot/projects/gdb/etc/rc.d/savecore#2 integrate .. //depot/projects/gdb/etc/rc.d/securelevel#2 integrate .. //depot/projects/gdb/etc/rc.d/sendmail#2 integrate .. //depot/projects/gdb/etc/rc.d/sshd#2 integrate .. //depot/projects/gdb/etc/rc.d/swap1#2 integrate .. //depot/projects/gdb/etc/rc.d/sysctl#2 integrate .. //depot/projects/gdb/etc/rc.d/syslogd#2 integrate .. //depot/projects/gdb/etc/rc.d/timed#2 integrate .. //depot/projects/gdb/etc/rc.d/ttys#2 delete .. //depot/projects/gdb/etc/rc.d/virecover#2 integrate .. //depot/projects/gdb/etc/rc.d/ypbind#2 integrate .. //depot/projects/gdb/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/gdb/etc/rc.d/ypserv#2 integrate .. //depot/projects/gdb/etc/rc.subr#2 integrate .. //depot/projects/gdb/etc/rc.suspend#2 integrate .. //depot/projects/gdb/etc/remote#2 integrate .. //depot/projects/gdb/etc/sendmail/Makefile#2 integrate .. //depot/projects/gdb/games/factor/Makefile#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/gdb/games/morse/morse.6#2 integrate .. //depot/projects/gdb/games/morse/morse.c#2 integrate .. //depot/projects/gdb/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/gnuregex.h#1 branch .. //depot/projects/gdb/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/bc/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gasp/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/strip/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/c++/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc1/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cccp/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cpp0/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/tradcpp0/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cvs/lib/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cvs/libdiff/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/dc/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/diff/diff.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gperf/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/config.hin#2 delete .. //depot/projects/gdb/gnu/usr.bin/grep/dfa.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/getopt.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/grep/getopt.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/grep/getopt1.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/grep/search.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/stpcpy.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/groff/src/libs/libgroff/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/getopt.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/gzip/getopt.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/gdb/gnu/usr.bin/patch/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/patch/getopt.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/patch/getopt.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/patch/getopt1.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/tar/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/texinfo/libtxi/Makefile#2 integrate .. //depot/projects/gdb/include/Makefile#2 integrate .. //depot/projects/gdb/include/netdb.h#2 integrate .. //depot/projects/gdb/kerberos5/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/Makefile.inc#2 integrate .. //depot/projects/gdb/kerberos5/include/Makefile#2 delete .. //depot/projects/gdb/kerberos5/lib/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libasn1/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libgssapi/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libhdb/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libkafs5/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libkrb5/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libroken/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libsl/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/lib/libvers/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/Makefile.inc#2 integrate .. //depot/projects/gdb/kerberos5/libexec/hprop/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/hpropd/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/ipropd-master/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/ipropd-slave/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/kadmind/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/kdc/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/libexec/kpasswdd/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/tools/Makefile#1 branch .. //depot/projects/gdb/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/gdb/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/gdb/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/gdb/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/gdb/kerberos5/usr.bin/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/kadmin/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/kdestroy/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/kinit/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/klist/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/kpasswd/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/krb5-config/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.bin/verify_krb5_conf/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.sbin/kstash/Makefile#2 integrate .. //depot/projects/gdb/kerberos5/usr.sbin/ktutil/Makefile#2 integrate .. //depot/projects/gdb/lib/Makefile#2 integrate .. //depot/projects/gdb/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/gdb/lib/libalias/Makefile#2 integrate .. //depot/projects/gdb/lib/libalias/alias.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias.h#2 integrate .. //depot/projects/gdb/lib/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_db.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_ftp.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_irc.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_local.h#2 integrate .. //depot/projects/gdb/lib/libalias/alias_nbt.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_old.c#1 branch .. //depot/projects/gdb/lib/libalias/alias_pptp.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_proxy.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_skinny.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_smedia.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_util.c#2 integrate .. //depot/projects/gdb/lib/libalias/libalias.3#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#1 branch .. //depot/projects/gdb/lib/libarchive/README#1 branch .. //depot/projects/gdb/lib/libarchive/archive.h#1 branch .. //depot/projects/gdb/lib/libarchive/archive_check_magic.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_entry.3#1 branch .. //depot/projects/gdb/lib/libarchive/archive_entry.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_entry.h#1 branch .. //depot/projects/gdb/lib/libarchive/archive_private.h#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read.3#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_buffer.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_open_file.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_all.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_bzip2.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_gzip.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_all.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_gnutar.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_string.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_string.h#1 branch .. //depot/projects/gdb/lib/libarchive/archive_string_sprintf.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_util.3#1 branch .. //depot/projects/gdb/lib/libarchive/archive_util.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write.3#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_bzip2.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_gzip.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_none.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_by_name.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_cpio.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#1 branch .. //depot/projects/gdb/lib/libarchive/libarchive.3#1 branch .. //depot/projects/gdb/lib/libarchive/tar.5#1 branch .. //depot/projects/gdb/lib/libatm/Makefile#2 integrate .. //depot/projects/gdb/lib/libbsnmp/Makefile#2 integrate .. //depot/projects/gdb/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/gdb/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_mibII/genfiles#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/genfiles#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#2 delete .. //depot/projects/gdb/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/gdb/lib/libc/Makefile#2 integrate .. //depot/projects/gdb/lib/libc/alpha/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/gdb/lib/libc/amd64/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/gdb/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/gdb/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/gdb/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/pw_scan.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem.c#2 integrate .. //depot/projects/gdb/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/gdb/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/ia64/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/ia64/string/bcopy.S#2 integrate .. //depot/projects/gdb/lib/libc/ia64/string/bzero.S#2 integrate .. //depot/projects/gdb/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/gdb/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/gdb/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/gdb/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/gdb/lib/libc/net/name6.c#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/fabs.S#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/flt_rounds.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpgetmask.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpgetround.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpgetsticky.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpsetmask.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpsetround.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/fpsetsticky.c#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/gen/fabs.S#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/gen/isinf.c#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/gdb/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt_long.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/poll.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/read.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/select.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/gdb/lib/libc/xdr/xdr_stdio.c#2 integrate .. //depot/projects/gdb/lib/libc_r/Makefile#2 integrate .. //depot/projects/gdb/lib/libc_r/arch/ia64/_atomic_lock.S#2 integrate .. //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#2 integrate .. //depot/projects/gdb/lib/libcam/Makefile#2 integrate .. //depot/projects/gdb/lib/libdevstat/Makefile#2 integrate .. //depot/projects/gdb/lib/libdisk/change.c#2 integrate .. //depot/projects/gdb/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/gdb/lib/libfetch/fetch.3#2 integrate .. //depot/projects/gdb/lib/libfetch/http.c#2 integrate .. //depot/projects/gdb/lib/libipsec/ipsec_dump_policy.c#2 integrate .. //depot/projects/gdb/lib/libipsec/pfkey.c#2 integrate .. //depot/projects/gdb/lib/libipsec/pfkey_dump.c#2 integrate .. //depot/projects/gdb/lib/libipsec/policy_token.l#2 integrate .. //depot/projects/gdb/lib/libnetgraph/Makefile#2 integrate .. //depot/projects/gdb/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/gdb/lib/libnetgraph/netgraph.3#2 integrate .. //depot/projects/gdb/lib/libnetgraph/netgraph.h#2 integrate .. //depot/projects/gdb/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/gdb/lib/libopie/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_krb5/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_ksu/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_ksu/pam_ksu.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/gdb/lib/libpthread/Makefile#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 integrate .. //depot/projects/gdb/lib/libpthread/pthread.map#2 integrate .. //depot/projects/gdb/lib/libpthread/test/Makefile#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_printf.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_sem.c#2 integrate .. //depot/projects/gdb/lib/libpthread_dbg/Makefile#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/Makefile.inc#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg.c#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg.h#1 branch .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg_int.h#1 branch .. //depot/projects/gdb/lib/libradius/Makefile#2 integrate .. //depot/projects/gdb/lib/libsdp/Makefile#2 integrate .. //depot/projects/gdb/lib/libsdp/sdp.3#2 integrate .. //depot/projects/gdb/lib/libsdp/sdp.h#2 integrate .. //depot/projects/gdb/lib/libsdp/search.c#2 integrate .. //depot/projects/gdb/lib/libsdp/service.c#1 branch .. //depot/projects/gdb/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/dosfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/ext2fs.c#2 integrate .. //depot/projects/gdb/lib/libstand/fstat.c#2 integrate .. //depot/projects/gdb/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/nfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/nullfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/read.c#2 integrate .. //depot/projects/gdb/lib/libstand/splitfs.c#2 integrate .. //depot/projects/gdb/lib/libstand/stand.h#2 integrate .. //depot/projects/gdb/lib/libstand/ufs.c#2 integrate .. //depot/projects/gdb/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/gdb/lib/libtacplus/Makefile#2 integrate .. //depot/projects/gdb/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_barrier.c#1 branch .. //depot/projects/gdb/lib/libthr/thread/thr_barrierattr.c#1 branch .. //depot/projects/gdb/lib/libthr/thread/thr_cancel.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_getschedparam.c#2 delete .. //depot/projects/gdb/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_kern.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_printf.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/gdb/lib/libusbhid/parse.c#2 integrate .. //depot/projects/gdb/lib/libusbhid/usbhid.h#2 integrate .. //depot/projects/gdb/lib/libypclnt/Makefile#2 integrate .. //depot/projects/gdb/libexec/Makefile#2 integrate .. //depot/projects/gdb/libexec/bootpd/bootpd.8#2 integrate .. //depot/projects/gdb/libexec/bootpd/bootpd.c#2 integrate .. //depot/projects/gdb/libexec/ftpd/Makefile#2 integrate .. //depot/projects/gdb/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/gdb/libexec/lukemftpd/Makefile#2 integrate .. //depot/projects/gdb/libexec/makekey/Makefile#2 integrate .. //depot/projects/gdb/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/gdb/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/gdb/libexec/rshd/Makefile#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/gdb/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/gdb/release/Makefile#2 integrate .. //depot/projects/gdb/release/Makefile.inc.docports#2 integrate .. //depot/projects/gdb/release/alpha/boot_crunch.conf#2 integrate .. //depot/projects/gdb/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/gdb/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/gdb/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/gdb/release/i386/dokern.sh#2 delete .. //depot/projects/gdb/release/i386/drivers.conf#2 delete .. //depot/projects/gdb/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/gdb/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/gdb/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/gdb/release/pc98/dokern.sh#2 delete .. //depot/projects/gdb/release/pc98/drivers-small.conf#2 delete .. //depot/projects/gdb/release/pc98/drivers.conf#2 delete .. //depot/projects/gdb/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/gdb/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/gdb/release/picobsd/tinyware/passwd/pw_copy.c#2 integrate .. //depot/projects/gdb/release/scripts/doFS.sh#2 integrate .. //depot/projects/gdb/release/scripts/driver-copy2.awk#2 delete .. //depot/projects/gdb/release/scripts/driver-desc.awk#2 delete .. //depot/projects/gdb/release/scripts/driver-remove.awk#2 delete .. //depot/projects/gdb/release/scripts/proflibs-make.sh#2 integrate .. //depot/projects/gdb/release/scripts/split-file.sh#1 branch .. //depot/projects/gdb/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/gdb/rescue/rescue/Makefile#2 integrate .. //depot/projects/gdb/sbin/Makefile#2 integrate .. //depot/projects/gdb/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_fore200.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_inet.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_print.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_set.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_show.c#2 integrate .. //depot/projects/gdb/sbin/atm/atm/atm_subr.c#2 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/diag.h#2 integrate .. //depot/projects/gdb/sbin/atm/fore_dnld/fore_dnld.c#2 integrate .. //depot/projects/gdb/sbin/atm/ilmid/ilmid.c#2 integrate .. //depot/projects/gdb/sbin/camcontrol/modeedit.c#2 integrate .. //depot/projects/gdb/sbin/conscontrol/conscontrol.8#2 integrate .. //depot/projects/gdb/sbin/conscontrol/conscontrol.c#2 integrate .. //depot/projects/gdb/sbin/devfs/devfs.c#2 integrate .. //depot/projects/gdb/sbin/devfs/rule.c#2 integrate .. //depot/projects/gdb/sbin/disklabel/Makefile#2 delete .. //depot/projects/gdb/sbin/disklabel/disklabel.5#2 delete .. //depot/projects/gdb/sbin/disklabel/disklabel.8#2 delete .. //depot/projects/gdb/sbin/disklabel/disklabel.c#2 delete .. //depot/projects/gdb/sbin/disklabel/pathnames.h#2 delete .. //depot/projects/gdb/sbin/dmesg/dmesg.c#2 integrate .. //depot/projects/gdb/sbin/dump/dump.8#2 integrate .. //depot/projects/gdb/sbin/ffsinfo/ffsinfo.8#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/check.c#2 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/ext.h#2 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/main.c#2 integrate .. //depot/projects/gdb/sbin/fsdb/Makefile#2 integrate .. //depot/projects/gdb/sbin/gbde/gbde.c#2 integrate .. //depot/projects/gdb/sbin/gbde/test.sh#2 integrate .. //depot/projects/gdb/sbin/gconcat/Makefile#1 branch .. //depot/projects/gdb/sbin/gconcat/gconcat.c#1 branch .. //depot/projects/gdb/sbin/growfs/growfs.8#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/gdb/sbin/init/init.8#2 integrate .. //depot/projects/gdb/sbin/ip6fw/ip6fw.8#2 integrate .. //depot/projects/gdb/sbin/ip6fw/ip6fw.c#2 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/gdb/sbin/md5/Makefile#2 integrate .. //depot/projects/gdb/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/gdb/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/gdb/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/gdb/sbin/mount/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount/mount.8#2 integrate .. //depot/projects/gdb/sbin/mount/mount.c#2 integrate .. //depot/projects/gdb/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/gdb/sbin/mount_nfs4/mount_nfs4.c#2 integrate .. //depot/projects/gdb/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/gdb/sbin/ping/ping.c#2 integrate .. //depot/projects/gdb/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/gdb/sbin/rcorder/Makefile#2 integrate .. //depot/projects/gdb/sbin/routed/Makefile#2 integrate .. //depot/projects/gdb/sbin/routed/rtquery/Makefile#2 integrate .. //depot/projects/gdb/sbin/savecore/savecore.c#2 integrate .. //depot/projects/gdb/sbin/sconfig/Makefile#2 integrate .. //depot/projects/gdb/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/gdb/sbin/sunlabel/Makefile#2 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.8#1 branch .. //depot/projects/gdb/sbin/vinum/commands.c#2 integrate .. //depot/projects/gdb/sbin/vinum/v.c#2 integrate .. //depot/projects/gdb/sbin/vinum/vext.h#2 integrate .. //depot/projects/gdb/sbin/vinum/vinum.8#2 integrate .. //depot/projects/gdb/secure/Makefile#2 integrate .. //depot/projects/gdb/secure/libexec/sftp-server/Makefile#2 integrate .. //depot/projects/gdb/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/gdb/share/Makefile#2 integrate .. //depot/projects/gdb/share/colldef/Makefile#2 integrate .. //depot/projects/gdb/share/colldef/kk_KZ.PT154.src#1 branch .. //depot/projects/gdb/share/colldef/map.PT154#1 branch .. //depot/projects/gdb/share/doc/papers/Makefile#2 integrate .. //depot/projects/gdb/share/doc/psd/Makefile#2 integrate .. //depot/projects/gdb/share/doc/smm/Makefile#2 integrate .. //depot/projects/gdb/share/doc/usd/Makefile#2 integrate .. //depot/projects/gdb/share/examples/bootforth/frames.4th#2 integrate .. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/gdb/share/examples/etc/make.conf#2 integrate .. //depot/projects/gdb/share/examples/isdn/v21/Makefile#2 integrate .. //depot/projects/gdb/share/examples/libvgl/Makefile#2 integrate .. //depot/projects/gdb/share/examples/scsi_target/Makefile#2 integrate .. //depot/projects/gdb/share/man/man1/Makefile#2 integrate .. //depot/projects/gdb/share/man/man3/Makefile#2 integrate .. //depot/projects/gdb/share/man/man3/pthread.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_barrier_destroy.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_barrierattr.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlock_timedrdlock.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_rwlock_timedwrlock.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_spin_init.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_spin_lock.3#1 branch .. //depot/projects/gdb/share/man/man3/pthread_suspend_all_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_suspend_np.3#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#2 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#2 integrate .. //depot/projects/gdb/share/man/man4/acpi_thermal.4#2 integrate .. //depot/projects/gdb/share/man/man4/ata.4#2 integrate .. //depot/projects/gdb/share/man/man4/ath.4#2 integrate .. //depot/projects/gdb/share/man/man4/awi.4#2 integrate .. //depot/projects/gdb/share/man/man4/crypto.4#2 integrate .. //depot/projects/gdb/share/man/man4/gdb.4#2 integrate .. //depot/projects/gdb/share/man/man4/gre.4#2 integrate .. //depot/projects/gdb/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/acpi_toshiba.4#1 branch .. //depot/projects/gdb/share/man/man4/man4.i386/tx.4#2 delete .. //depot/projects/gdb/share/man/man4/ng_one2many.4#2 integrate .. //depot/projects/gdb/share/man/man4/random.4#2 integrate .. //depot/projects/gdb/share/man/man4/tcp.4#2 integrate .. //depot/projects/gdb/share/man/man4/tdfx.4#2 integrate .. //depot/projects/gdb/share/man/man4/tx.4#1 branch .. //depot/projects/gdb/share/man/man4/umass.4#2 integrate .. //depot/projects/gdb/share/man/man4/uplcom.4#2 integrate .. //depot/projects/gdb/share/man/man4/uscanner.4#2 integrate .. //depot/projects/gdb/share/man/man4/wi.4#2 integrate .. //depot/projects/gdb/share/man/man4/witness.4#2 integrate .. //depot/projects/gdb/share/man/man5/Makefile#2 integrate .. //depot/projects/gdb/share/man/man5/hosts.lpd.5#2 integrate .. //depot/projects/gdb/share/man/man5/libmap.conf.5#2 integrate .. //depot/projects/gdb/share/man/man5/make.conf.5#2 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/gdb/share/man/man6/intro.6#2 integrate .. //depot/projects/gdb/share/man/man7/Makefile#2 integrate .. //depot/projects/gdb/share/man/man7/environ.7#2 integrate .. //depot/projects/gdb/share/man/man7/release.7#2 integrate .. //depot/projects/gdb/share/man/man7/security.7#2 integrate .. //depot/projects/gdb/share/man/man8/Makefile#2 integrate .. //depot/projects/gdb/share/man/man8/diskless.8#2 integrate .. //depot/projects/gdb/share/man/man8/yp.8#2 integrate .. //depot/projects/gdb/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/gdb/share/man/man9/DECLARE_GEOM_CLASS.9#1 branch .. //depot/projects/gdb/share/man/man9/MUTEX_PROFILING.9#1 branch .. //depot/projects/gdb/share/man/man9/Makefile#2 integrate .. //depot/projects/gdb/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/gdb/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/gdb/share/man/man9/disk.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_attach.9#1 branch .. //depot/projects/gdb/share/man/man9/g_bio.9#1 branch .. //depot/projects/gdb/share/man/man9/g_consumer.9#1 branch .. //depot/projects/gdb/share/man/man9/g_data.9#1 branch .. //depot/projects/gdb/share/man/man9/g_event.9#1 branch .. //depot/projects/gdb/share/man/man9/g_geom.9#1 branch .. //depot/projects/gdb/share/man/man9/g_provider.9#1 branch .. //depot/projects/gdb/share/man/man9/g_provider_by_name.9#1 branch .. //depot/projects/gdb/share/man/man9/g_wither_geom.9#1 branch .. //depot/projects/gdb/share/man/man9/ifnet.9#2 integrate .. //depot/projects/gdb/share/man/man9/mac.9#2 integrate .. //depot/projects/gdb/share/man/man9/malloc.9#2 integrate .. //depot/projects/gdb/share/man/man9/mbuf.9#2 integrate .. //depot/projects/gdb/share/man/man9/mutex.9#2 integrate .. //depot/projects/gdb/share/man/man9/pci.9#2 integrate .. //depot/projects/gdb/share/man/man9/pmap.9#2 integrate .. //depot/projects/gdb/share/man/man9/sbuf.9#2 integrate .. //depot/projects/gdb/share/man/man9/sleep.9#2 integrate .. //depot/projects/gdb/share/man/man9/sx.9#2 integrate .. //depot/projects/gdb/share/man/man9/zone.9#2 integrate .. //depot/projects/gdb/share/mk/Makefile#2 integrate .. //depot/projects/gdb/share/mk/bsd.README#2 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.info.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.own.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/gdb/share/mk/sys.mk#2 integrate .. //depot/projects/gdb/share/mklocale/Makefile#2 integrate .. //depot/projects/gdb/share/mklocale/kk_KZ.PT154.src#1 branch .. //depot/projects/gdb/share/monetdef/Makefile#2 integrate .. //depot/projects/gdb/share/monetdef/kk_KZ.PT154.src#1 branch .. //depot/projects/gdb/share/msgdef/Makefile#2 integrate .. //depot/projects/gdb/share/msgdef/kk_KZ.PT154.src#1 branch .. //depot/projects/gdb/share/numericdef/Makefile#2 integrate .. //depot/projects/gdb/share/numericdef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/gdb/share/numericdef/kk_KZ.PT154.src#1 branch .. //depot/projects/gdb/share/skel/Makefile#2 integrate .. //depot/projects/gdb/share/syscons/fonts/Makefile#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/it.iso.kbd#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/kk.pt154.io.kbd#1 branch .. //depot/projects/gdb/share/syscons/keymaps/kk.pt154.kst.kbd#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 21 10:28:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58BD116A4D0; Sat, 21 Feb 2004 10:28:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AE3616A4CE for ; Sat, 21 Feb 2004 10:28:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1335E43D1D for ; Sat, 21 Feb 2004 10:28:33 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1LISXGe062067 for ; Sat, 21 Feb 2004 10:28:33 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1LISWjG062064 for perforce@freebsd.org; Sat, 21 Feb 2004 10:28:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 21 Feb 2004 10:28:32 -0800 (PST) Message-Id: <200402211828.i1LISWjG062064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 47320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2004 18:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=47320 Change 47320 by rwatson@rwatson_paprika on 2004/02/21 10:28:09 Pull socket-level entry points out of mac_net.c into mac_socket.c. Pull inet-specific entry points out of mac_net into mac_inet.c. Generic mbuf routines, bpf routines, and ifnet routines remain in mac_net.c. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#1 add .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#19 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#22 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#19 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2002, 2003, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -62,7 +62,9 @@ extern struct mac_policy_list_head mac_policy_list; extern struct mac_policy_list_head mac_static_policy_list; extern int mac_late; +extern int mac_enforce_network; extern int mac_enforce_process; +extern int mac_enforce_socket; extern int mac_enforce_sysv; extern int mac_enforce_vm; #ifndef MAC_ALWAYS_LABEL_MBUF @@ -118,6 +120,8 @@ int mac_internalize_cred_label(struct label *label, char *string); void mac_relabel_cred(struct ucred *cred, struct label *newlabel); +struct label *mac_mbuf_to_label(struct mbuf *m); + void mac_copy_pipe_label(struct label *src, struct label *dest); int mac_externalize_pipe_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#22 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2002, 2003, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -61,42 +61,30 @@ #include #include -#include -#include -#include - #include -static int mac_enforce_network = 1; +/* + * mac_enforce_network is used by IPv4 and IPv6 checks, and so must + * be non-static for now. + */ +int mac_enforce_network = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_network, CTLFLAG_RW, &mac_enforce_network, 0, "Enforce MAC policy on network packets"); TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); -static int mac_enforce_socket = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_socket, CTLFLAG_RW, - &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); -TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); - #ifdef MAC_DEBUG -static unsigned int nmacmbufs, nmacifnets, nmacbpfdescs, nmacsockets, - nmacinpcbs, nmacipqs; +static unsigned int nmacifnets, nmacmbufs, nmacbpfdescs; +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ifnets, CTLFLAG_RD, + &nmacifnets, 0, "number of ifnets in use"); SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ifnets, CTLFLAG_RD, - &nmacifnets, 0, "number of ifnets in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, inpcbs, CTLFLAG_RD, - &nmacinpcbs, 0, "number of inpcbs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipqs, CTLFLAG_RD, - &nmacipqs, 0, "number of ipqs in use"); SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, bpfdescs, CTLFLAG_RD, &nmacbpfdescs, 0, "number of bpfdescs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); #endif -static struct label * -mbuf_to_label(struct mbuf *mbuf) +struct label * +mac_mbuf_to_label(struct mbuf *mbuf) { struct m_tag *tag; struct label *label; @@ -143,66 +131,7 @@ ifp->if_label = mac_ifnet_label_alloc(); } -static struct label * -mac_inpcb_label_alloc(int flag) -{ - struct label *label; - int error; - - label = mac_labelzone_alloc(flag); - if (label == NULL) - return (NULL); - MAC_CHECK(init_inpcb_label, label, flag); - if (error) { - MAC_PERFORM(destroy_inpcb_label, label); - mac_labelzone_free(label); - return (NULL); - } - MAC_DEBUG_COUNTER_INC(&nmacinpcbs); - return (label); -} - int -mac_init_inpcb(struct inpcb *inp, int flag) -{ - - inp->inp_label = mac_inpcb_label_alloc(flag); - if (inp->inp_label == NULL) - return (ENOMEM); - return (0); -} - -static struct label * -mac_ipq_label_alloc(int flag) -{ - struct label *label; - int error; - - label = mac_labelzone_alloc(flag); - if (label == NULL) - return (NULL); - - MAC_CHECK(init_ipq_label, label, flag); - if (error) { - MAC_PERFORM(destroy_ipq_label, label); - mac_labelzone_free(label); - return (NULL); - } - MAC_DEBUG_COUNTER_INC(&nmacipqs); - return (label); -} - -int -mac_init_ipq(struct ipq *ipq, int flag) -{ - - ipq->ipq_label = mac_ipq_label_alloc(flag); - if (ipq->ipq_label == NULL) - return (ENOMEM); - return (0); -} - -int mac_init_mbuf_tag(struct m_tag *tag, int flag) { struct label *label; @@ -250,62 +179,6 @@ return (0); } -struct label * -mac_socket_label_alloc(int flag) -{ - struct label *label; - int error; - - label = mac_labelzone_alloc(flag); - if (label == NULL) - return (NULL); - - MAC_CHECK(init_socket_label, label, flag); - if (error) { - MAC_PERFORM(destroy_socket_label, label); - mac_labelzone_free(label); - return (NULL); - } - MAC_DEBUG_COUNTER_INC(&nmacsockets); - return (label); -} - -static struct label * -mac_socket_peer_label_alloc(int flag) -{ - struct label *label; - int error; - - label = mac_labelzone_alloc(flag); - if (label == NULL) - return (NULL); - - MAC_CHECK(init_socket_peer_label, label, flag); - if (error) { - MAC_PERFORM(destroy_socket_peer_label, label); - mac_labelzone_free(label); - return (NULL); - } - MAC_DEBUG_COUNTER_INC(&nmacsockets); - return (label); -} - -int -mac_init_socket(struct socket *so, int flag) -{ - - so->so_label = mac_socket_label_alloc(flag); - if (so->so_label == NULL) - return (ENOMEM); - so->so_peerlabel = mac_socket_peer_label_alloc(flag); - if (so->so_peerlabel == NULL) { - mac_socket_label_free(so->so_label); - so->so_label = NULL; - return (ENOMEM); - } - return (0); -} - static void mac_bpfdesc_label_free(struct label *label) { @@ -340,41 +213,7 @@ ifp->if_label = NULL; } -static void -mac_inpcb_label_free(struct label *label) -{ - - MAC_PERFORM(destroy_inpcb_label, label); - mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacinpcbs); -} - -void -mac_destroy_inpcb(struct inpcb *inp) -{ - - mac_inpcb_label_free(inp->inp_label); - inp->inp_label = NULL; -} - -static void -mac_ipq_label_free(struct label *label) -{ - - MAC_PERFORM(destroy_ipq_label, label); - mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipqs); -} - void -mac_destroy_ipq(struct ipq *ipq) -{ - - mac_ipq_label_free(ipq->ipq_label); - ipq->ipq_label = NULL; -} - -void mac_destroy_mbuf_tag(struct m_tag *tag) { struct label *label; @@ -387,34 +226,6 @@ } void -mac_socket_label_free(struct label *label) -{ - - MAC_PERFORM(destroy_socket_label, label); - mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); -} - -static void -mac_socket_peer_label_free(struct label *label) -{ - - MAC_PERFORM(destroy_socket_peer_label, label); - mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); -} - -void -mac_destroy_socket(struct socket *socket) -{ - - mac_socket_label_free(socket->so_label); - socket->so_label = NULL; - mac_socket_peer_label_free(socket->so_peerlabel); - socket->so_peerlabel = NULL; -} - -void mac_copy_mbuf_tag(struct m_tag *src, struct m_tag *dest) { struct label *src_label, *dest_label; @@ -429,13 +240,6 @@ MAC_PERFORM(copy_mbuf_label, src_label, dest_label); } -void -mac_copy_socket_label(struct label *src, struct label *dest) -{ - - MAC_PERFORM(copy_socket_label, src, dest); -} - static int mac_externalize_ifnet_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) @@ -447,29 +251,7 @@ return (error); } -int -mac_externalize_socket_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen) -{ - int error; - - MAC_EXTERNALIZE(socket, label, elements, outbuf, outbuflen); - - return (error); -} - static int -mac_externalize_socket_peer_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen) -{ - int error; - - MAC_EXTERNALIZE(socket_peer, label, elements, outbuf, outbuflen); - - return (error); -} - -static int mac_internalize_ifnet_label(struct label *label, char *string) { int error; @@ -479,16 +261,6 @@ return (error); } -int -mac_internalize_socket_label(struct label *label, char *string) -{ - int error; - - MAC_INTERNALIZE(socket, label, string); - - return (error); -} - void mac_create_ifnet(struct ifnet *ifnet) { @@ -497,14 +269,6 @@ } void -mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp) -{ - - MAC_PERFORM(create_inpcb_from_socket, so, so->so_label, inp, - inp->inp_label); -} - -void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d) { @@ -512,100 +276,12 @@ } void -mac_create_socket(struct ucred *cred, struct socket *socket) -{ - - MAC_PERFORM(create_socket, cred, socket, socket->so_label); -} - -void -mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket) -{ - - MAC_PERFORM(create_socket_from_socket, oldsocket, oldsocket->so_label, - newsocket, newsocket->so_label); -} - -static void -mac_relabel_socket(struct ucred *cred, struct socket *socket, - struct label *newlabel) -{ - - MAC_PERFORM(relabel_socket, cred, socket, socket->so_label, newlabel); -} - -void -mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) -{ - struct label *label; - - label = mbuf_to_label(mbuf); - - MAC_PERFORM(set_socket_peer_from_mbuf, mbuf, label, socket, - socket->so_peerlabel); -} - -void -mac_set_socket_peer_from_socket(struct socket *oldsocket, - struct socket *newsocket) -{ - - MAC_PERFORM(set_socket_peer_from_socket, oldsocket, - oldsocket->so_label, newsocket, newsocket->so_peerlabel); -} - -void -mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram) -{ - struct label *label; - - label = mbuf_to_label(datagram); - - MAC_PERFORM(create_datagram_from_ipq, ipq, ipq->ipq_label, - datagram, label); -} - -void -mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment) -{ - struct label *datagramlabel, *fragmentlabel; - - datagramlabel = mbuf_to_label(datagram); - fragmentlabel = mbuf_to_label(fragment); - - MAC_PERFORM(create_fragment, datagram, datagramlabel, fragment, - fragmentlabel); -} - -void -mac_create_ipq(struct mbuf *fragment, struct ipq *ipq) -{ - struct label *label; - - label = mbuf_to_label(fragment); - - MAC_PERFORM(create_ipq, fragment, label, ipq, ipq->ipq_label); -} - -void -mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m) -{ - struct label *mlabel; - - INP_LOCK_ASSERT(inp); - mlabel = mbuf_to_label(m); - - MAC_PERFORM(create_mbuf_from_inpcb, inp, inp->inp_label, m, mlabel); -} - -void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) { struct label *oldmbuflabel, *newmbuflabel; - oldmbuflabel = mbuf_to_label(oldmbuf); - newmbuflabel = mbuf_to_label(newmbuf); + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); MAC_PERFORM(create_mbuf_from_mbuf, oldmbuf, oldmbuflabel, newmbuf, newmbuflabel); @@ -616,7 +292,7 @@ { struct label *label; - label = mbuf_to_label(mbuf); + label = mac_mbuf_to_label(mbuf); MAC_PERFORM(create_mbuf_from_bpfdesc, bpf_d, bpf_d->bd_label, mbuf, label); @@ -627,7 +303,7 @@ { struct label *label; - label = mbuf_to_label(mbuf); + label = mac_mbuf_to_label(mbuf); MAC_PERFORM(create_mbuf_linklayer, ifnet, ifnet->if_label, mbuf, label); @@ -638,7 +314,7 @@ { struct label *label; - label = mbuf_to_label(mbuf); + label = mac_mbuf_to_label(mbuf); MAC_PERFORM(create_mbuf_from_ifnet, ifnet, ifnet->if_label, mbuf, label); @@ -650,8 +326,8 @@ { struct label *oldmbuflabel, *newmbuflabel; - oldmbuflabel = mbuf_to_label(oldmbuf); - newmbuflabel = mbuf_to_label(newmbuf); + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); MAC_PERFORM(create_mbuf_multicast_encap, oldmbuf, oldmbuflabel, ifnet, ifnet->if_label, newmbuf, newmbuflabel); @@ -662,88 +338,14 @@ { struct label *oldmbuflabel, *newmbuflabel; - oldmbuflabel = mbuf_to_label(oldmbuf); - newmbuflabel = mbuf_to_label(newmbuf); + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); MAC_PERFORM(create_mbuf_netlayer, oldmbuf, oldmbuflabel, newmbuf, newmbuflabel); } int -mac_fragment_match(struct mbuf *fragment, struct ipq *ipq) -{ - struct label *label; - int result; - - label = mbuf_to_label(fragment); - - result = 1; - MAC_BOOLEAN(fragment_match, &&, fragment, label, ipq, - ipq->ipq_label); - - return (result); -} - -void -mac_reflect_mbuf_icmp(struct mbuf *m) -{ - struct label *label; - - label = mbuf_to_label(m); - - MAC_PERFORM(reflect_mbuf_icmp, m, label); -} -void -mac_reflect_mbuf_tcp(struct mbuf *m) -{ - struct label *label; - - label = mbuf_to_label(m); - - MAC_PERFORM(reflect_mbuf_tcp, m, label); -} - -void -mac_update_ipq(struct mbuf *fragment, struct ipq *ipq) -{ - struct label *label; - - label = mbuf_to_label(fragment); - - MAC_PERFORM(update_ipq, fragment, label, ipq, ipq->ipq_label); -} - -int -mac_update_mbuf_from_cipso(struct mbuf *m, char *cp, int *code) -{ - struct label *label, *ifnetlabel; - int error; - - label = mbuf_to_label(m); - - if (m->m_pkthdr.rcvif != NULL) - ifnetlabel = m->m_pkthdr.rcvif->if_label; - else - ifnetlabel = NULL; - - MAC_CHECK(update_mbuf_from_cipso, m, label, m->m_pkthdr.rcvif, - ifnetlabel, cp, code); - - return (error); -} - -void -mac_create_mbuf_from_socket(struct socket *socket, struct mbuf *mbuf) -{ - struct label *label; - - label = mbuf_to_label(mbuf); - - MAC_PERFORM(create_mbuf_from_socket, socket, socket->so_label, mbuf, - label); -} - -int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) { int error; @@ -768,7 +370,7 @@ if (!mac_enforce_network) return (0); - label = mbuf_to_label(mbuf); + label = mac_mbuf_to_label(mbuf); MAC_CHECK(check_ifnet_transmit, ifnet, ifnet->if_label, mbuf, label); @@ -777,134 +379,6 @@ } int -mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m) -{ - struct label *label; - int error; - - M_ASSERTPKTHDR(m); - - if (!mac_enforce_socket) - return (0); - - label = mbuf_to_label(m); - - MAC_CHECK(check_inpcb_deliver, inp, inp->inp_label, m, label); - - return (error); -} - -int -mac_check_socket_bind(struct ucred *ucred, struct socket *socket, - struct sockaddr *sockaddr) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_bind, ucred, socket, socket->so_label, - sockaddr); - - return (error); -} - -int -mac_check_socket_connect(struct ucred *cred, struct socket *socket, - struct sockaddr *sockaddr) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_connect, cred, socket, socket->so_label, - sockaddr); - - return (error); -} - -int -mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf) -{ - struct label *label; - int error; - - if (!mac_enforce_socket) - return (0); - - label = mbuf_to_label(mbuf); - - MAC_CHECK(check_socket_deliver, socket, socket->so_label, mbuf, - label); - - return (error); -} - -int -mac_check_socket_listen(struct ucred *cred, struct socket *socket) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_listen, cred, socket, socket->so_label); - return (error); -} - -int -mac_check_socket_receive(struct ucred *cred, struct socket *so) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_receive, cred, so, so->so_label); - - return (error); -} - -static int -mac_check_socket_relabel(struct ucred *cred, struct socket *socket, - struct label *newlabel) -{ - int error; - - MAC_CHECK(check_socket_relabel, cred, socket, socket->so_label, - newlabel); - - return (error); -} - -int -mac_check_socket_send(struct ucred *cred, struct socket *so) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_send, cred, so, so->so_label); - - return (error); -} - -int -mac_check_socket_visible(struct ucred *cred, struct socket *socket) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_socket_visible, cred, socket, socket->so_label); - - return (error); -} - -int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet) { @@ -994,127 +468,3 @@ mac_ifnet_label_free(intlabel); return (0); } - -void -mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp) -{ - - /* XXX: assert socket lock. */ - INP_LOCK_ASSERT(inp); - MAC_PERFORM(inpcb_sosetlabel, so, so->so_label, inp, inp->inp_label); -} - -int -mac_socket_label_set(struct ucred *cred, struct socket *so, - struct label *label) -{ - int error; - - error = mac_check_socket_relabel(cred, so, label); - if (error) - return (error); - - mac_relabel_socket(cred, so, label); - - /* - * If the protocol has expressed interest in socket layer changes, - * such as if it needs to propagate changes to a cached pcb - * label from the socket, notify it of the label change while - * holding the socket lock. - */ - if (so->so_proto->pr_usrreqs->pru_sosetlabel != NULL) - (so->so_proto->pr_usrreqs->pru_sosetlabel)(so); - - return (0); -} - -int -mac_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *mac) -{ - struct label *intlabel; - char *buffer; - int error; - - error = mac_check_structmac_consistent(mac); - if (error) - return (error); - - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL); - if (error) { - free(buffer, M_MACTEMP); - return (error); - } - - intlabel = mac_socket_label_alloc(M_WAITOK); - error = mac_internalize_socket_label(intlabel, buffer); - free(buffer, M_MACTEMP); - if (error) - goto out; - - /* XXX: Socket lock here. */ - error = mac_socket_label_set(cred, so, intlabel); - /* XXX: Socket unlock here. */ -out: - mac_socket_label_free(intlabel); - return (error); -} - -int -mac_getsockopt_label(struct ucred *cred, struct socket *so, struct mac *mac) -{ - char *buffer, *elements; - int error; - - error = mac_check_structmac_consistent(mac); - if (error) - return (error); - - elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); - if (error) { - free(elements, M_MACTEMP); - return (error); - } - - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_socket_label(so->so_label, elements, - buffer, mac->m_buflen); - if (error == 0) - error = copyout(buffer, mac->m_string, strlen(buffer)+1); - - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); - - return (error); -} - -int -mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, - struct mac *mac) -{ - char *elements, *buffer; - int error; - - error = mac_check_structmac_consistent(mac); - if (error) - return (error); - - elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); - if (error) { - free(elements, M_MACTEMP); - return (error); - } - - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_socket_peer_label(so->so_peerlabel, - elements, buffer, mac->m_buflen); - if (error == 0) - error = copyout(buffer, mac->m_string, strlen(buffer)+1); - - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); - - return (error); -} From owner-p4-projects@FreeBSD.ORG Sat Feb 21 17:43:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C062916A4D3; Sat, 21 Feb 2004 17:43:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9354416A4D1 for ; Sat, 21 Feb 2004 17:43:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8984D43D2D for ; Sat, 21 Feb 2004 17:43:12 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1M1hCGe087582 for ; Sat, 21 Feb 2004 17:43:12 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1M1gdF8087555 for perforce@freebsd.org; Sat, 21 Feb 2004 17:42:39 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 21 Feb 2004 17:42:39 -0800 (PST) Message-Id: <200402220142.i1M1gdF8087555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 47350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 01:43:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=47350 Change 47350 by marcel@marcel_nfs on 2004/02/21 17:41:50 Update binutils to weekly snapshot, dated 2004/02/17. This update removes files not part of binutils and adds files not previously imported, except for testsuites. Affected files ... .. //depot/projects/gdb/contrib/binutils/COPYING#1 add .. //depot/projects/gdb/contrib/binutils/COPYING.LIB#1 add .. //depot/projects/gdb/contrib/binutils/ChangeLog#2 delete .. //depot/projects/gdb/contrib/binutils/MAINTAINERS#2 delete .. //depot/projects/gdb/contrib/binutils/Makefile.def#1 add .. //depot/projects/gdb/contrib/binutils/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/Makefile.tpl#1 add .. //depot/projects/gdb/contrib/binutils/README#2 edit .. //depot/projects/gdb/contrib/binutils/README-maintainer-mode#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/COPYING#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-0001#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-0203#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-9193#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-9495#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-9697#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ChangeLog-9899#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/MAINTAINERS#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/PORTING#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/README#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/TODO#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/acinclude.m4#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aclocal.m4#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aix386-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aix5ppc-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aout-adobe.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aout-arm.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout-cris.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aout-encap.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout-ns32k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aout-sparcle.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout-target.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout-tic30.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/aout0.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout32.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aout64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aoutf1.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/aoutx.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/archive.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/archive64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/archures.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/armnetbsd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/bfd-in.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/bfd-in2.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/bfd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/bfdio.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/bfdwin.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/binary.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/bout.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cache.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cf-i386lynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cf-m68klynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cf-sparclynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cisco-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-a29k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-alpha.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-apollo.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-arm.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-aux.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-go32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-h8300.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-h8500.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-i386.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-i860.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-i960.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-m68k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-m88k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-or32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-pmac.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-ppc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-rs6000.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-sparc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coff-stgo32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-svm68k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-tic30.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-tic4x.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-tic54x.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-tic80.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-u68k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-w65.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-we32k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff-z8k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/coff64-rs6000.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coffcode.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coffgen.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cofflink.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/coffswap.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/config.bfd#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/config.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/configure#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/configure.com#1 add .. //depot/projects/gdb/contrib/binutils/bfd/configure.host#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/configure.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/corefile.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-a29k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-alpha.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-arc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-arm.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-avr.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-cris.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-d10v.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-d30v.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-dlx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-fr30.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-frv.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-h8300.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-h8500.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-hppa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-i370.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-i386.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-i860.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-i960.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-ia64-opc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-ip2k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-iq2000.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m10200.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m10300.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m32r.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m68hc11.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m68hc12.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m68k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-m88k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-mmix.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-msp430.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-ns32k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-openrisc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-or32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-pdp11.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-pj.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-powerpc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-rs6000.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-s390.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-sparc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/cpu-tic30.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-tic4x.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-tic54x.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-tic80.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-v850.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-vax.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-w65.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-we32k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-xstormy16.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-xtensa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/cpu-z8k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/demo64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/dep-in.sed#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/ChangeLog#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/ChangeLog-9103#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/aoutx.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/archive.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/archures.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfd.info#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfd.info-1#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfd.info-2#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfd.texinfo#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfdint.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfdio.texi#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfdsumm.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfdt.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/bfdwin.texi#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/cache.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/chew.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/coffcode.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/core.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/doc.str#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/elf.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/elfcode.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/fdl.texi#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/format.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/hash.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/header.sed#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/init.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/libbfd.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/linker.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/makefile.vms#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/mmo.texi#1 add .. //depot/projects/gdb/contrib/binutils/bfd/doc/opncls.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/proto.str#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/reloc.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/section.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/syms.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/doc/targets.texi#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/dwarf1.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/dwarf2.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ecoff.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ecofflink.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ecoffswap.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/efi-app-ia32.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/efi-app-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf-bfd.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf-eh-frame.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf-hppa.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf-m10200.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf-m10300.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf-strtab.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-am33lin.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-arc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-arm.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-avr.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-cris.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-d10v.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-d30v.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-dlx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-fr30.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-frv.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-gen.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-h8300.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-hppa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-hppa.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-i370.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-i386-fbsd.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/elf32-i386.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-i860.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-i960.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-ip2k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-iq2000.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m32r.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m68hc11.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m68hc12.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m68hc1x.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m68hc1x.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m68k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-m88k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-msp430.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-openrisc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-or32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-pj.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-ppc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-ppc.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-s390.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-sh64-com.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-sh64.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-sh64.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-sparc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf32-v850.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-vax.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-xstormy16.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32-xtensa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf32.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-alpha-fbsd.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/elf64-alpha.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-gen.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-hppa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf64-hppa.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf64-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf64-mmix.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf64-ppc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-ppc.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-s390.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-sh64.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elf64-sparc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64-x86-64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elf64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfarm-nabi.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfarm-oabi.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfcode.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfcore.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elflink.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elflink.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfn32-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elfxx-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/elfxx-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elfxx-mips.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/elfxx-target.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/epoc-pe-arm.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/epoc-pei-arm.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/format.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/freebsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/gen-aout.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/genlink.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/go32stub.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hash.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/host-aout.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/alphalinux.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/alphavms.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/decstation.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/delta68.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/dpx2.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/hp300bsd.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/i386bsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/i386linux.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/i386mach3.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/i386sco.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/hosts/i860mach3.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/m68kaux.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/m68klinux.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/m88kmach3.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/mipsbsd.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/mipsmach3.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/news-mips.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/news.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/pc532mach.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/riscos.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/symmetry.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/tahoe.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/vaxbsd.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/vaxult.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hosts/vaxult2.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hp300bsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hp300hpux.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hppabsd-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/hpux-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/i386aout.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/i386bsd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/i386dynix.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/i386freebsd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/i386linux.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/i386lynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/i386mach3.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/i386msdos.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/i386netbsd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/i386os9k.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ieee.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ihex.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/init.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/irix-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/libaout.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libbfd-in.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libbfd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libbfd.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libcoff-in.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libcoff.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libecoff.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libhppa.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/libieee.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libnlm.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/liboasys.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/libpei.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/libxcoff.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/linker.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/lynx-core.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/m68k4knetbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/m68klinux.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/m68klynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/m68knetbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/m88kmach3.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mach-o-target.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mach-o.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mach-o.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/makefile.vms#1 add .. //depot/projects/gdb/contrib/binutils/bfd/merge.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/mipsbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mmo.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mpw-config.in#1 add .. //depot/projects/gdb/contrib/binutils/bfd/mpw-make.sed#1 add .. //depot/projects/gdb/contrib/binutils/bfd/netbsd-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/netbsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/newsos3.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm-target.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm32-alpha.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm32-i386.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm32-ppc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm32-sparc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm32.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlm64.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlmcode.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/nlmswap.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ns32k.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ns32knetbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/oasys.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/opncls.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/osf-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/pc532-mach.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pdp11.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pe-arm.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/pe-i386.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/pe-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pe-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pe-ppc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/pe-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/peXXigen.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/pef-traceback.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pef.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pef.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-arm.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-i386.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-ppc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/pei-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/peicode.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/po/.cvsignore#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/BLD-POTFILES.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/po/Make-in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/po/POTFILES.in#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/po/SRC-POTFILES.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/po/bfd.pot#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/po/da.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/da.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/es.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/es.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/fr.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/fr.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/ja.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/ja.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/ro.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/ro.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/sv.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/sv.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/tr.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/tr.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/zh_CN.gmo#1 add .. //depot/projects/gdb/contrib/binutils/bfd/po/zh_CN.po#1 add .. //depot/projects/gdb/contrib/binutils/bfd/ppcboot.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ptrace-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/reloc.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/reloc16.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/riscix.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/rs6000-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/sco5-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/section.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/simple.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/som.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/som.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/sparclinux.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/sparclynx.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/sparcnetbsd.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/srec.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/stab-syms.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/stabs.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/stamp-h.in#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/sunos.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/syms.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/sysdep.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/targets.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/targmatch.sed#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/tekhex.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/ticoff.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/trad-core.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/vax1knetbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vaxbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vaxnetbsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/versados.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/version.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/vms-gsd.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vms-hdr.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vms-misc.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vms-tir.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vms.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/vms.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/xcoff-target.h#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/xcofflink.c#2 edit .. //depot/projects/gdb/contrib/binutils/bfd/xsym.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/xsym.h#1 add .. //depot/projects/gdb/contrib/binutils/bfd/xtensa-isa.c#1 add .. //depot/projects/gdb/contrib/binutils/bfd/xtensa-modules.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/ChangeLog#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/ChangeLog-0001#1 add .. //depot/projects/gdb/contrib/binutils/binutils/ChangeLog-0203#1 add .. //depot/projects/gdb/contrib/binutils/binutils/ChangeLog-9197#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/ChangeLog-9899#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/MAINTAINERS#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/NEWS#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/README#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/acinclude.m4#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/aclocal.m4#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/addr2line.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/ar.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/arlex.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/arlex.l#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/arparse.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/arparse.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/arparse.y#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/arsup.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/arsup.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/binemul.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/binemul.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/bucomm.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/bucomm.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/budbg.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/budemang.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/budemang.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/coffdump.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/coffgrok.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/coffgrok.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/config.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/configure#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/configure.com#1 add .. //depot/projects/gdb/contrib/binutils/binutils/configure.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/configure.tgt#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/cxxfilt.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/debug.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/debug.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/deflex.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/deflex.l#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/defparse.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/defparse.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/defparse.y#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/dep-in.sed#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/dlltool.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/dlltool.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/dllwrap.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/addr2line.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/ar.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/binutils.info#1 add .. //depot/projects/gdb/contrib/binutils/binutils/doc/binutils.texi#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/cxxfilt.man#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/dlltool.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/fdl.texi#1 add .. //depot/projects/gdb/contrib/binutils/binutils/doc/nlmconv.1#1 add .. //depot/projects/gdb/contrib/binutils/binutils/doc/nm.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/objcopy.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/objdump.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/ranlib.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/readelf.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/size.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/strings.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/strip.1#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/doc/windres.1#1 add .. //depot/projects/gdb/contrib/binutils/binutils/emul_aix.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/emul_vanilla.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/filemode.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/ieee.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/is-ranlib.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/is-strip.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/mac-binutils.r#1 add .. //depot/projects/gdb/contrib/binutils/binutils/makefile.vms-in#1 add .. //depot/projects/gdb/contrib/binutils/binutils/maybe-ranlib.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/maybe-strip.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/mpw-config.in#1 add .. //depot/projects/gdb/contrib/binutils/binutils/mpw-make.sed#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nlmconv.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nlmconv.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nlmheader.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nlmheader.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nlmheader.y#1 add .. //depot/projects/gdb/contrib/binutils/binutils/nm.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/not-ranlib.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/not-strip.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/objcopy.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/objdump.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/po/.cvsignore#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/Make-in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/po/POTFILES.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/po/binutils.pot#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/po/da.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/da.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/es.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/es.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/fr.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/fr.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/ja.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/ja.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/ru.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/ru.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/sv.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/sv.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/tr.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/tr.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/zh_CN.gmo#1 add .. //depot/projects/gdb/contrib/binutils/binutils/po/zh_CN.po#1 add .. //depot/projects/gdb/contrib/binutils/binutils/prdbg.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/ranlib.sh#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rclex.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rclex.l#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rcparse.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/rcparse.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/rcparse.y#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rdcoff.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rddbg.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/readelf.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rename.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/resbin.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/rescoff.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/resrc.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/resres.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/sanity.sh#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/size.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/srconv.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/stabs.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/stamp-h.in#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/strings.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/sysdump.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/sysinfo.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/sysinfo.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/sysinfo.y#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/syslex.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/syslex.l#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/sysroff.info#1 add .. //depot/projects/gdb/contrib/binutils/binutils/unwind-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/unwind-ia64.h#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/version.c#2 edit .. //depot/projects/gdb/contrib/binutils/binutils/windres.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/windres.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/winduni.c#1 add .. //depot/projects/gdb/contrib/binutils/binutils/winduni.h#1 add .. //depot/projects/gdb/contrib/binutils/binutils/wrstabs.c#2 edit .. //depot/projects/gdb/contrib/binutils/config-ml.in#2 edit .. //depot/projects/gdb/contrib/binutils/config.guess#2 edit .. //depot/projects/gdb/contrib/binutils/config.if#2 edit .. //depot/projects/gdb/contrib/binutils/config.sub#2 edit .. //depot/projects/gdb/contrib/binutils/config/ChangeLog#2 edit .. //depot/projects/gdb/contrib/binutils/config/accross.m4#1 add .. //depot/projects/gdb/contrib/binutils/config/acinclude.m4#2 edit .. //depot/projects/gdb/contrib/binutils/config/acx.m4#1 add .. //depot/projects/gdb/contrib/binutils/config/gettext.m4#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-armpic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-cxux#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-cygwin#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-decstation#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-dgux386#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-djgpp#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-elfalphapic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-i370pic#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-ia64pic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-interix#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-lynxrs6k#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-m68kpic#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-mingw32#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-ncr3000#1 add .. //depot/projects/gdb/contrib/binutils/config/mh-necv4#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-openedition#2 delete .. //depot/projects/gdb/contrib/binutils/config/mh-papic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-ppcpic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-s390pic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-sco#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-solaris#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-sparcpic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-sysv#2 delete .. //depot/projects/gdb/contrib/binutils/config/mh-sysv4#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-sysv5#2 edit .. //depot/projects/gdb/contrib/binutils/config/mh-x86pic#2 edit .. //depot/projects/gdb/contrib/binutils/config/mt-alphaieee#2 edit .. //depot/projects/gdb/contrib/binutils/config/mt-armpic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-d30v#1 add .. //depot/projects/gdb/contrib/binutils/config/mt-elfalphapic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-ia64pic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-linux#2 edit .. //depot/projects/gdb/contrib/binutils/config/mt-netware#1 add .. //depot/projects/gdb/contrib/binutils/config/mt-ospace#2 edit .. //depot/projects/gdb/contrib/binutils/config/mt-papic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-ppcpic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-s390pic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-sparcpic#2 delete .. //depot/projects/gdb/contrib/binutils/config/mt-v810#2 edit .. //depot/projects/gdb/contrib/binutils/config/mt-wince#1 add .. //depot/projects/gdb/contrib/binutils/config/mt-x86pic#2 delete .. //depot/projects/gdb/contrib/binutils/config/no-executables.m4#1 add .. //depot/projects/gdb/contrib/binutils/config/progtest.m4#1 add .. //depot/projects/gdb/contrib/binutils/configure#2 edit .. //depot/projects/gdb/contrib/binutils/configure.in#2 edit .. //depot/projects/gdb/contrib/binutils/contrib/ChangeLog#2 delete .. //depot/projects/gdb/contrib/binutils/contrib/texi2pod.pl#2 delete .. //depot/projects/gdb/contrib/binutils/cpu/ChangeLog#1 add .. //depot/projects/gdb/contrib/binutils/cpu/frv.cpu#1 add .. //depot/projects/gdb/contrib/binutils/cpu/frv.opc#1 add .. //depot/projects/gdb/contrib/binutils/cpu/iq10.cpu#1 add .. //depot/projects/gdb/contrib/binutils/cpu/iq2000.cpu#1 add .. //depot/projects/gdb/contrib/binutils/cpu/iq2000.opc#1 add .. //depot/projects/gdb/contrib/binutils/cpu/iq2000m.cpu#1 add .. //depot/projects/gdb/contrib/binutils/cpu/simplify.inc#1 add .. //depot/projects/gdb/contrib/binutils/etc/ChangeLog#2 delete .. //depot/projects/gdb/contrib/binutils/etc/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/etc/configbuild.ein#1 add .. //depot/projects/gdb/contrib/binutils/etc/configbuild.fig#1 add .. //depot/projects/gdb/contrib/binutils/etc/configbuild.jin#1 add .. //depot/projects/gdb/contrib/binutils/etc/configbuild.tin#1 add .. //depot/projects/gdb/contrib/binutils/etc/configdev.ein#1 add .. //depot/projects/gdb/contrib/binutils/etc/configdev.fig#1 add .. //depot/projects/gdb/contrib/binutils/etc/configdev.jin#1 add .. //depot/projects/gdb/contrib/binutils/etc/configdev.tin#1 add .. //depot/projects/gdb/contrib/binutils/etc/configure#1 add .. //depot/projects/gdb/contrib/binutils/etc/configure.in#1 add .. //depot/projects/gdb/contrib/binutils/etc/configure.info#1 add .. //depot/projects/gdb/contrib/binutils/etc/configure.texi#1 add .. //depot/projects/gdb/contrib/binutils/etc/fdl.texi#1 add .. //depot/projects/gdb/contrib/binutils/etc/make-stds.texi#1 add .. //depot/projects/gdb/contrib/binutils/etc/standards.info#1 add .. //depot/projects/gdb/contrib/binutils/etc/standards.texi#1 add .. //depot/projects/gdb/contrib/binutils/etc/texi2pod.pl#1 add .. //depot/projects/gdb/contrib/binutils/gas/CONTRIBUTORS#2 edit .. //depot/projects/gdb/contrib/binutils/gas/COPYING#1 add .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog-0001#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog-0203#1 add .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog-9295#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog-9697#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ChangeLog-9899#2 edit .. //depot/projects/gdb/contrib/binutils/gas/MAINTAINERS#2 edit .. //depot/projects/gdb/contrib/binutils/gas/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/gas/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/gas/NEWS#2 edit .. //depot/projects/gdb/contrib/binutils/gas/README#2 edit .. //depot/projects/gdb/contrib/binutils/gas/README-vms#1 add .. //depot/projects/gdb/contrib/binutils/gas/acinclude.m4#2 edit .. //depot/projects/gdb/contrib/binutils/gas/aclocal.m4#2 edit .. //depot/projects/gdb/contrib/binutils/gas/app.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/as.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/as.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/asintl.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/atof-generic.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/bignum-copy.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/bignum.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/bit_fix.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/cgen.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/cgen.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/cond.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config-gas.com#1 add .. //depot/projects/gdb/contrib/binutils/gas/config.in#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/aout_gnu.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/atof-ieee.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/atof-tahoe.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/atof-vax.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/e-crisaout.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/e-criself.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/e-i386aout.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/e-i386coff.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/e-i386elf.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/e-mipsecoff.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/e-mipself.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/itbl-mips.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/m68k-parse.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/m68k-parse.y#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/m88k-opcode.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-aout.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-aout.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-bout.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-bout.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-coff.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-coff.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-ecoff.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-ecoff.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-elf.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-elf.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-evax.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-evax.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-generic.c#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/obj-generic.h#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/obj-hp300.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-hp300.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-ieee.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-ieee.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-multi.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-multi.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/obj-som.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-som.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-vms.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/obj-vms.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-a29k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-a29k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-alpha.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-alpha.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-arc.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-arc.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-arm.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-arm.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-avr.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-avr.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-cris.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-cris.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-d10v.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-d10v.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-d30v.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-d30v.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-dlx.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-dlx.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-fr30.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-fr30.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-frv.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-frv.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-generic.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-generic.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-h8300.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-h8300.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-h8500.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-h8500.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-hppa.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-hppa.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i370.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i370.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i386.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i386.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i860.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i860.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i960.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-i960.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ia64.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ia64.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ip2k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ip2k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-iq2000.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-iq2000.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m32r.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m32r.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m68851.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m68hc11.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m68hc11.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m68k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m68k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m88k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-m88k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mcore.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mcore.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mips.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mips.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mmix.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mmix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mn10200.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mn10200.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mn10300.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-mn10300.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-msp430.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-msp430.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ns32k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ns32k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-openrisc.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-openrisc.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-or32.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-or32.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-pdp11.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-pdp11.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-pj.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-pj.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ppc.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-ppc.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-s390.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-s390.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sh.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sh.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sh64.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sh64.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sparc.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-sparc.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tahoe.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tahoe.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic30.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic30.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic4x.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic4x.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic54x.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic54x.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic80.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic80.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-v850.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-v850.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-vax.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-vax.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-w65.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-w65.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-xstormy16.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-xstormy16.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-xtensa.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-xtensa.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-z8k.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/tc-z8k.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-386bsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-aix5.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-aux.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-delt88.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-delta.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-dpx2.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-dynix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-epoc-pe.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-freebsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-generic.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-go32.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-hp300.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-hppa.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-hppa64.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-hppalinux64.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-hpux.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-i386aix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-ia64aix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-ic960.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-interix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-irix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-linux.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-lnews.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-lynx.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-mach.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-macos.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-nbsd.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-nbsd532.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-pc532mach.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-pe.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-ppcnw.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-psos.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-riscix.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-sparcaout.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-sun3.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-svr4.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-sysv32.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/config/te-tmips.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/te-wince-pe.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/vax-inst.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/vms-a-conf.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/vms-conf.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/xtensa-istack.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/xtensa-relax.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/config/xtensa-relax.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/configure#2 edit .. //depot/projects/gdb/contrib/binutils/gas/configure.in#2 edit .. //depot/projects/gdb/contrib/binutils/gas/debug.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/dep-in.sed#2 edit .. //depot/projects/gdb/contrib/binutils/gas/depend.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/Makefile#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/Makefile.am#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/Makefile.in#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/all.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/as.1#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/as.info#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/as.info-1#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/as.info-2#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/as.info-3#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/as.texinfo#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/asconfig.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-a29k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-alpha.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-arc.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-arm.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-cris.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-d10v.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-d30v.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-h8300.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-h8500.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-hppa.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-i370.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-i386.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-i860.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-i960.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-ia64.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-ip2k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-m32r.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-m68hc11.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-m68k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-m88k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-mips.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-mmix.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-msp430.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-ns32k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-pdp11.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-pj.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-ppc.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-sh.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-sh64.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-sparc.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/c-tic54x.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-v850.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-vax.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-xtensa.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/c-z8k.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/fdl.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/gasp.texi#2 delete .. //depot/projects/gdb/contrib/binutils/gas/doc/gasver.texi#1 add .. //depot/projects/gdb/contrib/binutils/gas/doc/h8.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/doc/internals.texi#2 edit .. //depot/projects/gdb/contrib/binutils/gas/dw2gencfi.c#1 add .. //depot/projects/gdb/contrib/binutils/gas/dw2gencfi.h#1 add .. //depot/projects/gdb/contrib/binutils/gas/dwarf2dbg.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/dwarf2dbg.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ecoff.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ecoff.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/ehopt.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/emul-target.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/emul.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/expr.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/expr.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/flonum-copy.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/flonum-konst.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/flonum-mult.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/flonum.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/frags.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/frags.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/gasp.c#2 delete .. //depot/projects/gdb/contrib/binutils/gas/gdbinit.in#2 edit .. //depot/projects/gdb/contrib/binutils/gas/hash.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/hash.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/input-file.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/input-file.h#2 edit .. //depot/projects/gdb/contrib/binutils/gas/input-scrub.c#2 edit .. //depot/projects/gdb/contrib/binutils/gas/itbl-lex.c#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 21 18:07:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01DD216A4D0; Sat, 21 Feb 2004 18:07:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B38CD16A4CE for ; Sat, 21 Feb 2004 18:07:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACB3E43D1D for ; Sat, 21 Feb 2004 18:07:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1M27gGe093064 for ; Sat, 21 Feb 2004 18:07:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1M27ggU093061 for perforce@freebsd.org; Sat, 21 Feb 2004 18:07:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 21 Feb 2004 18:07:42 -0800 (PST) Message-Id: <200402220207.i1M27ggU093061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 47351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 02:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=47351 Change 47351 by sam@sam_ebb on 2004/02/21 18:07:29 flush changes to sync w/ madwifi a week ago (need to update again) Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#17 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_dot1x.c#2 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#18 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#10 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#18 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radius.c#2 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#17 (text+ko) ==== @@ -178,6 +178,8 @@ /* XXX lock */ SLIST_REMOVE(&ieee80211_list, ic, ieee80211com, ic_next); + if (ic->ic_ec != NULL) + ieee80211_authenticator_detach(ic); ieee80211_proto_detach(ic); ieee80211_crypto_detach(ic); ieee80211_node_detach(ic); @@ -374,6 +376,16 @@ #endif if (ic->ic_max_aid == 0) ic->ic_max_aid = IEEE80211_MAX_AID; + /* + * If we default to 802.1x authentication then attach + * the authenticator now. Otherwise it'll get setup + * when the authentication mode is manually configured. + * Note that we delay until here so ic_max_aid is set; + * this lets the authenticator size/bound it's data + * structures accordingly. + */ + if (ic->ic_bss->ni_authmode == IEEE80211_AUTH_8021X) + ieee80211_authenticator_attach(ic); #undef ADD } ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_dot1x.c#2 (text+ko) ==== @@ -627,7 +627,7 @@ } struct mbuf * -eapol_alloc_mbuf(u_int pktlen) +eapol_alloc_mbuf(u_int payload) { /* NB: these will never be encrypted */ const int overhead = @@ -638,10 +638,9 @@ ; struct mbuf *m; - pktlen += overhead; - KASSERT(pktlen+overhead <= MCLBYTES, - ("EAPOL packet too large: %u", pktlen+overhead)); - if (pktlen+overhead <= MHLEN) + KASSERT(payload+overhead <= MCLBYTES, + ("EAPOL packet too large: %u", payload+overhead)); + if (payload+overhead <= MHLEN) MGETHDR(m, M_DONTWAIT, MT_DATA); else m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); @@ -649,8 +648,8 @@ * Align to the end of the mbuf/cluster so headers * fit w/o requiring another mbuf. */ - MH_ALIGN(m, pktlen); - m->m_pkthdr.len = m->m_len = pktlen; + MH_ALIGN(m, payload); + m->m_pkthdr.len = m->m_len = payload; return m; } @@ -1107,14 +1106,19 @@ switch (eap->eap_code) { case EAP_CODE_SUCCESS: case EAP_CODE_FAILURE: - /* XXX no need for these */ - goto out; case EAP_CODE_REQUEST: - m_adj(m, sizeof(struct eap_hdr)); /* XXX no need for these */ goto out; case EAP_CODE_RESPONSE: - m_adj(m, sizeof(struct eap_hdr)); + if (m->m_pkthdr.len < sizeof(struct eap_hdr)) { + IEEE80211_DPRINTF(ean->ean_ic, + IEEE80211_MSG_DOT1X, + ("[%s] EAP msg too short, len %u\n", + ether_sprintf(ean->ean_node->ni_macaddr), + m->m_pkthdr.len)); + eapolstats.eap_tooshort++; + goto out; + } return eapol_auth_input_eap(ean, eap, m); default: eapolstats.eap_badcode++; ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#18 (text+ko) ==== @@ -333,7 +333,7 @@ break; default: /* XXX here to keep compiler happy */ - break; + goto out; } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { /* @@ -771,7 +771,6 @@ ni = ieee80211_dup_bss(ic, wh->i_addr2); if (ni == NULL) return; - IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_bss->ni_bssid); allocbs = 1; } else allocbs = 0; @@ -797,6 +796,7 @@ ("open authentication failed (reason %d) for %s\n", status, ether_sprintf(wh->i_addr3))); + /* XXX can this happen? */ if (ni != ic->ic_bss) ni->ni_fails++; ic->ic_stats.is_rx_auth_fail++; @@ -919,8 +919,6 @@ /* NB: no way to return an error */ return; } - IEEE80211_ADDR_COPY(ni->ni_bssid, - ic->ic_bss->ni_bssid); allocbs = 1; } else allocbs = 0; ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#10 (text+ko) ==== @@ -512,6 +512,7 @@ IEEE80211_NODE_LOCK(ic); TAILQ_INSERT_TAIL(&ic->ic_node, ni, ni_list); LIST_INSERT_HEAD(&ic->ic_hash[hash], ni, ni_hash); + ni->ni_ucastkeyix = IEEE80211_KEYIX_NONE; /* * Note we don't enable the inactive timer when acting * as a station. Nodes created in this mode represent @@ -624,6 +625,8 @@ for (i = 0; i < N(ni->ni_rxfrag); i++) if (ni->ni_rxfrag[i] != NULL) m_freem(ni->ni_rxfrag[i]); + if (ni->ni_ucastkeyix != IEEE80211_KEYIX_NONE) + (*ic->ic_key_delete)(ic, ni->ni_ucastkeyix); (*ic->ic_node_free)(ic, ni); #undef N } ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#18 (text+ko) ==== @@ -828,7 +828,7 @@ struct mbuf *m) { if (_IF_QLEN(&ni->ni_savedq) == 0) - ic->ic_set_tim(ic, ni->ni_associd, 1); + (*ic->ic_set_tim)(ic, ni->ni_associd, 1); if (_IF_QLEN(&ni->ni_savedq) >= IEEE80211_PS_MAX_QUEUE) { IF_LOCK(&ni->ni_savedq); _IF_DROP(&ni->ni_savedq); ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_radius.c#2 (text+ko) ==== @@ -560,7 +560,7 @@ /* * Use the received length to size the payload * in the reply. This is likely an overestimate but - * simplfies things. Note also that eapol_alloc_mbuf + * simplifies things. Note also that eapol_alloc_mbuf * reserves headroom for the headers, including the * EAPOL header. */