From owner-p4-projects@FreeBSD.ORG Sun Nov 27 00:17:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9842E16A422; Sun, 27 Nov 2005 00:17:47 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6B1E516A41F for ; Sun, 27 Nov 2005 00:17:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F06A743D77 for ; Sun, 27 Nov 2005 00:17:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAR0Hehw023853 for ; Sun, 27 Nov 2005 00:17:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR0Hee5023850 for perforce@freebsd.org; Sun, 27 Nov 2005 00:17:40 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Nov 2005 00:17:40 GMT Message-Id: <200511270017.jAR0Hee5023850@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 Cc: Subject: PERFORCE change 87291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 00:17:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=87291 Change 87291 by sam@sam_ebb on 2005/11/27 00:17:11 Revamp ioctl handling a la linux: don't pass ENETRESET back from ieee80211_ioctl except in cases where the device must be re-initialized; instead handle state changes internally. This eliminates most gratuitous scanning. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#52 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#25 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#52 (text+ko) ==== @@ -70,6 +70,7 @@ ((_ic)->ic_ifp->if_drv_flags & IFF_DRV_RUNNING)) #define IS_UP_AUTO(_ic) \ (IS_UP(_ic) && (_ic)->ic_roaming == IEEE80211_ROAMING_AUTO) +#define RESCAN 1 static struct ieee80211_channel *findchannel(struct ieee80211com *, int ieee, int mode); @@ -1201,7 +1202,7 @@ isclr(chanlist, ic->ic_bsschan->ic_ieee)) ic->ic_bsschan = IEEE80211_CHAN_ANYC; memcpy(ic->ic_chan_active, chanlist, sizeof(ic->ic_chan_active)); - return IS_UP_AUTO(ic) ? ENETRESET : 0; + return IS_UP_AUTO(ic) ? ieee80211_init(ic, RESCAN) : 0; } static int @@ -1412,7 +1413,8 @@ ic->ic_des_ssid[0].len = ireq->i_len; memcpy(ic->ic_des_ssid[0].ssid, tmpssid, ireq->i_len); ic->ic_des_nssid = (ireq->i_len > 0); - error = ENETRESET; + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); break; case IEEE80211_IOC_WEP: switch (ireq->i_val) { @@ -1429,7 +1431,8 @@ ic->ic_flags &= ~IEEE80211_F_DROPUNENC; break; } - error = ENETRESET; + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); break; case IEEE80211_IOC_WEPKEY: kid = (u_int) ireq->i_val; @@ -1458,8 +1461,6 @@ } else error = EINVAL; ieee80211_key_update_end(ic); - if (!error) /* NB: for compatibility */ - error = ENETRESET; break; case IEEE80211_IOC_WEPTXKEY: kid = (u_int) ireq->i_val; @@ -1467,7 +1468,6 @@ (u_int16_t) kid != IEEE80211_KEYIX_NONE) return EINVAL; ic->ic_def_txkey = kid; - error = ENETRESET; /* push to hardware */ break; case IEEE80211_IOC_AUTHMODE: switch (ireq->i_val) { @@ -1507,7 +1507,8 @@ ic->ic_bss->ni_authmode = ireq->i_val; /* XXX mixed/mode/usage? */ ic->ic_auth = auth; - error = ENETRESET; + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); break; case IEEE80211_IOC_CHANNEL: /* XXX 0xffff overflows 16-bit signed */ @@ -1580,18 +1581,7 @@ * will pickup the desired channel and avoid scanning. */ if (IS_UP_AUTO(ic)) - error = ENETRESET; - } - if (error == ENETRESET && ic->ic_opmode == IEEE80211_M_MONITOR) { - if (IS_UP(ic)) { - /* - * Monitor mode can switch directly. - */ - if (ic->ic_des_chan != IEEE80211_CHAN_ANYC) - ic->ic_curchan = ic->ic_des_chan; - error = ic->ic_reset(ic->ic_ifp); - } else - error = 0; + error = ieee80211_init(ic, RESCAN); } break; case IEEE80211_IOC_POWERSAVE: @@ -1702,7 +1692,7 @@ ic->ic_flags |= IEEE80211_F_WPA1 | IEEE80211_F_WPA2; break; } - error = ENETRESET; /* XXX? */ + error = ENETRESET; break; case IEEE80211_IOC_WME: if (ireq->i_val) { @@ -1711,7 +1701,8 @@ ic->ic_flags |= IEEE80211_F_WME; } else ic->ic_flags &= ~IEEE80211_F_WME; - error = ENETRESET; /* XXX maybe not for station? */ + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, 0); break; case IEEE80211_IOC_HIDESSID: if (ireq->i_val) @@ -1801,7 +1792,8 @@ ic->ic_flags &= ~IEEE80211_F_DESBSSID; else ic->ic_flags |= IEEE80211_F_DESBSSID; - error = ENETRESET; + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); break; case IEEE80211_IOC_CHANLIST: error = ieee80211_ioctl_setchanlist(ic, ireq); @@ -1873,7 +1865,7 @@ ic->ic_flags |= IEEE80211_F_FF; } else ic->ic_flags &= ~IEEE80211_F_FF; - error = ENETRESET; /* XXX maybe not for station? */ + error = ENETRESET; break; case IEEE80211_IOC_TURBOP: if (ireq->i_val) { @@ -1882,7 +1874,7 @@ ic->ic_flags |= IEEE80211_F_TURBOP; } else ic->ic_flags &= ~IEEE80211_F_TURBOP; - error = ENETRESET; /* XXX maybe not for station? */ + error = ENETRESET; break; case IEEE80211_IOC_BGSCAN: if (ireq->i_val) { @@ -1942,8 +1934,8 @@ error = EINVAL; break; } - if (error == ENETRESET && !IS_UP_AUTO(ic)) - error = 0; + if (error == ENETRESET) + error = IS_UP_AUTO(ic) ? ieee80211_init(ic, 0) : 0; return error; } ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#39 (text+ko) ==== @@ -843,6 +843,56 @@ } /* + * Start a device. If this is the first vap running on the + * underlying device then we first bring it up. + */ +int +ieee80211_init(struct ieee80211com *ic, int forcescan) +{ + struct ifnet *ifp = ic->ic_ifp; + + IEEE80211_DPRINTF(ic, + IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, + "%s\n", "start running"); + + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + ifp->if_init(ifp); + /* + * Kick the 802.11 state machine as appropriate. + */ + if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) { + if (ic->ic_opmode == IEEE80211_M_STA) { + /* + * Try to be intelligent about clocking the state + * machine. If we're currently in RUN state then + * we should be able to apply any new state/parameters + * simply by re-associating. Otherwise we need to + * re-scan to select an appropriate ap. + */ + if (ic->ic_state != IEEE80211_S_RUN || forcescan) + ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); + else + ieee80211_new_state(ic, IEEE80211_S_ASSOC, 1); + } else { + /* + * For monitor+wds modes there's nothing to do but + * start running. Otherwise, if this is the first + * vap to be brought up, start a scan which may be + * preempted if the station is locked to a particular + * channel. + */ + if (ic->ic_opmode == IEEE80211_M_MONITOR || + ic->ic_opmode == IEEE80211_M_WDS) { + ic->ic_state = IEEE80211_S_INIT; /* XXX*/ + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + } else + ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); + } + } + return 0; +} + +/* * Switch between turbo and non-turbo operating modes. * Use the specified channel flags to locate the new * channel, update 802.11 state, and then call back into ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#25 (text+ko) ==== @@ -217,6 +217,7 @@ #define ieee80211_new_state(_ic, _nstate, _arg) \ (((_ic)->ic_newstate)((_ic), (_nstate), (_arg))) +int ieee80211_init(struct ieee80211com *, int forcescan); void ieee80211_dturbo_switch(struct ieee80211com *, int newflags); void ieee80211_beacon_miss(struct ieee80211com *); void ieee80211_print_essid(const u_int8_t *, int); From owner-p4-projects@FreeBSD.ORG Sun Nov 27 01:16:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B3316A423; Sun, 27 Nov 2005 01:16:06 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D30A216A420 for ; Sun, 27 Nov 2005 01:16:05 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8101043D66 for ; Sun, 27 Nov 2005 01:15:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAR1FqBp033676 for ; Sun, 27 Nov 2005 01:15:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR1Fqql033673 for perforce@freebsd.org; Sun, 27 Nov 2005 01:15:52 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Nov 2005 01:15:52 GMT Message-Id: <200511270115.jAR1Fqql033673@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 Cc: Subject: PERFORCE change 87295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 01:16:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=87295 Change 87295 by sam@sam_ebb on 2005/11/27 01:15:08 tweak ap selection algorithm: o when comparing rssi cap values to avoid choosing an ap purely by the rssi; this fixes the case of choosing an 11b ap over an 11g ap when both have strong signal o treat ssid and bssid specifications as desired propertys and not requirements; this allows us to fall back to another ap without having to tweak desired ssid/bssid Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#5 (text+ko) ==== @@ -65,6 +65,7 @@ /* XXX tunable */ #define STA_RSSI_MIN 8 /* min acceptable rssi */ +#define STA_RSSI_MAX 40 /* max rssi for comparison */ #define RSSI_LPF_LEN 10 #define RSSI_EP_MULTIPLIER (1<<7) /* pow2 to optimize out * and / */ @@ -85,6 +86,9 @@ u_int8_t se_fails; /* failure to associate count */ u_int8_t se_seen; /* seen during current scan */ u_int8_t se_notseen; /* not seen in previous scans */ + u_int8_t se_flags; +#define STA_SSID_MATCH 0x01 +#define STA_BSSID_MATCH 0x02 u_int32_t se_avgrssi; /* LPF rssi state */ unsigned long se_lastupdate; /* time of last update */ unsigned long se_lastfail; /* time of last failure */ @@ -108,7 +112,7 @@ static void sta_flush_table(struct sta_table *); static int match_bss(struct ieee80211com *, - const struct ieee80211_scan_state *, const struct sta_entry *, int); + const struct ieee80211_scan_state *, struct sta_entry *, int); /* number of references from net80211 layer */ static int nrefs = 0; @@ -602,22 +606,35 @@ sta_compare(const struct sta_entry *a, const struct sta_entry *b) { u_int8_t maxa, maxb; + int8_t rssia, rssib; int weight; - /* privacy support preferred */ - if ((a->base.se_capinfo & IEEE80211_CAPINFO_PRIVACY) && - (b->base.se_capinfo & IEEE80211_CAPINFO_PRIVACY) == 0) - return 1; - if ((a->base.se_capinfo & IEEE80211_CAPINFO_PRIVACY) == 0 && - (b->base.se_capinfo & IEEE80211_CAPINFO_PRIVACY)) - return -1; + /* desired bssid */ + if ((a->se_flags ^ b->se_flags) & STA_BSSID_MATCH) + return (a->se_flags & STA_BSSID_MATCH) ? 1 : -1; + /* desired ssid */ + if ((a->se_flags ^ b->se_flags) & STA_SSID_MATCH) + return (a->se_flags & STA_SSID_MATCH) ? 1 : -1; + /* privacy support */ + if ((a->base.se_capinfo ^ b->base.se_capinfo) & IEEE80211_CAPINFO_PRIVACY) + return (a->se_flags & IEEE80211_CAPINFO_PRIVACY) ? 1 : -1; /* compare count of previous failures */ weight = b->se_fails - a->se_fails; if (abs(weight) > 1) return weight; - if (abs(b->base.se_rssi - a->base.se_rssi) < 5) { + /* + * Compare rssi. If the two are considered equivalent + * then fallback to other criteria. We threshold the + * comparisons to avoid selecting an ap purely by rssi + * when both values may be good but one ap is otherwise + * more desirable (e.g. an 11b-only ap with stronger + * rssi than an 11g ap). + */ + rssia = MIN(a->base.se_rssi, STA_RSSI_MAX); + rssib = MIN(b->base.se_rssi, STA_RSSI_MAX); + if (abs(rssib - rssia) < 5) { /* best/max rate preferred if signal level close enough XXX */ maxa = maxrate(&a->base); maxb = maxrate(&b->base); @@ -710,10 +727,10 @@ */ static int match_bss(struct ieee80211com *ic, - const struct ieee80211_scan_state *ss, const struct sta_entry *se0, + const struct ieee80211_scan_state *ss, struct sta_entry *se0, int debug) { - const struct ieee80211_scan_entry *se = &se0->base; + struct ieee80211_scan_entry *se = &se0->base; u_int8_t rate; int fail; @@ -750,11 +767,15 @@ if (rate & IEEE80211_RATE_BASIC) fail |= 0x08; if (ss->ss_nssid != 0 && - !match_ssid(se->se_ssid, ss->ss_nssid, ss->ss_ssid)) - fail |= 0x10; + match_ssid(se->se_ssid, ss->ss_nssid, ss->ss_ssid)) + se0->se_flags |= STA_SSID_MATCH; + else + se0->se_flags &= ~STA_SSID_MATCH; if ((ic->ic_flags & IEEE80211_F_DESBSSID) && - !IEEE80211_ADDR_EQ(ic->ic_des_bssid, se->se_bssid)) - fail |= 0x20; + IEEE80211_ADDR_EQ(ic->ic_des_bssid, se->se_bssid)) + se0->se_flags |= STA_BSSID_MATCH; + else + se0->se_flags &= ~STA_BSSID_MATCH; if (se0->se_fails >= STA_FAILS_MAX) fail |= 0x40; if (se0->se_notseen >= STA_PURGE_SCANS) @@ -767,7 +788,7 @@ fail & 0x40 ? '=' : fail & 0x80 ? '^' : fail ? '-' : '+', ether_sprintf(se->se_macaddr)); printf(" %s%c", ether_sprintf(se->se_bssid), - fail & 0x20 ? '!' : ' '); + se0->se_flags & STA_BSSID_MATCH ? '!' : ' '); printf(" %3d%c", ieee80211_chan2ieee(ic, se->se_chan), fail & 0x01 ? '!' : ' '); printf(" %+4d%c", se->se_rssi, fail & 0x100 ? '!' : ' '); @@ -783,7 +804,7 @@ "wep" : "no", fail & 0x04 ? '!' : ' '); ieee80211_print_essid(se->se_ssid+2, se->se_ssid[1]); - printf("%s\n", fail & 0x10 ? "!" : ""); + printf("%s\n", se0->se_flags & STA_SSID_MATCH ? "!" : ""); } #endif return fail; From owner-p4-projects@FreeBSD.ORG Sun Nov 27 01:39:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECF7216A422; Sun, 27 Nov 2005 01:39:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8E1DB16A41F for ; Sun, 27 Nov 2005 01:39:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA2DB43D46 for ; Sun, 27 Nov 2005 01:39:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAR1dNkw034619 for ; Sun, 27 Nov 2005 01:39:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR1dNxE034616 for perforce@freebsd.org; Sun, 27 Nov 2005 01:39:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Nov 2005 01:39:23 GMT Message-Id: <200511270139.jAR1dNxE034616@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 Cc: Subject: PERFORCE change 87299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 01:39:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=87299 Change 87299 by rwatson@rwatson_zoo on 2005/11/27 01:39:02 Integrate netsmp. Affected files ... .. //depot/projects/netsmp/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/netsmp/src/sys/conf/files#13 integrate .. //depot/projects/netsmp/src/sys/conf/files.alpha#2 integrate .. //depot/projects/netsmp/src/sys/conf/files.i386#7 integrate .. //depot/projects/netsmp/src/sys/conf/files.pc98#4 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_fmt.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/netsmp/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/netsmp/src/sys/modules/Makefile#8 integrate .. //depot/projects/netsmp/src/sys/modules/geom/geom_vinum/Makefile#4 integrate .. //depot/projects/netsmp/src/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/netsmp/src/sys/net/if_clone.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/netsmp/src/sys/sys/_types.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/file.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mqueue.h#1 branch .. //depot/projects/netsmp/src/sys/sys/syscall.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/netsmp/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/time.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/types.h#3 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/netsmp/src/tools/regression/mqueue/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest1/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest1/mqtest1.c#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest2/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest2/mqtest2.c#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest3/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest3/mqtest3.c#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest4/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest4/mqtest4.c#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest5/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/mqueue/mqtest5/mqtest5.c#1 branch Differences ... ==== //depot/projects/netsmp/src/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.71 2005/11/24 15:28:32 le Exp $"); #include #include @@ -978,7 +978,7 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "total_bpages", CTLFLAG_RD, &bz->total_bpages, 0, - "Totoal bounce pages"); + "Total bounce pages"); SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0, ==== //depot/projects/netsmp/src/sys/conf/Makefile.arm#5 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.18 2005/11/24 02:25:49 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.19 2005/11/25 03:30:45 cognet Exp $ # # Makefile for FreeBSD # @@ -48,7 +48,7 @@ DDB_ENABLED!= grep DDB opt_ddb.h || true -SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.static \ +SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader \ -warn-common -export-dynamic -dynamic-linker /red/herring -o \ ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL +=; cat ldscript.$M| \ @@ -74,7 +74,7 @@ .endif -CLEANFILES += ldscript.$M ldscript.$M.static ${KERNEL_KO}.bin \ +CLEANFILES += ldscript.$M ldscript.$M.noheader ${KERNEL_KO}.bin \ ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin %BEFORE_DEPEND ==== //depot/projects/netsmp/src/sys/conf/files#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1066 2005/11/22 17:12:48 marius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1068 2005/11/26 12:42:35 davidxu Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -10,12 +10,12 @@ no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" aicasm optional ahc \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ + dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" aicasm optional ahd \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ + dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" @@ -488,10 +488,10 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist -dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr -dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ +dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr +dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" -dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ +dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" dev/ath/if_ath.c optional ath \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" @@ -829,7 +829,7 @@ dev/rp/rp_pci.c optional rp pci dev/sab/sab.c optional sab ebus dev/safe/safe.c optional safe -dev/sbsh/if_sbsh.c optional sbsh +dev/sbsh/if_sbsh.c optional sbsh dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa dev/si/si.c optional si @@ -872,7 +872,7 @@ dev/sound/pci/es137x.c optional snd_es137x pci dev/sound/pci/fm801.c optional snd_fm801 pci dev/sound/pci/ich.c optional snd_ich pci -dev/sound/pci/maestro.c optional snd_maestro pci +dev/sound/pci/maestro.c optional snd_maestro pci dev/sound/pci/maestro3.c optional snd_maestro3 pci \ warning "kernel contains GPL contaminated maestro3 headers" dev/sound/pci/neomagic.c optional snd_neomagic pci @@ -1363,6 +1363,7 @@ kern/uipc_domain.c standard kern/uipc_mbuf.c standard kern/uipc_mbuf2.c standard +kern/uipc_mqueue.c optional p1003_1b_mqueue kern/uipc_proto.c standard kern/uipc_sem.c optional p1003_1b_semaphores kern/uipc_socket.c standard @@ -1526,19 +1527,19 @@ netatm/spans/spans_subr.c optional atm_spans atm_core netatm/spans/spans_util.c optional atm_spans atm_core spans_xdr.h optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ - clean "spans_xdr.h" \ - no-obj no-implicit-rule + before-depend \ + dependency "$S/netatm/spans/spans_xdr.x" \ + compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ + clean "spans_xdr.h" \ + no-obj no-implicit-rule spans_xdr.c optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ - clean "spans_xdr.c" \ - no-obj no-implicit-rule local + before-depend \ + dependency "$S/netatm/spans/spans_xdr.x" \ + compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ + clean "spans_xdr.c" \ + no-obj no-implicit-rule local spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ + dependency "$S/netatm/spans/spans_xdr.x" \ compile-with "${NORMAL_C}" \ no-implicit-rule local netatm/uni/q2110_sigaa.c optional atm_uni atm_core ==== //depot/projects/netsmp/src/sys/conf/files.alpha#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.121 2005/06/14 04:16:10 marcel Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.122 2005/11/26 08:50:20 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -47,7 +47,6 @@ alpha/alpha/db_interface.c optional ddb alpha/alpha/db_trace.c optional ddb alpha/alpha/dec_1000a.c optional dec_1000a -alpha/alpha/dec_1000a.c optional dec_1000a alpha/alpha/dec_2100_a50.c optional dec_2100_a50 alpha/alpha/dec_2100_a500.c optional dec_2100_a500 alpha/alpha/dec_axppci_33.c optional dec_axppci_33 ==== //depot/projects/netsmp/src/sys/conf/files.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.545 2005/11/21 20:11:39 ru Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.546 2005/11/26 08:50:20 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -133,8 +133,6 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto -crypto/des/des_ecb.c optional crypto -crypto/des/des_setkey.c optional crypto crypto/via/padlock.c optional padlock dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa ==== //depot/projects/netsmp/src/sys/conf/files.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.329 2005/11/11 09:57:30 ru Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.330 2005/11/26 08:50:20 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -89,8 +89,6 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto -crypto/des/des_ecb.c optional crypto -crypto/des/des_setkey.c optional crypto dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.42 2005/11/23 00:57:51 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.43 2005/11/26 07:36:53 njl Exp $"); #include "opt_acpi.h" #include @@ -80,6 +80,7 @@ static int acpi_cmbat_info_expired(struct timespec *lastupdated); static void acpi_cmbat_info_updated(struct timespec *lastupdated); static void acpi_cmbat_get_bst(void *arg); +static void acpi_cmbat_get_bif_task(void *arg); static void acpi_cmbat_get_bif(void *arg); static int acpi_cmbat_bst(device_t dev, struct acpi_bst *bstp); static int acpi_cmbat_bif(device_t dev, struct acpi_bif *bifp); @@ -193,7 +194,7 @@ * Queue a callback to get the current battery info from thread * context. It's not safe to block in a notify handler. */ - AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_get_bif, dev); + AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_get_bif_task, dev); break; } @@ -288,6 +289,16 @@ AcpiOsFree(bst_buffer.Pointer); } +/* XXX There should be a cleaner way to do this locking. */ +static void +acpi_cmbat_get_bif_task(void *arg) +{ + + ACPI_SERIAL_BEGIN(cmbat); + acpi_cmbat_get_bif(arg); + ACPI_SERIAL_END(cmbat); +} + static void acpi_cmbat_get_bif(void *arg) { ==== //depot/projects/netsmp/src/sys/dev/amr/amr.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.69 2005/11/06 15:13:41 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.70 2005/11/26 07:30:09 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -85,6 +85,13 @@ #define AMR_DEFINE_TABLES #include +/* + * The CAM interface appears to be completely broken. Disable it. + */ +#ifndef AMR_ENABLE_CAM +#define AMR_ENABLE_CAM 0 +#endif + static d_open_t amr_open; static d_close_t amr_close; static d_ioctl_t amr_ioctl; @@ -225,12 +232,14 @@ debug(2, "controller query complete"); +#if AMR_ENABLE_CAM != 0 /* * Attach our 'real' SCSI channels to CAM. */ if (amr_cam_attach(sc)) return(ENXIO); debug(2, "CAM attach done"); +#endif /* * Create the control device. @@ -327,8 +336,10 @@ { struct amr_command_cluster *acc; +#if AMR_ENABLE_CAM != 0 /* detach from CAM */ amr_cam_detach(sc); +#endif /* cancel status timeout */ untimeout(amr_periodic, sc, sc->amr_timeout); @@ -855,9 +866,11 @@ if (ac == NULL) (void)amr_bio_command(sc, &ac); +#if AMR_ENABLE_CAM != 0 /* if that failed, build a command from a ccb */ if (ac == NULL) (void)amr_cam_command(sc, &ac); +#endif /* if we don't have anything to do, give up */ if (ac == NULL) ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.259 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.260 2005/11/25 09:00:56 sos Exp $"); #include "opt_ata.h" #include @@ -68,6 +68,7 @@ static void ata_interrupt(void *); static void ata_boot_attach(void); static device_t ata_add_child(device_t, struct ata_device *, int); +static int ata_getparam(struct ata_device *, int); static void bswap(int8_t *, int); static void btrim(int8_t *, int); static void bpack(int8_t *, int8_t *, int); @@ -511,6 +512,7 @@ return error; case IOCATAGPARM: + ata_getparam(atadev, 0); bcopy(&atadev->param, params, sizeof(struct ata_params)); return 0; @@ -572,9 +574,9 @@ } static int -ata_getparam(device_t parent, struct ata_device *atadev) +ata_getparam(struct ata_device *atadev, int init) { - struct ata_channel *ch = device_get_softc(parent); + struct ata_channel *ch = device_get_softc(device_get_parent(atadev->dev)); struct ata_request *request; u_int8_t command = 0; int error = ENOMEM, retries = 2; @@ -631,8 +633,7 @@ bpack(atacap->revision, atacap->revision, sizeof(atacap->revision)); btrim(atacap->serial, sizeof(atacap->serial)); bpack(atacap->serial, atacap->serial, sizeof(atacap->serial)); - sprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision); - device_set_desc_copy(atadev->dev, buffer); + if (bootverbose) printf("ata%d-%s: pio=%s wdma=%s udma=%s cable=%s wire\n", ch->unit, atadev->unit == ATA_MASTER ? "master":"slave", @@ -641,18 +642,22 @@ ata_mode2str(ata_umode(atacap)), (atacap->hwres & ATA_CABLE_ID) ? "80":"40"); - if (atadev->param.config & ATA_PROTO_ATAPI) { - if (atapi_dma && ch->dma && - (atadev->param.config & ATA_DRQ_MASK) != ATA_DRQ_INTR && - ata_umode(&atadev->param) >= ATA_UDMA2) - atadev->mode = ATA_DMA_MAX; + if (init) { + sprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision); + device_set_desc_copy(atadev->dev, buffer); + if (atadev->param.config & ATA_PROTO_ATAPI) { + if (atapi_dma && ch->dma && + (atadev->param.config & ATA_DRQ_MASK) != ATA_DRQ_INTR && + ata_umode(&atadev->param) >= ATA_UDMA2) + atadev->mode = ATA_DMA_MAX; + } + else { + if (ata_dma && ch->dma && + (ata_umode(&atadev->param) > 0 || + ata_wmode(&atadev->param) > 0)) + atadev->mode = ATA_DMA_MAX; + } } - else { - if (ata_dma && ch->dma && - (ata_umode(&atadev->param) > 0 || - ata_wmode(&atadev->param) > 0)) - atadev->mode = ATA_DMA_MAX; - } } else { if (!error) @@ -704,11 +709,11 @@ slave = NULL; } - if (slave && ata_getparam(dev, slave)) { + if (slave && ata_getparam(slave, 1)) { device_delete_child(dev, slave_child); free(slave, M_ATA); } - if (master && ata_getparam(dev, master)) { + if (master && ata_getparam(master, 1)) { device_delete_child(dev, master_child); free(master, M_ATA); } @@ -808,6 +813,12 @@ case ATA_FLUSHCACHE: request->u.ata.command = ATA_FLUSHCACHE48; break; + case ATA_READ_NATIVE_MAX_ADDDRESS: + request->u.ata.command = ATA_READ_NATIVE_MAX_ADDDRESS48; + break; + case ATA_SET_MAX_ADDRESS: + request->u.ata.command = ATA_SET_MAX_ADDRESS48; + break; default: return; } ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.106 2005/10/06 15:44:07 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.107 2005/11/25 09:00:56 sos Exp $ */ /* ATA register defines */ @@ -298,7 +298,7 @@ #define ATA_INTR_FLAGS (INTR_MPSAFE|INTR_TYPE_BIO|INTR_ENTROPY) #define ATA_OP_CONTINUES 0 #define ATA_OP_FINISHED 1 -#define ATA_MAX_28BIT_LBA 268435455 +#define ATA_MAX_28BIT_LBA 268435455UL /* ATAPI request sense structure */ struct atapi_sense { ==== //depot/projects/netsmp/src/sys/dev/em/if_em.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.89 2005/11/24 01:44:48 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.90 2005/11/24 15:13:47 cognet Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1219,6 +1219,7 @@ u_int32_t txd_upper; u_int32_t txd_lower, txd_used = 0, txd_saved = 0; int i, j, error = 0; + bus_dmamap_t map; struct mbuf *m_head; @@ -1253,6 +1254,7 @@ tx_buffer = &adapter->tx_buffer_area[adapter->next_avail_tx_desc]; error = bus_dmamap_load_mbuf_sg(adapter->txtag, tx_buffer->map, m_head, segs, &nsegs, BUS_DMA_NOWAIT); + map = tx_buffer->map; if (error != 0) { adapter->no_tx_dma_setup++; return (error); @@ -1383,7 +1385,7 @@ } tx_buffer->m_head = m_head; - bus_dmamap_sync(adapter->txtag, tx_buffer->map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(adapter->txtag, map, BUS_DMASYNC_PREWRITE); /* * Last Descriptor of Packet needs End Of Packet (EOP) ==== //depot/projects/netsmp/src/sys/dev/firewire/firewire.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.80 2005/01/06 01:42:41 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.81 2005/11/25 14:29:24 simokawa Exp $ * */ @@ -1324,6 +1324,7 @@ uint32_t addr; struct fw_xfer *xfer; struct fw_pkt *fp; + union fw_self_id *fwsid; if(fc->status != FWBUSEXPLORE) return; @@ -1336,7 +1337,8 @@ /* check link */ /* XXX we need to check phy_id first */ - if (!fw_find_self_id(fc, fc->ongonode)->p0.link_active) { + fwsid = fw_find_self_id(fc, fc->ongonode); + if (!fwsid || !fwsid->p0.link_active) { if (firewire_debug) printf("node%d: link down\n", fc->ongonode); fc->ongonode++; ==== //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.57 2005/11/14 18:19:33 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.58 2005/11/26 03:51:25 ariff Exp $"); MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); @@ -148,6 +148,7 @@ { 0x414c4710, 0x0f, 0, "ALC200", 0 }, { 0x414c4740, 0x0f, 0, "ALC202", 0 }, { 0x414c4720, 0x0f, 0, "ALC650", 0 }, + { 0x414c4752, 0x0f, 0, "ALC250", 0 }, { 0x414c4760, 0x0f, 0, "ALC655", 0 }, { 0x414c4780, 0x0f, 0, "ALC658", 0 }, { 0x414c4790, 0x0f, 0, "ALC850", 0 }, ==== //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_fmt.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.17 2005/11/14 18:37:59 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.18 2005/11/26 03:54:17 ariff Exp $"); MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder"); @@ -629,6 +629,93 @@ {0, 0} }; FEEDER_DECLARE(feeder_monotostereo16, 0, NULL); + +static int +feed_monotostereo24(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, + uint32_t count, void *source) +{ + int i, j, k = FEEDER_FEED(f->source, c, b, count >> 1, source); + uint8_t l, m, n; + + if (k < 3) { + FMT_TRACE("%s: Not enough data (Got: %d bytes)\n", + __func__, k); + return 0; + } + FMT_TEST(k % 3, "%s: Bytes not 24bit aligned.\n", __func__); + FMT_ALIGNBYTE(k -= k % 3); + i = k; + j = k << 1; + while (i > 0) { + l = b[--i]; + m = b[--i]; + n = b[--i]; + b[--j] = l; + b[--j] = m; + b[--j] = n; + b[--j] = l; + b[--j] = m; + b[--j] = n; + } + return k << 1; +} +static struct pcm_feederdesc feeder_monotostereo24_desc[] = { + {FEEDER_FMT, AFMT_U24_LE, AFMT_U24_LE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_S24_LE, AFMT_S24_LE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_U24_BE, AFMT_U24_BE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_S24_BE, AFMT_S24_BE|AFMT_STEREO, 0}, + {0, 0, 0, 0}, +}; +static kobj_method_t feeder_monotostereo24_methods[] = { + KOBJMETHOD(feeder_feed, feed_monotostereo24), + {0, 0} +}; +FEEDER_DECLARE(feeder_monotostereo24, 0, NULL); + +static int +feed_monotostereo32(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, + uint32_t count, void *source) +{ + int i, j, k = FEEDER_FEED(f->source, c, b, count >> 1, source); + uint8_t l, m, n, o; + + if (k < 4) { + FMT_TRACE("%s: Not enough data (Got: %d bytes)\n", + __func__, k); + return 0; + } + FMT_TEST(k & 3, "%s: Bytes not 32bit aligned.\n", __func__); + FMT_ALIGNBYTE(k &= ~3); + i = k; + j = k << 1; + while (i > 0) { + l = b[--i]; + m = b[--i]; + n = b[--i]; + o = b[--i]; + b[--j] = l; + b[--j] = m; + b[--j] = n; + b[--j] = o; + b[--j] = l; + b[--j] = m; + b[--j] = n; + b[--j] = o; + } + return k << 1; +} +static struct pcm_feederdesc feeder_monotostereo32_desc[] = { + {FEEDER_FMT, AFMT_U32_LE, AFMT_U32_LE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_S32_LE, AFMT_S32_LE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_U32_BE, AFMT_U32_BE|AFMT_STEREO, 0}, + {FEEDER_FMT, AFMT_S32_BE, AFMT_S32_BE|AFMT_STEREO, 0}, + {0, 0, 0, 0}, +}; +static kobj_method_t feeder_monotostereo32_methods[] = { + KOBJMETHOD(feeder_feed, feed_monotostereo32), + {0, 0} +}; +FEEDER_DECLARE(feeder_monotostereo32, 0, NULL); /* * Channel conversion (mono -> stereo) end */ @@ -712,6 +799,89 @@ {0, 0} }; FEEDER_DECLARE(feeder_stereotomono16, 0, NULL); + +static int +feed_stereotomono24(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, + uint32_t count, void *source) +{ + int i, j, k; + uint8_t *src = (uint8_t *)f->data; + + k = count << 1; + k = FEEDER_FEED(f->source, c, src, min(k, FEEDBUF24SZ), source); + if (k < 6) { + FMT_TRACE("%s: Not enough data (Got: %d bytes)\n", + __func__, k); + return 0; + } + FMT_TEST(k % 6, "%s: Bytes not 24bit (stereo) aligned.\n", __func__); + FMT_ALIGNBYTE(k -= k % 6); + i = k >> 1; + j = i; + while (i > 0) { + k -= 3; + b[--i] = src[--k]; + b[--i] = src[--k]; + b[--i] = src[--k]; + } + return j; +} +static struct pcm_feederdesc feeder_stereotomono24_desc[] = { + {FEEDER_FMT, AFMT_U24_LE|AFMT_STEREO, AFMT_U24_LE, 0}, + {FEEDER_FMT, AFMT_S24_LE|AFMT_STEREO, AFMT_S24_LE, 0}, + {FEEDER_FMT, AFMT_U24_BE|AFMT_STEREO, AFMT_U24_BE, 0}, + {FEEDER_FMT, AFMT_S24_BE|AFMT_STEREO, AFMT_S24_BE, 0}, + {0, 0, 0, 0}, +}; +static kobj_method_t feeder_stereotomono24_methods[] = { + KOBJMETHOD(feeder_init, feed_common_init), + KOBJMETHOD(feeder_free, feed_common_free), + KOBJMETHOD(feeder_feed, feed_stereotomono24), + {0, 0} +}; +FEEDER_DECLARE(feeder_stereotomono24, 0, NULL); + +static int +feed_stereotomono32(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, + uint32_t count, void *source) +{ + int i, j, k; + uint8_t *src = (uint8_t *)f->data; + + k = count << 1; + k = FEEDER_FEED(f->source, c, src, min(k, FEEDBUFSZ), source); + if (k < 8) { + FMT_TRACE("%s: Not enough data (Got: %d bytes)\n", + __func__, k); + return 0; + } + FMT_TEST(k & 7, "%s: Bytes not 32bit (stereo) aligned.\n", __func__); + FMT_ALIGNBYTE(k &= ~7); + i = k >> 1; + j = i; + while (i > 0) { + k -= 4; + b[--i] = src[--k]; + b[--i] = src[--k]; + b[--i] = src[--k]; + b[--i] = src[--k]; + } + return j; +} +static struct pcm_feederdesc feeder_stereotomono32_desc[] = { + {FEEDER_FMT, AFMT_U32_LE|AFMT_STEREO, AFMT_U32_LE, 0}, + {FEEDER_FMT, AFMT_S32_LE|AFMT_STEREO, AFMT_S32_LE, 0}, + {FEEDER_FMT, AFMT_U32_BE|AFMT_STEREO, AFMT_U32_BE, 0}, + {FEEDER_FMT, AFMT_S32_BE|AFMT_STEREO, AFMT_S32_BE, 0}, + {0, 0, 0, 0}, +}; +static kobj_method_t feeder_stereotomono32_methods[] = { + KOBJMETHOD(feeder_init, feed_common_init), + KOBJMETHOD(feeder_free, feed_common_free), + KOBJMETHOD(feeder_feed, feed_stereotomono32), + {0, 0} +}; +FEEDER_DECLARE(feeder_stereotomono32, 0, NULL); /* * Channel conversion (stereo -> mono) end */ ==== //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.22 2005/11/23 17:32:57 damien Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.26 2005/11/25 21:15:07 damien Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.22 2005/11/23 17:32:57 damien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.26 2005/11/25 21:15:07 damien Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -453,9 +453,13 @@ ic->ic_state = IEEE80211_S_INIT; /* set device capabilities */ - ic->ic_caps = IEEE80211_C_MONITOR | IEEE80211_C_IBSS | - IEEE80211_C_HOSTAP | IEEE80211_C_SHPREAMBLE | IEEE80211_C_SHSLOT | - IEEE80211_C_PMGT | IEEE80211_C_TXPMGT | IEEE80211_C_WPA; + ic->ic_caps = + IEEE80211_C_IBSS | /* IBSS mode supported */ + IEEE80211_C_MONITOR | /* monitor mode supported */ + IEEE80211_C_HOSTAP | /* HostAp mode supported */ + IEEE80211_C_TXPMGT | /* tx power management */ + IEEE80211_C_SHPREAMBLE | /* short preamble supported */ + IEEE80211_C_WPA; /* 802.11i */ if (sc->rf_rev == RAL_RF_5222) { /* set supported .11a rates */ @@ -527,6 +531,11 @@ callout_stop(&sc->scan_ch); callout_stop(&sc->amrr_ch); + if (sc->amrr_xfer != NULL) { + usbd_free_xfer(sc->amrr_xfer); + sc->amrr_xfer = NULL; + } + if (sc->sc_rx_pipeh != NULL) { usbd_abort_pipe(sc->sc_rx_pipeh); usbd_close_pipe(sc->sc_rx_pipeh); @@ -685,7 +694,7 @@ return error; } - if ((ifp->if_flags & IFF_UP) && + if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) ural_init(sc); @@ -876,7 +885,7 @@ usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL); - if (len < RAL_RX_DESC_SIZE) { + if (len < RAL_RX_DESC_SIZE + IEEE80211_MIN_LEN) { printf("%s: xfer too short %d\n", USBDEVNAME(sc->sc_dev), len); ifp->if_ierrors++; goto skip; @@ -909,7 +918,19 @@ /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; - m->m_flags |= M_HASFCS; /* hardware appends FCS */ + m->m_flags |= M_HASFCS; /* h/w leaves FCS */ + + if (sc->sc_drvbpf != NULL) { + struct ural_rx_radiotap_header *tap = &sc->sc_rxtap; + + tap->wr_flags = 0; + tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); + tap->wr_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wr_antenna = sc->rx_ant; + tap->wr_antsignal = desc->rssi; + + bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + } wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); @@ -984,7 +1005,6 @@ else txtime += 144 + 48; } - return txtime; } @@ -1036,27 +1056,22 @@ */ desc->plcp_service = 4; - len += 4; /* account for FCS */ + len += IEEE80211_CRC_LEN; if (RAL_RATE_IS_OFDM(rate)) { - /* - * PLCP length field (LENGTH). - * From IEEE Std 802.11a-1999, pp. 14. - */ + /* IEEE Std 802.11a-1999, pp. 14 */ plcp_length = len & 0xfff; - desc->plcp_length = htole16((plcp_length >> 6) << 8 | - (plcp_length & 0x3f)); + desc->plcp_length_hi = plcp_length >> 6; + desc->plcp_length_lo = plcp_length & 0x3f; } else { - /* - * Long PLCP LENGTH field. - * From IEEE Std 802.11b-1999, pp. 16. - */ + /* IEEE Std 802.11b-1999, pp. 16 */ plcp_length = (16 * len + rate - 1) / rate; if (rate == 22) { remainder = (16 * len) % 22; if (remainder != 0 && remainder < 7) desc->plcp_service |= RAL_PLCP_LENGEXT; } - desc->plcp_length = htole16(plcp_length); + desc->plcp_length_hi = plcp_length >> 8; + desc->plcp_length_lo = plcp_length & 0xff; } desc->plcp_signal = ural_plcp_signal(rate); @@ -1138,18 +1153,6 @@ rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 4; - if (sc->sc_drvbpf != NULL) { - struct ural_tx_radiotap_header *tap = &sc->sc_txtap; - - tap->wt_flags = 0; - tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); - tap->wt_antenna = sc->tx_ant; - - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); - } - data->m = m0; data->ni = ni; @@ -1169,12 +1172,31 @@ flags |= RAL_TX_TIMESTAMP; } + if (sc->sc_drvbpf != NULL) { + struct ural_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; + tap->wt_rate = rate; + tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_antenna = sc->tx_ant; + + bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + } + m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RAL_TX_DESC_SIZE); ural_setup_tx_desc(sc, desc, flags, m0->m_pkthdr.len, rate); - /* xfer length needs to be a multiple of two! */ + /* align end on a 2-bytes boundary */ xferlen = (RAL_TX_DESC_SIZE + m0->m_pkthdr.len + 1) & ~1; + /* + * No space left in the last URB to store the extra 2 bytes, force + * sending of another URB. + */ + if ((xferlen % 64) == 0) + xferlen += 2; + DPRINTFN(10, ("sending mgt frame len=%u rate=%u xfer len=%u\n", m0->m_pkthdr.len, rate, xferlen)); @@ -1224,18 +1246,6 @@ wh = mtod(m0, struct ieee80211_frame *); } - if (sc->sc_drvbpf != NULL) { - struct ural_tx_radiotap_header *tap = &sc->sc_txtap; - - tap->wt_flags = 0; - tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); - tap->wt_antenna = sc->tx_ant; - - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); - } - data = &sc->tx_data[0]; desc = (struct ural_tx_desc *)data->buf; @@ -1251,12 +1261,31 @@ *(uint16_t *)wh->i_dur = htole16(dur); } + if (sc->sc_drvbpf != NULL) { + struct ural_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 27 03:22:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68D0816A424; Sun, 27 Nov 2005 03:22:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 210AA16A41F for ; Sun, 27 Nov 2005 03:22:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C47043D53 for ; Sun, 27 Nov 2005 03:22:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAR3MSDY038794 for ; Sun, 27 Nov 2005 03:22:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR3MRga038791 for perforce@freebsd.org; Sun, 27 Nov 2005 03:22:27 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Nov 2005 03:22:27 GMT Message-Id: <200511270322.jAR3MRga038791@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 Cc: Subject: PERFORCE change 87301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 03:22:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=87301 Change 87301 by sam@sam_ebb on 2005/11/27 03:22:07 o fix preference for privacy o fix bssid/ssid match debug msg; mark match with '*' Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#6 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#6 (text+ko) ==== @@ -605,19 +605,21 @@ static int sta_compare(const struct sta_entry *a, const struct sta_entry *b) { +#define PREFER(_a,_b,_what) do { \ + if (((_a) ^ (_b)) & (_what)) \ + return ((_a) & (_what)) ? 1 : -1; \ +} while (0) u_int8_t maxa, maxb; int8_t rssia, rssib; int weight; /* desired bssid */ - if ((a->se_flags ^ b->se_flags) & STA_BSSID_MATCH) - return (a->se_flags & STA_BSSID_MATCH) ? 1 : -1; + PREFER(a->se_flags, b->se_flags, STA_BSSID_MATCH); /* desired ssid */ - if ((a->se_flags ^ b->se_flags) & STA_SSID_MATCH) - return (a->se_flags & STA_SSID_MATCH) ? 1 : -1; + PREFER(a->se_flags, b->se_flags, STA_SSID_MATCH); /* privacy support */ - if ((a->base.se_capinfo ^ b->base.se_capinfo) & IEEE80211_CAPINFO_PRIVACY) - return (a->se_flags & IEEE80211_CAPINFO_PRIVACY) ? 1 : -1; + PREFER(a->base.se_capinfo, b->base.se_capinfo, + IEEE80211_CAPINFO_PRIVACY); /* compare count of previous failures */ weight = b->se_fails - a->se_fails; @@ -630,7 +632,7 @@ * comparisons to avoid selecting an ap purely by rssi * when both values may be good but one ap is otherwise * more desirable (e.g. an 11b-only ap with stronger - * rssi than an 11g ap). + * signal than an 11g ap). */ rssia = MIN(a->base.se_rssi, STA_RSSI_MAX); rssib = MIN(b->base.se_rssi, STA_RSSI_MAX); @@ -651,6 +653,7 @@ } /* all things being equal, use signal level */ return a->base.se_rssi - b->base.se_rssi; +#undef PREFER } /* @@ -788,7 +791,7 @@ fail & 0x40 ? '=' : fail & 0x80 ? '^' : fail ? '-' : '+', ether_sprintf(se->se_macaddr)); printf(" %s%c", ether_sprintf(se->se_bssid), - se0->se_flags & STA_BSSID_MATCH ? '!' : ' '); + se0->se_flags & STA_BSSID_MATCH ? '*' : ' '); printf(" %3d%c", ieee80211_chan2ieee(ic, se->se_chan), fail & 0x01 ? '!' : ' '); printf(" %+4d%c", se->se_rssi, fail & 0x100 ? '!' : ' '); @@ -804,7 +807,7 @@ "wep" : "no", fail & 0x04 ? '!' : ' '); ieee80211_print_essid(se->se_ssid+2, se->se_ssid[1]); - printf("%s\n", se0->se_flags & STA_SSID_MATCH ? "!" : ""); + printf("%s\n", se0->se_flags & STA_SSID_MATCH ? "*" : ""); } #endif return fail; From owner-p4-projects@FreeBSD.ORG Sun Nov 27 06:05:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65C6416A423; Sun, 27 Nov 2005 06:05:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3A94B16A41F for ; Sun, 27 Nov 2005 06:05:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C067F43D5A for ; Sun, 27 Nov 2005 06:05:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAR65j3l052038 for ; Sun, 27 Nov 2005 06:05:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR65jYw052035 for perforce@freebsd.org; Sun, 27 Nov 2005 06:05:45 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Nov 2005 06:05:45 GMT Message-Id: <200511270605.jAR65jYw052035@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 Cc: Subject: PERFORCE change 87305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 06:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=87305 Change 87305 by sam@sam_ebb on 2005/11/27 06:05:28 revert cl#84524; need more than this to fix the problem Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#65 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#65 (text+ko) ==== @@ -463,10 +463,11 @@ } else { /* * When denying unencrypted frames, discard - * any frames received without encryption. + * any non-PAE frames received without encryption. */ if ((ic->ic_flags & IEEE80211_F_DROPUNENC) && - key == NULL) { + key == NULL && + eh->ether_type != htons(ETHERTYPE_PAE)) { /* * Drop unencrypted frames. */ From owner-p4-projects@FreeBSD.ORG Sun Nov 27 10:32:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF83C16A425; Sun, 27 Nov 2005 10:32:38 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 92F2116A424 for ; Sun, 27 Nov 2005 10:32:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7BE643D5D for ; Sun, 27 Nov 2005 10:32:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jARAWaNI070361 for ; Sun, 27 Nov 2005 10:32:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jARAWasE070358 for perforce@freebsd.org; Sun, 27 Nov 2005 10:32:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Nov 2005 10:32:36 GMT Message-Id: <200511271032.jARAWasE070358@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 Cc: Subject: PERFORCE change 87311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2005 10:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=87311 Change 87311 by rwatson@rwatson_zoo on 2005/11/27 10:31:47 Integrate netsmp branch. Affected files ... .. //depot/projects/netsmp/src/sys/conf/files#14 integrate .. //depot/projects/netsmp/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/netsmp/src/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/netsmp/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/netsmp/src/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/netsmp/src/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/netsmp/src/sys/netgraph/netflow/netflow.c#3 integrate Differences ... ==== //depot/projects/netsmp/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1068 2005/11/26 12:42:35 davidxu Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1069 2005/11/27 03:29:58 ariff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -859,6 +859,7 @@ dev/sound/isa/sbc.c optional snd_sbc isa dev/sound/isa/sndbuf_dma.c optional sound isa dev/sound/pci/als4000.c optional snd_als4000 pci +dev/sound/pci/atiixp.c optional snd_atiixp pci #dev/sound/pci/au88x0.c optional snd_au88x0 pci dev/sound/pci/cmi.c optional snd_cmi pci dev/sound/pci/cs4281.c optional snd_cs4281 pci ==== //depot/projects/netsmp/src/sys/dev/sound/driver.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/driver.c,v 1.13 2005/01/06 01:43:17 imp Exp $ + * $FreeBSD: src/sys/dev/sound/driver.c,v 1.14 2005/11/27 03:29:59 ariff Exp $ */ #include @@ -54,6 +54,7 @@ MODULE_DEPEND(snd_driver, snd_ad1816, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_als4000, 1, 1, 1); +MODULE_DEPEND(snd_driver, snd_atiixp, 1, 1, 1); /* MODULE_DEPEND(snd_driver, snd_aureal, 1, 1, 1); */ MODULE_DEPEND(snd_driver, snd_cmi, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_cs4281, 1, 1, 1); ==== //depot/projects/netsmp/src/sys/dev/usb/ohci.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.154 2005/05/29 04:42:27 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.155 2005/11/27 09:05:36 iedowse Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -524,7 +524,7 @@ tdflags = htole32( (rd ? OHCI_TD_IN : OHCI_TD_OUT) | (flags & USBD_SHORT_XFER_OK ? OHCI_TD_R : 0) | - OHCI_TD_NOCC | OHCI_TD_TOGGLE_CARRY | OHCI_TD_NOINTR); + OHCI_TD_NOCC | OHCI_TD_TOGGLE_CARRY | OHCI_TD_SET_DI(6)); for (;;) { next = ohci_alloc_std(sc); @@ -1355,7 +1355,7 @@ { ohci_softc_t *sc = v; ohci_soft_itd_t *sitd, *sidone, *sitdnext; - ohci_soft_td_t *std, *sdone, *stdnext; + ohci_soft_td_t *std, *sdone, *stdnext, *p, *n; usbd_xfer_handle xfer; struct ohci_pipe *opipe; int len, cc, s; @@ -1386,14 +1386,11 @@ stdnext = std->dnext; DPRINTFN(10, ("ohci_process_done: std=%p xfer=%p hcpriv=%p\n", std, xfer, (xfer ? xfer->hcpriv : NULL))); - if (xfer == NULL || (std->flags & OHCI_TD_HANDLED)) { + if (xfer == NULL) { /* * xfer == NULL: There seems to be no xfer associated * with this TD. It is tailp that happened to end up on * the done queue. - * flags & OHCI_TD_HANDLED: The TD has already been - * handled by process_done and should not be done again. - * Shouldn't happen, but some chips are broken(?). */ continue; } @@ -1404,9 +1401,6 @@ /* Handled by abort routine. */ continue; } - usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); - usb_rem_task(OXFER(xfer)->xfer.pipe->device, - &OXFER(xfer)->abort_task); len = std->len; if (std->td.td_cbp != 0) @@ -1418,38 +1412,32 @@ xfer->actlen += len; cc = OHCI_TD_GET_CC(le32toh(std->td.td_flags)); - if (cc == OHCI_CC_NO_ERROR) { - if (std->flags & OHCI_CALL_DONE) { - xfer->status = USBD_NORMAL_COMPLETION; - s = splusb(); - usb_transfer_complete(xfer); - splx(s); - } - ohci_free_std(sc, std); - } else { + if (cc != OHCI_CC_NO_ERROR) { /* * Endpoint is halted. First unlink all the TDs * belonging to the failed transfer, and then restart * the endpoint. */ - ohci_soft_td_t *p, *n; opipe = (struct ohci_pipe *)xfer->pipe; DPRINTFN(15,("ohci_process_done: error cc=%d (%s)\n", OHCI_TD_GET_CC(le32toh(std->td.td_flags)), ohci_cc_strs[OHCI_TD_GET_CC(le32toh(std->td.td_flags))])); + usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); + usb_rem_task(OXFER(xfer)->xfer.pipe->device, + &OXFER(xfer)->abort_task); - - /* Mark all the TDs in the done queue for the current - * xfer as handled - */ - for (p = stdnext; p; p = p->dnext) { - if (p->xfer == xfer) - p->flags |= OHCI_TD_HANDLED; + /* Remove all this xfer's TDs from the done queue. */ + for (p = std; p->dnext != NULL; p = p->dnext) { + if (p->dnext->xfer != xfer) + continue; + p->dnext = p->dnext->dnext; } + /* The next TD may have been removed. */ + stdnext = std->dnext; - /* remove TDs */ - for (p = std; p->xfer == xfer; p = n) { + /* Remove all TDs belonging to this xfer. */ + for (p = xfer->hcpriv; p->xfer == xfer; p = n) { n = p->nexttd; ohci_free_std(sc, p); } @@ -1465,7 +1453,27 @@ s = splusb(); usb_transfer_complete(xfer); splx(s); + continue; + } + /* + * Skip intermediate TDs. They remain linked from + * xfer->hcpriv and we free them when the transfer completes. + */ + if ((std->flags & OHCI_CALL_DONE) == 0) + continue; + + /* Normal transfer completion */ + usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); + usb_rem_task(OXFER(xfer)->xfer.pipe->device, + &OXFER(xfer)->abort_task); + for (p = xfer->hcpriv; p->xfer == xfer; p = n) { + n = p->nexttd; + ohci_free_std(sc, p); } + xfer->status = USBD_NORMAL_COMPLETION; + s = splusb(); + usb_transfer_complete(xfer); + splx(s); } #ifdef USB_DEBUG @@ -1779,7 +1787,7 @@ memcpy(KERNADDR(&opipe->u.ctl.reqdma, 0), req, sizeof *req); setup->td.td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC | - OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR); + OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DI(6)); setup->td.td_cbp = htole32(DMAADDR(&opipe->u.ctl.reqdma, 0)); setup->nexttd = next; setup->td.td_nexttd = htole32(next->physaddr); ==== //depot/projects/netsmp/src/sys/dev/usb/ohcivar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.40 2005/03/19 19:08:46 iedowse Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.41 2005/11/27 09:05:37 iedowse Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,7 +57,6 @@ u_int16_t flags; #define OHCI_CALL_DONE 0x0001 #define OHCI_ADD_LEN 0x0002 -#define OHCI_TD_HANDLED 0x0004 /* signal process_done has seen it */ } ohci_soft_td_t; #define OHCI_STD_SIZE ((sizeof (struct ohci_soft_td) + OHCI_TD_ALIGN - 1) / OHCI_TD_ALIGN * OHCI_TD_ALIGN) #define OHCI_STD_CHUNK (PAGE_SIZE / OHCI_STD_SIZE) ==== //depot/projects/netsmp/src/sys/kern/uipc_mqueue.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.1 2005/11/26 12:42:35 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.2 2005/11/27 08:30:12 davidxu Exp $"); #include #include @@ -2354,5 +2354,5 @@ SYSCALL_MODULE_HELPER(mq_notify); SYSCALL_MODULE_HELPER(mq_unlink); -VFS_SET(mqfs_vfsops, mqueue, VFCF_SYNTHETIC); -MODULE_VERSION(mqueue, 1); +VFS_SET(mqfs_vfsops, mqueuefs, VFCF_SYNTHETIC); +MODULE_VERSION(mqueuefs, 1); ==== //depot/projects/netsmp/src/sys/modules/mqueue/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/modules/mqueue/Makefile,v 1.1 2005/11/26 12:46:01 davidxu Exp $ +# $FreeBSD: src/sys/modules/mqueue/Makefile,v 1.2 2005/11/27 08:30:12 davidxu Exp $ .PATH: ${.CURDIR}/../../kern -KMOD= mqueue +KMOD= mqueuefs SRCS= uipc_mqueue.c \ vnode_if.h \ opt_posix.h ==== //depot/projects/netsmp/src/sys/modules/sound/driver/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.17 2005/10/25 04:01:41 yongari Exp $ +# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.18 2005/11/27 03:29:59 ariff Exp $ .if ${MACHINE_ARCH} == "sparc64" SUBDIR = audiocs es137x .else -SUBDIR = als4000 ad1816 cmi cs4281 csa ds1 emu10k1 es137x ess +SUBDIR = als4000 ad1816 atiixp cmi cs4281 csa ds1 emu10k1 es137x ess SUBDIR += fm801 ich maestro maestro3 mss neomagic sb16 sb8 sbc solo SUBDIR += t4dwave via8233 via82c686 vibes SUBDIR += driver uaudio ==== //depot/projects/netsmp/src/sys/netgraph/netflow/netflow.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ static const char rcs_id[] = - "@(#) $FreeBSD: src/sys/netgraph/netflow/netflow.c,v 1.16 2005/10/31 15:41:26 rwatson Exp $"; + "@(#) $FreeBSD: src/sys/netgraph/netflow/netflow.c,v 1.17 2005/11/27 02:43:08 glebius Exp $"; #include #include @@ -621,12 +621,9 @@ getnanotime(&ts); header->unix_secs = htonl(ts.tv_sec); header->unix_nsecs = htonl(ts.tv_nsec); + header->flow_seq = htonl(atomic_fetchadd_32(&priv->flow_seq, + header->count)); header->count = htons(header->count); - header->flow_seq = htonl(atomic_load_acq_32(&priv->flow_seq)); - - /* Flow sequence contains number of first record, so it - is updated after being put in header. */ - atomic_add_32(&priv->flow_seq, header->count); if (priv->export != NULL) /* Should also NET_LOCK_GIANT(). */ From owner-p4-projects@FreeBSD.ORG Mon Nov 28 06:48:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4207C16A422; Mon, 28 Nov 2005 06:48:35 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DE77516A420 for ; Mon, 28 Nov 2005 06:48:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 951C243D72 for ; Mon, 28 Nov 2005 06:48:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAS6mKv8054836 for ; Mon, 28 Nov 2005 06:48:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAS6mKV3054833 for perforce@freebsd.org; Mon, 28 Nov 2005 06:48:20 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Nov 2005 06:48:20 GMT Message-Id: <200511280648.jAS6mKV3054833@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 Cc: Subject: PERFORCE change 87342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 06:48:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=87342 Change 87342 by sam@sam_ebb on 2005/11/28 06:48:04 beacon miss updates: o bring in code to send a probe req on bmiss before clocking the state machine o bring in s/w beacon miss support o remove ic_bmisstimeout it was never kept in sync with the beacon interval; users must now caclulate the value Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#32 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#20 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#66 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#40 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#38 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#32 (text+ko) ==== @@ -186,7 +186,7 @@ if (ic->ic_bintval == 0) ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; - ic->ic_bmisstimeout = 7*ic->ic_bintval; /* default 7 beacons */ + ic->ic_bmissthreshold = 7; /* 7 consecutive beacons */ ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; IEEE80211_LOCK_INIT(ic, "ieee80211com"); IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#20 (text+ko) ==== @@ -126,6 +126,9 @@ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "driver_caps", CTLFLAG_RW, &ic->ic_caps, 0, "driver capabilities"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "bmiss_max", CTLFLAG_RW, &ic->ic_bmiss_max, 0, + "consecutive beacon misses before scanning"); ic->ic_sysctl = ctx; } ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#66 (text+ko) ==== @@ -2098,6 +2098,9 @@ /* record tsf of last beacon */ memcpy(ni->ni_tstamp.data, scan.tstamp, sizeof(ni->ni_tstamp)); + /* count beacon frame for s/w bmiss handling */ + ic->ic_swbmiss_count++; + ic->ic_bmiss_count = 0; if (ni->ni_erp != scan.erp) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, "[%s] erp change: was 0x%x, now 0x%x\n", ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#40 (text+ko) ==== @@ -97,6 +97,8 @@ ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT; ic->ic_fragthreshold = IEEE80211_FRAG_DEFAULT; ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE; + ic->ic_bmiss_max = IEEE80211_BMISS_MAX; + callout_init(&ic->ic_swbmiss, CALLOUT_MPSAFE); callout_init(&ic->ic_mgtsend, CALLOUT_MPSAFE); ic->ic_mcast_rate = IEEE80211_MCAST_RATE_DEFAULT; ic->ic_protmode = IEEE80211_PROT_CTSONLY; @@ -849,14 +851,11 @@ int ieee80211_init(struct ieee80211com *ic, int forcescan) { - struct ifnet *ifp = ic->ic_ifp; IEEE80211_DPRINTF(ic, IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "%s\n", "start running"); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) - ifp->if_init(ifp); /* * Kick the 802.11 state machine as appropriate. */ @@ -940,9 +939,23 @@ * associated; any other conditions else will be handled * through different means (e.g. the tx timeout on mgt frames). */ - if (ic->ic_opmode != IEEE80211_M_STA || - ic->ic_state != IEEE80211_S_RUN) + if (ic->ic_opmode != IEEE80211_M_STA || ic->ic_state != IEEE80211_S_RUN) + return; + + if (++ic->ic_bmiss_count < ic->ic_bmiss_max) { + /* + * Send a directed probe req before falling back to a scan; + * if we receive a response ic_bmiss_count will be reset. + * Some cards mistakenly report beacon miss so this avoids + * the expensive scan if the ap is still there. + */ + ieee80211_send_probereq(ic->ic_bss, ic->ic_myaddr, + ic->ic_bss->ni_bssid, ic->ic_bss->ni_bssid, + ic->ic_bss->ni_essid, ic->ic_bss->ni_esslen, + ic->ic_opt_ie, ic->ic_opt_ie_len); return; + } + ic->ic_bmiss_count = 0; if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) { /* * If we receive a beacon miss interrupt when using @@ -967,7 +980,27 @@ } } +/* + * Software beacon miss handling. Check if any beacons + * were received in the last period. If not post a + * beacon miss; otherwise reset the counter. + */ static void +ieee80211_swbmiss(void *arg) +{ + struct ieee80211com *ic = arg; + + if (ic->ic_swbmiss_count == 0) { + ieee80211_beacon_miss(ic); + if (ic->ic_bmiss_count == 0) /* don't re-arm timer */ + return; + } else + ic->ic_swbmiss_count = 0; + callout_reset(&ic->ic_swbmiss, ic->ic_swbmiss_period, + ieee80211_swbmiss, ic); +} + +static void sta_disassoc(void *arg, struct ieee80211_node *ni) { struct ieee80211com *ic = arg; @@ -1002,6 +1035,8 @@ callout_stop(&ic->ic_mgtsend); /* XXX callout_drain */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(ic); /* background scan */ + if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) + callout_stop(&ic->ic_swbmiss); ni = ic->ic_bss; /* NB: no reference held */ switch (nstate) { case IEEE80211_S_INIT: @@ -1238,6 +1273,20 @@ if_start(ifp); /* XXX not authorized yet */ break; } + if (ostate != IEEE80211_S_RUN && + ic->ic_opmode == IEEE80211_M_STA && + (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS)) { + /* + * Start s/w beacon miss timer for devices w/o + * hardware support. We fudge a bit here since + * we're doing this in software. + */ + ic->ic_swbmiss_period = IEEE80211_TU_TO_TICKS( + 2 * ic->ic_bmissthreshold * ni->ni_intval); + ic->ic_swbmiss_count = 0; + callout_reset(&ic->ic_swbmiss, ic->ic_swbmiss_period, + ieee80211_swbmiss, ic); + } /* * Start/stop the authenticator when operating as an * AP. We delay until here to allow configuration to ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#38 (text+ko) ==== @@ -72,6 +72,9 @@ #define IEEE80211_BINTVAL_MIN 25 /* min beacon interval (TU's) */ #define IEEE80211_BINTVAL_DEFAULT 100 /* default beacon interval (TU's) */ +#define IEEE80211_BMISS_MAX 2 /* maximum consecutive bmiss allowed */ +#define IEEE80211_SWBMISS_THRESHOLD 50 /* s/w bmiss threshold (TU's) */ + #define IEEE80211_BGSCAN_INTVAL_MIN 15 /* min bg scan intvl (secs) */ #define IEEE80211_BGSCAN_INTVAL_DEFAULT (5*60) /* default bg scan intvl */ @@ -89,6 +92,7 @@ #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024) #define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000) +#define IEEE80211_TU_TO_TICKS(x)(((x) * hz) / 1024) struct ieee80211_aclator; struct sysctl_ctx_list; @@ -118,7 +122,6 @@ u_int16_t ic_bintval; /* beacon interval */ u_int16_t ic_lintval; /* listen interval */ u_int16_t ic_holdover; /* PM hold over duration */ - u_int16_t ic_bmisstimeout;/* beacon miss threshold (ms) */ u_int16_t ic_txpowlimit; /* global tx power limit */ /* @@ -192,6 +195,12 @@ int ic_mcast_rate; /* rate for mcast frames */ u_int16_t ic_rtsthreshold; u_int16_t ic_fragthreshold; + u_int8_t ic_bmissthreshold; + u_int8_t ic_bmiss_count; /* current beacon miss count */ + int ic_bmiss_max; /* max bmiss before scan */ + u_int16_t ic_swbmiss_count;/* beacons in last period */ + u_int16_t ic_swbmiss_period;/* s/w bmiss period */ + struct callout ic_swbmiss; /* s/w beacon miss timer */ u_int16_t ic_txmin; /* min tx retry count */ u_int16_t ic_txmax; /* max tx retry count */ @@ -295,6 +304,7 @@ #define IEEE80211_FEXT_WDS 0x00000001 /* CONF: 4 addr allowed */ /* 0x00000006 reserved */ #define IEEE80211_FEXT_BGSCAN 0x00000008 /* STATUS: enable full bgscan completion */ +#define IEEE80211_FEXT_SWBMISS 0x00000400 /* CONFF: do bmiss in s/w */ /* ic_caps */ #define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */ From owner-p4-projects@FreeBSD.ORG Mon Nov 28 06:50:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BEBA16A500; Mon, 28 Nov 2005 06:50:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BBCD216A50C for ; Mon, 28 Nov 2005 06:50:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E854F43D73 for ; Mon, 28 Nov 2005 06:50:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAS6oN2U055018 for ; Mon, 28 Nov 2005 06:50:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAS6oNHj055015 for perforce@freebsd.org; Mon, 28 Nov 2005 06:50:23 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Nov 2005 06:50:23 GMT Message-Id: <200511280650.jAS6oNHj055015@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 Cc: Subject: PERFORCE change 87343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 06:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=87343 Change 87343 by sam@sam_ebb on 2005/11/28 06:50:15 don't use ic_bmisstimeout; calculate the value directly so we use the correct beacon interval Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#117 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#117 (text+ko) ==== @@ -832,10 +832,12 @@ struct ieee80211com *ic = &sc->sc_ic; u_int64_t lastrx = sc->sc_lastrx; u_int64_t tsf = ath_hal_gettsf64(sc->sc_ah); + u_int bmisstimeout = + ic->ic_bmissthreshold * ic->ic_bss->ni_intval * 1024; DPRINTF(sc, ATH_DEBUG_BEACON, "%s: tsf %llu lastrx %lld (%llu) bmiss %u\n", - __func__, tsf, tsf - lastrx, lastrx, ic->ic_bmisstimeout*1024); + __func__, tsf, tsf - lastrx, lastrx, bmisstimeout); /* * Workaround phantom bmiss interrupts by sanity-checking @@ -844,7 +846,7 @@ * truly a bmiss we'll get another interrupt soon and that'll * be dispatched up for processing. */ - if (tsf - lastrx > ic->ic_bmisstimeout*1024) + if (tsf - lastrx > bmisstimeout) ieee80211_beacon_miss(&sc->sc_ic); else sc->sc_stats.ast_bmiss_phantom++; @@ -2643,12 +2645,10 @@ #endif /* * Calculate the number of consecutive beacons to miss - * before taking a BMISS interrupt. The configuration - * is specified in ms, so we need to convert that to - * TU's and then calculate based on the beacon interval. + * before taking a BMISS interrupt. * Note that we clamp the result to at most 10 beacons. */ - bs.bs_bmissthreshold = howmany(ic->ic_bmisstimeout, intval); + bs.bs_bmissthreshold = ic->ic_bmissthreshold; if (bs.bs_bmissthreshold > 10) bs.bs_bmissthreshold = 10; else if (bs.bs_bmissthreshold <= 0) From owner-p4-projects@FreeBSD.ORG Mon Nov 28 06:51:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41E5416A424; Mon, 28 Nov 2005 06:51:26 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0138016A41F for ; Mon, 28 Nov 2005 06:51:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACE2D43D58 for ; Mon, 28 Nov 2005 06:51:25 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAS6pPd1055113 for ; Mon, 28 Nov 2005 06:51:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAS6pP57055110 for perforce@freebsd.org; Mon, 28 Nov 2005 06:51:25 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Nov 2005 06:51:25 GMT Message-Id: <200511280651.jAS6pP57055110@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 Cc: Subject: PERFORCE change 87344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 06:51:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=87344 Change 87344 by sam@sam_ebb on 2005/11/28 06:50:36 request s/w beacon miss handling since the h/w doesn't do it Affected files ... .. //depot/projects/wifi/sys/dev/ral/if_ral.c#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/if_ral.c#16 (text+ko) ==== @@ -483,6 +483,8 @@ ic->ic_scan_start = ral_scan_start; ic->ic_scan_end = ral_scan_end; ic->ic_set_channel = ral_set_channel; + /* enable s/w bmiss handling in sta mode */ + ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS; /* override state transition machine */ sc->sc_newstate = ic->ic_newstate; From owner-p4-projects@FreeBSD.ORG Mon Nov 28 06:59:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0C7F16A422; Mon, 28 Nov 2005 06:59:37 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 818BD16A41F for ; Mon, 28 Nov 2005 06:59:37 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 198A843D68 for ; Mon, 28 Nov 2005 06:59:36 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAS6xZBS055459 for ; Mon, 28 Nov 2005 06:59:35 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAS6xZ9A055456 for perforce@freebsd.org; Mon, 28 Nov 2005 06:59:35 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 28 Nov 2005 06:59:35 GMT Message-Id: <200511280659.jAS6xZ9A055456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 87345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 06:59:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=87345 Change 87345 by soc-andrew@soc-andrew_serv on 2005/11/28 06:58:43 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#3 edit .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.522 2005/11/22 20:47:43 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -705,12 +705,6 @@ false .endif @echo "--------------------------------------------------------------" - @echo ">>> Making hierarchy" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; \ - ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy - @echo - @echo "--------------------------------------------------------------" @echo ">>> Installing kernel" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#3 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR=aura dfui installer lua +SUBDIR=aura dfui lua .include ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -97,6 +97,49 @@ ; None of the above (else (empty-sosofo))))) +(mode qandatoc + (default + (let* ((arch (attribute-string (normalize "arch"))) + (role (attribute-string (normalize "role"))) + (for-arch (entity-text "arch"))) + (cond + + ; If role=historic, and we're not printing historic things, then + ; don't output this element. + ((and (equal? role "historic") + (not %include-historic%)) + (empty-sosofo)) + + + ; If arch= not specified, then print unconditionally. This clause + ; handles the majority of cases. + ((or (equal? arch #f) (equal? arch "")) + (next-match)) + + ; arch= specified, see if it's equal to "all". If so, then + ; print unconditionally. Note that this clause could be + ; combined with the check to see if arch= wasn't specified + ; or was empty; they have the same outcome. + ((equal? arch "all") + (next-match)) + + ; arch= specified. If we're building for all architectures, + ; then print it prepended with the set of architectures to which + ; this element applies. + ; + ; XXX This doesn't work. +; ((equal? for-arch "all") +; (sosofo-append (literal "[") (literal arch) (literal "] ") +; (process-children))) + + ; arch= specified, so we need to check to see if the specified + ; parameter includes the architecture we're building for. + ((string-list-match? for-arch (split-string-to-list arch)) + (next-match)) + + ; None of the above + (else (empty-sosofo)))))) + ; We might have some sect1 level elements where the modification times ; are significant. An example of this is the "What's New" section in ; the release notes. We enable the printing of pubdate entry in ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile#2 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR=backend install_ncurses +SUBDIR=install_ncurses .include From owner-p4-projects@FreeBSD.ORG Mon Nov 28 21:22:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C12DF16A422; Mon, 28 Nov 2005 21:22:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 68EEB16A420 for ; Mon, 28 Nov 2005 21:22:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7246043D4C for ; Mon, 28 Nov 2005 21:22:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASLM7XA022426 for ; Mon, 28 Nov 2005 21:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASLM7uK022423 for perforce@freebsd.org; Mon, 28 Nov 2005 21:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Nov 2005 21:22:07 GMT Message-Id: <200511282122.jASLM7uK022423@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 Cc: Subject: PERFORCE change 87382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 21:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=87382 Change 87382 by rwatson@rwatson_peppercorn on 2005/11/28 21:21:48 In getauditflagsbin(), return EINVAL if the arguments are invalid or a class in the mask string isn't recognized. In getauditflagschar(), return EINVAL if the arguments are invalid. Annotate that we should also reject the character string if it contains an unrecognized class. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#6 (text+ko) ==== @@ -28,6 +28,7 @@ #include +#include #include #include @@ -45,8 +46,10 @@ struct au_class_ent *c; char *last; - if ((auditstr == NULL) || (masks == NULL)) + if ((auditstr == NULL) || (masks == NULL)) { + errno = EINVAL; return (-1); + } masks->am_success = 0; masks->am_failure = 0; @@ -76,8 +79,10 @@ else ADD_TO_MASK(masks, c->ac_class, sel); free_au_class_ent(c); - } else + } else { + errno = EINVAL; return (-1); + } /* Get the next class. */ tok = strtok_r(NULL, delim, &last); @@ -89,6 +94,9 @@ * Convert the au_mask_t fields into a string value. If verbose is non-zero * the long flag names are used else the short (2-character)flag names are * used. + * + * XXXRW: If bits are specified that are not matched by any class, they are + * omitted rather than rejected with EINVAL. */ int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) @@ -97,8 +105,10 @@ char *strptr = auditstr; u_char sel; - if ((auditstr == NULL) || (masks == NULL)) + if ((auditstr == NULL) || (masks == NULL)) { + return (EINVAL); return (-1); + } /* * Enumerate the class entries, check if each is selected in either From owner-p4-projects@FreeBSD.ORG Mon Nov 28 22:07:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E94716A423; Mon, 28 Nov 2005 22:07:03 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 199E916A420 for ; Mon, 28 Nov 2005 22:07:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D292943D5A for ; Mon, 28 Nov 2005 22:07:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASM72xt024492 for ; Mon, 28 Nov 2005 22:07:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASM72W7024489 for perforce@freebsd.org; Mon, 28 Nov 2005 22:07:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Nov 2005 22:07:02 GMT Message-Id: <200511282207.jASM72W7024489@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 Cc: Subject: PERFORCE change 87385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 22:07:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=87385 Change 87385 by rwatson@rwatson_peppercorn on 2005/11/28 22:07:01 Make the class file parser a little more flexible and correct: when a comment is encountered in getauclassent(), don't abort parsing, just skip to the next line. Implement getauclassnam() using getauclassent() to fix the same bug there. This parser could be further improved. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#5 (text+ko) ==== @@ -146,10 +146,18 @@ return (NULL); } - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { - pthread_mutex_unlock(&mutex); - return (NULL); + /* + * Read until next non-comment line is found, or EOF. + */ + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { + pthread_mutex_unlock(&mutex); + return (NULL); + } + if (linestr[0] != '#') + break; } + /* Remove trailing new line character. */ if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; @@ -180,7 +188,6 @@ getauclassnam(const char *name) { struct au_class_ent *c; - char *nl; if (name == NULL) return (NULL); @@ -201,24 +208,16 @@ return (NULL); } - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove trailing new line character */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; - - /* parse tokptr to au_class_ent components */ - if (classfromstr(linestr, delim, c) != NULL) { - if (!strcmp(name, c->ac_name)) { - pthread_mutex_unlock(&mutex); - return (c); - } + while ((c = getauclassent()) != NULL) { + if (strcmp(name, c->ac_name) == 0) { + pthread_mutex_unlock(&mutex); + return (c); } + free_au_class_ent(c); } - free_au_class_ent(c); pthread_mutex_unlock(&mutex); return (NULL); - } /* From owner-p4-projects@FreeBSD.ORG Mon Nov 28 22:12:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC55B16A422; Mon, 28 Nov 2005 22:12:10 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 87B8316A41F for ; Mon, 28 Nov 2005 22:12:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5568A43D67 for ; Mon, 28 Nov 2005 22:12:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASMCA6E024735 for ; Mon, 28 Nov 2005 22:12:10 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASMCAo6024732 for perforce@freebsd.org; Mon, 28 Nov 2005 22:12:10 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 28 Nov 2005 22:12:10 GMT Message-Id: <200511282212.jASMCAo6024732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 87386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 22:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=87386 Change 87386 by soc-andrew@soc-andrew_serv on 2005/11/28 22:11:51 Add a missing `,'. Note change 87345 also unhocked the C backend and libinstaller Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#6 (text+ko) ==== @@ -415,7 +415,7 @@ cmds:add{ cmdline = "${root}${TAR} -f " .. "${root}usr/${uname}/${dir}/${src}.${dist_suffix}" .. - "-x -C ${root}${base}${dest}" + "-x -C ${root}${base}${dest}", replacements = { base = base, src = src, From owner-p4-projects@FreeBSD.ORG Mon Nov 28 22:14:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2319A16A422; Mon, 28 Nov 2005 22:14:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DB48016A41F for ; Mon, 28 Nov 2005 22:14:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE2B043D66 for ; Mon, 28 Nov 2005 22:14:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASMEDdq024905 for ; Mon, 28 Nov 2005 22:14:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASMED82024902 for perforce@freebsd.org; Mon, 28 Nov 2005 22:14:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Nov 2005 22:14:13 GMT Message-Id: <200511282214.jASMED82024902@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 Cc: Subject: PERFORCE change 87387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 22:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=87387 Change 87387 by rwatson@rwatson_peppercorn on 2005/11/28 22:13:12 Merge class lookup fixes from OpenBSM to audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#3 (text+ko) ==== @@ -146,10 +146,18 @@ return (NULL); } - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { - pthread_mutex_unlock(&mutex); - return (NULL); + /* + * Read until next non-comment line is found, or EOF. + */ + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { + pthread_mutex_unlock(&mutex); + return (NULL); + } + if (linestr[0] != '#') + break; } + /* Remove trailing new line character. */ if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; @@ -180,7 +188,6 @@ getauclassnam(const char *name) { struct au_class_ent *c; - char *nl; if (name == NULL) return (NULL); @@ -201,24 +208,16 @@ return (NULL); } - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove trailing new line character */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; - - /* parse tokptr to au_class_ent components */ - if (classfromstr(linestr, delim, c) != NULL) { - if (!strcmp(name, c->ac_name)) { - pthread_mutex_unlock(&mutex); - return (c); - } + while ((c = getauclassent()) != NULL) { + if (strcmp(name, c->ac_name) == 0) { + pthread_mutex_unlock(&mutex); + return (c); } + free_au_class_ent(c); } - free_au_class_ent(c); pthread_mutex_unlock(&mutex); return (NULL); - } /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#3 (text+ko) ==== @@ -28,6 +28,7 @@ #include +#include #include #include @@ -45,8 +46,10 @@ struct au_class_ent *c; char *last; - if ((auditstr == NULL) || (masks == NULL)) + if ((auditstr == NULL) || (masks == NULL)) { + errno = EINVAL; return (-1); + } masks->am_success = 0; masks->am_failure = 0; @@ -76,8 +79,10 @@ else ADD_TO_MASK(masks, c->ac_class, sel); free_au_class_ent(c); - } else + } else { + errno = EINVAL; return (-1); + } /* Get the next class. */ tok = strtok_r(NULL, delim, &last); @@ -89,6 +94,9 @@ * Convert the au_mask_t fields into a string value. If verbose is non-zero * the long flag names are used else the short (2-character)flag names are * used. + * + * XXXRW: If bits are specified that are not matched by any class, they are + * omitted rather than rejected with EINVAL. */ int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) @@ -97,8 +105,10 @@ char *strptr = auditstr; u_char sel; - if ((auditstr == NULL) || (masks == NULL)) + if ((auditstr == NULL) || (masks == NULL)) { + return (EINVAL); return (-1); + } /* * Enumerate the class entries, check if each is selected in either ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#5 (text+ko) ==== @@ -1108,8 +1108,8 @@ } token_t * -au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, - pid_t pid, au_asid_t sid, au_tid_addr_t *tid) +au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { return (au_to_subject32_ex(auid, euid, egid, ruid, rgid, pid, sid, From owner-p4-projects@FreeBSD.ORG Mon Nov 28 23:01:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4600116A422; Mon, 28 Nov 2005 23:01:11 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F3FAD16A41F for ; Mon, 28 Nov 2005 23:01:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF5F543D49 for ; Mon, 28 Nov 2005 23:01:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASN1AhF027154 for ; Mon, 28 Nov 2005 23:01:10 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASN1AoO027151 for perforce@freebsd.org; Mon, 28 Nov 2005 23:01:10 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 28 Nov 2005 23:01:10 GMT Message-Id: <200511282301.jASN1AoO027151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 87389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 23:01:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=87389 Change 87389 by soc-andrew@soc-andrew_serv on 2005/11/28 23:00:58 Fix the extraction of distfiles Reword the question about installing ports Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#7 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/431_ports.lua#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#7 (text+ko) ==== @@ -415,7 +415,7 @@ cmds:add{ cmdline = "${root}${TAR} -f " .. "${root}usr/${uname}/${dir}/${src}.${dist_suffix}" .. - "-x -C ${root}${base}${dest}", + " -x -C ${root}${base}${dest}", replacements = { base = base, src = src, ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/431_ports.lua#2 (text+ko) ==== @@ -39,7 +39,7 @@ local response = App.ui:present({ id = "install_ports", name = _("Install Ports tree"), - short_desc = _("Do you want the Ports tree installed?"), + short_desc = _("Do you want yo install the Ports tree?"), actions = { { id = "yes", From owner-p4-projects@FreeBSD.ORG Mon Nov 28 23:22:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8368F16A427; Mon, 28 Nov 2005 23:22:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4136C16A425 for ; Mon, 28 Nov 2005 23:22:53 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E74643D66 for ; Mon, 28 Nov 2005 23:22:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASNMduv028656 for ; Mon, 28 Nov 2005 23:22:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASNMb4b028653 for perforce@freebsd.org; Mon, 28 Nov 2005 23:22:37 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Nov 2005 23:22:37 GMT Message-Id: <200511282322.jASNMb4b028653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 23:22:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=87392 Change 87392 by peter@peter_daintree on 2005/11/28 23:22:13 IFC @87383 Affected files ... .. //depot/projects/hammer/Makefile#36 integrate .. //depot/projects/hammer/Makefile.inc1#108 integrate .. //depot/projects/hammer/bin/date/date.1#14 integrate .. //depot/projects/hammer/bin/kenv/kenv.1#5 integrate .. //depot/projects/hammer/bin/ls/ls.1#24 integrate .. //depot/projects/hammer/bin/ls/ls.c#16 integrate .. //depot/projects/hammer/bin/ls/util.c#10 integrate .. //depot/projects/hammer/bin/rm/rm.1#13 integrate .. //depot/projects/hammer/bin/sh/sh.1#22 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mntopts.h#2 delete .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#6 integrate .. //depot/projects/hammer/etc/Makefile#44 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#63 integrate .. //depot/projects/hammer/etc/network.subr#14 integrate .. //depot/projects/hammer/etc/periodic/daily/470.status-named#5 integrate .. //depot/projects/hammer/etc/rc.d/hcsecd#2 integrate .. //depot/projects/hammer/etc/rc.d/netif#14 integrate .. //depot/projects/hammer/etc/rc.d/sdpd#2 integrate .. //depot/projects/hammer/etc/rc.firewall#4 integrate .. //depot/projects/hammer/etc/rc.subr#29 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#53 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#24 integrate .. //depot/projects/hammer/gnu/usr.bin/man/apropos/apropos.man#5 integrate .. //depot/projects/hammer/include/Makefile#50 integrate .. //depot/projects/hammer/include/kenv.h#2 integrate .. //depot/projects/hammer/include/mqueue.h#1 branch .. //depot/projects/hammer/include/string.h#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#10 integrate .. //depot/projects/hammer/lib/libarchive/configure.ac.in#9 integrate .. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#9 integrate .. //depot/projects/hammer/lib/libc/gen/ftw.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getcap.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/hammer/lib/libc/gmon/moncontrol.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/isalnum.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isalpha.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isblank.3#8 integrate .. //depot/projects/hammer/lib/libc/locale/iscntrl.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isdigit.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isgraph.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/islower.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isprint.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/ispunct.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isspace.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isupper.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/isxdigit.3#8 integrate .. //depot/projects/hammer/lib/libc/locale/tolower.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/toupper.3#5 integrate .. //depot/projects/hammer/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/hammer/lib/libc/net/inet6_opt_init.3#6 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#19 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl_get_entry.3#5 integrate .. //depot/projects/hammer/lib/libc/posix1e/posix1e.3#5 integrate .. //depot/projects/hammer/lib/libc/rpc/publickey.3#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_clnt_create.3#6 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_svc_calls.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/getwc.3#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/hammer/lib/libc/string/memmem.3#2 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#18 integrate .. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/kse.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mq.c#1 branch .. //depot/projects/hammer/lib/libc/sys/nfssvc.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/sigwait.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#10 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid.3#5 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr.3#3 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#10 integrate .. //depot/projects/hammer/lib/libedit/editline.3#9 integrate .. //depot/projects/hammer/lib/libedit/editrc.5#5 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#5 integrate .. //depot/projects/hammer/lib/libmd/sha256.3#4 integrate .. //depot/projects/hammer/lib/libmemstat/libmemstat.3#6 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#7 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.3#4 integrate .. //depot/projects/hammer/lib/libpthread/test/guard_b.c#2 integrate .. //depot/projects/hammer/lib/libpthread/test/mutex_d.c#3 integrate .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#3 integrate .. //depot/projects/hammer/lib/libstand/libstand.3#9 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.3#7 integrate .. //depot/projects/hammer/lib/libutil/login_cap.3#7 integrate .. //depot/projects/hammer/lib/libutil/pidfile.3#3 integrate .. //depot/projects/hammer/lib/libutil/property.c#5 integrate .. //depot/projects/hammer/lib/msun/bsdsrc/mathimpl.h#5 integrate .. //depot/projects/hammer/lib/msun/man/fma.3#3 integrate .. //depot/projects/hammer/lib/msun/man/ieee_test.3#4 integrate .. //depot/projects/hammer/lib/msun/man/ilogb.3#3 integrate .. //depot/projects/hammer/lib/msun/man/math.3#14 integrate .. //depot/projects/hammer/lib/msun/man/remainder.3#4 integrate .. //depot/projects/hammer/lib/msun/man/scalbn.3#3 integrate .. //depot/projects/hammer/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#6 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#6 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#7 integrate .. //depot/projects/hammer/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#82 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#34 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.dsl#5 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#11 integrate .. //depot/projects/hammer/sbin/devd/devd.8#12 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#18 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.8#5 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#12 integrate .. //depot/projects/hammer/sbin/gvinum/Makefile#4 integrate .. //depot/projects/hammer/sbin/gvinum/gvinum.8#1 branch .. //depot/projects/hammer/sbin/gvinum/gvinum.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#31 integrate .. //depot/projects/hammer/sbin/init/init.8#15 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#48 integrate .. //depot/projects/hammer/sbin/kldload/kldload.8#6 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.8#5 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#6 integrate .. //depot/projects/hammer/sbin/mount/Makefile#7 integrate .. //depot/projects/hammer/sbin/mount/extern.h#4 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.3#4 integrate .. //depot/projects/hammer/sbin/mount/mount.c#20 integrate .. //depot/projects/hammer/sbin/mount/mount_ufs.c#7 delete .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.8#11 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#12 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#11 integrate .. //depot/projects/hammer/sbin/mount_nullfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.c#7 integrate .. //depot/projects/hammer/sbin/mount_std/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_ufs/Makefile#3 delete .. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#5 delete .. //depot/projects/hammer/sbin/ping/ping.8#9 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#5 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#16 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#12 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile#11 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#43 integrate .. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#5 integrate .. //depot/projects/hammer/share/man/man4/Makefile#79 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#4 integrate .. //depot/projects/hammer/share/man/man4/ath.4#29 integrate .. //depot/projects/hammer/share/man/man4/bge.4#18 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#11 integrate .. //depot/projects/hammer/share/man/man4/cardbus.4#4 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#6 integrate .. //depot/projects/hammer/share/man/man4/de.4#11 integrate .. //depot/projects/hammer/share/man/man4/ed.4#13 integrate .. //depot/projects/hammer/share/man/man4/em.4#13 integrate .. //depot/projects/hammer/share/man/man4/fwip.4#6 integrate .. //depot/projects/hammer/share/man/man4/geom.4#9 integrate .. //depot/projects/hammer/share/man/man4/hptmv.4#5 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#10 integrate .. //depot/projects/hammer/share/man/man4/icmp.4#8 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/hammer/share/man/man4/ip.4#18 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#6 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#7 integrate .. //depot/projects/hammer/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/hammer/share/man/man4/lmc.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_sony.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#15 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#17 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#13 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/linux.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/perfmon.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ray.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vx.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_iface.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#10 integrate .. //depot/projects/hammer/share/man/man4/nve.4#6 integrate .. //depot/projects/hammer/share/man/man4/pccard.4#5 integrate .. //depot/projects/hammer/share/man/man4/pccbb.4#8 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#15 integrate .. //depot/projects/hammer/share/man/man4/ral.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_ad1816.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_als4000.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_atiixp.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_cmi.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_cs4281.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_ds1.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_es137x.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_ess.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_fm801.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_mss.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_neomagic.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_solo.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_t4dwave.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_via8233.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_via82c686.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_vibes.4#2 integrate .. //depot/projects/hammer/share/man/man4/txp.4#10 integrate .. //depot/projects/hammer/share/man/man4/ural.4#6 integrate .. //depot/projects/hammer/share/man/man4/wi.4#25 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#8 integrate .. //depot/projects/hammer/share/man/man4/xe.4#10 integrate .. //depot/projects/hammer/share/man/man5/disktab.5#7 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#41 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#65 integrate .. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/hammer/share/man/man7/build.7#12 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#12 integrate .. //depot/projects/hammer/share/man/man9/VFS_LOCK_GIANT.9#2 integrate .. //depot/projects/hammer/share/man/man9/alloc_unr.9#3 integrate .. //depot/projects/hammer/share/man/man9/atomic.9#4 integrate .. //depot/projects/hammer/share/man/man9/bios.9#5 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#20 integrate .. //depot/projects/hammer/share/man/man9/device_add_child.9#8 integrate .. //depot/projects/hammer/share/man/man9/device_get_softc.9#7 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#24 integrate .. //depot/projects/hammer/share/man/man9/namei.9#7 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#12 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#25 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#15 integrate .. //depot/projects/hammer/share/monetdef/he_IL.UTF-8.src#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#48 integrate .. //depot/projects/hammer/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/alpha/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#147 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#110 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#130 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#81 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#84 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#89 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#28 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#3 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#4 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#28 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf.5#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#29 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#38 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#39 integrate .. //depot/projects/hammer/sys/conf/Makefile.alpha#12 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#21 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#14 integrate .. //depot/projects/hammer/sys/conf/Makefile.i386#10 integrate .. //depot/projects/hammer/sys/conf/Makefile.ia64#12 integrate .. //depot/projects/hammer/sys/conf/Makefile.pc98#10 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#16 integrate .. //depot/projects/hammer/sys/conf/Makefile.sparc64#11 integrate .. //depot/projects/hammer/sys/conf/files#131 integrate .. //depot/projects/hammer/sys/conf/files.alpha#23 integrate .. //depot/projects/hammer/sys/conf/files.amd64#80 integrate .. //depot/projects/hammer/sys/conf/files.i386#67 integrate .. //depot/projects/hammer/sys/conf/files.ia64#33 integrate .. //depot/projects/hammer/sys/conf/files.pc98#50 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#15 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#33 integrate .. //depot/projects/hammer/sys/conf/ldscript.arm#3 integrate .. //depot/projects/hammer/sys/conf/options#88 integrate .. //depot/projects/hammer/sys/conf/options.i386#42 integrate .. //depot/projects/hammer/sys/conf/options.pc98#38 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#31 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#26 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#55 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#34 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#32 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#39 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#20 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#56 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#27 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#53 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#27 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#15 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#16 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#17 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#31 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#30 integrate .. //depot/projects/hammer/sys/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#13 integrate .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#8 integrate .. //depot/projects/hammer/sys/dev/owi/if_ieee80211.h#2 delete .. //depot/projects/hammer/sys/dev/owi/if_owi.c#13 delete .. //depot/projects/hammer/sys/dev/owi/if_owi_pccard.c#8 delete .. //depot/projects/hammer/sys/dev/owi/if_wireg.h#3 delete .. //depot/projects/hammer/sys/dev/owi/if_wivar.h#5 delete .. //depot/projects/hammer/sys/dev/puc/puc.c#19 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#11 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#37 integrate .. //depot/projects/hammer/sys/dev/sound/driver.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/ohcivar.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#33 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#37 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#10 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#21 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#34 integrate .. //depot/projects/hammer/sys/geom/geom_disk.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#34 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#14 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#15 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#8 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#42 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#81 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#2 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#15 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#66 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#51 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#77 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#44 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#12 integrate .. //depot/projects/hammer/sys/i386/include/smptests.h#7 delete .. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/ia64/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#14 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#51 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#19 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#49 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#49 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/hammer/sys/kern/uipc_socket.c#61 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#39 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#61 integrate .. //depot/projects/hammer/sys/modules/Makefile#92 integrate .. //depot/projects/hammer/sys/modules/geom/geom_vinum/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/i2c/controllers/pcf/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/hammer/sys/modules/oldcard/Makefile#4 delete .. //depot/projects/hammer/sys/modules/owi/Makefile#4 delete .. //depot/projects/hammer/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_clone.c#9 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#51 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#34 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#19 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#12 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#25 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#40 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#25 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#26 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#55 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#30 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#1 branch .. //depot/projects/hammer/sys/netinet/ip_options.h#1 branch .. //depot/projects/hammer/sys/netinet/ip_output.c#54 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#25 integrate .. //depot/projects/hammer/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#57 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#33 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#31 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#36 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#16 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#11 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#37 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#24 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#44 integrate .. //depot/projects/hammer/sys/nfsclient/nfsm_subs.h#6 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#37 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#54 integrate .. //depot/projects/hammer/sys/pc98/include/smptests.h#2 delete .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/hammer/sys/pci/if_de.c#30 integrate .. //depot/projects/hammer/sys/pci/if_devar.h#11 integrate .. //depot/projects/hammer/sys/posix4/mqueue.h#3 delete .. //depot/projects/hammer/sys/powerpc/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#24 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#7 integrate .. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#43 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#18 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#17 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#8 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#7 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhcvar.h#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#24 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#10 integrate .. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#38 integrate .. //depot/projects/hammer/sys/sys/_types.h#14 integrate .. //depot/projects/hammer/sys/sys/bio.h#18 integrate .. //depot/projects/hammer/sys/sys/event.h#13 integrate .. //depot/projects/hammer/sys/sys/file.h#14 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#47 integrate .. //depot/projects/hammer/sys/sys/mqueue.h#1 branch .. //depot/projects/hammer/sys/sys/queue.h#8 integrate .. //depot/projects/hammer/sys/sys/resource.h#11 integrate .. //depot/projects/hammer/sys/sys/syscall.h#48 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#48 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#48 integrate .. //depot/projects/hammer/sys/sys/time.h#10 integrate .. //depot/projects/hammer/sys/sys/types.h#22 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#55 integrate .. //depot/projects/hammer/sys/vm/pmap.h#23 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#51 integrate .. //depot/projects/hammer/tools/regression/mqueue/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest1/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest1/mqtest1.c#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest2/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest2/mqtest2.c#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest3/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest3/mqtest3.c#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest4/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest4/mqtest4.c#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest5/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mqueue/mqtest5/mqtest5.c#1 branch .. //depot/projects/hammer/tools/sched/schedgraph.py#4 integrate .. //depot/projects/hammer/tools/tools/nanobsd/FlashDevice.sub#2 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#7 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#6 integrate .. //depot/projects/hammer/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/hammer/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/hammer/usr.bin/cmp/cmp.1#4 integrate .. //depot/projects/hammer/usr.bin/compress/compress.1#6 integrate .. //depot/projects/hammer/usr.bin/indent/lexi.c#5 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#10 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#10 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#12 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#13 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.1#8 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.c#9 integrate .. //depot/projects/hammer/usr.bin/split/split.1#6 integrate .. //depot/projects/hammer/usr.bin/tar/configure.ac.in#7 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.4#8 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#3 integrate .. //depot/projects/hammer/usr.sbin/config/config.h#9 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#11 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#10 integrate .. //depot/projects/hammer/usr.sbin/config/mkheaders.c#7 integrate .. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#10 integrate .. //depot/projects/hammer/usr.sbin/devinfo/devinfo.8#3 integrate .. //depot/projects/hammer/usr.sbin/lmcconfig/lmcconfig.8#2 integrate .. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#15 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.8#10 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#12 integrate .. //depot/projects/hammer/usr.sbin/portsnap/make_index/make_index.c#3 integrate .. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.8#7 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#14 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/kern.c#8 integrate .. //depot/projects/hammer/usr.sbin/rtadvd/config.c#9 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#13 integrate Differences ... ==== //depot/projects/hammer/Makefile#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.323 2005/07/29 21:51:33 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ # # The user-driven targets are: # @@ -269,7 +269,8 @@ .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 + find [A-Z]*[A-Z] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${mach} .ORDER: universe_prologue universe_${mach} universe_epilogue ==== //depot/projects/hammer/Makefile.inc1#108 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -237,7 +237,7 @@ LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} +LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif # install stage @@ -252,6 +252,7 @@ # kernel stage KMAKEENV= ${WMAKEENV} +KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} # # buildworld @@ -488,16 +489,18 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} # -# Use this to add checks to installworld/installkernel targets. +# installcheck +# +# Checks to be sure system is ready for installworld/installkernel. # -SPECIAL_INSTALLCHECKS= +installcheck: # # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} .if !make(distributeworld) -SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck: installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ @@ -507,9 +510,7 @@ .endif # -# installcheck -# -# Checks to be sure system is ready for installworld +# Check for missing UIDs/GIDs. # CHECK_UIDS= CHECK_GIDS= @@ -521,7 +522,8 @@ CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck: ${SPECIAL_INSTALLCHECKS} +installcheck: installcheck_UGID +installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -562,7 +564,7 @@ # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: ${SPECIAL_INSTALLCHECKS} +reinstall: @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -664,15 +666,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR} + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @@ -693,15 +693,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 3.1: making dependencies" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3.2: building everything" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -713,18 +711,12 @@ # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} +reinstallkernel reinstallkernel.debug: installcheck .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false .endif @echo "--------------------------------------------------------------" - @echo ">>> Making hierarchy" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; \ - ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy - @echo - @echo "--------------------------------------------------------------" @echo ">>> Installing kernel" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ==== //depot/projects/hammer/bin/date/date.1#14 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.73 2005/11/01 19:31:25 trhodes Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.74 2005/11/17 12:15:22 ru Exp $ .\" .Dd November 1, 2005 .Dt DATE 1 @@ -421,12 +421,7 @@ utility is expected to be compatible with .St -p1003.2 . The -.Fl d , -.Fl f , -.Fl j , -.Fl n , -.Fl r , -.Fl t , +.Fl d , f , j , n , r , t , and .Fl v options are all extensions to the standard. ==== //depot/projects/hammer/bin/kenv/kenv.1#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.12 2005/09/13 19:01:53 rwatson Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ .\" -.Dd July 8, 2000 +.Dd September 13, 2005 .Dt KENV 1 .Os .Sh NAME ==== //depot/projects/hammer/bin/ls/ls.1#24 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.95 2005/11/17 12:15:23 ru Exp $ .\" -.Dd November 10, 2005 +.Dd November 16, 2005 .Dt LS 1 .Os .Sh NAME @@ -72,9 +72,9 @@ .Pa \&. and .Pa .. . -Always set for the super-user. +Automatically set for the super-user unless .Fl I -cancel this option. +is specified. .It Fl B Force printing of non-printable characters (as defined by .Xr ctype 3 @@ -120,11 +120,9 @@ .Fl l options are specified. .It Fl I -This option cancels the +Prevent .Fl A -option. Usually used by super-user when -.Fl A -is not necessary. +from being automatically set for the super-user. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. @@ -652,9 +650,7 @@ .Xr sticky 8 .Sh STANDARDS With the exception of options -.Fl I , -.Fl g , -.Fl n +.Fl I , g , n and .Fl o , the ==== //depot/projects/hammer/bin/ls/ls.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.81 2005/11/10 00:02:32 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.82 2005/11/16 07:13:37 ru Exp $"); #include #include @@ -110,8 +110,7 @@ static int f_kblocks; /* print size in kilobytes */ static int f_listdir; /* list actual directory, not contents */ static int f_listdot; /* list files beginning with . */ -static int f_nolistdot; /* don't list files beginning with . */ -static int f_forcelistdot; /* force list files beginning with . */ +static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ @@ -241,13 +240,12 @@ break; case 'a': fts_options |= FTS_SEEDOT; - f_forcelistdot = 1; - break; + /* FALLTHROUGH */ case 'A': f_listdot = 1; break; case 'I': - f_nolistdot = 1; + f_noautodot = 1; break; /* The -d option turns off the -R option. */ case 'd': @@ -328,8 +326,8 @@ argc -= optind; argv += optind; - /* Root is -A automatically. */ - if (!getuid() && !f_nolistdot) + /* Root is -A automatically unless -I. */ + if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot) f_listdot = 1; /* Enabling of colours is conditional on the environment. */ @@ -496,8 +494,7 @@ break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && - p->fts_name[0] == '.' && ((!f_listdot || - f_nolistdot) && !f_forcelistdot)) + p->fts_name[0] == '.' && !f_listdot) break; /* @@ -657,8 +654,7 @@ } } else { /* Only display dot file if -a/-A set. */ - if (cur->fts_name[0] == '.' && ((!f_listdot || - f_nolistdot) && !f_forcelistdot)) { + if (cur->fts_name[0] == '.' && !f_listdot) { cur->fts_number = NO_PRINT; continue; } ==== //depot/projects/hammer/bin/ls/util.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.38 2005/06/03 11:05:58 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.39 2005/11/16 07:13:37 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1]" #else - "usage: ls [-ABCFHLPRSTWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTWZabcdfghiklmnopqrstuwx1]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/hammer/bin/rm/rm.1#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.38 2005/09/30 02:12:15 dougb Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $ .\" .Dd September 29, 2005 .Dt RM 1 @@ -91,7 +91,7 @@ Specifying this flag for a read only file will cause .Nm to generate an error message and exit. -The file wil not be removed or overwritten. +The file will not be removed or overwritten. .It Fl R Attempt to remove the file hierarchy rooted in each file argument. The ==== //depot/projects/hammer/bin/sh/sh.1#22 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.113 2005/11/03 00:15:19 jcamou Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.114 2005/11/17 12:15:23 ru Exp $ .\" .Dd October 29, 2005 .Dt SH 1 @@ -209,7 +209,11 @@ Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be explicitly tested if the command is part of the list used to control -an if, elif, while, or until; if the command is the left +an +.Ic if , elif , while , +or +.Ic until ; +if the command is the left hand operand of an .Dq Li && or @@ -431,7 +435,7 @@ .Pp An alias name may be escaped in a command line, so that it is not replaced by its alias value, by using quoting characters within or -adjacent to the alias name. +adjacent to the alias name. This is most often done by prefixing an alias name with a backslash to execute a function, built-in, or normal program with the same name. @@ -893,7 +897,7 @@ .Bd -ragged -offset indent .Ic local .Op Ar variable ... -.Op Ar - +.Op Fl .Ed .Pp The @@ -1478,7 +1482,7 @@ .Pp If the .Fl v -option is specified, +option is specified, .Ar utility is not executed but a description of its interpretation by the shell is printed. @@ -1497,20 +1501,14 @@ where .Ar description is either -.Bl -item -offset indent -.It the path name to .Ar utility , -.It -.Ic a shell builtin , -.It -.Ic a shell function , -.It -.Ic a shell keyword +a shell builtin, +a shell function, +a shell keyword or -.It -.Ic an alias for Ar value . -.El +an alias for +. Ar value . .It Ic echo Oo Fl e | n Oc Op Ar string Print .Ar string @@ -1780,7 +1778,7 @@ If the .Fl s option is specified, only the PIDs of the jobs are printed, one per line. -.It Ic local Oo Ar variable ... Oc Op Ar - +.It Ic local Oo Ar variable ... Oc Op Fl See the .Sx Functions subsection. ==== //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $ -.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.4 2005/11/01 21:16:39 trhodes Exp $ +.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.5 2005/11/18 10:56:28 ru Exp $ .Dd March 10, 2000 .Dt MOUNT_SMBFS 8 .Os @@ -157,8 +157,8 @@ for smbfs mounts: .Pp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 28 23:28:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226DF16A427; Mon, 28 Nov 2005 23:28:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F09E816A41F for ; Mon, 28 Nov 2005 23:28:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F0C243D67 for ; Mon, 28 Nov 2005 23:28:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASNSlEH028884 for ; Mon, 28 Nov 2005 23:28:47 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASNSkDS028881 for perforce@freebsd.org; Mon, 28 Nov 2005 23:28:46 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Nov 2005 23:28:46 GMT Message-Id: <200511282328.jASNSkDS028881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 23:28:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=87393 Change 87393 by peter@peter_daintree on 2005/11/28 23:28:45 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#148 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#111 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#82 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#85 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#90 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#28 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#34 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#47 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#45 (text+ko) ==== @@ -75,6 +75,10 @@ * IRQs behave as PCI IRQs by default. We also assume that the pin for * IRQ 0 is actually an ExtINT pin. The apic enumerators override the * configuration of individual pins as indicated by their tables. + * + * Documentation for the I/O APIC: "82093AA I/O Advanced Programmable + * Interrupt Controller (IOAPIC)", May 1996, Intel Corp. + * ftp://download.intel.com/design/chipsets/datashts/29056601.pdf */ struct ioapic_intsrc { ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#148 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#111 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#82 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#85 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#90 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1212) +# (XXX from i386:NOTES,v 1.1214) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.49 2005/11/27 23:16:58 ru Exp $ # ==== //depot/projects/hammer/sys/amd64/include/smp.h#28 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Nov 28 23:58:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8682116A422; Mon, 28 Nov 2005 23:58:28 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 470DB16A41F for ; Mon, 28 Nov 2005 23:58:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5166443D78 for ; Mon, 28 Nov 2005 23:58:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jASNwNd4031223 for ; Mon, 28 Nov 2005 23:58:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jASNwMdd031220 for perforce@freebsd.org; Mon, 28 Nov 2005 23:58:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Nov 2005 23:58:22 GMT Message-Id: <200511282358.jASNwMdd031220@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 Cc: Subject: PERFORCE change 87394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 23:58:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=87394 Change 87394 by rwatson@rwatson_peppercorn on 2005/11/28 23:57:55 Apply similar changes to audit_control parsing as previously applied to audit_class: handle comments without terminating parsing, universally use (-1) as the return value for errors. Distinguish EOF and an error reading a configuration file. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#6 (text+ko) ==== @@ -68,22 +68,33 @@ return (0); /* Error */ } - /* Search for the line beginning with the given name. */ - while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove trailing new line character. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { + pthread_mutex_unlock(&mutex); + if (ferror(fp)) + return (-1); + return (0); + } + + if (linestr[0] != '#') + break; + } + + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - tokptr = linestr; - if ((type = strtok_r(tokptr, delim, &last)) != NULL) { - if (!strcmp(name, type)) { - /* Found matching name. */ - *str = strtok_r(NULL, delim, &last); - pthread_mutex_unlock(&mutex); - if (*str == NULL) - return (1); /* Parse error in file */ - return (0); /* Success */ + tokptr = linestr; + if ((type = strtok_r(tokptr, delim, &last)) != NULL) { + if (!strcmp(name, type)) { + /* Found matching name. */ + *str = strtok_r(NULL, delim, &last); + pthread_mutex_unlock(&mutex); + if (*str == NULL) { + errno = EINVAL; + return (-1); /* Parse error in file */ } + return (0); /* Success */ } } @@ -150,7 +161,7 @@ pthread_mutex_unlock(&mutex); - if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) == 1) + if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) < 0) return (-3); if (dir == NULL) @@ -179,7 +190,7 @@ return (-2); } - if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) == 1) + if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) < 0) return (-3); if (min == NULL) @@ -205,7 +216,7 @@ return (-2); } - if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) == 1) + if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) < 0) return (-3); if (str == NULL) @@ -234,7 +245,7 @@ return (-2); } - if (getstrfromtype(NA_CONTROL_ENTRY, &str) == 1) + if (getstrfromtype(NA_CONTROL_ENTRY, &str) < 0) return (-3); if (str == NULL) From owner-p4-projects@FreeBSD.ORG Tue Nov 29 00:49:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32EAC16A423; Tue, 29 Nov 2005 00:49:28 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0BB5016A420 for ; Tue, 29 Nov 2005 00:49:28 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D26C43D62 for ; Tue, 29 Nov 2005 00:49:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT0nRmU041054 for ; Tue, 29 Nov 2005 00:49:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT0nRDO041051 for perforce@freebsd.org; Tue, 29 Nov 2005 00:49:27 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 00:49:27 GMT Message-Id: <200511290049.jAT0nRDO041051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 00:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=87400 Change 87400 by peter@peter_daintree on 2005/11/29 00:48:28 add a knob to use the TSC to implement the DELAY() spin loop. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#12 edit .. //depot/projects/hammer/sys/amd64/include/clock.h#17 edit .. //depot/projects/hammer/sys/amd64/isa/clock.c#49 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#12 (text+ko) ==== @@ -128,3 +128,15 @@ { return (rdtsc()); } + +void +tsc_DELAY(int n) +{ + uint64_t start, end, now; + + start = rdtsc(); + end = start + (tsc_freq * n) / 1000000; + do { + now = rdtsc(); + } while (now < end || (now > start && end < start)); +} ==== //depot/projects/hammer/sys/amd64/include/clock.h#17 (text+ko) ==== @@ -37,6 +37,7 @@ int sysbeep(int pitch, int period); void init_TSC(void); void init_TSC_tc(void); +void tsc_DELAY(int); #endif /* _KERNEL */ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#49 (text+ko) ==== @@ -255,6 +255,9 @@ return ((high << 8) | low); } +static int do_tsc_delay = 0; +SYSCTL_INT(_debug, OID_AUTO, do_tsc_delay, CTLFLAG_RW, &do_tsc_delay, 0, + "use TSC for DELAY()"); /* * Wait "n" microseconds. * Relies on timer 1 counting down from (timer_freq / hz) @@ -269,7 +272,13 @@ int getit_calls = 1; int n1; static int state = 0; +#endif + if (tsc_freq != 0 && !tsc_is_broken) { + tsc_DELAY(n); + return; + } +#ifdef DELAYDEBUG if (state == 0) { state = 1; for (n1 = 1; n1 <= 10000000; n1 *= 10) From owner-p4-projects@FreeBSD.ORG Tue Nov 29 01:14:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2D2C16A427; Tue, 29 Nov 2005 01:14:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 86DE016A41F for ; Tue, 29 Nov 2005 01:14:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A3C143D5C for ; Tue, 29 Nov 2005 01:14:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT1E0s4042148 for ; Tue, 29 Nov 2005 01:14:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT1Dx1i042143 for perforce@freebsd.org; Tue, 29 Nov 2005 01:13:59 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 01:13:59 GMT Message-Id: <200511290113.jAT1Dx1i042143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 01:14:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=87404 Change 87404 by peter@peter_daintree on 2005/11/29 01:13:53 oops. forgot to activate sysctl. oh well. Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#50 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#50 (text+ko) ==== @@ -255,9 +255,6 @@ return ((high << 8) | low); } -static int do_tsc_delay = 0; -SYSCTL_INT(_debug, OID_AUTO, do_tsc_delay, CTLFLAG_RW, &do_tsc_delay, 0, - "use TSC for DELAY()"); /* * Wait "n" microseconds. * Relies on timer 1 counting down from (timer_freq / hz) From owner-p4-projects@FreeBSD.ORG Tue Nov 29 01:18:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDC3916A423; Tue, 29 Nov 2005 01:18:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C782116A41F for ; Tue, 29 Nov 2005 01:18:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86E6D43D55 for ; Tue, 29 Nov 2005 01:18:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT1I5Wk042294 for ; Tue, 29 Nov 2005 01:18:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT1I5wD042291 for perforce@freebsd.org; Tue, 29 Nov 2005 01:18:05 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 01:18:05 GMT Message-Id: <200511290118.jAT1I5wD042291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 01:18:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=87405 Change 87405 by peter@peter_daintree on 2005/11/29 01:17:18 So, there was no need to turn to use 3 files when 1 would do. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 edit .. //depot/projects/hammer/sys/amd64/include/clock.h#18 edit .. //depot/projects/hammer/sys/amd64/isa/clock.c#51 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 (text+ko) ==== @@ -128,15 +128,3 @@ { return (rdtsc()); } - -void -tsc_DELAY(int n) -{ - uint64_t start, end, now; - - start = rdtsc(); - end = start + (tsc_freq * n) / 1000000; - do { - now = rdtsc(); - } while (now < end || (now > start && end < start)); -} ==== //depot/projects/hammer/sys/amd64/include/clock.h#18 (text+ko) ==== @@ -37,7 +37,6 @@ int sysbeep(int pitch, int period); void init_TSC(void); void init_TSC_tc(void); -void tsc_DELAY(int); #endif /* _KERNEL */ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#51 (text+ko) ==== @@ -272,7 +272,13 @@ #endif if (tsc_freq != 0 && !tsc_is_broken) { - tsc_DELAY(n); + uint64_t start, end, now; + + start = rdtsc(); + end = start + (tsc_freq * n) / 1000000; + do { + now = rdtsc(); + } while (now < end || (now > start && end < start)); return; } #ifdef DELAYDEBUG From owner-p4-projects@FreeBSD.ORG Tue Nov 29 01:57:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DB1316A422; Tue, 29 Nov 2005 01:57:55 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8577B16A41F for ; Tue, 29 Nov 2005 01:57:54 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38FA343D49 for ; Tue, 29 Nov 2005 01:57:54 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT1vsUf043612 for ; Tue, 29 Nov 2005 01:57:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT1vrq4043609 for perforce@freebsd.org; Tue, 29 Nov 2005 01:57:53 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Nov 2005 01:57:53 GMT Message-Id: <200511290157.jAT1vrq4043609@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 Cc: Subject: PERFORCE change 87406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 01:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=87406 Change 87406 by sam@sam_ebb on 2005/11/29 01:57:06 Fixup roaming a bit; decouple roaming-induced bg scans from normal bg scan work--only kick off a bg scan if we want to roam, previously we did it in case the scan cache was cold which caused bg scan activity to be periodic according to ic_scanvalid (typically overriding whatever ic_bgscanintvl was set to). This has the downside that we must typically do a scan before we can look for a roaming candidate as the scan cache is likely cold. There's also the problem that when roaming is desired we scan with period ic_scanvalid which may be too aggressive if trying to conserve power. In that case the user will probably want to manually disable bgscan which also turns off roaming. With the above we can restore a reasonable default to ic_scanvalid. Also enforce a minimum to avoid scanning too frequently 'cuz of roaming. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#53 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#39 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#53 (text+ko) ==== @@ -1897,7 +1897,10 @@ error = EINVAL; break; case IEEE80211_IOC_SCANVALID: - ic->ic_scanvalid = ireq->i_val*hz; + if (ireq->i_val >= IEEE80211_SCAN_VALID_MIN) + ic->ic_scanvalid = ireq->i_val*hz; + else + error = EINVAL; break; case IEEE80211_IOC_ROAM_RSSI_11A: ic->ic_roam.rssi11a = ireq->i_val; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#7 (text+ko) ==== @@ -110,7 +110,7 @@ ic->ic_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz; ic->ic_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz; - ic->ic_scanvalid = ic->ic_bgscanintvl; + ic->ic_scanvalid = IEEE80211_SCAN_VALID_DEFAULT*hz; ic->ic_roam.rssi11a = ROAM_RSSI_11A_DEFAULT; ic->ic_roam.rssi11b = ROAM_RSSI_11B_DEFAULT; ic->ic_roam.rssi11bOnly = ROAM_RSSI_11BONLY_DEFAULT; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#7 (text+ko) ==== @@ -980,41 +980,34 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_ROAM, "%s: currssi %d roamrssi %d\n", __func__, curRssi, roamRssi); } - if (time_after(ticks, ic->ic_lastscan + ic->ic_scanvalid)) { - /* - * Scan cache contents is too old; check about updating it. - */ - if (curRate < roamRate || curRssi < roamRssi) { + /* + * Check if a new ap should be used and switch. + * XXX deauth current ap + */ + if (curRate < roamRate || curRssi < roamRssi) { + if (time_after(ticks, ic->ic_lastscan + ic->ic_scanvalid)) { /* - * Thresholds exceeded, force a scan now so we - * have current state to make a decision with. + * Scan cache contents are too old; force a scan now + * if possible so we have current state to make a + * decision with. We don't kick off a bg scan if + * we're using dynamic turbo and boosted or if the + * channel is busy. + * XXX force immediate switch on scan complete */ - ieee80211_bg_scan(ic); - } else if (time_after(ticks, - ic->ic_lastdata + ic->ic_bgscanidle)) { - /* - * We're not in need of a new ap, but idle; - * kick off a bg scan to replenish the cache. - */ - ieee80211_bg_scan(ic); + if (!IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) && + time_after(ticks, ic->ic_lastdata + ic->ic_bgscanidle)) + ieee80211_bg_scan(ic); + return; } - } else { - /* - * Scan cache contents are warm enough to use; - * check if a new ap should be used and switch. - * XXX deauth current ap - */ - if (curRate < roamRate || curRssi < roamRssi) { - se->base.se_rssi = curRssi; - selbs = select_bss(ss, ic, IEEE80211_MSG_ROAM); - if (selbs != NULL && selbs != se) { - IEEE80211_DPRINTF(ic, - IEEE80211_MSG_ROAM | IEEE80211_MSG_DEBUG, - "%s: ROAM: curRate %u, roamRate %u, " - "curRssi %d, roamRssi %d\n", __func__, - curRate, roamRate, curRssi, roamRssi); - ieee80211_sta_join(ic, &selbs->base); - } + se->base.se_rssi = curRssi; + selbs = select_bss(ss, ic, IEEE80211_MSG_ROAM); + if (selbs != NULL && selbs != se) { + IEEE80211_DPRINTF(ic, + IEEE80211_MSG_ROAM | IEEE80211_MSG_DEBUG, + "%s: ROAM: curRate %u, roamRate %u, " + "curRssi %d, roamRssi %d\n", __func__, + curRate, roamRate, curRssi, roamRssi); + ieee80211_sta_join(ic, &selbs->base); } } } ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#39 (text+ko) ==== @@ -81,6 +81,9 @@ #define IEEE80211_BGSCAN_IDLE_MIN 100 /* min idle time (ms) */ #define IEEE80211_BGSCAN_IDLE_DEFAULT 250 /* default idle time (ms) */ +#define IEEE80211_SCAN_VALID_MIN 10 /* min scan valid time (secs) */ +#define IEEE80211_SCAN_VALID_DEFAULT 60 /* default scan valid time */ + #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ From owner-p4-projects@FreeBSD.ORG Tue Nov 29 02:37:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C47DE16A422; Tue, 29 Nov 2005 02:37:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DECB716A41F for ; Tue, 29 Nov 2005 02:37:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60D1143D4C for ; Tue, 29 Nov 2005 02:37:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT2bgFZ044993 for ; Tue, 29 Nov 2005 02:37:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT2bgnb044990 for perforce@freebsd.org; Tue, 29 Nov 2005 02:37:42 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Nov 2005 02:37:42 GMT Message-Id: <200511290237.jAT2bgnb044990@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 Cc: Subject: PERFORCE change 87407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 02:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=87407 Change 87407 by sam@sam_ebb on 2005/11/29 02:36:54 line 'em up finally Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#52 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#52 (text+ko) ==== @@ -927,12 +927,12 @@ if (len < sizeof(struct ieee80211req_scan_result)) return; - printf("%-14.14s %-17.17s %4s %4s %-8s %3s %4s\n" + printf("%-14.14s %-17.17s %4s %4s %-7s %3s %4s\n" , "SSID" , "BSSID" , "CHAN" , "RATE" - , " S:N" + , " S:N" , "INT" , "CAPS" ); From owner-p4-projects@FreeBSD.ORG Tue Nov 29 05:26:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2018216A422; Tue, 29 Nov 2005 05:26:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 EC7BF16A41F; Tue, 29 Nov 2005 05:26:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFDDD43D4C; Tue, 29 Nov 2005 05:26:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 2781190 for multiple; Tue, 29 Nov 2005 00:26:23 -0500 Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id jAT5Q64T067237; Tue, 29 Nov 2005 00:26:06 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Peter Wemm Date: Tue, 29 Nov 2005 00:22:24 -0500 User-Agent: KMail/1.8.3 References: <200511290118.jAT1I5wD042291@repoman.freebsd.org> In-Reply-To: <200511290118.jAT1I5wD042291@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200511290022.25288.jhb@freebsd.org> X-Spam-Status: No, score=-2.8 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 87405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 05:26:16 -0000 On Monday 28 November 2005 08:18 pm, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D87405 > > Change 87405 by peter@peter_daintree on 2005/11/29 01:17:18 > > So, there was no need to turn to use 3 files when 1 would do. > > Affected files ... > > .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 edit > .. //depot/projects/hammer/sys/amd64/include/clock.h#18 edit > .. //depot/projects/hammer/sys/amd64/isa/clock.c#51 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 (text+ko) = =3D=3D=3D=3D > > @@ -128,15 +128,3 @@ > { > return (rdtsc()); > } > - > -void > -tsc_DELAY(int n) > -{ > - uint64_t start, end, now; > - > - start =3D rdtsc(); > - end =3D start + (tsc_freq * n) / 1000000; > - do { > - now =3D rdtsc(); > - } while (now < end || (now > start && end < start)); > -} > > =3D=3D=3D=3D //depot/projects/hammer/sys/amd64/include/clock.h#18 (text+k= o) =3D=3D=3D=3D > > @@ -37,7 +37,6 @@ > int sysbeep(int pitch, int period); > void init_TSC(void); > void init_TSC_tc(void); > -void tsc_DELAY(int); > > #endif /* _KERNEL */ > > > =3D=3D=3D=3D //depot/projects/hammer/sys/amd64/isa/clock.c#51 (text+ko) = =3D=3D=3D=3D > > @@ -272,7 +272,13 @@ > #endif > > if (tsc_freq !=3D 0 && !tsc_is_broken) { > - tsc_DELAY(n); > + uint64_t start, end, now; > + > + start =3D rdtsc(); > + end =3D start + (tsc_freq * n) / 1000000; > + do { > + now =3D rdtsc(); > + } while (now < end || (now > start && end < start)); > return; > } > #ifdef DELAYDEBUG What happens when you are preempted and migrate to another CPU? Currently= =20 DELAY() doesn't mandate that callers hold a critical section while calling= =20 it. You could do a critical_enter/exit pair here perhaps (note that=20 critical_enter/exit doesn't block interrupts, just ithread preemptions). =2D-=20 John Baldwin =A0<>< =A0http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" =A0=3D =A0http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Nov 29 06:07:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B27E716A422; Tue, 29 Nov 2005 06:07:07 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8C2E316A41F for ; Tue, 29 Nov 2005 06:07:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A74C43D60 for ; Tue, 29 Nov 2005 06:06:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAT66v6V060567 for ; Tue, 29 Nov 2005 06:06:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT66v66060564 for perforce@freebsd.org; Tue, 29 Nov 2005 06:06:57 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Nov 2005 06:06:57 GMT Message-Id: <200511290606.jAT66v66060564@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 Cc: Subject: PERFORCE change 87416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 06:07:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=87416 Change 87416 by sam@sam_ebb on 2005/11/29 06:06:02 print decoded wme, wpa, rsn, and ath ie's with -v Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#53 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#53 (text+ko) ==== @@ -812,6 +812,252 @@ } } +#define LE_READ_2(p) \ + ((u_int16_t) \ + ((((const u_int8_t *)(p))[0] ) | \ + (((const u_int8_t *)(p))[1] << 8))) +#define LE_READ_4(p) \ + ((u_int32_t) \ + ((((const u_int8_t *)(p))[0] ) | \ + (((const u_int8_t *)(p))[1] << 8) | \ + (((const u_int8_t *)(p))[2] << 16) | \ + (((const u_int8_t *)(p))[3] << 24))) + +/* + * NB: The decoding routines assume a properly formatted ie + * which should be safe as the kernel only retains them + * if they parse ok. + */ + +static void +printwmeie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) +{ +#define MS(_v, _f) (((_v) & _f) >> _f##_S) + static const char *acnames[] = { "BE", "BK", "VO", "VI" }; + int i; + + printf("%s", tag); + if (verbose) { + printf(""); + } +#undef MS +} + +static void +printathie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) +{ + + printf("%s", tag); + if (verbose) { + const struct ieee80211_ath_ie *ath = + (const struct ieee80211_ath_ie *)ie; + + printf("<"); + if (ath->ath_capability & ATHEROS_CAP_TURBO_PRIME) + printf("DTURBO,"); + if (ath->ath_capability & ATHEROS_CAP_COMPRESSION) + printf("COMP,"); + if (ath->ath_capability & ATHEROS_CAP_FAST_FRAME) + printf("FF,"); + if (ath->ath_capability & ATHEROS_CAP_XR) + printf("XR,"); + if (ath->ath_capability & ATHEROS_CAP_AR) + printf("AR,"); + if (ath->ath_capability & ATHEROS_CAP_BURST) + printf("BURST,"); + if (ath->ath_capability & ATHEROS_CAP_WME) + printf("WME,"); + if (ath->ath_capability & ATHEROS_CAP_BOOST) + printf("BOOST,"); + printf("0x%x>", LE_READ_2(ath->ath_defkeyix)); + } +} + +static const char * +wpa_cipher(const u_int8_t *sel) +{ +#define WPA_SEL(x) (((x)<<24)|WPA_OUI) + u_int32_t w = LE_READ_4(sel); + + switch (w) { + case WPA_SEL(WPA_CSE_NULL): + return "NONE"; + case WPA_SEL(WPA_CSE_WEP40): + return "WEP40"; + case WPA_SEL(WPA_CSE_WEP104): + return "WEP104"; + case WPA_SEL(WPA_CSE_TKIP): + return "TKIP"; + case WPA_SEL(WPA_CSE_CCMP): + return "AES-CCMP"; + } + return "?"; /* NB: so 1<< is discarded */ +#undef WPA_SEL +} + +static const char * +wpa_keymgmt(const u_int8_t *sel) +{ +#define WPA_SEL(x) (((x)<<24)|WPA_OUI) + u_int32_t w = LE_READ_4(sel); + + switch (w) { + case WPA_SEL(WPA_ASE_8021X_UNSPEC): + return "8021X-UNSPEC"; + case WPA_SEL(WPA_ASE_8021X_PSK): + return "8021X-PSK"; + case WPA_SEL(WPA_ASE_NONE): + return "NONE"; + } + return "?"; +#undef WPA_SEL +} + +static void +printwpaie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) +{ + u_int8_t len = ie[1]; + + printf("%s", tag); + if (verbose) { + const char *sep; + int n; + + ie += 6, len -= 4; /* NB: len is payload only */ + + printf(" 0; n--) { + printf("%s%s", sep, wpa_cipher(ie)); + ie += 4, len -= 4; + sep = "+"; + } + + /* key management algorithms */ + n = LE_READ_2(ie); + ie += 2, len -= 2; + sep = " km:"; + for (; n > 0; n--) { + printf("%s%s", sep, wpa_keymgmt(ie)); + ie += 4, len -= 4; + sep = "+"; + } + + if (len > 2) /* optional capabilities */ + printf(", caps 0x%x", LE_READ_2(ie)); + printf(">"); + } +} + +static const char * +rsn_cipher(const u_int8_t *sel) +{ +#define RSN_SEL(x) (((x)<<24)|RSN_OUI) + u_int32_t w = LE_READ_4(sel); + + switch (w) { + case RSN_SEL(RSN_CSE_NULL): + return "NONE"; + case RSN_SEL(RSN_CSE_WEP40): + return "WEP40"; + case RSN_SEL(RSN_CSE_WEP104): + return "WEP104"; + case RSN_SEL(RSN_CSE_TKIP): + return "TKIP"; + case RSN_SEL(RSN_CSE_CCMP): + return "AES-CCMP"; + case RSN_SEL(RSN_CSE_WRAP): + return "AES-OCB"; + } + return "?"; +#undef WPA_SEL +} + +static const char * +rsn_keymgmt(const u_int8_t *sel) +{ +#define RSN_SEL(x) (((x)<<24)|RSN_OUI) + u_int32_t w = LE_READ_4(sel); + + switch (w) { + case RSN_SEL(RSN_ASE_8021X_UNSPEC): + return "8021X-UNSPEC"; + case RSN_SEL(RSN_ASE_8021X_PSK): + return "8021X-PSK"; + case RSN_SEL(RSN_ASE_NONE): + return "NONE"; + } + return "?"; +#undef RSN_SEL +} + +static void +printrsnie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) +{ + u_int8_t len = ie[1]; + + printf("%s", tag); + if (verbose) { + const char *sep; + int n; + + ie += 6, len -= 4; /* NB: len is payload only */ + + printf(" 0; n--) { + printf("%s%s", sep, rsn_cipher(ie)); + ie += 4, len -= 4; + sep = "+"; + } + + /* key management algorithms */ + n = LE_READ_2(ie); + ie += 2, len -= 2; + sep = " km:"; + for (; n > 0; n--) { + printf("%s%s", sep, rsn_keymgmt(ie)); + ie += 4, len -= 4; + sep = "+"; + } + + if (len > 2) /* optional capabilities */ + printf(", caps 0x%x", LE_READ_2(ie)); + /* XXXPMKID */ + printf(">"); + } +} + /* * Copy the ssid string contents into buf, truncating to fit. If the * ssid is entirely printable then just copy intact. Otherwise convert @@ -887,16 +1133,16 @@ switch (vp[0]) { case IEEE80211_ELEMID_VENDOR: if (iswpaoui(vp)) - printie(" WPA", vp, 2+vp[1], maxcols); + printwpaie(" WPA", vp, 2+vp[1], maxcols); else if (iswmeoui(vp)) - printie(" WME", vp, 2+vp[1], maxcols); + printwmeie(" WME", vp, 2+vp[1], maxcols); else if (isatherosoui(vp)) - printie(" ATH", vp, 2+vp[1], maxcols); + printathie(" ATH", vp, 2+vp[1], maxcols); else printie(" VEN", vp, 2+vp[1], maxcols); break; case IEEE80211_ELEMID_RSN: - printie(" RSN", vp, 2+vp[1], maxcols); + printrsnie(" RSN", vp, 2+vp[1], maxcols); break; default: printie(" ???", vp, 2+vp[1], maxcols); From owner-p4-projects@FreeBSD.ORG Tue Nov 29 14:53:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D343116A422; Tue, 29 Nov 2005 14:53:12 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 948F116A41F for ; Tue, 29 Nov 2005 14:53:12 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EBC343D60 for ; Tue, 29 Nov 2005 14:53:12 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATErC3T003473 for ; Tue, 29 Nov 2005 14:53:12 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATErBAu003470 for perforce@freebsd.org; Tue, 29 Nov 2005 14:53:11 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 29 Nov 2005 14:53:11 GMT Message-Id: <200511291453.jATErBAu003470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 87433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 14:53:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=87433 Change 87433 by soc-bushman@soc-bushman_stinger on 2005/11/29 14:52:56 some bugfixes + branch integration Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#15 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#10 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/ftw.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/moncontrol.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isblank.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/iscntrl.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isdigit.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isgraph.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/islower.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isprint.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/ispunct.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isspace.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isupper.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isxdigit.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/tolower.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/toupper.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet6_opt_init.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/name6.c#7 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscachedcli.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nsdispatch.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/acl_get_entry.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/posix1e.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/publickey.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/getc.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/getwc.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/memmem.3#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/intro.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/kse.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mmap.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/nfssvc.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/read.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/wait.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/write.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/xdr/xdr.3#3 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#15 (text+ko) ==== @@ -32,6 +32,8 @@ .Sh SYNOPSIS .Nm .Op Fl nst +.Op Fl i Ar cachename +.Op Fl I Ar cachename .Sh DESCRIPTION .Nm - is the system caching daemon. @@ -97,6 +99,38 @@ and .Fl s flags for debugging purposes. +.It Fl i Ar cachename +Invalidates personal cache. When specified, +.Nm +acts as the administration tool. It asks the already +running +.Nm +to invalidate the specified part of the cache of the +calling user. For example, you may want sometimes +to invalidate your +.Pa hosts +cache. You can specify +.Pa all +as the +.Pa cachename +to invalidate your personal cache as a whole. You +can't use this option for the cachename, for which +the +.Pa perform-actual-lookups +option is enabled. +.It Fl I Ar cachename +Invalidates the cache for every user. When specified, +.Nm +acts as the administration tool. It asks the already +running +.Nm +to invalidate the specified part of the cache for +every user. You can specify +.Pa all +as the +.Pa cachename +to invalidate the whole cache. Only root can use this +option. .El .Sh FILES .Xr cached.conf 5 @@ -109,4 +143,4 @@ .Aq bushman@rsu.ru .Sh "BUGS" To report bugs or suggestions please mail me -.Aq bushman@rsu.ru. +.Aq bushman@rsu.ru ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#15 (text+ko) ==== @@ -30,7 +30,8 @@ #define TRACE_WANTED 32 -#ifndef NDEBUG +/*#ifndef NDEBUG*/ +#if 0 #define TRACE_IN(x) __trace_in(#x, __FILE__, __LINE__) #define TRACE_POINT() __trace_point(__FILE__, __LINE__) #define TRACE_MSG(x) __trace_msg(x, __FILE__, __LINE__) ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#15 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.12 2005/11/12 16:00:29 deischen Exp $"); #include #include @@ -97,8 +97,8 @@ #define FUNC_EXP(name) __CONCAT(name, _exp) #define STUB_FUNC(name, idx, ret) \ - static ret FUNC_EXP(name)(void) __used; \ - static ret FUNC_INT(name)(void) __used; \ + static ret FUNC_EXP(name)(void) __used; \ + static ret FUNC_INT(name)(void) __used; \ WEAK_REF(FUNC_EXP(name), name); \ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ typedef ret (*FUNC_TYPE(name))(void); \ @@ -176,7 +176,7 @@ STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *) STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *) STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) -STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *) +STUB_FUNC2(pthread_cond_wait, PJT_COND_WAIT, int, void *, void *) STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/ftw.3#3 (text+ko) ==== @@ -18,7 +18,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.2 2004/07/07 20:11:35 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.3 2005/11/23 15:41:36 ru Exp $ .\" .Dd July 5, 2004 .Dt FTW 3 @@ -37,7 +37,7 @@ .Ft int .Fo nftw .Fa "const char *path" -.Fa "int \*[lp]*fn\*[rp]\*[lp](const char *, const struct stat *, int, struct FTW *\*[rp]" +.Fa "int \*[lp]*fn\*[rp]\*[lp]const char *, const struct stat *, int, struct FTW *\*[rp]" .Fa "int maxfds" .Fa "int flags" .Fc ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getcap.3#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.27 2005/02/13 23:45:46 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.28 2005/11/23 15:44:42 ru Exp $ .\" -.Dd May 13, 1994 +.Dd March 22, 2002 .Dt GETCAP 3 .Os .Sh NAME @@ -55,19 +55,19 @@ .Sh SYNOPSIS .In stdlib.h .Ft int -.Fn cgetent "char **buf" "char **db_array" "char *name" +.Fn cgetent "char **buf" "char **db_array" "const char *name" .Ft int -.Fn cgetset "char *ent" +.Fn cgetset "const char *ent" .Ft int -.Fn cgetmatch "char *buf" "char *name" +.Fn cgetmatch "const char *buf" "const char *name" .Ft char * -.Fn cgetcap "char *buf" "char *cap" "int type" +.Fn cgetcap "char *buf" "const char *cap" "int type" .Ft int -.Fn cgetnum "char *buf" "char *cap" "long *num" +.Fn cgetnum "char *buf" "const char *cap" "long *num" .Ft int -.Fn cgetstr "char *buf" "char *cap" "char **str" +.Fn cgetstr "char *buf" "const char *cap" "char **str" .Ft int -.Fn cgetustr "char *buf" "char *cap" "char **str" +.Fn cgetustr "char *buf" "const char *cap" "char **str" .Ft int .Fn cgetfirst "char **buf" "char **db_array" .Ft int ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/pwcache.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwcache.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.12 2002/03/22 02:35:47 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.13 2005/11/23 15:44:42 ru Exp $ .\" -.Dd June 9, 1993 +.Dd Dd March 22, 2002 .Dt PWCACHE 3 .Os .Sh NAME @@ -43,10 +43,10 @@ .Sh SYNOPSIS .In pwd.h .Ft const char * -.Fn user_from_uid "unsigned long uid" "int nouser" +.Fn user_from_uid "uid_t uid" "int nouser" .In grp.h .Ft const char * -.Fn group_from_gid "unsigned long gid" "int nogroup" +.Fn group_from_gid "gid_t gid" "int nogroup" .Sh DESCRIPTION The .Fn user_from_uid ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/moncontrol.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)moncontrol.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.15 2004/06/14 18:41:24 bms Exp $ +.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.16 2005/11/23 15:55:38 ru Exp $ .\" .Dd June 14, 2004 .Dt MONCONTROL 3 @@ -44,10 +44,10 @@ .Sh SYNOPSIS .In sys/types.h .In sys/gmon.h -.Ft int +.Ft void .Fn moncontrol "int mode" -.Ft int -.Fn monstartup "u_long *lowpc" "u_long *highpc" +.Ft void +.Fn monstartup "u_long lowpc" "u_long highpc" .Sh DESCRIPTION An executable program compiled using the .Fl pg ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalnum.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isalnum.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.20 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.21 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISALNUM 3 @@ -57,7 +57,7 @@ .Xr isdigit 3 is true. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalpha.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isalpha.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.19 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.20 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISALPHA 3 @@ -57,7 +57,7 @@ .Xr islower 3 is true. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isblank.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isblank.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.21 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.22 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISBLANK 3 @@ -58,7 +58,7 @@ .Fn isblank successful test is limited to this characters only. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/iscntrl.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)iscntrl.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.18 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.19 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISCNTRL 3 @@ -53,7 +53,7 @@ .Fn iscntrl function tests for any control character. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isdigit.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isdigit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.20 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.21 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISDIGIT 3 @@ -69,7 +69,7 @@ setting. .Pp The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isgraph.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isgraph.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.20 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.21 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISGRAPH 3 @@ -56,7 +56,7 @@ and other locale specific space-like characters. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/islower.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)islower.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.18 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.19 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISLOWER 3 @@ -53,7 +53,7 @@ .Fn islower function tests for any lower-case letters. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isprint.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isprint.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.21 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.22 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISPRINT 3 @@ -54,7 +54,7 @@ function tests for any printing character including space .Pq Ql "\ " . The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/ispunct.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ispunct.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.19 2005/07/17 04:11:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.20 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISPUNCT 3 @@ -58,7 +58,7 @@ .Xr isalnum 3 is true. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isspace.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isspace.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.18 2005/07/17 04:11:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.19 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISSPACE 3 @@ -62,7 +62,7 @@ .Fn isspace successful test is limited to this characters only. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isupper.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isupper.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.19 2005/07/17 04:11:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.20 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISUPPER 3 @@ -53,7 +53,7 @@ .Fn isupper function tests for any upper-case letter. The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Pp ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isxdigit.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isxdigit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.21 2005/07/17 04:11:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.22 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt ISXDIGIT 3 @@ -72,7 +72,7 @@ depending on the current locale setting. .Pp The value of the argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/tolower.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tolower.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/tolower.3,v 1.17 2005/07/17 03:37:00 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/tolower.3,v 1.18 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt TOLOWER 3 @@ -54,7 +54,7 @@ function converts an upper-case letter to the corresponding lower-case letter. The argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/toupper.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)toupper.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/toupper.3,v 1.17 2005/07/17 03:37:00 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/toupper.3,v 1.18 2005/11/17 12:59:59 ru Exp $ .\" .Dd July 17, 2005 .Dt TOUPPER 3 @@ -54,7 +54,7 @@ function converts a lower-case letter to the corresponding upper-case letter. The argument must be representable as an -.Vt unsigned char +.Vt "unsigned char" or the value of .Dv EOF . .Sh RETURN VALUES ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/if_indextoname.3#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.10 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.11 2005/11/23 10:49:07 ru Exp $ .\" -.Dd July 15, 2002 +.Dd November 23, 2005 .Dt IF_NAMETOINDEX 3 .Os .Sh NAME @@ -34,6 +34,8 @@ .Nm if_freenameindex .Nd provide mappings between interface names and indexes .Sh SYNOPSIS +.In sys/types.h +.In sys/socket.h .In net/if.h .Ft "unsigned int" .Fn if_nametoindex "const char *ifname" ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet6_opt_init.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/inet6_opt_init.3,v 1.9 2005/01/24 18:14:18 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/inet6_opt_init.3,v 1.10 2005/11/23 16:07:54 ru Exp $ .\" .Dd December 23, 2004 .Dt INET6_OPT_INIT 3 @@ -58,7 +58,7 @@ .Ft "int" .Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp" .Ft "int" -.Fn inet6_opt_get_val "void *databuf" "socklen_t offset" "void *val" "socklen_t vallen" +.Fn inet6_opt_get_val "void *databuf" "int offset" "void *val" "socklen_t vallen" .\" .Sh DESCRIPTION Building and parsing the Hop-by-Hop and Destination options is ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/name6.c#7 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.54 2005/05/27 20:44:57 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.55 2005/11/15 03:40:15 ume Exp $"); #include "namespace.h" #ifdef ICMPNL @@ -121,6 +121,7 @@ #include #include "un-namespace.h" #include "netdb_private.h" +#include "res_config.h" #ifndef _PATH_HOSTS #define _PATH_HOSTS "/etc/hosts" ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscachedcli.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ /* * safe_write writes data to the specified connection and tries to do it in * the very safe manner. We ensure, that we can write to the socket with - * kevent. If the data_size can't be send in one piece, then it would be + * kevent. If the data_size can't be sent in one piece, then it would be * splitted. */ static int @@ -413,6 +413,9 @@ return (retval); } +/* + * Adds new portion of data to the opened write session + */ int cached_mp_write(struct cached_connection_ *ws, const char *data, size_t data_size) @@ -443,6 +446,10 @@ return (error_code); } +/* + * Abandons all operations with the write session. All data, that were written + * to the session before, are discarded. + */ int abandon_cached_mp_write_session(struct cached_connection_ *ws) { @@ -455,6 +462,10 @@ return (result); } +/* + * Gracefully closes the write session. The data, that were previously written + * to the session, are committed. + */ int close_cached_mp_write_session(struct cached_connection_ *ws) { ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nsdispatch.c#12 (text+ko) ==== @@ -684,8 +684,7 @@ #ifdef NS_CACHING if ((cache_data_p != NULL) && - (result & (NS_TERMINATE | NS_NOTFOUND)) && - (cache_flag == 0)) { + (result & NS_NOTFOUND) && (cache_flag == 0)) { va_start(ap, defaults); if (result == NS_SUCCESS) { if (cache_data.info->id_func != NULL) @@ -694,7 +693,7 @@ else if (cache_data.info->marshal_func != NULL) nss_mp_cache_write(retval, cache_data_p, ap); - } else if ((result == NS_RETURN) || (result == NS_NOTFOUND)) { + } else if (result == NS_NOTFOUND) { if (cache_data.info->id_func == NULL) { if (cache_data.info->marshal_func != NULL) nss_mp_cache_write_submit(retval, ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/acl_get_entry.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.8 2005/07/31 03:30:44 keramida Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.9 2005/11/17 12:59:59 ru Exp $ .\" .Dd April 13, 2001 .Dt ACL_GET_ENTRY 3 @@ -79,7 +79,7 @@ .Sh RETURN VALUES If the .Fn acl_get_entry -function successfuly obtains an ACL entry, a value of 1 is returned. +function successfully obtains an ACL entry, a value of 1 is returned. If the ACL has no ACL entries, the .Fn acl_get_entry returns a value of 0. ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/posix1e.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.26 2002/12/13 16:53:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.27 2005/11/23 16:24:39 ru Exp $ .\" .Dd January 17, 2000 .Dt POSIX1E 3 @@ -37,7 +37,7 @@ .In sys/types.h .In sys/acl.h .\" .In sys/audit.h -.In sys/capability.h +.\" .In sys/capability.h .In sys/mac.h .Sh DESCRIPTION The IEEE POSIX.1e specification never left draft form, but the interfaces ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/publickey.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" @(#)publickey.3r 2.1 88/08/07 4.0 RPCSRC -.\" $FreeBSD: src/lib/libc/rpc/publickey.3,v 1.7 2002/12/18 12:45:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/rpc/publickey.3,v 1.8 2005/11/23 16:44:23 ru Exp $ .\" .Dd October 6, 1987 .Dt PUBLICKEY 3 @@ -14,7 +14,7 @@ .In rpc/key_prot.h .Ft int .Fo getpublickey -.Fa "char netname[MAXNETNAMELEN+1]" +.Fa "const char netname[MAXNETNAMELEN+1]" .Fa "char publickey[HEXKEYBYTES+1]" .Fc .Ft int ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_clnt_create.3#3 (text+ko) ==== @@ -3,7 +3,7 @@ .\" @(#)rpc_clnt_create 1.5 89/07/24 SMI; .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved. .\" $NetBSD: rpc_clnt_create.3,v 1.2 2000/06/20 00:53:08 fvdl Exp $ -.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_create.3,v 1.13 2005/02/13 22:25:12 ru Exp $ +.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_create.3,v 1.14 2005/11/23 16:44:23 ru Exp $ .Dd May 7, 1993 .Dt RPC_CLNT_CREATE 3 .Os @@ -40,7 +40,7 @@ .Ft "CLIENT *" .Fn clnt_create_vers "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "const char *nettype" .Ft "CLIENT *" -.Fn clnt_create_vers_timed "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "char *nettype" "const struct timeval *timeout" +.Fn clnt_create_vers_timed "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "const char *nettype" "const struct timeval *timeout" .Ft void .Fn clnt_destroy "CLIENT *clnt" .Ft "CLIENT *" @@ -52,7 +52,7 @@ .Ft "CLIENT *" .Fn clnt_raw_create "const rpcprog_t prognum" "const rpcvers_t versnum" .Ft "CLIENT *" -.Fn clnt_tli_create "const int fildes" "const struct netconfig *netconf" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz" +.Fn clnt_tli_create "const int fildes" "const struct netconfig *netconf" "struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz" .Ft "CLIENT *" .Fn clnt_tp_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" .Ft "CLIENT *" ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_svc_calls.3#3 (text+ko) ==== @@ -3,7 +3,7 @@ .\" @(#)rpc_svc_calls 1.5 89/07/25 SMI; .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved. .\" $NetBSD: rpc_svc_calls.3,v 1.1 2000/06/02 23:11:13 fvdl Exp $ -.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_calls.3,v 1.9 2005/02/09 18:03:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_calls.3,v 1.10 2005/11/23 16:44:23 ru Exp $ .Dd May 3, 1993 .Dt RPC_SVC_CALLS 3 .Os @@ -47,7 +47,7 @@ .Ft void .Fn svc_run "void" .Ft bool_t -.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "char *out" +.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "void *out" .Sh DESCRIPTION These routines are part of the RPC ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/getc.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.19 2004/03/17 12:37:28 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.20 2005/11/23 20:26:58 ru Exp $ .\" .Dd January 10, 2003 .Dt GETC 3 @@ -58,7 +58,7 @@ .Ft int .Fn getc_unlocked "FILE *stream" .Ft int -.Fn getchar +.Fn getchar void .Ft int .Fn getchar_unlocked "void" .Ft int ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/getwc.3#3 (text+ko) ==== @@ -36,7 +36,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 29 17:02:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B9E16A440; Tue, 29 Nov 2005 17:02:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3241316A427 for ; Tue, 29 Nov 2005 17:02:38 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A18F43D8F for ; Tue, 29 Nov 2005 17:01:59 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATH1qL7016253 for ; Tue, 29 Nov 2005 17:01:52 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATH1pNE016250 for perforce@freebsd.org; Tue, 29 Nov 2005 17:01:51 GMT (envelope-from cognet@freebsd.org) Date: Tue, 29 Nov 2005 17:01:51 GMT Message-Id: <200511291701.jATH1pNE016250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 87444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 17:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=87444 Change 87444 by cognet@cognet on 2005/11/29 17:01:42 YA IFC Affected files ... .. //depot/projects/arm/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/arm/src/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sparc64#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#7 integrate .. //depot/projects/arm/src/sys/conf/files#7 integrate .. //depot/projects/arm/src/sys/conf/files.alpha#3 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#5 integrate .. //depot/projects/arm/src/sys/conf/files.i386#7 integrate .. //depot/projects/arm/src/sys/conf/files.ia64#3 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#3 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/arm/src/sys/dev/ips/ips.c#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ips.h#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/arm/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/arm/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/arm/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/arm/src/sys/modules/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/drm/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/geom/geom_vinum/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if_clone.c#4 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/arm/src/sys/pci/agp_intel.c#3 integrate .. //depot/projects/arm/src/sys/posix4/mqueue.h#2 delete .. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/arm/src/sys/sys/_types.h#3 integrate .. //depot/projects/arm/src/sys/sys/file.h#2 integrate .. //depot/projects/arm/src/sys/sys/mount.h#4 integrate .. //depot/projects/arm/src/sys/sys/mqueue.h#1 branch .. //depot/projects/arm/src/sys/sys/syscall.h#4 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/arm/src/sys/sys/time.h#4 integrate .. //depot/projects/arm/src/sys/sys/types.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/arm/src/usr.sbin/config/config.h#3 integrate .. //depot/projects/arm/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/arm/src/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/arm/src/usr.sbin/config/mkheaders.c#2 integrate .. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#2 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.2 2005/11/21 20:22:34 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ -# Not yet, this would break all existing configs -#machine alpha +machine alpha # Pseudo devices. device mem # Memory and kernel memory devices ==== //depot/projects/arm/src/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -18,9 +18,8 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.190 2005/11/21 20:17:45 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $ -machine alpha cpu EV4 cpu EV5 ident GENERIC ==== //depot/projects/arm/src/sys/alpha/conf/NOTES#2 (text+ko) ==== @@ -1,14 +1,8 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.157 2005/11/27 23:16:58 ru Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# This directive is mandatory. It defines the architecture to be -# configured for. In this case, this kernel is for a machine using -# Alpha processors. -# -machine alpha - ##################################################################### # CPU OPTIONS ==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.71 2005/11/24 15:28:32 le Exp $"); #include #include @@ -978,7 +978,7 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "total_bpages", CTLFLAG_RD, &bz->total_bpages, 0, - "Totoal bounce pages"); + "Total bounce pages"); SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0, ==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.16 2005/10/25 19:48:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.17 2005/11/28 20:18:43 jhb Exp $ */ /* @@ -190,6 +190,7 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); + return; } /* ==== //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,10 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.3 2005/11/21 20:22:34 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ -# Not yet, this would break all existing configs -#machine amd64 +machine amd64 # Bus support. device isa ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.446 2005/11/05 19:48:53 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.447 2005/11/27 23:16:58 ru Exp $ -machine amd64 cpu HAMMER ident GENERIC ==== //depot/projects/arm/src/sys/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,16 +4,10 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.48 2005/11/11 09:57:29 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.50 2005/11/28 23:13:52 anholt Exp $ # # -# This directive is mandatory; it defines the architecture to be -# configured for; in this case, the AMD64 family based machines. -# -machine amd64 - -# # We want LINT to cover profiling as well. profile 2 @@ -214,6 +208,7 @@ device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 device radeondrm # ATI Radeon +device savagedrm # S3 Savage3D, Savage4 device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee options DRM_DEBUG # Include debug printfs (slow) ==== //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.89 2005/03/06 22:28:14 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.90 2005/11/29 00:28:17 rodrigc Exp $"); #include #include @@ -395,7 +395,6 @@ ADD_OPTION(MNT_SYNCHRONOUS, "sync"); ADD_OPTION(MNT_NOEXEC, "noexec"); ADD_OPTION(MNT_NOSUID, "nosuid"); - ADD_OPTION(MNT_NODEV, "nodev"); ADD_OPTION(MNT_UNION, "union"); ADD_OPTION(MNT_ASYNC, "async"); ADD_OPTION(MNT_SUIDDIR, "suiddir"); ==== //depot/projects/arm/src/sys/conf/Makefile.alpha#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.138 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.140 2005/11/28 17:51:30 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 .if !defined(S) .if exists(./@/.) ==== //depot/projects/arm/src/sys/conf/Makefile.amd64#3 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.20 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso ==== //depot/projects/arm/src/sys/conf/Makefile.arm#5 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.18 2005/11/24 02:25:49 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.21 2005/11/28 17:51:30 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 # Temporary stuff while we're still embryonic NO_MODULES= @@ -48,7 +48,7 @@ DDB_ENABLED!= grep DDB opt_ddb.h || true -SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.static \ +SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader \ -warn-common -export-dynamic -dynamic-linker /red/herring -o \ ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL +=; cat ldscript.$M| \ @@ -74,7 +74,7 @@ .endif -CLEANFILES += ldscript.$M ldscript.$M.static ${KERNEL_KO}.bin \ +CLEANFILES += ldscript.$M ldscript.$M.noheader ${KERNEL_KO}.bin \ ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin %BEFORE_DEPEND ==== //depot/projects/arm/src/sys/conf/Makefile.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.268 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.270 2005/11/28 17:51:30 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso ==== //depot/projects/arm/src/sys/conf/Makefile.ia64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.65 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso ==== //depot/projects/arm/src/sys/conf/Makefile.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.170 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.172 2005/11/28 17:51:31 imp Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 .if !defined(S) .if exists(./@/.) ==== //depot/projects/arm/src/sys/conf/Makefile.powerpc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.281 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso ==== //depot/projects/arm/src/sys/conf/Makefile.sparc64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.36 2005/11/04 04:14:49 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso ==== //depot/projects/arm/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1334 2005/10/07 06:32:11 joel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1335 2005/11/29 05:31:46 ariff Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1922,6 +1922,7 @@ # since this is unsupported at the moment...). # # snd_als4000: Avance Logic ALS4000 PCI. +# snd_atiixp: ATI IXP 200/300/400 PCI. # snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_audiocs: Crystal Semiconductor CS4231 SBus/EBus. # snd_cmi: CMedia CMI8338/CMI8738 PCI. @@ -1957,6 +1958,7 @@ device snd_ad1816 device snd_als4000 +device snd_atiixp #device snd_au88x0 #device snd_audiocs device snd_cmi ==== //depot/projects/arm/src/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1066 2005/11/22 17:12:48 marius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1071 2005/11/28 23:13:50 anholt Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -9,13 +9,8 @@ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" -aicasm optional ahc \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ - compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ - no-obj no-implicit-rule \ - clean "aicasm* y.tab.h" -aicasm optional ahd \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ +aicasm optional ahc | ahd \ + dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" @@ -89,14 +84,8 @@ cam/scsi/scsi_cd.c optional cd cam/scsi/scsi_ch.c optional ch cam/scsi/scsi_da.c optional da -cam/scsi/scsi_low.c optional ct -cam/scsi/scsi_low.c optional ncv -cam/scsi/scsi_low.c optional nsp -cam/scsi/scsi_low.c optional stg -cam/scsi/scsi_low_pisa.c optional ct -cam/scsi/scsi_low_pisa.c optional ncv -cam/scsi/scsi_low_pisa.c optional nsp -cam/scsi/scsi_low_pisa.c optional stg +cam/scsi/scsi_low.c optional ct | ncv | nsp | stg +cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg cam/scsi/scsi_pass.c optional pass cam/scsi/scsi_pt.c optional pt cam/scsi/scsi_sa.c optional sa @@ -344,33 +333,17 @@ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp -crypto/blowfish/bf_skey.c optional crypto -crypto/blowfish/bf_skey.c optional ipsec ipsec_esp -crypto/des/des_ecb.c optional crypto -crypto/des/des_ecb.c optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto -crypto/des/des_setkey.c optional crypto -crypto/des/des_setkey.c optional ipsec ipsec_esp -crypto/des/des_setkey.c optional netsmbcrypto +crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp +crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmbcrypto +crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmbcrypto crypto/rc4/rc4.c optional netgraph_mppc_encryption -crypto/rijndael/rijndael-alg-fst.c optional crypto -crypto/rijndael/rijndael-alg-fst.c optional geom_bde -crypto/rijndael/rijndael-alg-fst.c optional ipsec -crypto/rijndael/rijndael-alg-fst.c optional random -crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp -crypto/rijndael/rijndael-api-fst.c optional geom_bde -crypto/rijndael/rijndael-api-fst.c optional random -crypto/rijndael/rijndael-api.c optional crypto -crypto/rijndael/rijndael-api.c optional ipsec -crypto/rijndael/rijndael-api.c optional wlan_ccmp -crypto/sha1.c optional carp -crypto/sha1.c optional netgraph_mppc_encryption -crypto/sha1.c optional crypto -crypto/sha1.c optional ipsec -crypto/sha2/sha2.c optional crypto -crypto/sha2/sha2.c optional geom_bde -crypto/sha2/sha2.c optional ipsec -crypto/sha2/sha2.c optional random +crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \ + ipsec | random | wlan_ccmp +crypto/rijndael/rijndael-api-fst.c optional geom_bde | random +crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp +crypto/sha1.c optional carp | crypto | ipsec | \ + netgraph_mppc_encryption +crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random ddb/db_access.c optional ddb ddb/db_break.c optional ddb ddb/db_command.c optional ddb @@ -488,10 +461,10 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist -dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr -dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ +dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr +dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" -dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ +dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" dev/ath/if_ath.c optional ath \ compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" @@ -583,6 +556,9 @@ dev/drm/radeon_irq.c optional radeondrm dev/drm/radeon_mem.c optional radeondrm dev/drm/radeon_state.c optional radeondrm +dev/drm/savage_bci.c optional savagedrm +dev/drm/savage_drv.c optional savagedrm +dev/drm/savage_state.c optional savagedrm dev/drm/sis_drv.c optional sisdrm dev/drm/sis_ds.c optional sisdrm dev/drm/sis_mm.c optional sisdrm @@ -661,12 +637,10 @@ dev/ida/ida_pci.c optional ida pci dev/ie/if_ie.c optional ie isa nowerror dev/ie/if_ie_isa.c optional ie isa -dev/ieee488/ibfoo.c optional pcii -dev/ieee488/ibfoo.c optional tnt4882 -dev/ieee488/pcii.c optional pcii +dev/ieee488/ibfoo.c optional pcii | tnt4882 +dev/ieee488/pcii.c optional pcii dev/ieee488/tnt4882.c optional tnt4882 -dev/ieee488/upd7210.c optional pcii -dev/ieee488/upd7210.c optional tnt4882 +dev/ieee488/upd7210.c optional pcii | tnt4882 dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic dev/iicbus/iicbb.c optional iicbb @@ -782,10 +756,8 @@ dev/pci/pcib_if.m standard dev/pdq/if_fea.c optional fea eisa dev/pdq/if_fpa.c optional fpa pci -dev/pdq/pdq.c optional fea eisa nowerror -dev/pdq/pdq.c optional fpa pci nowerror -dev/pdq/pdq_ifsubr.c optional fea eisa nowerror -dev/pdq/pdq_ifsubr.c optional fpa pci nowerror +dev/pdq/pdq.c optional nowerror fea eisa | fpa pci +dev/pdq/pdq_ifsubr.c optional nowerror fea eisa | fpa pci dev/ppbus/if_plip.c optional plip dev/ppbus/immio.c optional vpo dev/ppbus/lpbb.c optional lpbb @@ -807,8 +779,7 @@ dev/puc/puc_ebus.c optional puc ebus dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci -dev/puc/puc_sbus.c optional puc fhc -dev/puc/puc_sbus.c optional puc sbus +dev/puc/puc_sbus.c optional puc fhc | puc sbus dev/puc/pucdata.c optional puc pci dev/ral/if_ral.c optional ral dev/ral/if_ralrate.c optional ral @@ -829,7 +800,7 @@ dev/rp/rp_pci.c optional rp pci dev/sab/sab.c optional sab ebus dev/safe/safe.c optional safe -dev/sbsh/if_sbsh.c optional sbsh +dev/sbsh/if_sbsh.c optional sbsh dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa dev/si/si.c optional si @@ -859,6 +830,7 @@ dev/sound/isa/sbc.c optional snd_sbc isa dev/sound/isa/sndbuf_dma.c optional sound isa dev/sound/pci/als4000.c optional snd_als4000 pci +dev/sound/pci/atiixp.c optional snd_atiixp pci #dev/sound/pci/au88x0.c optional snd_au88x0 pci dev/sound/pci/cmi.c optional snd_cmi pci dev/sound/pci/cs4281.c optional snd_cs4281 pci @@ -872,7 +844,7 @@ dev/sound/pci/es137x.c optional snd_es137x pci dev/sound/pci/fm801.c optional snd_fm801 pci dev/sound/pci/ich.c optional snd_ich pci -dev/sound/pci/maestro.c optional snd_maestro pci +dev/sound/pci/maestro.c optional snd_maestro pci dev/sound/pci/maestro3.c optional snd_maestro3 pci \ warning "kernel contains GPL contaminated maestro3 headers" dev/sound/pci/neomagic.c optional snd_neomagic pci @@ -1112,8 +1084,7 @@ geom/geom_apple.c optional geom_apple geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd -geom/geom_ccd.c optional ccd -geom/geom_ccd.c optional geom_ccd +geom/geom_ccd.c optional ccd | geom_ccd geom/geom_ctl.c standard geom/geom_dev.c standard geom/geom_disk.c standard @@ -1177,11 +1148,10 @@ i4b/driver/i4b_rbch.c optional i4brbch i4b/driver/i4b_tel.c optional i4btel i4b/driver/i4b_ipr.c optional i4bipr -net/slcompress.c optional i4bipr +net/slcompress.c optional i4bipr | i4bisppp i4b/driver/i4b_ctl.c optional i4bctl i4b/driver/i4b_ing.c optional i4bing i4b/driver/i4b_isppp.c optional i4bisppp -net/slcompress.c optional i4bisppp # # isdn4bsd CAPI driver # @@ -1363,6 +1333,7 @@ kern/uipc_domain.c standard kern/uipc_mbuf.c standard kern/uipc_mbuf2.c standard +kern/uipc_mqueue.c optional p1003_1b_mqueue kern/uipc_proto.c standard kern/uipc_sem.c optional p1003_1b_semaphores kern/uipc_socket.c standard @@ -1426,8 +1397,7 @@ libkern/strtouq.c standard libkern/strvalid.c standard net/bpf.c standard -net/bpf_filter.c optional bpf -net/bpf_filter.c optional netgraph_bpf +net/bpf_filter.c optional bpf | netgraph_bpf net/bridgestp.c optional if_bridge net/bsd_comp.c optional ppp_bsdcomp net/if.c standard @@ -1449,10 +1419,8 @@ net/if_mib.c standard net/if_ppp.c optional ppp net/if_sl.c optional sl -net/if_spppfr.c optional sppp -net/if_spppfr.c optional i4bisppp -net/if_spppsubr.c optional sppp -net/if_spppsubr.c optional i4bisppp +net/if_spppfr.c optional i4bisppp | sppp +net/if_spppsubr.c optional i4bisppp | sppp net/if_stf.c optional stf net/if_tun.c optional tun net/if_tap.c optional tap @@ -1460,21 +1428,15 @@ net/netisr.c standard net/ppp_deflate.c optional ppp_deflate net/ppp_tty.c optional ppp -net/pfil.c optional ether -net/pfil.c optional inet +net/pfil.c optional ether | inet net/radix.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard net/rtsock.c standard -net/slcompress.c optional netgraph_vjc -net/slcompress.c optional ppp -net/slcompress.c optional sl -net/slcompress.c optional sppp -net/zlib.c optional ppp_deflate -net/zlib.c optional ipsec -net/zlib.c optional crypto -net/zlib.c optional geom_uzip +net/slcompress.c optional netgraph_vjc | ppp | sl | sppp +net/zlib.c optional crypto | geom_uzip | ipsec | \ + ppp_deflate net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl net80211/ieee80211_crypto.c optional wlan @@ -1526,19 +1488,19 @@ netatm/spans/spans_subr.c optional atm_spans atm_core netatm/spans/spans_util.c optional atm_spans atm_core spans_xdr.h optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ - clean "spans_xdr.h" \ - no-obj no-implicit-rule + before-depend \ + dependency "$S/netatm/spans/spans_xdr.x" \ + compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ + clean "spans_xdr.h" \ + no-obj no-implicit-rule spans_xdr.c optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ - clean "spans_xdr.c" \ - no-obj no-implicit-rule local + before-depend \ + dependency "$S/netatm/spans/spans_xdr.x" \ + compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ + clean "spans_xdr.c" \ + no-obj no-implicit-rule local spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ + dependency "$S/netatm/spans/spans_xdr.x" \ compile-with "${NORMAL_C}" \ no-implicit-rule local netatm/uni/q2110_sigaa.c optional atm_uni atm_core @@ -1635,8 +1597,8 @@ netgraph/ng_ksocket.c optional netgraph_ksocket netgraph/ng_l2tp.c optional netgraph_l2tp netgraph/ng_lmi.c optional netgraph_lmi -netgraph/ng_mppc.c optional netgraph_mppc_compression -netgraph/ng_mppc.c optional netgraph_mppc_encryption +netgraph/ng_mppc.c optional netgraph_mppc_compression | \ + netgraph_mppc_encryption netgraph/ng_nat.c optional netgraph_nat netgraph/ng_one2many.c optional netgraph_one2many netgraph/ng_parse.c optional netgraph @@ -1667,10 +1629,8 @@ netinet/in_rmx.c optional inet netinet/ip_divert.c optional ipdivert netinet/ip_dummynet.c optional dummynet -netinet/ip_ecn.c optional inet -netinet/ip_ecn.c optional inet6 -netinet/ip_encap.c optional inet -netinet/ip_encap.c optional inet6 +netinet/ip_ecn.c optional inet | inet6 +netinet/ip_encap.c optional inet | inet6 netinet/ip_fastfwd.c optional inet netinet/ip_fw2.c optional ipfirewall netinet/ip_fw_pfil.c optional ipfirewall @@ -1787,8 +1747,7 @@ netsmb/smb_subr.c optional netsmb netsmb/smb_trantcp.c optional netsmb netsmb/smb_usr.c optional netsmb -nfs/nfs_common.c optional nfsclient -nfs/nfs_common.c optional nfsserver +nfs/nfs_common.c optional nfsclient | nfsserver nfs4client/nfs4_dev.c optional nfsclient nfs4client/nfs4_idmap.c optional nfsclient nfs4client/nfs4_socket.c optional nfsclient @@ -1814,22 +1773,19 @@ nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver # crypto support -opencrypto/cast.c optional crypto -opencrypto/cast.c optional ipsec ipsec_esp +opencrypto/cast.c optional crypto | ipsec ipsec_esp opencrypto/criov.c optional crypto opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptosoft.c optional crypto opencrypto/deflate.c optional crypto -opencrypto/rmd160.c optional crypto -opencrypto/rmd160.c optional ipsec +opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto pci/agp.c optional agp pci pci/agp_if.m optional agp pci pci/alpm.c optional alpm pci -pci/amdpm.c optional amdpm pci -pci/amdpm.c optional nfpm pci +pci/amdpm.c optional amdpm pci | nfpm pci pci/if_de.c optional de pci pci/if_mn.c optional mn pci pci/if_pcn.c optional pcn pci ==== //depot/projects/arm/src/sys/conf/files.alpha#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.121 2005/06/14 04:16:10 marcel Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.123 2005/11/27 21:41:58 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -47,7 +47,6 @@ alpha/alpha/db_interface.c optional ddb alpha/alpha/db_trace.c optional ddb alpha/alpha/dec_1000a.c optional dec_1000a -alpha/alpha/dec_1000a.c optional dec_1000a alpha/alpha/dec_2100_a50.c optional dec_2100_a50 alpha/alpha/dec_2100_a500.c optional dec_2100_a500 alpha/alpha/dec_axppci_33.c optional dec_axppci_33 @@ -96,45 +95,30 @@ alpha/mcbus/mcbus.c optional dec_kn300 alpha/mcbus/mcmem.c optional dec_kn300 alpha/mcbus/mcpcia.c optional dec_kn300 -alpha/osf1/imgact_osf1.c optional compat_linux -alpha/osf1/imgact_osf1.c optional compat_osf1 -alpha/osf1/osf1_ioctl.c optional compat_linux -alpha/osf1/osf1_ioctl.c optional compat_osf1 -alpha/osf1/osf1_misc.c optional compat_linux -alpha/osf1/osf1_misc.c optional compat_osf1 -alpha/osf1/osf1_mount.c optional compat_linux -alpha/osf1/osf1_mount.c optional compat_osf1 -alpha/osf1/osf1_signal.c optional compat_linux -alpha/osf1/osf1_signal.c optional compat_osf1 -alpha/osf1/osf1_sysent.c optional compat_linux -alpha/osf1/osf1_sysent.c optional compat_osf1 -alpha/osf1/osf1_sysvec.c optional compat_linux -alpha/osf1/osf1_sysvec.c optional compat_osf1 +alpha/osf1/imgact_osf1.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_ioctl.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_misc.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_mount.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_signal.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_sysent.c optional compat_linux | compat_osf1 +alpha/osf1/osf1_sysvec.c optional compat_linux | compat_osf1 alpha/pci/alphapci_if.m optional pci -alpha/pci/apecs.c optional dec_2100_a50 -alpha/pci/apecs.c optional dec_eb64plus -alpha/pci/apecs.c optional dec_1000a -alpha/pci/apecs_pci.c optional dec_2100_a50 -alpha/pci/apecs_pci.c optional dec_eb64plus -alpha/pci/apecs_pci.c optional dec_1000a +alpha/pci/apecs.c optional dec_1000a | dec_2100_a50 | \ + dec_eb64plus +alpha/pci/apecs_pci.c optional dec_1000a | dec_2100_a50 | \ + dec_eb64plus alpha/pci/bwx.c optional pci -alpha/pci/cia.c optional dec_eb164 -alpha/pci/cia.c optional dec_kn20aa -alpha/pci/cia.c optional dec_st550 -alpha/pci/cia.c optional dec_1000a -alpha/pci/cia_pci.c optional dec_eb164 -alpha/pci/cia_pci.c optional dec_kn20aa -alpha/pci/cia_pci.c optional dec_st550 -alpha/pci/cia_pci.c optional dec_1000a +alpha/pci/cia.c optional dec_1000a | dec_eb164 | \ + dec_kn20aa | dec_st550 +alpha/pci/cia_pci.c optional dec_1000a | dec_eb164 | \ + dec_kn20aa | dec_st550 alpha/pci/irongate.c optional api_up1000 alpha/pci/irongate_pci.c optional api_up1000 alpha/pci/lca.c optional dec_axppci_33 alpha/pci/lca_pci.c optional dec_axppci_33 -alpha/pci/pci_eb164_intr.s optional dec_eb164 -alpha/pci/pci_eb164_intr.s optional dec_kn20aa -alpha/pci/pci_eb164_intr.s optional dec_st550 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 29 17:36:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC4E216A422; Tue, 29 Nov 2005 17:36:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C3CC516A41F for ; Tue, 29 Nov 2005 17:36:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AB5B43D67 for ; Tue, 29 Nov 2005 17:36:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATHaY1C017678 for ; Tue, 29 Nov 2005 17:36:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATHaYiq017675 for perforce@freebsd.org; Tue, 29 Nov 2005 17:36:34 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Nov 2005 17:36:34 GMT Message-Id: <200511291736.jATHaYiq017675@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 Cc: Subject: PERFORCE change 87445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 17:36:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=87445 Change 87445 by sam@sam_ebb on 2005/11/29 17:35:42 correct mcast buffering indication in dtim; from madwifi Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#59 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#59 (text+ko) ==== @@ -2029,7 +2029,7 @@ else tie->tim_count--; /* update state for buffered multicast frames on DTIM */ - if (mcast && (tie->tim_count == 1 || tie->tim_period == 1)) + if (mcast && tie->tim_count == 0) tie->tim_bitctl |= 1; else tie->tim_bitctl &= ~1; From owner-p4-projects@FreeBSD.ORG Tue Nov 29 18:50:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 247AB16A422; Tue, 29 Nov 2005 18:50:07 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F1DA316A420 for ; Tue, 29 Nov 2005 18:50:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AFD143D60 for ; Tue, 29 Nov 2005 18:50:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATIo63p021549 for ; Tue, 29 Nov 2005 18:50:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATIo6XJ021546 for perforce@freebsd.org; Tue, 29 Nov 2005 18:50:06 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 18:50:06 GMT Message-Id: <200511291850.jATIo6XJ021546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 18:50:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=87453 Change 87453 by peter@peter_daintree on 2005/11/29 18:50:05 Use sched_pin on the chance that DELAY() is called with interrupts enabled. It is cheap and harmless. Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#52 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#52 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -274,11 +275,13 @@ if (tsc_freq != 0 && !tsc_is_broken) { uint64_t start, end, now; + sched_pin(); start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { now = rdtsc(); - } while (now < end || (now > start && end < start)); + } while (now < end); + sched_unpin(); return; } #ifdef DELAYDEBUG From owner-p4-projects@FreeBSD.ORG Tue Nov 29 19:06:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4448416A423; Tue, 29 Nov 2005 19:06:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 036DB16A41F for ; Tue, 29 Nov 2005 19:06:41 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C32743D79 for ; Tue, 29 Nov 2005 19:06:28 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATJ6RqS022717 for ; Tue, 29 Nov 2005 19:06:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATJ6QnU022713 for perforce@freebsd.org; Tue, 29 Nov 2005 19:06:26 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 19:06:26 GMT Message-Id: <200511291906.jATJ6QnU022713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 19:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=87455 Change 87455 by peter@peter_melody on 2005/11/29 19:06:13 When DEFAULTS was added, the existence check of the main config file was deferred till AFTER a mkdir of ../compile/[*argv] This leads to garbage directories being created. As a hack, do an explicit open test for the named config file. Affected files ... .. //depot/projects/hammer/usr.sbin/config/main.c#11 edit Differences ... ==== //depot/projects/hammer/usr.sbin/config/main.c#11 (text+ko) ==== @@ -96,6 +96,7 @@ int ch, len; char *p; char xxx[MAXPATHLEN]; + FILE *fp; while ((ch = getopt(argc, argv, "d:gpV")) != -1) switch (ch) { @@ -125,6 +126,10 @@ usage(); PREFIX = *argv; + fp = fopen(PREFIX, "r"); + if (fp == NULL) + err(2, "%s", PREFIX); + fclose(fp); if (freopen("DEFAULTS", "r", stdin) != NULL) { found_defaults = 1; yyfile = "DEFAULTS"; From owner-p4-projects@FreeBSD.ORG Tue Nov 29 21:48:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C770916A427; Tue, 29 Nov 2005 21:48:57 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 62A2316A420 for ; Tue, 29 Nov 2005 21:48:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BC2E43D80 for ; Tue, 29 Nov 2005 21:48:56 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATLmpwg049521 for ; Tue, 29 Nov 2005 21:48:51 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATLmpTD049518 for perforce@freebsd.org; Tue, 29 Nov 2005 21:48:51 GMT (envelope-from peter@freebsd.org) Date: Tue, 29 Nov 2005 21:48:51 GMT Message-Id: <200511292148.jATLmpTD049518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 87476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2005 21:48:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=87476 Change 87476 by peter@peter_melody on 2005/11/29 21:48:37 Handle wraparound, in case we happen to be doing a DELAY as we cross an uptime of about 140 years on a 2GHz machine. One can never be too safe! :-) Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#53 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#53 (text+ko) ==== @@ -280,7 +280,7 @@ end = start + (tsc_freq * n) / 1000000; do { now = rdtsc(); - } while (now < end); + } while (now < end || (now > start && end < start)); sched_unpin(); return; } From owner-p4-projects@FreeBSD.ORG Wed Nov 30 03:38:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FB3D16A432; Wed, 30 Nov 2005 03:38:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D193D16A420 for ; Wed, 30 Nov 2005 03:38:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D17D143D7E for ; Wed, 30 Nov 2005 03:38:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAU3c9Ll079242 for ; Wed, 30 Nov 2005 03:38:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU3c9CO079239 for perforce@freebsd.org; Wed, 30 Nov 2005 03:38:09 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 03:38:09 GMT Message-Id: <200511300338.jAU3c9CO079239@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 Cc: Subject: PERFORCE change 87496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 03:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=87496 Change 87496 by sam@sam_ebb on 2005/11/30 03:38:04 move node-related malloc's to the M_80211_NODE bucket Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#67 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#69 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#67 (text+ko) ==== @@ -1098,7 +1098,7 @@ { if (ni->ni_challenge == NULL) MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, - M_DEVBUF, M_NOWAIT); + M_80211_NODE, M_NOWAIT); if (ni->ni_challenge == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, "[%s] shared key challenge alloc failed\n", @@ -1285,7 +1285,7 @@ switch (seq) { case IEEE80211_AUTH_SHARED_PASS: if (ni->ni_challenge != NULL) { - FREE(ni->ni_challenge, M_DEVBUF); + FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } if (status != 0) { @@ -1886,8 +1886,8 @@ */ if (*iep == NULL || (*iep)[1] != ie[1]) { if (*iep != NULL) - FREE(*iep, M_DEVBUF); - MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT); + FREE(*iep, M_80211_NODE); + MALLOC(*iep, void*, ielen, M_80211_NODE, M_NOWAIT); } if (*iep != NULL) memcpy(*iep, ie, ielen); @@ -2498,7 +2498,7 @@ } /* discard challenge after association */ if (ni->ni_challenge != NULL) { - FREE(ni->ni_challenge, M_DEVBUF); + FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } /* NB: 802.11 spec says to ignore station's privacy bit */ @@ -2554,7 +2554,7 @@ /* * Flush any state from a previous association. */ - FREE(ni->ni_wpa_ie, M_DEVBUF); + FREE(ni->ni_wpa_ie, M_80211_NODE); ni->ni_wpa_ie = NULL; } if (wme != NULL) { @@ -2569,7 +2569,7 @@ /* * Flush any state from a previous association. */ - FREE(ni->ni_wme_ie, M_DEVBUF); + FREE(ni->ni_wme_ie, M_80211_NODE); ni->ni_wme_ie = NULL; ni->ni_flags &= ~IEEE80211_NODE_QOS; } @@ -2585,7 +2585,7 @@ /* * Flush any state from a previous association. */ - FREE(ni->ni_ath_ie, M_DEVBUF); + FREE(ni->ni_ath_ie, M_80211_NODE); ni->ni_ath_ie = NULL; ni->ni_ath_flags = 0; } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#69 (text+ko) ==== @@ -110,7 +110,7 @@ ic->ic_max_aid = IEEE80211_AID_MAX; MALLOC(ic->ic_aid_bitmap, u_int32_t *, howmany(ic->ic_max_aid, 32) * sizeof(u_int32_t), - M_DEVBUF, M_NOWAIT | M_ZERO); + M_80211_NODE, M_NOWAIT | M_ZERO); if (ic->ic_aid_bitmap == NULL) { /* XXX no way to recover */ printf("%s: no memory for AID bitmap!\n", __func__); @@ -170,7 +170,7 @@ } ieee80211_node_table_cleanup(&ic->ic_sta); if (ic->ic_aid_bitmap != NULL) { - FREE(ic->ic_aid_bitmap, M_DEVBUF); + FREE(ic->ic_aid_bitmap, M_80211_NODE); ic->ic_aid_bitmap = NULL; } } @@ -664,7 +664,7 @@ ni->ni_associd = 0; if (ni->ni_challenge != NULL) { - FREE(ni->ni_challenge, M_DEVBUF); + FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } /* @@ -698,11 +698,11 @@ ic->ic_node_cleanup(ni); if (ni->ni_wpa_ie != NULL) - FREE(ni->ni_wpa_ie, M_DEVBUF); + FREE(ni->ni_wpa_ie, M_80211_NODE); if (ni->ni_wme_ie != NULL) - FREE(ni->ni_wme_ie, M_DEVBUF); + FREE(ni->ni_wme_ie, M_80211_NODE); if (ni->ni_ath_ie != NULL) - FREE(ni->ni_ath_ie, M_DEVBUF); + FREE(ni->ni_ath_ie, M_80211_NODE); IEEE80211_NODE_SAVEQ_DESTROY(ni); FREE(ni, M_80211_NODE); } From owner-p4-projects@FreeBSD.ORG Wed Nov 30 04:02:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F2C116A422; Wed, 30 Nov 2005 04:02:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 52B1416A41F for ; Wed, 30 Nov 2005 04:02:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEB4543D68 for ; Wed, 30 Nov 2005 04:02:39 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAU42dd3083664 for ; Wed, 30 Nov 2005 04:02:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU42dx2083661 for perforce@freebsd.org; Wed, 30 Nov 2005 04:02:39 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 04:02:39 GMT Message-Id: <200511300402.jAU42dx2083661@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 Cc: Subject: PERFORCE change 87497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 04:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=87497 Change 87497 by sam@sam_ebb on 2005/11/30 04:02:14 use new slottime setting, not old one when updating based on a rcvd beacon Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#68 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#68 (text+ko) ==== @@ -2126,7 +2126,7 @@ */ ieee80211_set_shortslottime(ic, IEEE80211_IS_CHAN_A(ic->ic_bsschan) || - (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); + (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ni->ni_capinfo = scan.capinfo; /* XXX statistic */ } From owner-p4-projects@FreeBSD.ORG Wed Nov 30 04:03:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9B9316A422; Wed, 30 Nov 2005 04:03:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C548616A41F for ; Wed, 30 Nov 2005 04:03:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B1443D58 for ; Wed, 30 Nov 2005 04:03:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAU43fQ8083689 for ; Wed, 30 Nov 2005 04:03:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU43fHH083686 for perforce@freebsd.org; Wed, 30 Nov 2005 04:03:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 04:03:41 GMT Message-Id: <200511300403.jAU43fHH083686@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 Cc: Subject: PERFORCE change 87498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 04:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=87498 Change 87498 by sam@sam_ebb on 2005/11/30 04:03:07 update only the slot time capability based on rcvd beacons; was copying all of capinfo Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#69 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#69 (text+ko) ==== @@ -2127,7 +2127,8 @@ ieee80211_set_shortslottime(ic, IEEE80211_IS_CHAN_A(ic->ic_bsschan) || (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); - ni->ni_capinfo = scan.capinfo; + ni->ni_capinfo = (ni->ni_capinfo &~ IEEE80211_CAPINFO_SHORT_SLOTTIME) + | (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME); /* XXX statistic */ } if (scan.wme != NULL && From owner-p4-projects@FreeBSD.ORG Wed Nov 30 04:18:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B1EC16A422; Wed, 30 Nov 2005 04:18:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1B0E316A420 for ; Wed, 30 Nov 2005 04:18:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB46C43D98 for ; Wed, 30 Nov 2005 04:17:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAU4HxdX084420 for ; Wed, 30 Nov 2005 04:17:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU4HwL5084417 for perforce@freebsd.org; Wed, 30 Nov 2005 04:17:58 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 04:17:58 GMT Message-Id: <200511300417.jAU4HwL5084417@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 Cc: Subject: PERFORCE change 87499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 04:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=87499 Change 87499 by sam@sam_ebb on 2005/11/30 04:17:13 handle ap's that beacon both wpa and rsn: o record both ie's o add new ioctl to return both (existing ioctl cannot handle it but is kept for compatbility) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#70 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#54 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#32 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#70 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#36 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#70 (text+ko) ==== @@ -1919,7 +1919,7 @@ #define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) struct ieee80211_frame *wh; u_int8_t *frm, *efrm; - u_int8_t *ssid, *rates, *xrates, *wpa, *wme, *ath; + u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath; int reassoc, resp, allocbs; u_int8_t rate; @@ -2015,7 +2015,7 @@ scan.erp = frm[2]; break; case IEEE80211_ELEMID_RSN: - scan.wpa = frm; + scan.rsn = frm; break; case IEEE80211_ELEMID_VENDOR: if (iswpaoui(frm)) @@ -2371,7 +2371,7 @@ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { u_int16_t capinfo, lintval; - struct ieee80211_rsnparms rsn; + struct ieee80211_rsnparms rsnparms; u_int8_t reason; if (ic->ic_opmode != IEEE80211_M_HOSTAP || @@ -2411,7 +2411,7 @@ lintval = le16toh(*(u_int16_t *)frm); frm += 2; if (reassoc) frm += 6; /* ignore current AP info */ - ssid = rates = xrates = wpa = wme = ath = NULL; + ssid = rates = xrates = wpa = rsn = wme = ath = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_SSID: @@ -2425,7 +2425,7 @@ break; /* XXX verify only one of RSN and WPA ie's? */ case IEEE80211_ELEMID_RSN: - wpa = frm; + rsn = frm; break; case IEEE80211_ELEMID_VENDOR: if (iswpaoui(frm)) @@ -2453,8 +2453,21 @@ ic->ic_stats.is_rx_assoc_notauth++; return; } - /* assert right associstion security credentials */ - if (wpa == NULL && (ic->ic_flags & IEEE80211_F_WPA)) { + /* assert right association security credentials */ + switch (ic->ic_flags & IEEE80211_F_WPA) { + case IEEE80211_F_WPA1: + if (wpa == NULL) + goto badwparsn; + break; + case IEEE80211_F_WPA2: + if (rsn == NULL) + goto badwparsn; + break; + case IEEE80211_F_WPA1|IEEE80211_F_WPA2: + if (wpa != NULL || rsn != NULL) + break; + /* fall thru... */ + badwparsn: IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, "[%s] no WPA/RSN IE in association request\n", @@ -2463,23 +2476,22 @@ IEEE80211_FC0_SUBTYPE_DEAUTH, IEEE80211_REASON_RSN_REQUIRED); ieee80211_node_leave(ic, ni); - /* XXX distinguish WPA/RSN? */ ic->ic_stats.is_rx_assoc_badwpaie++; return; } - if (wpa != NULL) { + if (wpa != NULL || rsn != NULL) { /* - * Parse WPA information element. Note that + * Parse WPA/RSN information element. Note that * we initialize the param block from the node * state so that information in the IE overrides * our defaults. The resulting parameters are * installed below after the association is assured. */ - rsn = ni->ni_rsn; + rsnparms = ni->ni_rsn; if (wpa[0] != IEEE80211_ELEMID_RSN) - reason = ieee80211_parse_wpa(ic, wpa, &rsn, wh); + reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh); else - reason = ieee80211_parse_rsn(ic, wpa, &rsn, wh); + reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh); if (reason != 0) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason); @@ -2493,9 +2505,9 @@ "[%s] %s ie: mc %u/%u uc %u/%u key %u caps 0x%x\n", ether_sprintf(wh->i_addr2), wpa[0] != IEEE80211_ELEMID_RSN ? "WPA" : "RSN", - rsn.rsn_mcastcipher, rsn.rsn_mcastkeylen, - rsn.rsn_ucastcipher, rsn.rsn_ucastkeylen, - rsn.rsn_keymgmt, rsn.rsn_caps); + rsnparms.rsn_mcastcipher, rsnparms.rsn_mcastkeylen, + rsnparms.rsn_ucastcipher, rsnparms.rsn_ucastkeylen, + rsnparms.rsn_keymgmt, rsnparms.rsn_caps); } /* discard challenge after association */ if (ni->ni_challenge != NULL) { @@ -2545,11 +2557,11 @@ ni->ni_fhindex = ic->ic_bss->ni_fhindex; if (wpa != NULL) { /* - * Record WPA/RSN parameters for station, mark + * Record WPA parameters for station, mark * node as using WPA and record information element * for applications that require it. */ - ni->ni_rsn = rsn; + ni->ni_rsn = rsnparms; ieee80211_saveie(&ni->ni_wpa_ie, wpa); } else if (ni->ni_wpa_ie != NULL) { /* @@ -2558,6 +2570,21 @@ FREE(ni->ni_wpa_ie, M_80211_NODE); ni->ni_wpa_ie = NULL; } + if (rsn != NULL) { + /* + * Record RSN parameters for station, mark + * node as using WPA and record information element + * for applications that require it. + */ + ni->ni_rsn = rsnparms; + ieee80211_saveie(&ni->ni_rsn_ie, rsn); + } else if (ni->ni_wpa_ie != NULL) { + /* + * Flush any state from a previous association. + */ + FREE(ni->ni_rsn_ie, M_80211_NODE); + ni->ni_rsn_ie = NULL; + } if (wme != NULL) { /* * Record WME parameters for station, mark node ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#54 (text+ko) ==== @@ -181,10 +181,10 @@ } static int -ieee80211_ioctl_getwpaie(struct ieee80211com *ic, struct ieee80211req *ireq) +ieee80211_ioctl_getwpaie(struct ieee80211com *ic, struct ieee80211req *ireq, int req) { struct ieee80211_node *ni; - struct ieee80211req_wpaie wpaie; + struct ieee80211req_wpaie2 wpaie; int error; if (ireq->i_len < IEEE80211_ADDR_LEN) @@ -202,9 +202,29 @@ ielen = sizeof(wpaie.wpa_ie); memcpy(wpaie.wpa_ie, ni->ni_wpa_ie, ielen); } + if (req == IEEE80211_IOC_WPAIE2) { + memset(wpaie.rsn_ie, 0, sizeof(wpaie.rsn_ie)); + if (ni->ni_rsn_ie != NULL) { + int ielen = ni->ni_rsn_ie[1] + 2; + if (ielen > sizeof(wpaie.rsn_ie)) + ielen = sizeof(wpaie.rsn_ie); + memcpy(wpaie.rsn_ie, ni->ni_rsn_ie, ielen); + } + if (ireq->i_len > sizeof(struct ieee80211req_wpaie2)) + ireq->i_len = sizeof(struct ieee80211req_wpaie2); + } else { + /* compatibility op, may overwrite wpa ie */ + /* XXX check ic_flags? */ + if (ni->ni_rsn_ie != NULL) { + int ielen = ni->ni_rsn_ie[1] + 2; + if (ielen > sizeof(wpaie.wpa_ie)) + ielen = sizeof(wpaie.wpa_ie); + memcpy(wpaie.wpa_ie, ni->ni_rsn_ie, ielen); + } + if (ireq->i_len > sizeof(struct ieee80211req_wpaie)) + ireq->i_len = sizeof(struct ieee80211req_wpaie); + } ieee80211_free_node(ni); - if (ireq->i_len > sizeof(wpaie)) - ireq->i_len = sizeof(wpaie); return copyout(&wpaie, ireq->i_data, ireq->i_len); } @@ -245,6 +265,8 @@ *ielen = 0; if (se->se_wpa_ie != NULL) *ielen += 2+se->se_wpa_ie[1]; + if (se->se_rsn_ie != NULL) + *ielen += 2+se->se_rsn_ie[1]; if (se->se_wme_ie != NULL) *ielen += 2+se->se_wme_ie[1]; if (se->se_ath_ie != NULL) @@ -302,6 +324,10 @@ memcpy(cp, se->se_wpa_ie, 2+se->se_wpa_ie[1]); cp += 2+se->se_wpa_ie[1]; } + if (se->se_rsn_ie != NULL) { + memcpy(cp, se->se_rsn_ie, 2+se->se_rsn_ie[1]); + cp += 2+se->se_rsn_ie[1]; + } if (se->se_wme_ie != NULL) { memcpy(cp, se->se_wme_ie, 2+se->se_wme_ie[1]); cp += 2+se->se_wme_ie[1]; @@ -361,6 +387,8 @@ *ielen = 0; if (ni->ni_wpa_ie != NULL) *ielen += 2+ni->ni_wpa_ie[1]; + if (ni->ni_rsn_ie != NULL) + *ielen += 2+ni->ni_rsn_ie[1]; if (ni->ni_wme_ie != NULL) *ielen += 2+ni->ni_wme_ie[1]; if (ni->ni_ath_ie != NULL) @@ -440,6 +468,10 @@ memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); cp += 2+ni->ni_wpa_ie[1]; } + if (ni->ni_rsn_ie != NULL) { + memcpy(cp, ni->ni_rsn_ie, 2+ni->ni_rsn_ie[1]); + cp += 2+ni->ni_rsn_ie[1]; + } if (ni->ni_wme_ie != NULL) { memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); cp += 2+ni->ni_wme_ie[1]; @@ -767,7 +799,10 @@ ireq->i_data, ireq->i_len); break; case IEEE80211_IOC_WPAIE: - error = ieee80211_ioctl_getwpaie(ic, ireq); + error = ieee80211_ioctl_getwpaie(ic, ireq, ireq->i_type); + break; + case IEEE80211_IOC_WPAIE2: + error = ieee80211_ioctl_getwpaie(ic, ireq, ireq->i_type); break; case IEEE80211_IOC_SCAN_RESULTS: error = ieee80211_ioctl_getscanresults(ic, ireq); @@ -1044,6 +1079,7 @@ return error; switch (mlme.im_op) { case IEEE80211_MLME_ASSOC: + /* XXX ibss/ahdemo */ if (ic->ic_opmode == IEEE80211_M_STA) { struct scanlookup lookup; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#32 (text+ko) ==== @@ -281,9 +281,14 @@ /* * Retrieve the WPA/RSN information element for an associated station. */ -struct ieee80211req_wpaie { +struct ieee80211req_wpaie { /* old version w/ only one ie */ + u_int8_t wpa_macaddr[IEEE80211_ADDR_LEN]; + u_int8_t wpa_ie[IEEE80211_MAX_OPT_IE]; +}; +struct ieee80211req_wpaie2 { u_int8_t wpa_macaddr[IEEE80211_ADDR_LEN]; u_int8_t wpa_ie[IEEE80211_MAX_OPT_IE]; + u_int8_t rsn_ie[IEEE80211_MAX_OPT_IE]; }; /* @@ -458,6 +463,7 @@ #define IEEE80211_IOC_ROAM_RATE_11G 71 /* tx rate threshold in 11g */ #define IEEE80211_IOC_MCAST_RATE 72 /* tx rate for mcast frames */ #define IEEE80211_IOC_FRAGTHRESHOLD 73 /* tx fragmentation threshold */ +#define IEEE80211_IOC_WPAIE2 74 /* WPA+RSN info elements */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#70 (text+ko) ==== @@ -591,6 +591,8 @@ ni->ni_noise = se->se_noise; if (se->se_wpa_ie != NULL) ieee80211_saveie(&ni->ni_wpa_ie, se->se_wpa_ie); + if (se->se_rsn_ie != NULL) + ieee80211_saveie(&ni->ni_rsn_ie, se->se_rsn_ie); if (se->se_wme_ie != NULL) ieee80211_saveie(&ni->ni_wme_ie, se->se_wme_ie); if (se->se_ath_ie != NULL) @@ -699,6 +701,8 @@ ic->ic_node_cleanup(ni); if (ni->ni_wpa_ie != NULL) FREE(ni->ni_wpa_ie, M_80211_NODE); + if (ni->ni_rsn_ie != NULL) + FREE(ni->ni_rsn_ie, M_80211_NODE); if (ni->ni_wme_ie != NULL) FREE(ni->ni_wme_ie, M_80211_NODE); if (ni->ni_ath_ie != NULL) @@ -920,6 +924,8 @@ ieee80211_saveie(&ni->ni_wme_ie, sp->wme); if (sp->wpa != NULL) ieee80211_saveie(&ni->ni_wpa_ie, sp->wpa); + if (sp->rsn != NULL) + ieee80211_saveie(&ni->ni_rsn_ie, sp->rsn); if (sp->ath != NULL) ieee80211_saveath(ni, sp->ath); ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#36 (text+ko) ==== @@ -115,7 +115,8 @@ u_int16_t ni_txpower; /* current transmit power */ u_int16_t ni_vlan; /* vlan tag */ u_int32_t *ni_challenge; /* shared-key challenge */ - u_int8_t *ni_wpa_ie; /* captured WPA/RSN ie */ + u_int8_t *ni_wpa_ie; /* captured WPA ie */ + u_int8_t *ni_rsn_ie; /* captured RSN ie */ u_int8_t *ni_wme_ie; /* captured WME ie */ u_int8_t *ni_ath_ie; /* captured Atheros ie */ u_int16_t ni_txseqs[17]; /* tx seq per-tid */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#5 (text+ko) ==== @@ -136,6 +136,7 @@ u_int8_t *xrates; u_int8_t *doth; u_int8_t *wpa; + u_int8_t *rsn; u_int8_t *wme; u_int8_t *ath; }; @@ -165,7 +166,8 @@ int8_t se_rssi; /* avg'd recv ssi */ int8_t se_noise; /* noise floor */ u_int8_t se_dtimperiod; /* DTIM period */ - u_int8_t *se_wpa_ie; /* captured WPA/RSN ie */ + u_int8_t *se_wpa_ie; /* captured WPA ie */ + u_int8_t *se_rsn_ie; /* captured RSN ie */ u_int8_t *se_wme_ie; /* captured WME ie */ u_int8_t *se_ath_ie; /* captured Atheros ie */ u_int se_age; /* age of entry (0 on create) */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#8 (text+ko) ==== @@ -275,6 +275,7 @@ } saveie(&ise->se_wme_ie, sp->wme); saveie(&ise->se_wpa_ie, sp->wpa); + saveie(&ise->se_rsn_ie, sp->rsn); saveie(&ise->se_ath_ie, sp->ath); /* clear failure count after STA_FAIL_AGE passes */ From owner-p4-projects@FreeBSD.ORG Wed Nov 30 05:18:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B99D16A425; Wed, 30 Nov 2005 05:18:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E706816A420 for ; Wed, 30 Nov 2005 05:18:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E20DC43D8A for ; Wed, 30 Nov 2005 05:18:13 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAU5ID7n094069 for ; Wed, 30 Nov 2005 05:18:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU5IDH2094066 for perforce@freebsd.org; Wed, 30 Nov 2005 05:18:13 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 05:18:13 GMT Message-Id: <200511300518.jAU5IDH2094066@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 Cc: Subject: PERFORCE change 87503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 05:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=87503 Change 87503 by sam@sam_ebb on 2005/11/30 05:17:59 save power save fixes Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#71 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#71 (text+ko) ==== @@ -2147,8 +2147,14 @@ int max = tim->tim_len + min - 4; if ((tim->tim_bitctl&1) || (min <= ix && ix <= max && - isset(tim->tim_bitmap - min, aid))) + isset(tim->tim_bitmap - min, aid))) { + /* + * XXX Do not let bg scan kick off + * we are expecting data. + */ + ic->ic_lastdata = ticks; ieee80211_sta_pwrsave(ic, 0); + } #endif ni->ni_dtim_count = tim->tim_count; ni->ni_dtim_period = tim->tim_period; @@ -2167,11 +2173,18 @@ * return on-channel to receive a beacon from * our ap. */ - if (ic->ic_flags & IEEE80211_F_SCAN) + if (ic->ic_flags & IEEE80211_F_SCAN) { ieee80211_add_scan(ic, &scan, wh, subtype, rssi, noise, rstamp); - else if (contbgscan(ic) || startbgscan(ic)) + } else if (contbgscan(ic)) { + ieee80211_bg_scan(ic); + } else if (startbgscan(ic)) { +#if 0 + /* wakeup if we are sleeing */ + ieee80211_set_pwrsave(ic, 0); +#endif ieee80211_bg_scan(ic); + } return; } /* From owner-p4-projects@FreeBSD.ORG Wed Nov 30 14:03:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 230C416A41F; Wed, 30 Nov 2005 14:03:06 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B8A9116A41F for ; Wed, 30 Nov 2005 14:03:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BB8843D6E for ; Wed, 30 Nov 2005 14:02:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUE2wwX035689 for ; Wed, 30 Nov 2005 14:02:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUE2ufB035686 for perforce@freebsd.org; Wed, 30 Nov 2005 14:02:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 14:02:56 GMT Message-Id: <200511301402.jAUE2ufB035686@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 Cc: Subject: PERFORCE change 87517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 14:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=87517 Change 87517 by rwatson@rwatson_peppercorn on 2005/11/30 14:01:59 Fix additional bugs in reading of audit_control: return (-2) when errno will have a valid error number for the caller. Properly iterate over the file, correcting bugs introduced in the previous revision. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#7 (text+ko) ==== @@ -65,7 +65,7 @@ if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return (0); /* Error */ + return (-1); /* Error */ } while (1) { @@ -73,28 +73,29 @@ pthread_mutex_unlock(&mutex); if (ferror(fp)) return (-1); - return (0); + return (0); /* EOF */ } - if (linestr[0] != '#') - break; - } + if (linestr[0] == '#') + continue; + - /* Remove trailing new line character. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - tokptr = linestr; - if ((type = strtok_r(tokptr, delim, &last)) != NULL) { - if (!strcmp(name, type)) { - /* Found matching name. */ - *str = strtok_r(NULL, delim, &last); - pthread_mutex_unlock(&mutex); - if (*str == NULL) { - errno = EINVAL; - return (-1); /* Parse error in file */ + tokptr = linestr; + if ((type = strtok_r(tokptr, delim, &last)) != NULL) { + if (strcmp(name, type) == 0) { + /* Found matching name. */ + *str = strtok_r(NULL, delim, &last); + pthread_mutex_unlock(&mutex); + if (*str == NULL) { + errno = EINVAL; + return (-1); /* Parse error in file */ + } + return (0); /* Success */ } - return (0); /* Success */ } } @@ -162,7 +163,7 @@ pthread_mutex_unlock(&mutex); if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) < 0) - return (-3); + return (-2); if (dir == NULL) return (-1); @@ -191,7 +192,7 @@ } if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) < 0) - return (-3); + return (-2); if (min == NULL) return (1); @@ -217,7 +218,7 @@ } if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) < 0) - return (-3); + return (-2); if (str == NULL) return (1); @@ -246,7 +247,7 @@ } if (getstrfromtype(NA_CONTROL_ENTRY, &str) < 0) - return (-3); + return (-2); if (str == NULL) return (1); From owner-p4-projects@FreeBSD.ORG Wed Nov 30 14:28:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0407916A422; Wed, 30 Nov 2005 14:28:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B71B816A41F for ; Wed, 30 Nov 2005 14:28:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A83343D5F for ; Wed, 30 Nov 2005 14:28:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUESUPL037039 for ; Wed, 30 Nov 2005 14:28:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUESUQB037036 for perforce@freebsd.org; Wed, 30 Nov 2005 14:28:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 14:28:30 GMT Message-Id: <200511301428.jAUESUQB037036@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 Cc: Subject: PERFORCE change 87519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 14:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=87519 Change 87519 by rwatson@rwatson_peppercorn on 2005/11/30 14:28:30 Man pages need expanding to document contents of returned data structures. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#2 (text+ko) ==== @@ -5,3 +5,4 @@ type and then compares the results with known good data. Make sure to test that things work properly with respect to endianness of the local platform. +- Document contents of libbsm "public" data structures in libbsm man pages. From owner-p4-projects@FreeBSD.ORG Wed Nov 30 22:31:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AEC816A423; Wed, 30 Nov 2005 22:31:50 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DD31816A420 for ; Wed, 30 Nov 2005 22:31:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88D8943D46 for ; Wed, 30 Nov 2005 22:31:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUMVnpo076710 for ; Wed, 30 Nov 2005 22:31:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUMVnn9076706 for perforce@freebsd.org; Wed, 30 Nov 2005 22:31:49 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 22:31:49 GMT Message-Id: <200511302231.jAUMVnn9076706@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 Cc: Subject: PERFORCE change 87546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 22:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=87546 Change 87546 by sam@sam_ebb on 2005/11/30 22:30:48 be more careful about how we respond to a deauth; don't pound the ap if it's not going allow us in Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#72 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#41 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#72 (text+ko) ==== @@ -2780,7 +2780,7 @@ switch (ic->ic_opmode) { case IEEE80211_M_STA: ieee80211_new_state(ic, IEEE80211_S_AUTH, - wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); + (reason << 8) | IEEE80211_FC0_SUBTYPE_DEAUTH); break; case IEEE80211_M_HOSTAP: if (ni != ic->ic_bss) ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#41 (text+ko) ==== @@ -1021,6 +1021,34 @@ IEEE80211_REASON_ASSOC_LEAVE); } +/* + * Handle deauth with reason. We retry only for + * the cases where we might succeed. Otherwise + * we downgrade the ap and scan. + */ +static void +sta_authretry(struct ieee80211com *ic, struct ieee80211_node *ni, int reason) +{ + switch (reason) { + case IEEE80211_STATUS_TIMEOUT: + case IEEE80211_REASON_ASSOC_EXPIRE: + case IEEE80211_REASON_NOT_AUTHED: + case IEEE80211_REASON_NOT_ASSOCED: + case IEEE80211_REASON_ASSOC_LEAVE: + case IEEE80211_REASON_ASSOC_NOT_AUTHED: + IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, 1); + break; + default: + ieee80211_scan_assoc_fail(ic, ic->ic_bss->ni_macaddr, reason); + if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) + ieee80211_check_scan(ic, + IEEE80211_SCAN_ACTIVE, + IEEE80211_SCAN_FOREVER, + ic->ic_des_nssid, ic->ic_des_ssid); + break; + } +} + static int ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { @@ -1163,20 +1191,19 @@ break; case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: - switch (arg) { + switch (arg & 0xff) { case IEEE80211_FC0_SUBTYPE_AUTH: /* ??? */ IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, 2); break; case IEEE80211_FC0_SUBTYPE_DEAUTH: - IEEE80211_SEND_MGMT(ic, ni, - IEEE80211_FC0_SUBTYPE_AUTH, 1); + sta_authretry(ic, ni, arg>>8); break; } break; case IEEE80211_S_RUN: - switch (arg) { + switch (arg & 0xff) { case IEEE80211_FC0_SUBTYPE_AUTH: IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, 2); From owner-p4-projects@FreeBSD.ORG Wed Nov 30 23:31:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0ADD16A422; Wed, 30 Nov 2005 23:31:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 494DF16A41F for ; Wed, 30 Nov 2005 23:31:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B78E143D6E for ; Wed, 30 Nov 2005 23:31:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNV9Ap079183 for ; Wed, 30 Nov 2005 23:31:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNV81n079180 for perforce@freebsd.org; Wed, 30 Nov 2005 23:31:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 23:31:08 GMT Message-Id: <200511302331.jAUNV81n079180@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 Cc: Subject: PERFORCE change 87549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 23:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=87549 Change 87549 by rwatson@rwatson_peppercorn on 2005/11/30 23:31:00 Rework locking of the BSM class code -- acquire mutex in the entry API calls, resulting in atomicity across each full function call (i.e., between tests for fp being non-NULL and calling into lookup functions, etc). Expose getauclassnam() as non-static, as it's a public API in BSM. Add getauclassnum() to look up classes by number, an OpenBSM extension that is quite useful. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#6 (text+ko) ==== @@ -46,7 +46,8 @@ /* * XXX The reentrant versions of the following functions is TBD * XXX struct au_class_ent *getclassent_r(au_class_ent_t *class_int); - * XXX struct au_class_ent *getclassnam_r(au_class_ent_t *class_int, const char *name); + * XXX struct au_class_ent *getclassnam_r(au_class_ent_t *class_int, const + * char *name); */ /* @@ -132,28 +133,24 @@ /* * Return the next au_class_ent structure from the file setauclass should be * called before invoking this function for the first time. + * + * Must be called with mutex held. */ -struct au_class_ent * -getauclassent(void) +static struct au_class_ent * +getauclassent_locked(void) { struct au_class_ent *c; char *tokptr, *nl; - pthread_mutex_lock(&mutex); - - if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - pthread_mutex_unlock(&mutex); + if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) return (NULL); - } /* * Read until next non-comment line is found, or EOF. */ while (1) { - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { - pthread_mutex_unlock(&mutex); + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) return (NULL); - } if (linestr[0] != '#') break; } @@ -165,26 +162,55 @@ tokptr = linestr; c = get_class_area(); /* allocate */ - if (c == NULL) { - pthread_mutex_unlock(&mutex); + if (c == NULL) return (NULL); - } /* Parse tokptr to au_class_ent components. */ if (classfromstr(tokptr, delim, c) == NULL) { free_au_class_ent(c); - pthread_mutex_unlock(&mutex); return (NULL); } + return (c); +} + +struct au_class_ent * +getauclassent(void) +{ + struct au_class_ent *c; + + pthread_mutex_lock(&mutex); + c = getauclassent_locked(); pthread_mutex_unlock(&mutex); return (c); } /* + * Rewind to the beginning of the enumeration. + * + * Must be called with mutex held. + */ +static void +setauclass_locked(void) +{ + + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + +void +setauclass(void) +{ + + pthread_mutex_lock(&mutex); + setauclass_locked(); + pthread_mutex_unlock(&mutex); +} + +/* * Return the next au_class_entry having the given class name. */ -struct au_class_ent * +au_class_ent_t * getauclassnam(const char *name) { struct au_class_ent *c; @@ -192,22 +218,8 @@ if (name == NULL) return (NULL); - /* Rewind to beginning of file. */ - setauclass(); - pthread_mutex_lock(&mutex); - - if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - pthread_mutex_unlock(&mutex); - return (NULL); - } - - c = get_class_area(); /* allocate */ - if (c == NULL) { - pthread_mutex_unlock(&mutex); - return (NULL); - } - + setauclass_locked(); while ((c = getauclassent()) != NULL) { if (strcmp(name, c->ac_name) == 0) { pthread_mutex_unlock(&mutex); @@ -215,22 +227,29 @@ } free_au_class_ent(c); } - pthread_mutex_unlock(&mutex); return (NULL); } /* - * Rewind to the beginning of the enumeration. + * Return the next au_class_entry having the given class number. + * + * OpenBSM extension. */ -void -setauclass(void) +au_class_ent_t * +getauclassnum(au_class_t class_number) { + au_class_ent_t *c; pthread_mutex_lock(&mutex); - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setauclass_locked(); + while ((c = getauclassent()) != NULL) { + if (class_number == c->ac_class) + return (c); + free_au_class_ent(c); + } pthread_mutex_unlock(&mutex); + return (NULL); } /* From owner-p4-projects@FreeBSD.ORG Wed Nov 30 23:38:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECF0716A422; Wed, 30 Nov 2005 23:38:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 AA50616A41F for ; Wed, 30 Nov 2005 23:38:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E17B543D5F for ; Wed, 30 Nov 2005 23:38:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNcIZt079380 for ; Wed, 30 Nov 2005 23:38:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNcIwQ079377 for perforce@freebsd.org; Wed, 30 Nov 2005 23:38:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 23:38:18 GMT Message-Id: <200511302338.jAUNcIwQ079377@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 Cc: Subject: PERFORCE change 87550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 23:38:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=87550 Change 87550 by rwatson@rwatson_peppercorn on 2005/11/30 23:37:24 Rework locking in BSM control code -- acquire mutex in the entry API calls, resulting in atomicity across each full function call (i.e., between tests for fp being non-NULL and calling into lookup functions, etc). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#8 (text+ko) ==== @@ -50,9 +50,11 @@ /* * Returns the string value corresponding to the given label from the * configuration file. + * + * Must be called with mutex held. */ static int -getstrfromtype(char *name, char **str) +getstrfromtype_locked(char *name, char **str) { char *type, *nl; char *tokptr; @@ -60,17 +62,11 @@ *str = NULL; - pthread_mutex_lock(&mutex); - - if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == - NULL)) { - pthread_mutex_unlock(&mutex); + if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == NULL)) return (-1); /* Error */ - } while (1) { if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { - pthread_mutex_unlock(&mutex); if (ferror(fp)) return (-1); return (0); /* EOF */ @@ -89,7 +85,6 @@ if (strcmp(name, type) == 0) { /* Found matching name. */ *str = strtok_r(NULL, delim, &last); - pthread_mutex_unlock(&mutex); if (*str == NULL) { errno = EINVAL; return (-1); /* Parse error in file */ @@ -99,7 +94,6 @@ } } - pthread_mutex_unlock(&mutex); return (0); /* EOF */ } @@ -160,11 +154,14 @@ ret = 2; } - pthread_mutex_unlock(&mutex); - if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) < 0) + if (getstrfromtype_locked(DIR_CONTROL_ENTRY, &dir) < 0) { + pthread_mutex_unlock(&mutex); return (-2); + } + pthread_mutex_unlock(&mutex); + if (dir == NULL) return (-1); @@ -191,9 +188,15 @@ return (-2); } - if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) < 0) + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(MINFREE_CONTROL_ENTRY, &min) < 0) { + pthread_mutex_unlock(&mutex); return (-2); + } + pthread_mutex_unlock(&mutex); + if (min == NULL) return (1); @@ -217,8 +220,14 @@ return (-2); } - if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) < 0) + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(FLAGS_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); return (-2); + } + + pthread_mutex_unlock(&mutex); if (str == NULL) return (1); @@ -246,8 +255,13 @@ return (-2); } - if (getstrfromtype(NA_CONTROL_ENTRY, &str) < 0) + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(NA_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); return (-2); + } + pthread_mutex_unlock(&mutex); if (str == NULL) return (1); From owner-p4-projects@FreeBSD.ORG Wed Nov 30 23:40:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B356116A42A; Wed, 30 Nov 2005 23:40:35 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4029016A41F for ; Wed, 30 Nov 2005 23:40:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04D9F43D5E for ; Wed, 30 Nov 2005 23:40:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNeLr1079529 for ; Wed, 30 Nov 2005 23:40:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNeLQr079526 for perforce@freebsd.org; Wed, 30 Nov 2005 23:40:21 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Nov 2005 23:40:21 GMT Message-Id: <200511302340.jAUNeLQr079526@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 Cc: Subject: PERFORCE change 87551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 23:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=87551 Change 87551 by sam@sam_ebb on 2005/11/30 23:39:51 o shuffle tools in separate directories so crunchgen is happy o rename 80211 tools to "wlan" as intended long ago Affected files ... .. //depot/projects/wifi/tools/tools/ath/80211debug.c#9 delete .. //depot/projects/wifi/tools/tools/ath/80211stats.c#12 delete .. //depot/projects/wifi/tools/tools/ath/80211watch.c#4 delete .. //depot/projects/wifi/tools/tools/ath/Makefile#6 edit .. //depot/projects/wifi/tools/tools/ath/athdebug.c#5 delete .. //depot/projects/wifi/tools/tools/ath/athdebug/Makefile#1 add .. //depot/projects/wifi/tools/tools/ath/athdebug/athdebug.c#1 add .. //depot/projects/wifi/tools/tools/ath/athstats.c#9 delete .. //depot/projects/wifi/tools/tools/ath/athstats/Makefile#1 add .. //depot/projects/wifi/tools/tools/ath/athstats/athstats.c#1 add .. //depot/projects/wifi/tools/tools/net80211/Makefile#1 add .. //depot/projects/wifi/tools/tools/net80211/wlandebug/Makefile#1 add .. //depot/projects/wifi/tools/tools/net80211/wlandebug/wlandebug.c#1 add .. //depot/projects/wifi/tools/tools/net80211/wlanstats/Makefile#1 add .. //depot/projects/wifi/tools/tools/net80211/wlanstats/wlanstats.c#1 add .. //depot/projects/wifi/tools/tools/net80211/wlanwatch/Makefile#1 add .. //depot/projects/wifi/tools/tools/net80211/wlanwatch/wlanwatch.c#1 add Differences ... ==== //depot/projects/wifi/tools/tools/ath/Makefile#6 (text+ko) ==== @@ -1,51 +1,5 @@ # $FreeBSD: src/tools/tools/ath/Makefile,v 1.5 2004/12/08 17:42:53 sam Exp $ -# -# Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -BINDIR= /usr/local/bin -ALL= athstats 80211stats 80211watch athdebug 80211debug +SUBDIR= athstats athdebug -all: ${ALL} - -athstats: athstats.c - ${CC} -o athstats athstats.c -athdebug: athdebug.c - ${CC} -o athdebug athdebug.c -80211stats: 80211stats.c - ${CC} -o 80211stats 80211stats.c -80211watch: 80211watch.c - ${CC} -o 80211watch 80211watch.c -80211debug: 80211debug.c - ${CC} -o 80211debug 80211debug.c -install: ${ALL} - install athstats ${DESTDIR}${BINDIR} - install 80211stats ${DESTDIR}${BINDIR} - install 80211watch ${DESTDIR}${BINDIR} - install 80211debug ${DESTDIR}${BINDIR} - install athdebug ${DESTDIR}${BINDIR} - -clean: - rm -f ${ALL} core a.out +.include From owner-p4-projects@FreeBSD.ORG Wed Nov 30 23:55:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADF3416A423; Wed, 30 Nov 2005 23:55:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 852CE16A41F for ; Wed, 30 Nov 2005 23:55:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41FCB43D62 for ; Wed, 30 Nov 2005 23:55:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNtfXu080196 for ; Wed, 30 Nov 2005 23:55:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNteig080193 for perforce@freebsd.org; Wed, 30 Nov 2005 23:55:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 23:55:40 GMT Message-Id: <200511302355.jAUNteig080193@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 Cc: Subject: PERFORCE change 87553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 23:55:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=87553 Change 87553 by rwatson@rwatson_peppercorn on 2005/11/30 23:54:59 Acquire mutex in entry API functions for BSM events, in order to improve atomicity between rewind of the event file and beginning iteration. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#5 (text+ko) ==== @@ -135,13 +135,20 @@ /* * Rewind the audit_event file. */ +static void +setauevent_locked(void) +{ + + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + void setauevent(void) { pthread_mutex_lock(&mutex); - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setauevent_locked(); pthread_mutex_unlock(&mutex); } @@ -213,11 +220,11 @@ if (name == NULL) return (NULL); + pthread_mutex_lock(&mutex); + /* Rewind to beginning of the file. */ - setauevent(); + setauevent_locked(); - pthread_mutex_lock(&mutex); - if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); return (NULL); @@ -242,8 +249,10 @@ } } + pthread_mutex_unlock(&mutex); + free_au_event_ent(e); - pthread_mutex_unlock(&mutex); + return (NULL); } @@ -255,11 +264,11 @@ struct au_event_ent *e; char *nl; + pthread_mutex_lock(&mutex); + /* Rewind to beginning of the file. */ - setauevent(); + setauevent_locked(); - pthread_mutex_lock(&mutex); - if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); return (NULL); @@ -284,8 +293,8 @@ } } + pthread_mutex_unlock(&mutex); free_au_event_ent(e); - pthread_mutex_unlock(&mutex); return (NULL); } From owner-p4-projects@FreeBSD.ORG Wed Nov 30 23:57:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DE216A422; Wed, 30 Nov 2005 23:57:45 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0442B16A41F for ; Wed, 30 Nov 2005 23:57:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E4E443D68 for ; Wed, 30 Nov 2005 23:57:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNviKx080255 for ; Wed, 30 Nov 2005 23:57:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNvhm7080252 for perforce@freebsd.org; Wed, 30 Nov 2005 23:57:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 Nov 2005 23:57:43 GMT Message-Id: <200511302357.jAUNvhm7080252@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 Cc: Subject: PERFORCE change 87554 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2005 23:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=87554 Change 87554 by rwatson@rwatson_peppercorn on 2005/11/30 23:57:14 Annotate a case of non-atomicity in the BSM flags code, where there is a potential race with another thread in similar code. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#7 (text+ko) ==== @@ -97,6 +97,11 @@ * * XXXRW: If bits are specified that are not matched by any class, they are * omitted rather than rejected with EINVAL. + * + * XXXRW: This is not thread-safe as it relies on atomicity between + * setauclass() and sequential calls to getauclassent(). This could be + * fixed by iterating through the bitmask fields rather than iterating + * through the classes. */ int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) From owner-p4-projects@FreeBSD.ORG Thu Dec 1 00:45:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A850916A42B; Thu, 1 Dec 2005 00:45:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4BFDE16A427 for ; Thu, 1 Dec 2005 00:45:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D916143D58 for ; Thu, 1 Dec 2005 00:45:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB10jhqo082247 for ; Thu, 1 Dec 2005 00:45:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB10jgPn082244 for perforce@freebsd.org; Thu, 1 Dec 2005 00:45:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 1 Dec 2005 00:45:42 GMT Message-Id: <200512010045.jB10jgPn082244@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 Cc: Subject: PERFORCE change 87557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 00:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=87557 Change 87557 by rwatson@rwatson_peppercorn on 2005/12/01 00:45:14 Minor style tweaks. Annotate a race in the initialization of the mask code. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#6 (text+ko) ==== @@ -42,11 +42,14 @@ * XXX ev_cache, once created, sticks around until the calling program exits. * This may or may not be a problem as far as absolute memory usage goes, but * at least there don't appear to be any leaks in using the cache. + * + * XXXRW: Note that despite (mutex), load_event_table() could race with + * other consumers of the getauevents() API. */ static LIST_HEAD(, audit_event_map) ev_cache; static int -load_event_table(VOID) +load_event_table(void) { struct au_event_ent *ev; struct audit_event_map *elem; @@ -64,7 +67,7 @@ /* Enumerate the events. */ while ((ev = getauevent()) != NULL) { - elem = malloc (sizeof (struct audit_event_map)); + elem = malloc(sizeof(struct audit_event_map)); if (elem == NULL) { free_au_event_ent(ev); pthread_mutex_unlock(&mutex); @@ -126,7 +129,7 @@ LIST_FOREACH(elem, &ev_cache, ev_list) { if (elem->ev->ae_number == event) { pthread_mutex_unlock(&mutex); - return elem->ev; + return (elem->ev); } } pthread_mutex_unlock(&mutex); From owner-p4-projects@FreeBSD.ORG Thu Dec 1 01:48:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D08316A422; Thu, 1 Dec 2005 01:48:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E237216A420 for ; Thu, 1 Dec 2005 01:47:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 494EC43D60 for ; Thu, 1 Dec 2005 01:47:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB11lxUt092025 for ; Thu, 1 Dec 2005 01:47:59 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB11lxf3092022 for perforce@freebsd.org; Thu, 1 Dec 2005 01:47:59 GMT (envelope-from wsalamon@computer.org) Date: Thu, 1 Dec 2005 01:47:59 GMT Message-Id: <200512010147.jB11lxf3092022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 01:48:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=87558 Change 87558 by wsalamon@gretsch on 2005/12/01 01:47:20 Updates on wait4 and link system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#3 (text+ko) ==== @@ -21,11 +21,11 @@ SYS_write 4 N N SYS_open 5 Y Y path, fflags, mode audited SYS_close 6 Y Y fd -SYS_wait4 7 ? N pid, options, status?, return PID +SYS_wait4 7 Y N pid, options, status?, return PID SYS_creat 8 Y Y Implemented via kern_open(), so audited as open() -SYS_link 9 Y N -SYS_unlink 10 Y N +SYS_link 9 Y Y from and to paths, from attr +SYS_unlink 10 Y Y path, attr SYS_chdir 12 Y Y SYS_fchdir 13 Y N path; should fd be audited? From owner-p4-projects@FreeBSD.ORG Thu Dec 1 01:58:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C73516A422; Thu, 1 Dec 2005 01:58:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 98EE516A41F for ; Thu, 1 Dec 2005 01:58:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6166543D49 for ; Thu, 1 Dec 2005 01:58:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB11wC3b092451 for ; Thu, 1 Dec 2005 01:58:12 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB11wCf6092448 for perforce@freebsd.org; Thu, 1 Dec 2005 01:58:12 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 1 Dec 2005 01:58:12 GMT Message-Id: <200512010158.jB11wCf6092448@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 87559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 01:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=87559 Change 87559 by soc-andrew@soc-andrew_serv on 2005/12/01 01:57:11 Remove the unused libinstaller and C backend Fix cross-builds of lua Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/Makefile#4 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.c#6 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.h#4 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/extract.c#3 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/extract.h#3 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/lua/Makefile#2 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#6 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.c#7 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.h#3 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#11 delete Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/lua/Makefile#2 (text+ko) ==== @@ -2,7 +2,7 @@ SRCS= lua.c LUA_DIR=${.CURDIR}/../../contrib/lua/lua -LUA_LIB=${.CURDIR}/../../lib/lua +LUA_LIB=${.OBJDIR}/../../lib/lua CFLAGS+=-I${LUA_DIR}/include From owner-p4-projects@FreeBSD.ORG Thu Dec 1 02:19:53 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50ECB16A422; Thu, 1 Dec 2005 02:19:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0AD8216A41F for ; Thu, 1 Dec 2005 02:19:53 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7135343D5C for ; Thu, 1 Dec 2005 02:19:52 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB12JpdW093603 for ; Thu, 1 Dec 2005 02:19:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB12Jn74093586 for perforce@freebsd.org; Thu, 1 Dec 2005 02:19:49 GMT (envelope-from marcel@freebsd.org) Date: Thu, 1 Dec 2005 02:19:49 GMT Message-Id: <200512010219.jB12Jn74093586@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 Cc: Subject: PERFORCE change 87561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 02:19:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=87561 Change 87561 by marcel@marcel_nfs on 2005/12/01 02:19:19 IFC @87556 Affected files ... .. //depot/projects/ia64/Makefile#46 integrate .. //depot/projects/ia64/Makefile.inc1#107 integrate .. //depot/projects/ia64/UPDATING#82 integrate .. //depot/projects/ia64/bin/date/date.1#12 integrate .. //depot/projects/ia64/bin/kenv/kenv.1#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#28 integrate .. //depot/projects/ia64/bin/ls/ls.c#25 integrate .. //depot/projects/ia64/bin/ls/util.c#13 integrate .. //depot/projects/ia64/bin/rm/rm.1#13 integrate .. //depot/projects/ia64/bin/sh/sh.1#34 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mntopts.h#3 delete .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.8#6 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/ia64/etc/Makefile#51 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#65 integrate .. //depot/projects/ia64/etc/network.subr#14 integrate .. //depot/projects/ia64/etc/periodic/daily/470.status-named#6 integrate .. //depot/projects/ia64/etc/rc.d/hcsecd#2 integrate .. //depot/projects/ia64/etc/rc.d/netif#12 integrate .. //depot/projects/ia64/etc/rc.d/sdpd#2 integrate .. //depot/projects/ia64/etc/rc.firewall#5 integrate .. //depot/projects/ia64/etc/rc.subr#25 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#52 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#28 integrate .. //depot/projects/ia64/gnu/usr.bin/man/apropos/apropos.man#8 integrate .. //depot/projects/ia64/include/Makefile#51 integrate .. //depot/projects/ia64/include/kenv.h#2 integrate .. //depot/projects/ia64/include/mqueue.h#1 branch .. //depot/projects/ia64/include/string.h#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#8 integrate .. //depot/projects/ia64/lib/libarchive/configure.ac.in#7 integrate .. //depot/projects/ia64/lib/libarchive/libarchive-formats.5#7 integrate .. //depot/projects/ia64/lib/libc/gen/ftw.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/pwcache.3#4 integrate .. //depot/projects/ia64/lib/libc/gmon/moncontrol.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/isalnum.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/isalpha.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/isblank.3#11 integrate .. //depot/projects/ia64/lib/libc/locale/iscntrl.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/isdigit.3#9 integrate .. //depot/projects/ia64/lib/libc/locale/isgraph.3#8 integrate .. //depot/projects/ia64/lib/libc/locale/islower.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/isprint.3#8 integrate .. //depot/projects/ia64/lib/libc/locale/ispunct.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/isspace.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/isupper.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/isxdigit.3#9 integrate .. //depot/projects/ia64/lib/libc/locale/tolower.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/toupper.3#7 integrate .. //depot/projects/ia64/lib/libc/net/if_indextoname.3#5 integrate .. //depot/projects/ia64/lib/libc/net/inet6_opt_init.3#4 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#19 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get_entry.3#5 integrate .. //depot/projects/ia64/lib/libc/posix1e/posix1e.3#6 integrate .. //depot/projects/ia64/lib/libc/rpc/publickey.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_create.3#9 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_calls.3#7 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.3#9 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.3#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#15 integrate .. //depot/projects/ia64/lib/libc/string/memmem.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#24 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/mq.c#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/ia64/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/ia64/lib/libc/sys/nfssvc.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/recv.2#11 integrate .. //depot/projects/ia64/lib/libc/sys/sendfile.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/sigwait.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/wait.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/write.2#11 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid.3#6 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr.3#4 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#10 integrate .. //depot/projects/ia64/lib/libedit/editline.3#8 integrate .. //depot/projects/ia64/lib/libedit/editrc.5#6 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#14 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.3#7 integrate .. //depot/projects/ia64/lib/libmd/sha256.3#4 integrate .. //depot/projects/ia64/lib/libmemstat/Makefile#3 integrate .. //depot/projects/ia64/lib/libmemstat/libmemstat.3#2 integrate .. //depot/projects/ia64/lib/libpmc/pmc.3#4 integrate .. //depot/projects/ia64/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/ia64/lib/libpthread/test/guard_b.c#2 integrate .. //depot/projects/ia64/lib/libpthread/test/mutex_d.c#3 integrate .. //depot/projects/ia64/lib/libpthread/test/sigsuspend_d.c#3 integrate .. //depot/projects/ia64/lib/libstand/libstand.3#11 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.3#8 integrate .. //depot/projects/ia64/lib/libutil/login_cap.3#8 integrate .. //depot/projects/ia64/lib/libutil/pidfile.3#3 integrate .. //depot/projects/ia64/lib/libutil/property.c#6 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/mathimpl.h#6 integrate .. //depot/projects/ia64/lib/msun/man/fma.3#3 integrate .. //depot/projects/ia64/lib/msun/man/ieee_test.3#4 integrate .. //depot/projects/ia64/lib/msun/man/ilogb.3#3 integrate .. //depot/projects/ia64/lib/msun/man/math.3#9 integrate .. //depot/projects/ia64/lib/msun/man/remainder.3#4 integrate .. //depot/projects/ia64/lib/msun/man/scalbn.3#3 integrate .. //depot/projects/ia64/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/e_lgammaf_r.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/ia64/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/k_cosf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/k_sinf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/k_tanf.c#5 integrate .. //depot/projects/ia64/lib/msun/src/math_private.h#10 integrate .. //depot/projects/ia64/lib/msun/src/s_cosf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_sinf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_tanf.c#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#93 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#14 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.dsl#8 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#15 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#11 integrate .. //depot/projects/ia64/sbin/devd/devd.8#13 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#18 integrate .. //depot/projects/ia64/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatec/ggatec.8#5 integrate .. //depot/projects/ia64/sbin/gpt/gpt.8#8 integrate .. //depot/projects/ia64/sbin/gvinum/Makefile#4 integrate .. //depot/projects/ia64/sbin/gvinum/gvinum.8#1 branch .. //depot/projects/ia64/sbin/gvinum/gvinum.c#4 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#33 integrate .. //depot/projects/ia64/sbin/init/init.8#16 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#48 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#48 integrate .. //depot/projects/ia64/sbin/kldload/kldload.8#9 integrate .. //depot/projects/ia64/sbin/kldstat/kldstat.8#6 integrate .. //depot/projects/ia64/sbin/ldconfig/ldconfig.8#7 integrate .. //depot/projects/ia64/sbin/mount/Makefile#7 integrate .. //depot/projects/ia64/sbin/mount/extern.h#4 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.3#4 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.c#7 integrate .. //depot/projects/ia64/sbin/mount/mntopts.h#10 integrate .. //depot/projects/ia64/sbin/mount/mount.c#22 integrate .. //depot/projects/ia64/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/ia64/sbin/mount/mount_ufs.c#8 delete .. //depot/projects/ia64/sbin/mount_cd9660/Makefile#6 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.8#14 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#12 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/Makefile#9 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#13 integrate .. //depot/projects/ia64/sbin/mount_nullfs/Makefile#4 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#10 integrate .. //depot/projects/ia64/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/ia64/sbin/mount_reiserfs/mount_reiserfs.c#4 integrate .. //depot/projects/ia64/sbin/mount_std/Makefile#4 integrate .. //depot/projects/ia64/sbin/mount_ufs/Makefile#3 delete .. //depot/projects/ia64/sbin/mount_ufs/mount_ufs.c#5 delete .. //depot/projects/ia64/sbin/ping/ping.8#17 integrate .. //depot/projects/ia64/sbin/reboot/Makefile#7 integrate .. //depot/projects/ia64/sbin/reboot/boot_i386.8#16 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#18 integrate .. //depot/projects/ia64/secure/lib/libssl/Makefile#13 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#52 integrate .. //depot/projects/ia64/share/man/man3/pthread_barrier_destroy.3#4 integrate .. //depot/projects/ia64/share/man/man4/Makefile#90 integrate .. //depot/projects/ia64/share/man/man4/ataraid.4#4 integrate .. //depot/projects/ia64/share/man/man4/ath.4#26 integrate .. //depot/projects/ia64/share/man/man4/bge.4#15 integrate .. //depot/projects/ia64/share/man/man4/bpf.4#13 integrate .. //depot/projects/ia64/share/man/man4/cardbus.4#6 integrate .. //depot/projects/ia64/share/man/man4/da.4#10 integrate .. //depot/projects/ia64/share/man/man4/dcons.4#6 integrate .. //depot/projects/ia64/share/man/man4/de.4#10 integrate .. //depot/projects/ia64/share/man/man4/ed.4#13 integrate .. //depot/projects/ia64/share/man/man4/em.4#18 integrate .. //depot/projects/ia64/share/man/man4/fwip.4#6 integrate .. //depot/projects/ia64/share/man/man4/geom.4#13 integrate .. //depot/projects/ia64/share/man/man4/hptmv.4#4 integrate .. //depot/projects/ia64/share/man/man4/hwpmc.4#5 integrate .. //depot/projects/ia64/share/man/man4/icmp.4#8 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/ia64/share/man/man4/ip.4#17 integrate .. //depot/projects/ia64/share/man/man4/ipw.4#5 integrate .. //depot/projects/ia64/share/man/man4/iwi.4#6 integrate .. //depot/projects/ia64/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/ia64/share/man/man4/lmc.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#11 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_ibm.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_sony.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/arl.4#6 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cp.4#6 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cs.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#11 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ep.4#13 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ex.4#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/fe.4#9 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ie.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/linux.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/lnc.4#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/perfmon.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ray.4#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/vx.4#8 integrate .. //depot/projects/ia64/share/man/man4/ng_iface.4#6 integrate .. //depot/projects/ia64/share/man/man4/ng_netflow.4#8 integrate .. //depot/projects/ia64/share/man/man4/nve.4#4 integrate .. //depot/projects/ia64/share/man/man4/pccard.4#7 integrate .. //depot/projects/ia64/share/man/man4/pccbb.4#8 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#14 integrate .. //depot/projects/ia64/share/man/man4/ral.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_ad1816.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_als4000.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_atiixp.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_cmi.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_cs4281.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_ds1.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_emu10k1.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_es137x.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_ess.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_fm801.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_ich.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_mss.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_neomagic.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_solo.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_t4dwave.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_via8233.4#3 integrate .. //depot/projects/ia64/share/man/man4/snd_via82c686.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_vibes.4#2 integrate .. //depot/projects/ia64/share/man/man4/txp.4#8 integrate .. //depot/projects/ia64/share/man/man4/ural.4#4 integrate .. //depot/projects/ia64/share/man/man4/wi.4#39 integrate .. //depot/projects/ia64/share/man/man4/wlan.4#8 integrate .. //depot/projects/ia64/share/man/man4/xe.4#7 integrate .. //depot/projects/ia64/share/man/man5/disktab.5#8 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#56 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#19 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#67 integrate .. //depot/projects/ia64/share/man/man6/intro.6#4 integrate .. //depot/projects/ia64/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/ia64/share/man/man7/build.7#13 integrate .. //depot/projects/ia64/share/man/man8/diskless.8#16 integrate .. //depot/projects/ia64/share/man/man9/VFS_LOCK_GIANT.9#2 integrate .. //depot/projects/ia64/share/man/man9/alloc_unr.9#3 integrate .. //depot/projects/ia64/share/man/man9/atomic.9#5 integrate .. //depot/projects/ia64/share/man/man9/bios.9#5 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#16 integrate .. //depot/projects/ia64/share/man/man9/device_add_child.9#7 integrate .. //depot/projects/ia64/share/man/man9/device_get_softc.9#7 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#22 integrate .. //depot/projects/ia64/share/man/man9/namei.9#9 integrate .. //depot/projects/ia64/share/man/man9/timeout.9#11 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#36 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#25 integrate .. //depot/projects/ia64/share/monetdef/he_IL.UTF-8.src#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock.c#15 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#57 integrate .. //depot/projects/ia64/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/ia64/sys/alpha/conf/GENERIC#39 integrate .. //depot/projects/ia64/sys/alpha/conf/NOTES#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#35 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#49 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/ia64/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/ia64/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#10 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/ia64/sys/arm/include/armreg.h#3 integrate .. //depot/projects/ia64/sys/arm/include/elf.h#4 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#30 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf.5#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#29 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#64 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#37 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#17 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#18 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#13 integrate .. //depot/projects/ia64/sys/conf/Makefile.arm#11 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#25 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#23 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#23 integrate .. //depot/projects/ia64/sys/conf/NOTES#96 integrate .. //depot/projects/ia64/sys/conf/files#136 integrate .. //depot/projects/ia64/sys/conf/files.alpha#33 integrate .. //depot/projects/ia64/sys/conf/files.amd64#32 integrate .. //depot/projects/ia64/sys/conf/files.i386#71 integrate .. //depot/projects/ia64/sys/conf/files.ia64#62 integrate .. //depot/projects/ia64/sys/conf/files.pc98#59 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#24 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#47 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#56 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#48 integrate .. //depot/projects/ia64/sys/conf/ldscript.arm#3 integrate .. //depot/projects/ia64/sys/conf/options#89 integrate .. //depot/projects/ia64/sys/conf/options.i386#36 integrate .. //depot/projects/ia64/sys/conf/options.pc98#36 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#48 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#26 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#26 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#15 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#65 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#33 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#48 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#21 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#10 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#63 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#34 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#14 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.h#7 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.c#9 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.h#5 integrate .. //depot/projects/ia64/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/ia64/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/ia64/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/ia64/sys/dev/drm/drm.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/ia64/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/mga_dma.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drm.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/mga_irq.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/mga_state.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/mga_warp.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drm.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.h#10 integrate .. //depot/projects/ia64/sys/dev/drm/r128_irq.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/r128_state.c#11 integrate .. //depot/projects/ia64/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_cp.c#12 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drm.h#11 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.c#11 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.h#13 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_mem.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#14 integrate .. //depot/projects/ia64/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drm.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx_drv.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#48 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#30 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#17 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#17 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#46 integrate .. //depot/projects/ia64/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/ia64/sys/dev/ips/ips.c#12 integrate .. //depot/projects/ia64/sys/dev/ips/ips.h#14 integrate .. //depot/projects/ia64/sys/dev/ips/ips_commands.c#13 integrate .. //depot/projects/ia64/sys/dev/ips/ips_disk.c#8 integrate .. //depot/projects/ia64/sys/dev/ips/ips_ioctl.c#8 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#5 integrate .. //depot/projects/ia64/sys/dev/lge/if_lge.c#27 integrate .. //depot/projects/ia64/sys/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/ia64/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/ia64/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/ia64/sys/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/ia64/sys/dev/ofw/openfirm.c#10 integrate .. //depot/projects/ia64/sys/dev/owi/if_ieee80211.h#2 delete .. //depot/projects/ia64/sys/dev/owi/if_owi.c#10 delete .. //depot/projects/ia64/sys/dev/owi/if_owi_pccard.c#6 delete .. //depot/projects/ia64/sys/dev/owi/if_wireg.h#3 delete .. //depot/projects/ia64/sys/dev/owi/if_wivar.h#5 delete .. //depot/projects/ia64/sys/dev/puc/puc.c#28 integrate .. //depot/projects/ia64/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/ia64/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#25 integrate .. //depot/projects/ia64/sys/dev/sound/driver.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#16 integrate .. //depot/projects/ia64/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#18 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#31 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#18 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#31 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#20 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#22 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_rate.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#18 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#30 integrate .. //depot/projects/ia64/sys/dev/usb/ohcivar.h#13 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#47 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#39 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#15 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#29 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#14 integrate .. //depot/projects/ia64/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#44 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#49 integrate .. //depot/projects/ia64/sys/geom/geom_disk.h#4 integrate .. //depot/projects/ia64/sys/geom/geom_fox.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#41 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#35 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#45 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#11 integrate .. //depot/projects/ia64/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/ia64/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/ia64/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/ia64/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#16 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/ia64/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/ia64/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#60 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#69 integrate .. //depot/projects/ia64/sys/i386/conf/XBOX#2 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#9 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#35 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#39 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#66 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#48 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#88 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#51 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#50 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#16 integrate .. //depot/projects/ia64/sys/i386/include/smptests.h#8 delete .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#27 integrate .. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#1 branch .. //depot/projects/ia64/sys/ia64/conf/GENERIC#46 integrate .. //depot/projects/ia64/sys/ia64/conf/NOTES#7 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#19 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#92 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#46 integrate .. //depot/projects/ia64/sys/kern/init_main.c#52 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#50 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#82 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#67 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#62 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#64 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#86 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#61 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#92 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#20 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#49 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#51 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#52 integrate .. //depot/projects/ia64/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/ia64/sys/kern/uipc_socket.c#53 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#40 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#46 integrate .. //depot/projects/ia64/sys/modules/Makefile#91 integrate .. //depot/projects/ia64/sys/modules/drm/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/ia64/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_vinum/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/i2c/controllers/pcf/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/ia64/sys/modules/oldcard/Makefile#6 delete .. //depot/projects/ia64/sys/modules/owi/Makefile#4 delete .. //depot/projects/ia64/sys/modules/sound/driver/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/ia64/sys/net/if_bridge.c#4 integrate .. //depot/projects/ia64/sys/net/if_clone.c#6 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#48 integrate .. //depot/projects/ia64/sys/net/if_vlan.c#27 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#14 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#9 integrate .. //depot/projects/ia64/sys/netgraph/netgraph.h#16 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#28 integrate .. //depot/projects/ia64/sys/netinet/igmp.c#17 integrate .. //depot/projects/ia64/sys/netinet/ip_carp.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#40 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#18 integrate .. //depot/projects/ia64/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#28 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#51 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#11 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#29 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#57 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#35 integrate .. //depot/projects/ia64/sys/netinet/ip_options.c#1 branch .. //depot/projects/ia64/sys/netinet/ip_options.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_output.c#51 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#28 integrate .. //depot/projects/ia64/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#65 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#34 integrate .. //depot/projects/ia64/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#41 integrate .. //depot/projects/ia64/sys/netinet6/mld6.c#14 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#14 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#21 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#37 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#31 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_subs.c#22 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#46 integrate .. //depot/projects/ia64/sys/nfsclient/nfsm_subs.h#7 integrate .. //depot/projects/ia64/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#52 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#32 integrate .. //depot/projects/ia64/sys/pc98/include/smptests.h#2 delete .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/ia64/sys/pci/agp_amd64.c#7 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#21 integrate .. //depot/projects/ia64/sys/pci/if_de.c#23 integrate .. //depot/projects/ia64/sys/pci/if_devar.h#9 integrate .. //depot/projects/ia64/sys/posix4/mqueue.h#4 delete .. //depot/projects/ia64/sys/powerpc/conf/DEFAULTS#1 branch .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#31 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/ia64/sys/sparc64/central/central.c#6 integrate .. //depot/projects/ia64/sys/sparc64/conf/DEFAULTS#1 branch .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#55 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#14 integrate .. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#19 integrate .. //depot/projects/ia64/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/ia64/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/ia64/sys/sparc64/fhc/fhc_central.c#6 integrate .. //depot/projects/ia64/sys/sparc64/fhc/fhc_nexus.c#6 integrate .. //depot/projects/ia64/sys/sparc64/fhc/fhcvar.h#4 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#37 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychoreg.h#10 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#12 integrate .. //depot/projects/ia64/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#60 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/rtc.c#5 integrate .. //depot/projects/ia64/sys/sys/_types.h#14 integrate .. //depot/projects/ia64/sys/sys/bio.h#26 integrate .. //depot/projects/ia64/sys/sys/event.h#14 integrate .. //depot/projects/ia64/sys/sys/file.h#25 integrate .. //depot/projects/ia64/sys/sys/ktrace.h#9 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#40 integrate .. //depot/projects/ia64/sys/sys/mount.h#35 integrate .. //depot/projects/ia64/sys/sys/mqueue.h#1 branch .. //depot/projects/ia64/sys/sys/proc.h#99 integrate .. //depot/projects/ia64/sys/sys/queue.h#13 integrate .. //depot/projects/ia64/sys/sys/resource.h#12 integrate .. //depot/projects/ia64/sys/sys/signal.h#16 integrate .. //depot/projects/ia64/sys/sys/syscall.h#50 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#50 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#53 integrate .. //depot/projects/ia64/sys/sys/time.h#20 integrate .. //depot/projects/ia64/sys/sys/types.h#31 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#57 integrate .. //depot/projects/ia64/sys/vm/pmap.h#29 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#81 integrate .. //depot/projects/ia64/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/ia64/tools/regression/mqueue/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest1/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest1/mqtest1.c#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest2/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest2/mqtest2.c#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest3/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest3/mqtest3.c#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest4/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest4/mqtest4.c#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest5/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mqueue/mqtest5/mqtest5.c#1 branch .. //depot/projects/ia64/tools/sched/schedgraph.py#4 integrate .. //depot/projects/ia64/tools/tools/nanobsd/FlashDevice.sub#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/default.rc#6 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/head.rc#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#15 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#28 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#10 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#20 integrate .. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#7 integrate .. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#6 integrate .. //depot/projects/ia64/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/ia64/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/ia64/usr.bin/cmp/cmp.1#4 integrate .. //depot/projects/ia64/usr.bin/col/col.c#8 integrate .. //depot/projects/ia64/usr.bin/compress/compress.1#9 integrate .. //depot/projects/ia64/usr.bin/indent/indent.c#10 integrate .. //depot/projects/ia64/usr.bin/indent/indent_globs.h#8 integrate .. //depot/projects/ia64/usr.bin/indent/io.c#8 integrate .. //depot/projects/ia64/usr.bin/indent/lexi.c#8 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.1#8 integrate .. //depot/projects/ia64/usr.bin/make/main.c#34 integrate .. //depot/projects/ia64/usr.bin/make/var.c#25 integrate .. //depot/projects/ia64/usr.bin/mt/mt.1#14 integrate .. //depot/projects/ia64/usr.bin/mt/mt.c#9 integrate .. //depot/projects/ia64/usr.bin/netstat/main.c#18 integrate .. //depot/projects/ia64/usr.bin/netstat/mbuf.c#10 integrate .. //depot/projects/ia64/usr.bin/netstat/netstat.1#11 integrate .. //depot/projects/ia64/usr.bin/netstat/netstat.h#11 integrate .. //depot/projects/ia64/usr.bin/pkill/pkill.1#6 integrate .. //depot/projects/ia64/usr.bin/pkill/pkill.c#6 integrate .. //depot/projects/ia64/usr.bin/rlogin/rlogin.c#12 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_clntout.c#7 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_cout.c#7 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_hout.c#8 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_main.c#11 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_parse.c#6 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_parse.h#5 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_sample.c#6 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_scan.c#6 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_scan.h#5 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_svcout.c#9 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_tblout.c#7 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_util.c#5 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_util.h#5 integrate .. //depot/projects/ia64/usr.bin/split/split.1#8 integrate .. //depot/projects/ia64/usr.bin/tar/configure.ac.in#7 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.4#7 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#3 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#4 integrate .. //depot/projects/ia64/usr.sbin/config/config.h#9 integrate .. //depot/projects/ia64/usr.sbin/config/config.y#11 integrate .. //depot/projects/ia64/usr.sbin/config/configvers.h#11 integrate .. //depot/projects/ia64/usr.sbin/config/main.c#12 integrate .. //depot/projects/ia64/usr.sbin/config/mkheaders.c#7 integrate .. //depot/projects/ia64/usr.sbin/config/mkmakefile.c#11 integrate .. //depot/projects/ia64/usr.sbin/devinfo/devinfo.8#4 integrate .. //depot/projects/ia64/usr.sbin/lmcconfig/lmcconfig.8#2 integrate .. //depot/projects/ia64/usr.sbin/mount_smbfs/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.8#13 integrate .. //depot/projects/ia64/usr.sbin/ndp/ndp.8#11 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#14 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#10 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/pkg_version.1#14 integrate .. //depot/projects/ia64/usr.sbin/portsnap/make_index/make_index.c#3 integrate .. //depot/projects/ia64/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/ia64/usr.sbin/powerd/powerd.8#5 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#19 integrate .. //depot/projects/ia64/usr.sbin/rpc.lockd/kern.c#12 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#14 integrate .. //depot/projects/ia64/usr.sbin/slstat/slstat.8#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#17 integrate Differences ... ==== //depot/projects/ia64/Makefile#46 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.323 2005/07/29 21:51:33 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ # # The user-driven targets are: # @@ -269,7 +269,8 @@ .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 + find [A-Z]*[A-Z] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${mach} .ORDER: universe_prologue universe_${mach} universe_epilogue ==== //depot/projects/ia64/Makefile.inc1#107 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -237,7 +237,7 @@ LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} +LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif # install stage @@ -252,6 +252,7 @@ # kernel stage KMAKEENV= ${WMAKEENV} +KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} # # buildworld @@ -476,16 +477,18 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} # -# Use this to add checks to installworld/installkernel targets. +# installcheck +# +# Checks to be sure system is ready for installworld/installkernel. # -SPECIAL_INSTALLCHECKS= +installcheck: # # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} .if !make(distributeworld) -SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck: installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ @@ -495,9 +498,7 @@ .endif # -# installcheck -# -# Checks to be sure system is ready for installworld +# Check for missing UIDs/GIDs. # CHECK_UIDS= CHECK_GIDS= @@ -509,7 +510,8 @@ CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck: ${SPECIAL_INSTALLCHECKS} +installcheck: installcheck_UGID +installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -550,7 +552,7 @@ # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: ${SPECIAL_INSTALLCHECKS} +reinstall: @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -652,15 +654,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR} + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @@ -681,15 +681,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 3.1: making dependencies" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3.2: building everything" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -701,18 +699,12 @@ # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} +reinstallkernel reinstallkernel.debug: installcheck .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false .endif @echo "--------------------------------------------------------------" - @echo ">>> Making hierarchy" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; \ - ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy - @echo - @echo "--------------------------------------------------------------" @echo ">>> Installing kernel" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ==== //depot/projects/ia64/UPDATING#82 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20051129: + The nodev mount option was deprecated in RELENG_6 (where it + was a no-op), and is now unsupported. If you have nodev or dev listed + in /etc/fstab, remove it, otherwise it will result in a mount error. + +20051129: + ABI between ipfw(4) and ipfw(8) has been changed. You need + to rebuild ipfw(8) when rebuilding kernel. + 20051029: /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. Its /etc/rc.conf.d configuration file has been `ppp' from @@ -424,4 +433,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.423 2005/10/29 05:27:32 yar Exp $ +$FreeBSD: src/UPDATING,v 1.425 2005/11/29 19:13:28 rodrigc Exp $ ==== //depot/projects/ia64/bin/date/date.1#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.73 2005/11/01 19:31:25 trhodes Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.74 2005/11/17 12:15:22 ru Exp $ .\" .Dd November 1, 2005 .Dt DATE 1 @@ -421,12 +421,7 @@ utility is expected to be compatible with .St -p1003.2 . The -.Fl d , -.Fl f , -.Fl j , -.Fl n , -.Fl r , -.Fl t , +.Fl d , f , j , n , r , t , and .Fl v options are all extensions to the standard. ==== //depot/projects/ia64/bin/kenv/kenv.1#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.12 2005/09/13 19:01:53 rwatson Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ .\" -.Dd July 8, 2000 +.Dd September 13, 2005 .Dt KENV 1 .Os .Sh NAME ==== //depot/projects/ia64/bin/ls/ls.1#28 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.95 2005/11/17 12:15:23 ru Exp $ .\" -.Dd November 10, 2005 +.Dd November 16, 2005 .Dt LS 1 .Os .Sh NAME @@ -72,9 +72,9 @@ .Pa \&. and .Pa .. . -Always set for the super-user. +Automatically set for the super-user unless .Fl I -cancel this option. +is specified. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 1 02:39:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 393C516A422; Thu, 1 Dec 2005 02:39:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DB5FB16A41F for ; Thu, 1 Dec 2005 02:39:18 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 453C443D5E for ; Thu, 1 Dec 2005 02:39:18 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB12dIPn000342 for ; Thu, 1 Dec 2005 02:39:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB12dFjf000327 for perforce@freebsd.org; Thu, 1 Dec 2005 02:39:15 GMT (envelope-from marcel@freebsd.org) Date: Thu, 1 Dec 2005 02:39:15 GMT Message-Id: <200512010239.jB12dFjf000327@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 Cc: Subject: PERFORCE change 87562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 02:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=87562 Change 87562 by marcel@marcel_nfs on 2005/12/01 02:38:49 IFC @87556 Affected files ... .. //depot/projects/tty/Makefile#14 integrate .. //depot/projects/tty/Makefile.inc1#25 integrate .. //depot/projects/tty/UPDATING#25 integrate .. //depot/projects/tty/bin/date/date.1#8 integrate .. //depot/projects/tty/bin/kenv/kenv.1#4 integrate .. //depot/projects/tty/bin/ls/ls.1#13 integrate .. //depot/projects/tty/bin/ls/ls.c#10 integrate .. //depot/projects/tty/bin/ls/util.c#9 integrate .. //depot/projects/tty/bin/rm/rm.1#8 integrate .. //depot/projects/tty/bin/sh/sh.1#13 integrate .. //depot/projects/tty/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete .. //depot/projects/tty/contrib/smbfs/mount_smbfs/mntopts.h#2 delete .. //depot/projects/tty/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate .. //depot/projects/tty/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/tty/etc/Makefile#15 integrate .. //depot/projects/tty/etc/defaults/rc.conf#16 integrate .. //depot/projects/tty/etc/network.subr#8 integrate .. //depot/projects/tty/etc/periodic/daily/470.status-named#3 integrate .. //depot/projects/tty/etc/rc.d/hcsecd#2 integrate .. //depot/projects/tty/etc/rc.d/netif#8 integrate .. //depot/projects/tty/etc/rc.d/sdpd#2 integrate .. //depot/projects/tty/etc/rc.firewall#4 integrate .. //depot/projects/tty/etc/rc.subr#10 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#11 integrate .. //depot/projects/tty/gnu/usr.bin/man/apropos/apropos.man#5 integrate .. //depot/projects/tty/include/Makefile#20 integrate .. //depot/projects/tty/include/kenv.h#2 integrate .. //depot/projects/tty/include/mqueue.h#1 branch .. //depot/projects/tty/include/string.h#6 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/tty/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/tty/lib/libarchive/configure.ac.in#8 integrate .. //depot/projects/tty/lib/libarchive/libarchive-formats.5#7 integrate .. //depot/projects/tty/lib/libc/gen/ftw.3#2 integrate .. //depot/projects/tty/lib/libc/gen/getcap.3#4 integrate .. //depot/projects/tty/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/tty/lib/libc/gmon/moncontrol.3#3 integrate .. //depot/projects/tty/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isblank.3#5 integrate .. //depot/projects/tty/lib/libc/locale/iscntrl.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isdigit.3#5 integrate .. //depot/projects/tty/lib/libc/locale/isgraph.3#4 integrate .. //depot/projects/tty/lib/libc/locale/islower.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isprint.3#4 integrate .. //depot/projects/tty/lib/libc/locale/ispunct.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isspace.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isupper.3#4 integrate .. //depot/projects/tty/lib/libc/locale/isxdigit.3#5 integrate .. //depot/projects/tty/lib/libc/locale/tolower.3#4 integrate .. //depot/projects/tty/lib/libc/locale/toupper.3#4 integrate .. //depot/projects/tty/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/tty/lib/libc/net/inet6_opt_init.3#4 integrate .. //depot/projects/tty/lib/libc/net/name6.c#14 integrate .. //depot/projects/tty/lib/libc/posix1e/acl_get_entry.3#4 integrate .. //depot/projects/tty/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/tty/lib/libc/rpc/publickey.3#2 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_clnt_create.3#4 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_svc_calls.3#4 integrate .. //depot/projects/tty/lib/libc/stdio/getc.3#4 integrate .. //depot/projects/tty/lib/libc/stdio/getwc.3#3 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/tty/lib/libc/string/memmem.3#2 integrate .. //depot/projects/tty/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/tty/lib/libc/sys/clock_gettime.2#6 integrate .. //depot/projects/tty/lib/libc/sys/intro.2#8 integrate .. //depot/projects/tty/lib/libc/sys/kse.2#7 integrate .. //depot/projects/tty/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq.c#1 branch .. //depot/projects/tty/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/tty/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/tty/lib/libc/sys/nfssvc.2#4 integrate .. //depot/projects/tty/lib/libc/sys/read.2#8 integrate .. //depot/projects/tty/lib/libc/sys/recv.2#7 integrate .. //depot/projects/tty/lib/libc/sys/sendfile.2#9 integrate .. //depot/projects/tty/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sigwait.2#4 integrate .. //depot/projects/tty/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/tty/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/tty/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/tty/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/tty/lib/libc/sys/wait.2#5 integrate .. //depot/projects/tty/lib/libc/sys/write.2#7 integrate .. //depot/projects/tty/lib/libc/uuid/uuid.3#4 integrate .. //depot/projects/tty/lib/libc/xdr/xdr.3#2 integrate .. //depot/projects/tty/lib/libdisk/libdisk.3#7 integrate .. //depot/projects/tty/lib/libedit/editline.3#7 integrate .. //depot/projects/tty/lib/libedit/editrc.5#4 integrate .. //depot/projects/tty/lib/libfetch/fetch.3#9 integrate .. //depot/projects/tty/lib/libgeom/libgeom.3#7 integrate .. //depot/projects/tty/lib/libmd/sha256.3#4 integrate .. //depot/projects/tty/lib/libmemstat/Makefile#3 integrate .. //depot/projects/tty/lib/libmemstat/libmemstat.3#2 integrate .. //depot/projects/tty/lib/libpmc/pmc.3#5 integrate .. //depot/projects/tty/lib/libpmc/pmclog.3#3 integrate .. //depot/projects/tty/lib/libpthread/test/guard_b.c#2 integrate .. //depot/projects/tty/lib/libpthread/test/mutex_d.c#3 integrate .. //depot/projects/tty/lib/libpthread/test/sigsuspend_d.c#3 integrate .. //depot/projects/tty/lib/libstand/libstand.3#6 integrate .. //depot/projects/tty/lib/libusbhid/usbhid.3#7 integrate .. //depot/projects/tty/lib/libutil/login_cap.3#6 integrate .. //depot/projects/tty/lib/libutil/pidfile.3#3 integrate .. //depot/projects/tty/lib/libutil/property.c#4 integrate .. //depot/projects/tty/lib/msun/bsdsrc/mathimpl.h#5 integrate .. //depot/projects/tty/lib/msun/man/fma.3#3 integrate .. //depot/projects/tty/lib/msun/man/ieee_test.3#4 integrate .. //depot/projects/tty/lib/msun/man/ilogb.3#3 integrate .. //depot/projects/tty/lib/msun/man/math.3#7 integrate .. //depot/projects/tty/lib/msun/man/remainder.3#4 integrate .. //depot/projects/tty/lib/msun/man/scalbn.3#3 integrate .. //depot/projects/tty/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/tty/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/tty/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/tty/lib/msun/src/k_tanf.c#4 integrate .. //depot/projects/tty/lib/msun/src/math_private.h#6 integrate .. //depot/projects/tty/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 integrate .. //depot/projects/tty/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/tty/release/doc/share/sgml/release.dsl#5 integrate .. //depot/projects/tty/sbin/atacontrol/atacontrol.8#6 integrate .. //depot/projects/tty/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/tty/sbin/devd/devd.8#9 integrate .. //depot/projects/tty/sbin/devd/devd.cc#10 integrate .. //depot/projects/tty/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/tty/sbin/ggate/ggatec/ggatec.8#4 integrate .. //depot/projects/tty/sbin/gpt/gpt.8#8 integrate .. //depot/projects/tty/sbin/gvinum/Makefile#3 integrate .. //depot/projects/tty/sbin/gvinum/gvinum.8#1 branch .. //depot/projects/tty/sbin/gvinum/gvinum.c#4 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/tty/sbin/init/init.8#11 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#20 integrate .. //depot/projects/tty/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/tty/sbin/kldload/kldload.8#5 integrate .. //depot/projects/tty/sbin/kldstat/kldstat.8#5 integrate .. //depot/projects/tty/sbin/ldconfig/ldconfig.8#5 integrate .. //depot/projects/tty/sbin/mount/Makefile#5 integrate .. //depot/projects/tty/sbin/mount/extern.h#3 integrate .. //depot/projects/tty/sbin/mount/getmntopts.3#3 integrate .. //depot/projects/tty/sbin/mount/getmntopts.c#6 integrate .. //depot/projects/tty/sbin/mount/mntopts.h#6 integrate .. //depot/projects/tty/sbin/mount/mount.c#8 integrate .. //depot/projects/tty/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/tty/sbin/mount/mount_ufs.c#6 delete .. //depot/projects/tty/sbin/mount_cd9660/Makefile#5 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.8#8 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#8 integrate .. //depot/projects/tty/sbin/mount_msdosfs/Makefile#4 integrate .. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.c#8 integrate .. //depot/projects/tty/sbin/mount_nullfs/Makefile#3 integrate .. //depot/projects/tty/sbin/mount_nullfs/mount_nullfs.c#6 integrate .. //depot/projects/tty/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/tty/sbin/mount_reiserfs/mount_reiserfs.c#4 integrate .. //depot/projects/tty/sbin/mount_std/Makefile#3 integrate .. //depot/projects/tty/sbin/mount_ufs/Makefile#2 delete .. //depot/projects/tty/sbin/mount_ufs/mount_ufs.c#5 delete .. //depot/projects/tty/sbin/ping/ping.8#9 integrate .. //depot/projects/tty/sbin/reboot/Makefile#4 integrate .. //depot/projects/tty/sbin/reboot/boot_i386.8#7 integrate .. //depot/projects/tty/sbin/sysctl/sysctl.8#9 integrate .. //depot/projects/tty/secure/lib/libssl/Makefile#6 integrate .. //depot/projects/tty/share/examples/etc/make.conf#16 integrate .. //depot/projects/tty/share/man/man3/pthread_barrier_destroy.3#4 integrate .. //depot/projects/tty/share/man/man4/Makefile#22 integrate .. //depot/projects/tty/share/man/man4/ataraid.4#3 integrate .. //depot/projects/tty/share/man/man4/ath.4#10 integrate .. //depot/projects/tty/share/man/man4/bge.4#13 integrate .. //depot/projects/tty/share/man/man4/bpf.4#8 integrate .. //depot/projects/tty/share/man/man4/cardbus.4#3 integrate .. //depot/projects/tty/share/man/man4/da.4#5 integrate .. //depot/projects/tty/share/man/man4/dcons.4#7 integrate .. //depot/projects/tty/share/man/man4/de.4#8 integrate .. //depot/projects/tty/share/man/man4/ed.4#9 integrate .. //depot/projects/tty/share/man/man4/em.4#9 integrate .. //depot/projects/tty/share/man/man4/fwip.4#5 integrate .. //depot/projects/tty/share/man/man4/geom.4#9 integrate .. //depot/projects/tty/share/man/man4/hptmv.4#3 integrate .. //depot/projects/tty/share/man/man4/hwpmc.4#6 integrate .. //depot/projects/tty/share/man/man4/icmp.4#8 integrate .. //depot/projects/tty/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/tty/share/man/man4/ip.4#12 integrate .. //depot/projects/tty/share/man/man4/ipw.4#6 integrate .. //depot/projects/tty/share/man/man4/iwi.4#7 integrate .. //depot/projects/tty/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/tty/share/man/man4/lmc.4#5 integrate .. //depot/projects/tty/share/man/man4/mac_seeotheruids.4#7 integrate .. //depot/projects/tty/share/man/man4/man4.i386/acpi_ibm.4#4 integrate .. //depot/projects/tty/share/man/man4/man4.i386/acpi_sony.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/arl.4#5 integrate .. //depot/projects/tty/share/man/man4/man4.i386/cp.4#6 integrate .. //depot/projects/tty/share/man/man4/man4.i386/cs.4#6 integrate .. //depot/projects/tty/share/man/man4/man4.i386/cx.4#8 integrate .. //depot/projects/tty/share/man/man4/man4.i386/ep.4#12 integrate .. //depot/projects/tty/share/man/man4/man4.i386/ex.4#7 integrate .. //depot/projects/tty/share/man/man4/man4.i386/fe.4#7 integrate .. //depot/projects/tty/share/man/man4/man4.i386/ie.4#5 integrate .. //depot/projects/tty/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/lnc.4#8 integrate .. //depot/projects/tty/share/man/man4/man4.i386/perfmon.4#4 integrate .. //depot/projects/tty/share/man/man4/man4.i386/ray.4#7 integrate .. //depot/projects/tty/share/man/man4/man4.i386/vx.4#7 integrate .. //depot/projects/tty/share/man/man4/ng_iface.4#6 integrate .. //depot/projects/tty/share/man/man4/ng_netflow.4#6 integrate .. //depot/projects/tty/share/man/man4/nve.4#5 integrate .. //depot/projects/tty/share/man/man4/pccard.4#4 integrate .. //depot/projects/tty/share/man/man4/pccbb.4#7 integrate .. //depot/projects/tty/share/man/man4/pcm.4#10 integrate .. //depot/projects/tty/share/man/man4/ral.4#5 integrate .. //depot/projects/tty/share/man/man4/snd_ad1816.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_als4000.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_atiixp.4#1 branch .. //depot/projects/tty/share/man/man4/snd_cmi.4#5 integrate .. //depot/projects/tty/share/man/man4/snd_cs4281.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_ds1.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_emu10k1.4#6 integrate .. //depot/projects/tty/share/man/man4/snd_es137x.4#5 integrate .. //depot/projects/tty/share/man/man4/snd_ess.4#5 integrate .. //depot/projects/tty/share/man/man4/snd_fm801.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_ich.4#3 integrate .. //depot/projects/tty/share/man/man4/snd_mss.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_neomagic.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_solo.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_t4dwave.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_via8233.4#3 integrate .. //depot/projects/tty/share/man/man4/snd_via82c686.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_vibes.4#2 integrate .. //depot/projects/tty/share/man/man4/txp.4#8 integrate .. //depot/projects/tty/share/man/man4/ural.4#5 integrate .. //depot/projects/tty/share/man/man4/wi.4#15 integrate .. //depot/projects/tty/share/man/man4/wlan.4#6 integrate .. //depot/projects/tty/share/man/man4/xe.4#7 integrate .. //depot/projects/tty/share/man/man5/disktab.5#6 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#16 integrate .. //depot/projects/tty/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#22 integrate .. //depot/projects/tty/share/man/man6/intro.6#4 integrate .. //depot/projects/tty/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/tty/share/man/man7/build.7#9 integrate .. //depot/projects/tty/share/man/man8/diskless.8#8 integrate .. //depot/projects/tty/share/man/man9/VFS_LOCK_GIANT.9#2 integrate .. //depot/projects/tty/share/man/man9/alloc_unr.9#3 integrate .. //depot/projects/tty/share/man/man9/atomic.9#4 integrate .. //depot/projects/tty/share/man/man9/bios.9#4 integrate .. //depot/projects/tty/share/man/man9/bus_dma.9#10 integrate .. //depot/projects/tty/share/man/man9/device_add_child.9#6 integrate .. //depot/projects/tty/share/man/man9/device_get_softc.9#7 integrate .. //depot/projects/tty/share/man/man9/mbuf.9#13 integrate .. //depot/projects/tty/share/man/man9/namei.9#7 integrate .. //depot/projects/tty/share/man/man9/timeout.9#9 integrate .. //depot/projects/tty/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/tty/share/mk/bsd.prog.mk#8 integrate .. //depot/projects/tty/share/monetdef/he_IL.UTF-8.src#2 integrate .. //depot/projects/tty/sys/alpha/alpha/clock.c#9 integrate .. //depot/projects/tty/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/tty/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/tty/sys/alpha/conf/GENERIC#17 integrate .. //depot/projects/tty/sys/alpha/conf/NOTES#8 integrate .. //depot/projects/tty/sys/amd64/amd64/apic_vector.S#7 integrate .. //depot/projects/tty/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/tty/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/tty/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#13 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/tty/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/tty/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/tty/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/tty/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/tty/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/tty/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/tty/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/tty/sys/arm/include/armreg.h#3 integrate .. //depot/projects/tty/sys/arm/include/elf.h#4 integrate .. //depot/projects/tty/sys/arm/include/pmap.h#7 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/tty/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/tty/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_cd.c#12 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/tty/sys/conf/Makefile.alpha#8 integrate .. //depot/projects/tty/sys/conf/Makefile.amd64#8 integrate .. //depot/projects/tty/sys/conf/Makefile.arm#7 integrate .. //depot/projects/tty/sys/conf/Makefile.i386#8 integrate .. //depot/projects/tty/sys/conf/Makefile.ia64#9 integrate .. //depot/projects/tty/sys/conf/Makefile.pc98#8 integrate .. //depot/projects/tty/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/tty/sys/conf/Makefile.sparc64#8 integrate .. //depot/projects/tty/sys/conf/NOTES#29 integrate .. //depot/projects/tty/sys/conf/files#38 integrate .. //depot/projects/tty/sys/conf/files.alpha#18 integrate .. //depot/projects/tty/sys/conf/files.amd64#23 integrate .. //depot/projects/tty/sys/conf/files.i386#28 integrate .. //depot/projects/tty/sys/conf/files.ia64#23 integrate .. //depot/projects/tty/sys/conf/files.pc98#23 integrate .. //depot/projects/tty/sys/conf/files.powerpc#12 integrate .. //depot/projects/tty/sys/conf/files.sparc64#19 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#18 integrate .. //depot/projects/tty/sys/conf/kmod.mk#14 integrate .. //depot/projects/tty/sys/conf/ldscript.arm#3 integrate .. //depot/projects/tty/sys/conf/options#26 integrate .. //depot/projects/tty/sys/conf/options.i386#18 integrate .. //depot/projects/tty/sys/conf/options.pc98#17 integrate .. //depot/projects/tty/sys/dev/aac/aac.c#16 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_battery.c#8 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_cmbat.c#10 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_pci_link.c#11 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/tty/sys/dev/amr/amr.c#14 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.h#20 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/tty/sys/dev/ata/ata-lowlevel.c#16 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#23 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.h#13 integrate .. //depot/projects/tty/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/tty/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_card.c#10 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_card.h#5 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_tuner.c#7 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/tty/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/tty/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/tty/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/tty/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/tty/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/tty/sys/dev/drm/drm.h#9 integrate .. //depot/projects/tty/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/tty/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/tty/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/tty/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/tty/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/tty/sys/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/tty/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/tty/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/tty/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/tty/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/tty/sys/dev/drm/mga_dma.c#10 integrate .. //depot/projects/tty/sys/dev/drm/mga_drm.h#6 integrate .. //depot/projects/tty/sys/dev/drm/mga_drv.c#8 integrate .. //depot/projects/tty/sys/dev/drm/mga_drv.h#8 integrate .. //depot/projects/tty/sys/dev/drm/mga_irq.c#6 integrate .. //depot/projects/tty/sys/dev/drm/mga_state.c#7 integrate .. //depot/projects/tty/sys/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/tty/sys/dev/drm/mga_warp.c#6 integrate .. //depot/projects/tty/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/tty/sys/dev/drm/r128_drm.h#7 integrate .. //depot/projects/tty/sys/dev/drm/r128_drv.c#8 integrate .. //depot/projects/tty/sys/dev/drm/r128_drv.h#9 integrate .. //depot/projects/tty/sys/dev/drm/r128_irq.c#6 integrate .. //depot/projects/tty/sys/dev/drm/r128_state.c#10 integrate .. //depot/projects/tty/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/tty/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/tty/sys/dev/drm/radeon_cp.c#11 integrate .. //depot/projects/tty/sys/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/tty/sys/dev/drm/radeon_drv.c#9 integrate .. //depot/projects/tty/sys/dev/drm/radeon_drv.h#11 integrate .. //depot/projects/tty/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/tty/sys/dev/drm/radeon_mem.c#7 integrate .. //depot/projects/tty/sys/dev/drm/radeon_state.c#11 integrate .. //depot/projects/tty/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/tty/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/tty/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/tty/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/tty/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/tty/sys/dev/drm/sis_drm.h#5 integrate .. //depot/projects/tty/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/tty/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/tty/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/tty/sys/dev/drm/sis_ds.h#5 integrate .. //depot/projects/tty/sys/dev/drm/sis_mm.c#7 integrate .. //depot/projects/tty/sys/dev/drm/tdfx_drv.c#8 integrate .. //depot/projects/tty/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#17 integrate .. //depot/projects/tty/sys/dev/em/if_em.h#12 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.c#9 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/tty/sys/dev/fe/if_fe_pccard.c#10 integrate .. //depot/projects/tty/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/tty/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/tty/sys/dev/ips/ips.c#9 integrate .. //depot/projects/tty/sys/dev/ips/ips.h#9 integrate .. //depot/projects/tty/sys/dev/ips/ips_commands.c#9 integrate .. //depot/projects/tty/sys/dev/ips/ips_disk.c#7 integrate .. //depot/projects/tty/sys/dev/ips/ips_ioctl.c#6 integrate .. //depot/projects/tty/sys/dev/ips/ips_pci.c#6 integrate .. //depot/projects/tty/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/tty/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/tty/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/tty/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/tty/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/tty/sys/dev/lge/if_lge.c#15 integrate .. //depot/projects/tty/sys/dev/lge/if_lgereg.h#5 integrate .. //depot/projects/tty/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/tty/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/tty/sys/dev/nve/if_nvereg.h#3 integrate .. //depot/projects/tty/sys/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/tty/sys/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/tty/sys/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/tty/sys/dev/ofw/openfirm.c#7 integrate .. //depot/projects/tty/sys/dev/owi/if_ieee80211.h#2 delete .. //depot/projects/tty/sys/dev/owi/if_owi.c#9 delete .. //depot/projects/tty/sys/dev/owi/if_owi_pccard.c#6 delete .. //depot/projects/tty/sys/dev/owi/if_wireg.h#3 delete .. //depot/projects/tty/sys/dev/owi/if_wivar.h#5 delete .. //depot/projects/tty/sys/dev/puc/puc.c#11 integrate .. //depot/projects/tty/sys/dev/ral/if_ral.c#6 integrate .. //depot/projects/tty/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#15 integrate .. //depot/projects/tty/sys/dev/sound/driver.c#5 integrate .. //depot/projects/tty/sys/dev/sound/isa/sb16.c#8 integrate .. //depot/projects/tty/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/tty/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/tty/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/tty/sys/dev/sound/pci/ich.c#12 integrate .. //depot/projects/tty/sys/dev/sound/pci/via8233.c#12 integrate .. //depot/projects/tty/sys/dev/sound/pcm/ac97.c#14 integrate .. //depot/projects/tty/sys/dev/sound/pcm/channel.c#12 integrate .. //depot/projects/tty/sys/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/tty/sys/dev/sound/pcm/feeder_fmt.c#9 integrate .. //depot/projects/tty/sys/dev/sound/pcm/feeder_rate.c#9 integrate .. //depot/projects/tty/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/tty/sys/dev/sound/pcm/mixer.c#12 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio.h#4 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio_pcm.c#9 integrate .. //depot/projects/tty/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/tty/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/tty/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/tty/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/tty/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/tty/sys/dev/usb/umass.c#15 integrate .. //depot/projects/tty/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_vfsops.c#13 integrate .. //depot/projects/tty/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/tty/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/tty/sys/geom/geom_aes.c#11 integrate .. //depot/projects/tty/sys/geom/geom_apple.c#8 integrate .. //depot/projects/tty/sys/geom/geom_bsd.c#12 integrate .. //depot/projects/tty/sys/geom/geom_disk.c#15 integrate .. //depot/projects/tty/sys/geom/geom_disk.h#4 integrate .. //depot/projects/tty/sys/geom/geom_fox.c#6 integrate .. //depot/projects/tty/sys/geom/geom_gpt.c#11 integrate .. //depot/projects/tty/sys/geom/geom_kern.c#9 integrate .. //depot/projects/tty/sys/geom/geom_mbr.c#11 integrate .. //depot/projects/tty/sys/geom/geom_pc98.c#10 integrate .. //depot/projects/tty/sys/geom/geom_subr.c#15 integrate .. //depot/projects/tty/sys/geom/geom_sunlabel.c#9 integrate .. //depot/projects/tty/sys/geom/geom_vol_ffs.c#8 integrate .. //depot/projects/tty/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/tty/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/tty/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/tty/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/tty/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/tty/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/tty/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/tty/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/tty/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/tty/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#24 integrate .. //depot/projects/tty/sys/i386/conf/XBOX#2 integrate .. //depot/projects/tty/sys/i386/i386/apic_vector.s#7 integrate .. //depot/projects/tty/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/tty/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/tty/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/tty/sys/i386/i386/io_apic.c#8 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#21 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/tty/sys/i386/i386/trap.c#18 integrate .. //depot/projects/tty/sys/i386/i386/vm_machdep.c#16 integrate .. //depot/projects/tty/sys/i386/include/smp.h#10 integrate .. //depot/projects/tty/sys/i386/include/smptests.h#6 delete .. //depot/projects/tty/sys/i386/pci/pci_cfgreg.c#10 integrate .. //depot/projects/tty/sys/ia64/conf/DEFAULTS#1 branch .. //depot/projects/tty/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/tty/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/tty/sys/ia64/conf/SKI#7 integrate .. //depot/projects/tty/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/tty/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/tty/sys/kern/init_main.c#15 integrate .. //depot/projects/tty/sys/kern/init_sysent.c#15 integrate .. //depot/projects/tty/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/tty/sys/kern/kern_exit.c#18 integrate .. //depot/projects/tty/sys/kern/kern_fork.c#14 integrate .. //depot/projects/tty/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/tty/sys/kern/kern_proc.c#14 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#17 integrate .. //depot/projects/tty/sys/kern/kern_synch.c#16 integrate .. //depot/projects/tty/sys/kern/kern_thread.c#16 integrate .. //depot/projects/tty/sys/kern/kern_time.c#12 integrate .. //depot/projects/tty/sys/kern/subr_rman.c#11 integrate .. //depot/projects/tty/sys/kern/subr_trap.c#14 integrate .. //depot/projects/tty/sys/kern/syscalls.c#15 integrate .. //depot/projects/tty/sys/kern/syscalls.master#16 integrate .. //depot/projects/tty/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/tty/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/tty/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/tty/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/tty/sys/modules/Makefile#24 integrate .. //depot/projects/tty/sys/modules/drm/Makefile#5 integrate .. //depot/projects/tty/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/tty/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/tty/sys/modules/geom/geom_vinum/Makefile#3 integrate .. //depot/projects/tty/sys/modules/i2c/controllers/pcf/Makefile#4 integrate .. //depot/projects/tty/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/tty/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/tty/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/tty/sys/modules/oldcard/Makefile#3 delete .. //depot/projects/tty/sys/modules/owi/Makefile#4 delete .. //depot/projects/tty/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/tty/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/tty/sys/net/if_bridge.c#7 integrate .. //depot/projects/tty/sys/net/if_clone.c#5 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/tty/sys/net/if_vlan.c#13 integrate .. //depot/projects/tty/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/tty/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/tty/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/tty/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/tty/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/tty/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/tty/sys/netinet/igmp.c#10 integrate .. //depot/projects/tty/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/tty/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/tty/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/tty/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/tty/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/tty/sys/netinet/ip_input.c#18 integrate .. //depot/projects/tty/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/tty/sys/netinet/ip_options.c#1 branch .. //depot/projects/tty/sys/netinet/ip_options.h#1 branch .. //depot/projects/tty/sys/netinet/ip_output.c#17 integrate .. //depot/projects/tty/sys/netinet/ip_var.h#12 integrate .. //depot/projects/tty/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#22 integrate .. //depot/projects/tty/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/tty/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/tty/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/tty/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/tty/sys/netinet6/mld6.c#10 integrate .. //depot/projects/tty/sys/netipx/ipx_ip.c#9 integrate .. //depot/projects/tty/sys/netsmb/smb_dev.c#12 integrate .. //depot/projects/tty/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/tty/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/tty/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/tty/sys/nfsclient/nfs_subs.c#12 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/tty/sys/nfsclient/nfsm_subs.h#5 integrate .. //depot/projects/tty/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/tty/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/tty/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/tty/sys/pc98/include/smptests.h#2 delete .. //depot/projects/tty/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/tty/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/tty/sys/pci/agp_intel.c#9 integrate .. //depot/projects/tty/sys/pci/if_de.c#14 integrate .. //depot/projects/tty/sys/pci/if_devar.h#8 integrate .. //depot/projects/tty/sys/posix4/mqueue.h#2 delete .. //depot/projects/tty/sys/powerpc/conf/DEFAULTS#1 branch .. //depot/projects/tty/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/tty/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/tty/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/tty/sys/sparc64/central/central.c#6 integrate .. //depot/projects/tty/sys/sparc64/conf/DEFAULTS#1 branch .. //depot/projects/tty/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/tty/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/tty/sys/sparc64/ebus/ebus.c#10 integrate .. //depot/projects/tty/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/tty/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/tty/sys/sparc64/fhc/fhc_central.c#6 integrate .. //depot/projects/tty/sys/sparc64/fhc/fhc_nexus.c#6 integrate .. //depot/projects/tty/sys/sparc64/fhc/fhcvar.h#4 integrate .. //depot/projects/tty/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/tty/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/tty/sys/sparc64/pci/psychoreg.h#5 integrate .. //depot/projects/tty/sys/sparc64/pci/psychovar.h#7 integrate .. //depot/projects/tty/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/tty/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/tty/sys/sparc64/sparc64/eeprom.c#7 integrate .. //depot/projects/tty/sys/sparc64/sparc64/genassym.c#8 integrate .. //depot/projects/tty/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/tty/sys/sparc64/sparc64/mem.c#8 integrate .. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/tty/sys/sparc64/sparc64/rtc.c#4 integrate .. //depot/projects/tty/sys/sys/_types.h#7 integrate .. //depot/projects/tty/sys/sys/bio.h#9 integrate .. //depot/projects/tty/sys/sys/event.h#9 integrate .. //depot/projects/tty/sys/sys/file.h#8 integrate .. //depot/projects/tty/sys/sys/ktrace.h#7 integrate .. //depot/projects/tty/sys/sys/mbuf.h#17 integrate .. //depot/projects/tty/sys/sys/mount.h#13 integrate .. //depot/projects/tty/sys/sys/mqueue.h#1 branch .. //depot/projects/tty/sys/sys/proc.h#20 integrate .. //depot/projects/tty/sys/sys/queue.h#7 integrate .. //depot/projects/tty/sys/sys/resource.h#7 integrate .. //depot/projects/tty/sys/sys/signal.h#7 integrate .. //depot/projects/tty/sys/sys/syscall.h#15 integrate .. //depot/projects/tty/sys/sys/syscall.mk#15 integrate .. //depot/projects/tty/sys/sys/sysproto.h#16 integrate .. //depot/projects/tty/sys/sys/time.h#7 integrate .. //depot/projects/tty/sys/sys/types.h#10 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/tty/sys/vm/pmap.h#11 integrate .. //depot/projects/tty/sys/vm/vm_map.c#14 integrate .. //depot/projects/tty/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/tty/tools/regression/mqueue/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest1/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest1/mqtest1.c#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest2/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest2/mqtest2.c#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest3/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest3/mqtest3.c#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest4/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest4/mqtest4.c#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest5/Makefile#1 branch .. //depot/projects/tty/tools/regression/mqueue/mqtest5/mqtest5.c#1 branch .. //depot/projects/tty/tools/sched/schedgraph.py#4 integrate .. //depot/projects/tty/tools/tools/nanobsd/FlashDevice.sub#2 integrate .. //depot/projects/tty/tools/tools/tinderbox/etc/default.rc#5 integrate .. //depot/projects/tty/tools/tools/tinderbox/etc/head.rc#2 integrate .. //depot/projects/tty/tools/tools/tinderbox/tbmaster.1#9 integrate .. //depot/projects/tty/tools/tools/tinderbox/tbmaster.pl#14 integrate .. //depot/projects/tty/tools/tools/tinderbox/tinderbox.1#7 integrate .. //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#13 integrate .. //depot/projects/tty/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#5 integrate .. //depot/projects/tty/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#6 integrate .. //depot/projects/tty/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/tty/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/tty/usr.bin/cmp/cmp.1#3 integrate .. //depot/projects/tty/usr.bin/col/col.c#3 integrate .. //depot/projects/tty/usr.bin/compress/compress.1#5 integrate .. //depot/projects/tty/usr.bin/indent/indent.c#5 integrate .. //depot/projects/tty/usr.bin/indent/indent_globs.h#5 integrate .. //depot/projects/tty/usr.bin/indent/io.c#5 integrate .. //depot/projects/tty/usr.bin/indent/lexi.c#4 integrate .. //depot/projects/tty/usr.bin/kdump/kdump.1#6 integrate .. //depot/projects/tty/usr.bin/make/main.c#16 integrate .. //depot/projects/tty/usr.bin/make/var.c#12 integrate .. //depot/projects/tty/usr.bin/mt/mt.1#8 integrate .. //depot/projects/tty/usr.bin/mt/mt.c#3 integrate .. //depot/projects/tty/usr.bin/netstat/main.c#11 integrate .. //depot/projects/tty/usr.bin/netstat/mbuf.c#7 integrate .. //depot/projects/tty/usr.bin/netstat/netstat.1#9 integrate .. //depot/projects/tty/usr.bin/netstat/netstat.h#8 integrate .. //depot/projects/tty/usr.bin/pkill/pkill.1#6 integrate .. //depot/projects/tty/usr.bin/pkill/pkill.c#6 integrate .. //depot/projects/tty/usr.bin/rlogin/rlogin.c#5 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_clntout.c#4 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_cout.c#4 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_hout.c#4 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_main.c#7 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_parse.c#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_parse.h#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_sample.c#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_scan.c#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_scan.h#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_svcout.c#4 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_tblout.c#5 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_util.c#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_util.h#3 integrate .. //depot/projects/tty/usr.bin/split/split.1#5 integrate .. //depot/projects/tty/usr.bin/tar/configure.ac.in#5 integrate .. //depot/projects/tty/usr.sbin/arp/arp.4#5 integrate .. //depot/projects/tty/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#3 integrate .. //depot/projects/tty/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#4 integrate .. //depot/projects/tty/usr.sbin/config/config.h#7 integrate .. //depot/projects/tty/usr.sbin/config/config.y#10 integrate .. //depot/projects/tty/usr.sbin/config/configvers.h#7 integrate .. //depot/projects/tty/usr.sbin/config/main.c#9 integrate .. //depot/projects/tty/usr.sbin/config/mkheaders.c#5 integrate .. //depot/projects/tty/usr.sbin/config/mkmakefile.c#7 integrate .. //depot/projects/tty/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/tty/usr.sbin/lmcconfig/lmcconfig.8#2 integrate .. //depot/projects/tty/usr.sbin/mount_smbfs/Makefile#5 integrate .. //depot/projects/tty/usr.sbin/moused/moused.8#9 integrate .. //depot/projects/tty/usr.sbin/ndp/ndp.8#9 integrate .. //depot/projects/tty/usr.sbin/pkg_install/add/pkg_add.1#8 integrate .. //depot/projects/tty/usr.sbin/pkg_install/info/pkg_info.1#7 integrate .. //depot/projects/tty/usr.sbin/pkg_install/version/pkg_version.1#9 integrate .. //depot/projects/tty/usr.sbin/portsnap/make_index/make_index.c#3 integrate .. //depot/projects/tty/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/tty/usr.sbin/powerd/powerd.8#5 integrate .. //depot/projects/tty/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/tty/usr.sbin/rpc.lockd/kern.c#7 integrate .. //depot/projects/tty/usr.sbin/rtadvd/config.c#6 integrate .. //depot/projects/tty/usr.sbin/slstat/slstat.8#3 integrate .. //depot/projects/tty/usr.sbin/sysinstall/sysinstall.8#10 integrate Differences ... ==== //depot/projects/tty/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.323 2005/07/29 21:51:33 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ # # The user-driven targets are: # @@ -269,7 +269,8 @@ .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 + find [A-Z]*[A-Z] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${mach} .ORDER: universe_prologue universe_${mach} universe_epilogue ==== //depot/projects/tty/Makefile.inc1#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -237,7 +237,7 @@ LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} +LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif # install stage @@ -252,6 +252,7 @@ # kernel stage KMAKEENV= ${WMAKEENV} +KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} # # buildworld @@ -476,16 +477,18 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} # -# Use this to add checks to installworld/installkernel targets. +# installcheck +# +# Checks to be sure system is ready for installworld/installkernel. # -SPECIAL_INSTALLCHECKS= +installcheck: # # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} .if !make(distributeworld) -SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck: installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ @@ -495,9 +498,7 @@ .endif # -# installcheck -# -# Checks to be sure system is ready for installworld +# Check for missing UIDs/GIDs. # CHECK_UIDS= CHECK_GIDS= @@ -509,7 +510,8 @@ CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck: ${SPECIAL_INSTALLCHECKS} +installcheck: installcheck_UGID +installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -550,7 +552,7 @@ # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: ${SPECIAL_INSTALLCHECKS} +reinstall: @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -652,15 +654,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR} + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @@ -681,15 +681,13 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 3.1: making dependencies" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3.2: building everything" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ + cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -701,18 +699,12 @@ # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} +reinstallkernel reinstallkernel.debug: installcheck .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false .endif @echo "--------------------------------------------------------------" - @echo ">>> Making hierarchy" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; \ - ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy - @echo - @echo "--------------------------------------------------------------" @echo ">>> Installing kernel" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ==== //depot/projects/tty/UPDATING#25 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20051129: + The nodev mount option was deprecated in RELENG_6 (where it + was a no-op), and is now unsupported. If you have nodev or dev listed + in /etc/fstab, remove it, otherwise it will result in a mount error. + +20051129: + ABI between ipfw(4) and ipfw(8) has been changed. You need + to rebuild ipfw(8) when rebuilding kernel. + 20051029: /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. Its /etc/rc.conf.d configuration file has been `ppp' from @@ -424,4 +433,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.423 2005/10/29 05:27:32 yar Exp $ +$FreeBSD: src/UPDATING,v 1.425 2005/11/29 19:13:28 rodrigc Exp $ ==== //depot/projects/tty/bin/date/date.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.73 2005/11/01 19:31:25 trhodes Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.74 2005/11/17 12:15:22 ru Exp $ .\" .Dd November 1, 2005 .Dt DATE 1 @@ -421,12 +421,7 @@ utility is expected to be compatible with .St -p1003.2 . The -.Fl d , -.Fl f , -.Fl j , -.Fl n , -.Fl r , -.Fl t , +.Fl d , f , j , n , r , t , and .Fl v options are all extensions to the standard. ==== //depot/projects/tty/bin/kenv/kenv.1#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.12 2005/09/13 19:01:53 rwatson Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ .\" -.Dd July 8, 2000 +.Dd September 13, 2005 .Dt KENV 1 .Os .Sh NAME ==== //depot/projects/tty/bin/ls/ls.1#13 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.95 2005/11/17 12:15:23 ru Exp $ .\" -.Dd November 10, 2005 +.Dd November 16, 2005 .Dt LS 1 .Os .Sh NAME @@ -72,9 +72,9 @@ .Pa \&. and .Pa .. . -Always set for the super-user. +Automatically set for the super-user unless .Fl I -cancel this option. +is specified. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 1 16:42:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EF4316A422; Thu, 1 Dec 2005 16:42:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 12AAA16A41F for ; Thu, 1 Dec 2005 16:42:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C5E43D45 for ; Thu, 1 Dec 2005 16:42:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1GgCNU056649 for ; Thu, 1 Dec 2005 16:42:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1GgCKf056646 for perforce@freebsd.org; Thu, 1 Dec 2005 16:42:12 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 16:42:12 GMT Message-Id: <200512011642.jB1GgCKf056646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 16:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=87587 Change 87587 by millert@millert_ibook on 2005/12/01 16:41:14 Cosmetic changes to reduce diffs with DSEP Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#4 (text+ko) ==== @@ -388,12 +388,12 @@ .mpo_execve_will_transition = ipctrace_execve_will_transition }; -static char *labelnamespaces[] = {"ipctrace"}; +static char *labelnamespaces[IPCTRACE_LABEL_NAME_COUNT] = {IPCTRACE_LABEL_NAME}; struct mac_policy_conf ipctrace_policy_conf = { "ipctrace", /* policy name */ "IPC Trace Module", /* full name */ - labelnamespaces, /* label namespaces */ - 1, /* namespace count */ + labelnamespaces, /* label namespace */ + IPCTRACE_LABEL_NAME_COUNT, /* namespace count */ &ipctrace_ops, /* policy operations */ 0, /* loadtime flags*/ &ipctrace_slot, /* security field */ ==== //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.h#3 (text+ko) ==== @@ -46,6 +46,9 @@ #define ITA_COPY_SEND 12 #define ITA_MOVE_RECV 13 +#define IPCTRACE_LABEL_NAME "ipctrace" +#define IPCTRACE_LABEL_NAME_COUNT 1 + /* system calls */ #define IT_CALL_GET 1 From owner-p4-projects@FreeBSD.ORG Thu Dec 1 19:51:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C238016A422; Thu, 1 Dec 2005 19:51:02 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 85DF316A41F for ; Thu, 1 Dec 2005 19:51:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FB0543D53 for ; Thu, 1 Dec 2005 19:51:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1Jp2Xx072028 for ; Thu, 1 Dec 2005 19:51:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1Jp2PH072025 for perforce@freebsd.org; Thu, 1 Dec 2005 19:51:02 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 19:51:02 GMT Message-Id: <200512011951.jB1Jp2PH072025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 19:51:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=87593 Change 87593 by millert@millert_ibook on 2005/12/01 19:50:01 mach_init was not handling waitpid returning EINTR, which caused zombies to pile up over time. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#5 (text+ko) ==== @@ -594,7 +594,9 @@ /* * Reap our children. */ - presult = waitpid(serverp->pid, &wstatus, WNOHANG); + do { + presult = waitpid(serverp->pid, &wstatus, WNOHANG); + } while (presult == -1 && errno == EINTR); if (presult != serverp->pid) { unix_error("waitpid: cmd = %s", serverp->cmd); } else if (wstatus) { From owner-p4-projects@FreeBSD.ORG Thu Dec 1 20:49:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5491116A423; Thu, 1 Dec 2005 20:49:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E356116A41F for ; Thu, 1 Dec 2005 20:49:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A447043D45 for ; Thu, 1 Dec 2005 20:49:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1KnF8v081569 for ; Thu, 1 Dec 2005 20:49:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1KnF4f081566 for perforce@freebsd.org; Thu, 1 Dec 2005 20:49:15 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 20:49:15 GMT Message-Id: <200512012049.jB1KnF4f081566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 20:49:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=87600 Change 87600 by millert@millert_g4tower on 2005/12/01 20:48:47 Remove mpo_create_root_mount, it is no longer needed. From DSEP. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_vfs.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/mac_count/module/mac_count.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/mac_mls/mac_mls.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/mac_stub/mac_stub.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/mactest/mac_test.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#21 edit .. //depot/projects/trustedbsd/sedarwin7/src/stacktrace/module/mac_stacktrace.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac.h#4 (text+ko) ==== @@ -189,7 +189,6 @@ int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); void mac_update_devfsdirent(struct mount *mp, struct devnode *de, ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#10 (text+ko) ==== @@ -1096,7 +1096,6 @@ @param fslabel Label for the file system default @see mpo_init_mount_label_t @see mpo_init_mount_fs_label_t - @see mpo_create_root_mount_t Fill out the labels on the mount point being created by the supplied user credential. This call is made when file systems are first mounted. @@ -1109,29 +1108,6 @@ ); /** - @brief Create root mount labels - @param cred Subject credential - @param mp Mount point of file system being mounted - @param mntlabel Label to associate with the new mount point - @param fslabel Label for the file system default - @see mpo_init_mount_label_t - @see mpo_init_mount_fs_label_t - @see mpo_create_root_mount_t - - Fill out the labels on the root mount point being created by the - supplied user credential. - - @warning XXX This entry point is no longer necessary and will be - removed in a future version of the framework. -*/ -typedef void mpo_create_root_mount_t( - struct ucred *cred, - struct mount *mp, - struct label *mntlabel, - struct label *fslabel -); - -/** @brief Update a vnode label @param cred Subject credential @param vp The vnode to relabel @@ -3938,7 +3914,6 @@ mpo_create_devfs_symlink_t *mpo_create_devfs_symlink; mpo_create_vnode_extattr_t *mpo_create_vnode_extattr; mpo_create_mount_t *mpo_create_mount; - mpo_create_root_mount_t *mpo_create_root_mount; mpo_relabel_vnode_t *mpo_relabel_vnode; mpo_setlabel_vnode_extattr_t *mpo_setlabel_vnode_extattr; mpo_update_devfsdirent_t *mpo_update_devfsdirent; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_vfs.c#4 (text+ko) ==== @@ -980,14 +980,6 @@ mp->mnt_fslabel); } -void -mac_create_root_mount(struct ucred *cred, struct mount *mp) -{ - - MAC_PERFORM(create_root_mount, cred, mp, mp->mnt_mntlabel, - mp->mnt_fslabel); -} - int mac_check_mount_stat(struct ucred *cred, struct mount *mount) { ==== //depot/projects/trustedbsd/sedarwin7/src/mac_count/module/mac_count.c#2 (text+ko) ==== @@ -947,14 +947,6 @@ } static void -count_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mountlabel, struct label *fslabel) -{ - - COUNT(__func__); -} - -static void count_create_socket(struct ucred *cred, struct socket *so, struct label *solabel) { @@ -1301,7 +1293,6 @@ .mpo_create_posix_shm = count_create_posix_shm, .mpo_create_proc0 = count_create_proc0, .mpo_create_proc1 = count_create_proc1, - .mpo_create_root_mount = count_create_root_mount, .mpo_create_socket = count_create_socket, .mpo_create_socket_from_socket = count_create_socket_from_socket, .mpo_create_sysv_sem = count_create_sysv_sem, ==== //depot/projects/trustedbsd/sedarwin7/src/mac_mls/mac_mls.c#4 (text+ko) ==== @@ -1141,18 +1141,6 @@ } static void -mac_mls_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ - struct mac_mls *mac_mls; - - mac_mls = SLOT(fslabel); - mac_mls_set_effective(mac_mls, MAC_MLS_TYPE_LOW, 0, NULL); - mac_mls = SLOT(mntlabel); - mac_mls_set_effective(mac_mls, MAC_MLS_TYPE_LOW, 0, NULL); -} - -static void mac_mls_create_task (struct task *parent, struct task *child, struct label *pl, struct label *chl, struct label *chpl) { @@ -3442,7 +3430,6 @@ .mpo_init_proc_label = mac_mls_init_label, .mpo_create_proc0 = mac_mls_create_proc0, .mpo_create_proc1 = mac_mls_create_proc1, - .mpo_create_root_mount = mac_mls_create_root_mount, .mpo_check_system_swapon = mac_mls_check_system_swapon, .mpo_associate_vnode_devfs = mac_mls_associate_vnode_devfs, .mpo_associate_vnode_extattr = mac_mls_associate_vnode_extattr, ==== //depot/projects/trustedbsd/sedarwin7/src/mac_stub/mac_stub.c#4 (text+ko) ==== @@ -965,13 +965,6 @@ } static void -stub_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mountlabel, struct label *fslabel) -{ - -} - -static void stub_create_socket(struct ucred *cred, struct socket *so, struct label *solabel) { @@ -1300,7 +1293,6 @@ .mpo_create_posix_shm = stub_create_posix_shm, .mpo_create_proc0 = stub_create_proc0, .mpo_create_proc1 = stub_create_proc1, - .mpo_create_root_mount = stub_create_root_mount, .mpo_create_socket = stub_create_socket, .mpo_create_socket_from_socket = stub_create_socket_from_socket, .mpo_create_sysv_sem = stub_create_sysv_sem, ==== //depot/projects/trustedbsd/sedarwin7/src/mactest/mac_test.c#4 (text+ko) ==== @@ -915,18 +915,6 @@ } static void -mac_test_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ - CHECKNULL(cred, "cred", "mac_test_create_root_mount"); - CHECKNULL(mp, "mp", "mac_test_create_root_mount"); - - use_label(fslabel, MOUNTTYPE, "mac_test_create_root_mount (2)"); - use_label(cred->cr_label, CREDTYPE, "mac_test_create_root_mount (1)"); - init_label(mntlabel, MOUNTTYPE, "mac_test_create_root_mount"); -} - -static void mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { @@ -2626,7 +2614,6 @@ .mpo_create_devfs_symlink = mac_test_create_devfs_symlink, .mpo_create_vnode_extattr = mac_test_create_vnode_extattr, .mpo_create_mount = mac_test_create_mount, - .mpo_create_root_mount = mac_test_create_root_mount, .mpo_relabel_vnode = mac_test_relabel_vnode, .mpo_setlabel_vnode_extattr = mac_test_setlabel_vnode_extattr, .mpo_update_devfsdirent = mac_test_update_devfsdirent, ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#21 (text+ko) ==== @@ -1047,37 +1047,6 @@ #endif } -/* - * Initialize the SEBSD security server after the root partition has - * been mounted; policy is located on root partition. - */ -static void -sebsd_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ -#if 0 - struct vnode *vp, *nvp; - - /* - * Go through all open vnodes and reload their labels. - */ - mtx_lock(&mntvnode_mtx); - vp = TAILQ_FIRST(&mp->mnt_nvnodelist); - do { - nvp = TAILQ_NEXT(vp, v_nmntvnodes); - VI_LOCK(vp); - mtx_unlock(&mntvnode_mtx); - vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY, curthread); - (void)sebsd_associate_vnode_extattr(mp, fslabel, vp, - vp->v_label); - VOP_UNLOCK(vp, 0, curthread); - mtx_lock(&mntvnode_mtx); - vp = nvp; - } while (vp != NULL); - mtx_unlock(&mntvnode_mtx); -#endif -} - static int sebsd_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *parent, struct label *parentlabel, ==== //depot/projects/trustedbsd/sedarwin7/src/stacktrace/module/mac_stacktrace.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ TRACE_DATA(create_devfs_symlink, 56, STACKTRACE_ON); TRACE_DATA(create_vnode_extattr, 57, STACKTRACE_ON); TRACE_DATA(create_mount, 58, STACKTRACE_ON); -TRACE_DATA(create_root_mount, 59 , STACKTRACE_ON); +TRACE_DATA(create_root_mount, 59, STACKTRACE_ON); // deprecated & removed TRACE_DATA(relabel_vnode, 60, STACKTRACE_ON); TRACE_DATA(setlabel_vnode_extattr, 61, STACKTRACE_ON); TRACE_DATA(update_devfsdirent, 62, STACKTRACE_ON); @@ -1045,14 +1045,6 @@ } static void -stacktrace_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ - - trace(&create_root_mount_td); -} - -static void stacktrace_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { @@ -2056,7 +2048,6 @@ .mpo_create_devfs_symlink = stacktrace_create_devfs_symlink, .mpo_create_vnode_extattr = stacktrace_create_vnode_extattr, .mpo_create_mount = stacktrace_create_mount, - .mpo_create_root_mount = stacktrace_create_root_mount, .mpo_relabel_vnode = stacktrace_relabel_vnode, .mpo_setlabel_vnode_extattr = stacktrace_setlabel_vnode_extattr, .mpo_update_devfsdirent = stacktrace_update_devfsdirent, From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:06:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 765F316A423; Thu, 1 Dec 2005 21:06:37 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1D09016A41F for ; Thu, 1 Dec 2005 21:06:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D929743D55 for ; Thu, 1 Dec 2005 21:06:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1L6asK082481 for ; Thu, 1 Dec 2005 21:06:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1L6asS082478 for perforce@freebsd.org; Thu, 1 Dec 2005 21:06:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:06:36 GMT Message-Id: <200512012106.jB1L6asS082478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:06:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=87601 Change 87601 by millert@millert_g4tower on 2005/12/01 21:06:16 #if 0 out some dead code Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#22 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#22 (text+ko) ==== @@ -1374,6 +1374,7 @@ } #endif /* HAS_PIPES */ +#if 0 /* XXX */ static int sebsd_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1387,6 +1388,7 @@ return (cred_has_perm(cred, proc, PROCESS__SETSCHED)); } +#endif static int sebsd_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:17:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 796F616A422; Thu, 1 Dec 2005 21:17:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 19F4416A41F for ; Thu, 1 Dec 2005 21:17:53 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73BCB43D6A for ; Thu, 1 Dec 2005 21:17:52 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LHq0D082905 for ; Thu, 1 Dec 2005 21:17:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LHo11082902 for perforce@freebsd.org; Thu, 1 Dec 2005 21:17:50 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:17:50 GMT Message-Id: <200512012117.jB1LHo11082902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:17:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=87602 Change 87602 by millert@millert_g4tower on 2005/12/01 21:17:10 Update login context code from DSEP and implement sebsd_check_proc_setlcid() for SEDarwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_get.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_set.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/getlcmac/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/getlcmac/getlcmac.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/getlcmac/getlcmac.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/lcs/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/lcs/lcs.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/lcs/lcs.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/setlcmac/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/setlcmac/setlcmac.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/setlcmac/setlcmac.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/login#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/sshd#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/PAMModule.defs#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_lctx/GNUmakefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_lctx/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_lctx/lctx.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_lctx/pam_lctx.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_lctx/pam_lctx.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/init_sysent.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_bsm_klib.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_exit.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_fork.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_proc.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_prot.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_sysctl.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/syscalls.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/sysctl_init.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/lctx.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#11 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/proc.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/syscall.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/sysctl.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_base.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_internal.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_process.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#23 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/Makefile#5 (text+ko) ==== @@ -19,6 +19,7 @@ cd mach_cmds && gnumake cd top && make cd bsm/bsm/lib && gnumake + cd pam_modules/pam_lctx && gnumake cd system_cmds/mach_init.tproj && gnumake install: @@ -38,6 +39,7 @@ cd mach_cmds && gnumake install cd top && make install cd bsm/bsm/lib && gnumake install + cd pam_modules/pam_lctx && gnumake DSTROOT=$(DESTDIR) install cd system_cmds/mach_init.tproj && gnumake install clean: @@ -57,6 +59,6 @@ cd mach_cmds && gnumake clean cd top && make clean cd bsm/bsm/lib && gnumake clean + cd pam_modules/pam_lctx && gnumake clean cd system_cmds/mach_init.tproj && gnumake clean rm -rf build/obj - ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_get.c#3 (text+ko) ==== @@ -52,6 +52,20 @@ } int +mac_get_lcid(pid_t lcid, struct mac *label) +{ + + return (syscall(SYS___mac_get_lcid, lcid, label)); +} + +int +mac_get_lctx(struct mac *label) +{ + + return (syscall(SYS___mac_get_lctx, label)); +} + +int mac_get_link(const char *path, struct mac *label) { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_set.c#3 (text+ko) ==== @@ -51,6 +51,13 @@ } int +mac_set_lctx(struct mac *label) +{ + + return (syscall(SYS___mac_set_lctx, label)); +} + +int mac_set_link(const char *path, struct mac *label) { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/Makefile#3 (text+ko) ==== @@ -1,22 +1,27 @@ include ../../Makeconfig +SUBDIR= getfmac getlcmac getpmac mexec setfsmac setlcmac setpmac lcs + all: - cd getfmac && gnumake - cd getpmac && gnumake - cd mexec && gnumake - cd setfsmac && gnumake - cd setpmac && gnumake + @for dir in $(SUBDIR); do \ + gnumake -C $$dir ; \ + if [ $$? -ne 0 ] ; then \ + exit 1 ; \ + fi ; \ + done install: - cd getfmac && gnumake install - cd getpmac && gnumake install - cd mexec && gnumake install - cd setfsmac && gnumake install - cd setpmac && gnumake install + @for dir in $(SUBDIR); do \ + gnumake -C $$dir install ; \ + if [ $$? -ne 0 ] ; then \ + exit 1 ; \ + fi ; \ + done clean: - cd getfmac && gnumake clean - cd getpmac && gnumake clean - cd mexec && gnumake clean - cd setfsmac && gnumake clean - cd setpmac && gnumake clean + @for dir in $(SUBDIR); do \ + gnumake -C $$dir clean ; \ + if [ $$? -ne 0 ] ; then \ + exit 1 ; \ + fi ; \ + done ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/login#3 (text+ko) ==== @@ -6,3 +6,4 @@ account required pam_permit.so password required pam_deny.so session required pam_uwtmp.so +session required pam_lctx.so ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/sshd#3 (text+ko) ==== @@ -6,3 +6,4 @@ account required pam_permit.so password required pam_deny.so session required pam_permit.so +session required pam_lctx.so ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/PAMModule.defs#3 (text+ko) ==== @@ -24,8 +24,8 @@ Sources = . endif -Extra_CC_Flags += -Ddarwin -no-cpp-precomp -Wall -I/usr/include/pam -arch i386 -arch ppc -Extra_LD_Libraries += -lpam -arch i386 -arch ppc +Extra_CC_Flags += -Ddarwin -no-cpp-precomp -Wall -I/usr/include/pam -arch ppc +Extra_LD_Libraries += -lpam -arch ppc include $(CoreOSMakefiles)/Standard/Standard.make ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/init_sysent.c#3 (text+ko) ==== @@ -378,6 +378,9 @@ int getlcid(); int setlcid(); +int __mac_get_lcid(); +int __mac_get_lctx(); +int __mac_set_lctx(); /* * System call switch table. @@ -907,6 +910,9 @@ syss(getlcid,1), /* 404 = getlcid */ sysp(setlcid,2), /* 405 = setlcid */ + syss(__mac_get_lcid,2), /* 406 = __mac_get_lcid */ + syss(__mac_get_lctx,1), /* 407 = __mac_get_lctx */ + syss(__mac_set_lctx,1), /* 408 = __mac_set_lctx */ /* * N.B. * The argument count numbers in this table are actually ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_bsm_klib.c#3 (text+ko) ==== @@ -468,7 +468,11 @@ * XXXMAC We may wish to add audit to these later */ AUE_NULL, /* 404 = getlcid */ - AUE_NULL /* 405 = setlcid */ + AUE_NULL, /* 405 = setlcid */ + AUE_NULL, /* 406 = __mac_get_lcid */ + AUE_NULL, /* 407 = __mac_get_lctx */ + AUE_NULL, /* 408 = __mac_set_lctx */ + }; int nsys_au_event = sizeof(sys_au_event) / sizeof(sys_au_event[0]); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_exit.c#3 (text+ko) ==== @@ -669,6 +669,12 @@ wakeup(&p->p_stat); return (0); } +#ifdef LCTX + PROC_LOCK(p); + leavelctx(p); + PROC_UNLOCK(p); +#endif + p->p_xstat = 0; if (p->p_ru) { ruadd(&q->p_stats->p_cru, p->p_ru); @@ -715,9 +721,7 @@ * Unlink it from its process group and free it. */ leavepgrp(p); -#ifdef LCTX - leavelctx(p); -#endif + LIST_REMOVE(p, p_list); /* off zombproc */ LIST_REMOVE(p, p_sibling); p->p_flag &= ~P_WAITING; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_fork.c#3 (text+ko) ==== @@ -582,8 +582,8 @@ p2->p_lctx = NULL; /* Add new process to login context (if any). */ if (p1->p_lctx != NULL) { - p2->p_lctx = p1->p_lctx; - LIST_INSERT_AFTER(p1, p2, p_lclist); + LCTX_LOCK(p1->p_lctx); + enterlctx(p2, p1->p_lctx, 0); } #endif ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_proc.c#3 (text+ko) ==== @@ -81,10 +81,12 @@ #include #include #include +#include #include #include #include #include +#include #include /* @@ -110,7 +112,11 @@ struct proclist zombproc; #ifdef LCTX -static pid_t lastlcid = 1; +static pid_t lastlcid = 1; +static int alllctx_cnt; + +#define LCID_MAX 8192 /* Does this really need to be large? */ +static int maxlcid = LCID_MAX; LIST_HEAD(lctxlist, lctx); static struct lctxlist alllctx; @@ -132,6 +138,7 @@ LIST_INIT(&zombproc); #ifdef LCTX LIST_INIT(&alllctx); + alllctx_cnt = 0; #endif pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash); pgrphashtbl = hashinit(maxproc / 4, M_PROC, &pgrphash); @@ -260,34 +267,76 @@ struct lctx * lcfind(pid_t lcid) { - struct lctx *lc; + struct lctx *l; - LIST_FOREACH(lc, &alllctx, lc_list) - if (lc->lc_id == lcid) + ALLLCTX_LOCK; + LIST_FOREACH(l, &alllctx, lc_list) { + if (l->lc_id == lcid) { + LCTX_LOCK(l); break; - return (lc); + } + } + ALLLCTX_UNLOCK; + return (l); } -#define LCID_MAX 8192 /* Does this really need to be large? */ +#define LCID_INC \ + do { \ + lastlcid++; \ + if (lastlcid > maxlcid) \ + lastlcid = 1; \ + } while (0) \ + struct lctx * lccreate(void) { - struct lctx *lc; + struct lctx *l; /* Not very efficient but this isn't a common operation. */ - while ((lc = lcfind(lastlcid)) != NULL) { - lastlcid++; - if (lastlcid > LCID_MAX) - lastlcid = 1; + while ((l = lcfind(lastlcid)) != NULL) { + LCTX_UNLOCK(l); + LCID_INC; } /* Possible race condition with lastlcid here? */ - MALLOC(lc, struct lctx *, sizeof(struct lctx), M_LCTX, M_WAITOK|M_ZERO); - lc->lc_id = lastlcid; - lastlcid++; - LIST_INIT(&lc->lc_members); - LIST_INSERT_HEAD(&alllctx, lc, lc_list); - return (lc); + MALLOC(l, struct lctx *, sizeof(struct lctx), M_LCTX, M_WAITOK|M_ZERO); + l->lc_id = lastlcid; + LCID_INC; + LIST_INIT(&l->lc_members); +#ifdef MAC + l->lc_label = mac_lctx_label_alloc(); +#endif + ALLLCTX_LOCK; + LIST_INSERT_HEAD(&alllctx, l, lc_list); + alllctx_cnt++; + ALLLCTX_UNLOCK; + + return (l); +} + +/* + * Call with proc and lctx locked. + * Will unlock lctx on return. + */ +void +enterlctx (struct proc *p, struct lctx *l, int create) +{ + if (l == NULL) + return; + + p->p_lctx = l; + LIST_INSERT_HEAD(&l->lc_members, p, p_lclist); + l->lc_mc++; + +#ifdef MAC + if (create) + mac_proc_create_lctx(p, l); + else + mac_proc_join_lctx(p, l); +#endif + LCTX_UNLOCK(l); + + return; } /* @@ -296,15 +345,32 @@ void leavelctx (struct proc *p) { + struct lctx *l; + if (p->p_lctx == NULL) return; + LCTX_LOCK(p->p_lctx); + l = p->p_lctx; + p->p_lctx = NULL; LIST_REMOVE(p, p_lclist); - if (LIST_EMPTY(&p->p_lctx->lc_members)) { - LIST_REMOVE(p->p_lctx, lc_list); - FREE(p->p_lctx, M_LCTX); - } - p->p_lctx = NULL; + l->lc_mc--; +#ifdef MAC + mac_proc_leave_lctx(p, l); +#endif + if (LIST_EMPTY(&l->lc_members)) { + ALLLCTX_LOCK; + LIST_REMOVE(l, lc_list); + alllctx_cnt--; + ALLLCTX_UNLOCK; + LCTX_UNLOCK(l); +#ifdef MAC + mac_lctx_label_free(l->lc_label); +#endif + FREE(l, M_LCTX); + } else + LCTX_UNLOCK(l); + return; } #endif /* LCTX */ @@ -605,3 +671,79 @@ FREE(temp, M_TEMP); return (NULL); } + +#ifdef LCTX + +static int +sysctl_kern_lctx SYSCTL_HANDLER_ARGS +{ + int *name = (int*) arg1; + u_int namelen = arg2; + struct kinfo_lctx kil; + struct lctx *l; + int error; + + error = 0; + + switch (oidp->oid_number) { + case KERN_LCTX_ALL: + ALLLCTX_LOCK; + /* Request for size. */ + if (!req->oldptr) { + error = SYSCTL_OUT(req, 0, + sizeof(struct kinfo_lctx) * (alllctx_cnt + 1)); + goto out; + } + break; + + case KERN_LCTX_LCID: + /* No space */ + if (req->oldlen < sizeof(struct kinfo_lctx)) + return (ENOMEM); + /* No argument */ + if (namelen != 1) + return (EINVAL); + /* No login context */ + l = lcfind((pid_t)name[0]); + if (l == NULL) + return (ENOENT); + kil.id = l->lc_id; + kil.mc = l->lc_mc; + LCTX_UNLOCK(l); + return (SYSCTL_OUT(req, (caddr_t)&kil, sizeof(kil))); + + default: + return (EINVAL); + } + + /* Provided buffer is too small. */ + if (req->oldlen < (sizeof(struct kinfo_lctx) * alllctx_cnt)) { + error = ENOMEM; + goto out; + } + + LIST_FOREACH(l, &alllctx, lc_list) { + LCTX_LOCK(l); + kil.id = l->lc_id; + kil.mc = l->lc_mc; + LCTX_UNLOCK(l); + error = SYSCTL_OUT(req, (caddr_t)&kil, sizeof(kil)); + if (error) + break; + } +out: + ALLLCTX_UNLOCK; + + return (error); +} +SYSCTL_NODE(_kern, KERN_LCTX, lctx, CTLFLAG_RD, 0, "Login Context"); +SYSCTL_PROC(_kern_lctx, KERN_LCTX_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT, + 0, 0, sysctl_kern_lctx, "S,lctx", + "Return entire login context table"); +SYSCTL_NODE(_kern_lctx, KERN_LCTX_LCID, lcid, CTLFLAG_RD, + sysctl_kern_lctx, "Login Context Table"); +SYSCTL_INT(_kern_lctx, OID_AUTO, last, CTLFLAG_RD, &lastlcid, 0, ""); +SYSCTL_INT(_kern_lctx, OID_AUTO, count, CTLFLAG_RD, &alllctx_cnt, 0, ""); +SYSCTL_INT(_kern_lctx, OID_AUTO, max, CTLFLAG_RW, &maxlcid, 0, ""); + +#endif /* LCTX */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_prot.c#3 (text+ko) ==== @@ -86,6 +86,7 @@ #include #include +#include #include #include @@ -140,10 +141,6 @@ #ifdef LCTX -#define LCID_PROC_SELF (0) -#define LCID_REMOVE (-1) -#define LCID_CREATE (0) - /* * Set Login Context ID */ @@ -158,40 +155,53 @@ */ /* ARGSUSED */ int -setlcid(struct proc *td, struct setlcid_args *uap, register_t *retval) +setlcid(struct proc *p0, struct setlcid_args *uap, register_t *retval) { struct proc *p; - struct lctx *lc; - - /* XXXMAC: need check here? */ + struct lctx *l; + int error; if (uap->pid == LCID_PROC_SELF) { /* Create/Join/Leave */ - p = td; + p = p0; + PROC_LOCK(p); } else { /* Adopt/Orphan */ p = pfind(uap->pid); if (p == NULL) return (ESRCH); #if 0 /* XXX: we probably need the Darwin version of this... */ - if (p_cansee(td, p)) + if (p_cansee(p0, p)) { + PROC_UNLOCK(p); return (EPERM); + } #endif } +#ifdef MAC + error = mac_check_proc_setlcid(p0, p, uap->pid, uap->lcid); + if (error) { + PROC_UNLOCK(p); + return (error); + } +#endif + switch (uap->lcid) { /* Leave/Orphan */ case LCID_REMOVE: - /* XXXMAC: need check here? */ /* Only root may Leave/Orphan. */ - if (!is_suser1()) + if (!is_suser1()) { + PROC_UNLOCK(p); return (EPERM); + } /* Process not in login context. */ - if (p->p_lctx == NULL) + if (p->p_lctx == NULL) { + PROC_UNLOCK(p); return (ENOATTR); + } - lc = NULL; + l = NULL; break; @@ -199,42 +209,48 @@ case LCID_CREATE: /* Create only valid for self! */ - if (uap->pid != 0) + if (uap->pid != LCID_PROC_SELF) { + PROC_UNLOCK(p); return (EPERM); + } /* Already in a login context. */ - if (p->p_lctx != NULL) + if (p->p_lctx != NULL) { + PROC_UNLOCK(p); return (EPERM); + } - lc = lccreate(); - if (lc == NULL) + l = lccreate(); + if (l == NULL) { + PROC_UNLOCK(p); return (ENOMEM); + } + LCTX_LOCK(l); break; /* Join/Adopt */ default: - /* XXXMAC: need check here? */ /* Only root may Join/Adopt. */ - if (!is_suser1()) + if (!is_suser1()) { + PROC_UNLOCK(p); return (EPERM); + } - lc = lcfind(uap->lcid); - if (lc == NULL) + l = lcfind(uap->lcid); + if (l == NULL) { + PROC_UNLOCK(p); return (ENOATTR); + } break; } leavelctx(p); + enterlctx(p, l, (uap->lcid == LCID_CREATE) ? 1 : 0); - /* Add process to login context. */ - if (lc != NULL) { - p->p_lctx = lc; - LIST_INSERT_HEAD(&lc->lc_members, p, p_lclist); - } - + PROC_UNLOCK(p); return (0); } @@ -251,26 +267,37 @@ */ /* ARGSUSED */ int -getlcid(struct proc *td, struct getlcid_args *uap, register_t *retval) +getlcid(struct proc *p0, struct getlcid_args *uap, register_t *retval) { struct proc *p; + int error; - /* XXXMAC: need check here? */ - - if (uap->pid == 0) { - p = td; + if (uap->pid == LCID_PROC_SELF) { + p = p0; + PROC_LOCK(p); } else { p = pfind(uap->pid); if (p == NULL) return (ESRCH); #if 0 /* XXX: we probably need the Darwin version of this... */ - if (p_cansee(td, p)) + if (p_cansee(p0, p)) { + PROC_UNLOCK(p); return (EPERM); + } #endif } +#ifdef MAC + error = mac_check_proc_getlcid(p0, p, uap->pid); + if (error) { + PROC_UNLOCK(p); + return (error); + } +#endif if (p->p_lctx == NULL) return (ENOATTR); *retval = p->p_lctx->lc_id; + + PROC_UNLOCK(p); return (0); } #endif /* LCTX */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_sysctl.c#3 (text+ko) ==== @@ -501,7 +501,8 @@ || name[0] == KERN_SYSV || name[0] == KERN_AFFINITY || name[0] == KERN_CLASSIC - || name[0] == KERN_PANICINFO) + || name[0] == KERN_PANICINFO + || name[0] == KERN_LCTX) ) return (ENOTDIR); /* overloaded */ @@ -1483,7 +1484,6 @@ return (0); } - /* * Validate parameters and get old / set new parameters * for max number of concurrent aio requests. Makes sure ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/syscalls.c#3 (text+ko) ==== @@ -441,5 +441,8 @@ "__mac_set_fd", /* 402 = __mac_set_fd */ "__mac_get_pid", /* 403 = __mac_get_pid */ "getlcid", /* 404 = getlcid */ - "setlcid" /* 405 = setlcid */ + "setlcid", /* 405 = setlcid */ + "__mac_get_lcid", /* 406 = __mac_get_lcid */ + "__mac_get_lctx", /* 407 = __mac_get_lctx */ + "__mac_set_lctx", /* 408 = __mac_set_lctx */ }; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/sysctl_init.c#3 (text+ko) ==== @@ -99,6 +99,13 @@ extern struct sysctl_oid sysctl__kern_ipc_sosendminchain; extern struct sysctl_oid sysctl__kern_ipc_sorecvmincopy; extern struct sysctl_oid sysctl__kern_ipc_maxsockets; + +extern struct sysctl_oid sysctl__kern_lctx_all; +extern struct sysctl_oid sysctl__kern_lctx_lcid; +extern struct sysctl_oid sysctl__kern_lctx_last; +extern struct sysctl_oid sysctl__kern_lctx_count; +extern struct sysctl_oid sysctl__kern_lctx_max; + extern struct sysctl_oid sysctl__net_inet_icmp_icmplim; extern struct sysctl_oid sysctl__net_inet_icmp_maskrepl; extern struct sysctl_oid sysctl__net_inet_icmp_timestamp; @@ -270,6 +277,7 @@ extern struct sysctl_oid sysctl__kern_ipc; extern struct sysctl_oid sysctl__kern_sysv; +extern struct sysctl_oid sysctl__kern_lctx; extern struct sysctl_oid sysctl__net_inet; @@ -462,6 +470,11 @@ ,&sysctl__kern_ipc_sosendminchain ,&sysctl__kern_ipc_sorecvmincopy ,&sysctl__kern_ipc_maxsockets + ,&sysctl__kern_lctx_all + ,&sysctl__kern_lctx_lcid + ,&sysctl__kern_lctx_last + ,&sysctl__kern_lctx_count + ,&sysctl__kern_lctx_max ,&sysctl__hw_machine ,&sysctl__hw_model @@ -666,6 +679,7 @@ ,&sysctl__vfs_generic_nfs_client ,&sysctl__vfs_generic_nfs_client_initialdowndelay ,&sysctl__vfs_generic_nfs_client_nextdowndelay + ,&sysctl__kern_lctx ,&sysctl__kern_ipc ,&sysctl__kern_sysv ,&sysctl__net_inet ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/Makefile#4 (text+ko) ==== @@ -25,7 +25,7 @@ dir.h dirent.h disk.h disklabel.h disktab.h dkstat.h dmap.h domain.h \ errno.h ev.h event.h eventvar.h exec.h extattr.h fcntl.h file.h filedesc.h filio.h gmon.h ioccom.h ioctl.h \ ioctl_compat.h ipc.h kernel.h kern_event.h ktrace.h libkern.h loadable_fs.h lock.h lockf.h mach_swapon.h malloc.h \ - kdebug.h linker_set.h md5.h kern_control.h \ + kdebug.h lctx.h linker_set.h md5.h kern_control.h \ mac.h mac_policy.h \ mbuf.h mman.h mount.h msgbuf.h mtio.h namei.h netport.h param.h paths.h \ proc.h protosw.h ptrace.h queue.h quota.h random.h reboot.h resource.h resourcevar.h \ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac.h#5 (text+ko) ==== @@ -84,6 +84,8 @@ int mac_from_text(mac_t *_label, const char *_text); int mac_get_fd(int _fd, mac_t _label); int mac_get_file(const char *_path, mac_t _label); +int mac_get_lcid(pid_t _lcid, mac_t _label); +int mac_get_lctx(mac_t _label); int mac_get_link(const char *_path, mac_t _label); int mac_get_pid(pid_t _pid, mac_t _label); int mac_get_proc(mac_t _label); @@ -96,6 +98,7 @@ int mac_prepare_process_label(mac_t *_label); int mac_set_fd(int _fildes, const mac_t _label); int mac_set_file(const char *_path, mac_t _label); +int mac_set_lctx(mac_t _label); int mac_set_link(const char *_path, mac_t _label); int mac_set_proc(const mac_t _label); int mac_syscall(const char *_policyname, int _call, void *_arg); @@ -111,6 +114,7 @@ struct attrlist; struct componentname; struct devnode; +struct lctx; struct mount; struct pseminfo; struct pshminfo; @@ -167,6 +171,8 @@ void mac_vnode_label_free(struct label *label); int mac_get_vnode_audit_labels(struct vnode *vp, struct mac *mac); +struct label *mac_lctx_label_alloc(void); +void mac_lctx_label_free(struct label *label); #define mac_update_task_from_cred(cred, task) \ mac_update_task_label(((cred)->cr_label), task) @@ -256,6 +262,8 @@ void mac_thread_userret(struct uthread *td); #endif +void mac_relabel_lctx(struct lctx *l, struct label *newlabel); + /* * Label cleanup operation: This is the inverse complement for the mac_create * and associate type of hooks. This hook lets the policy module(s) perform @@ -274,6 +282,7 @@ const char *serv, const char *perm); int mac_check_cred_relabel(struct ucred *cred, struct label *newlabel); int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); +int mac_check_lctx_relabel(struct lctx *l, struct label *newlabel); int mac_check_posix_sem_create(struct ucred *cred, const char *name); int mac_check_posix_sem_open(struct ucred *cred, struct pseminfo *ps); int mac_check_posix_sem_post(struct ucred *cred, struct pseminfo *ps); @@ -326,6 +335,8 @@ int mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum); int mac_check_proc_wait(struct ucred *cred, struct proc *proc); +int mac_check_proc_setlcid(struct proc *, struct proc *, pid_t, pid_t); +int mac_check_proc_getlcid(struct proc *, struct proc *, pid_t); int mac_check_set_fd(struct ucred *cred, struct file *fp, char *buf, int buflen); int mac_check_socket_accept(struct ucred *cred, struct socket *so, @@ -430,6 +441,10 @@ int mac_audit_postselect(struct ucred *cred, unsigned short syscode, void *args, int error, int retval, int mac_forced); +void mac_proc_create_lctx(struct proc *, struct lctx *); +void mac_proc_join_lctx(struct proc *, struct lctx *); +void mac_proc_leave_lctx(struct proc *, struct lctx *); + /* * Calls to help various file systems implement labeling functionality * using their existing EA implementation. ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#11 (text+ko) ==== @@ -55,6 +55,7 @@ struct ifnet; struct ipq; struct label; +struct lctx; struct mac_policy_conf; struct mbuf; struct mount; @@ -219,6 +220,14 @@ ); /** + @brief Initialize Login Context label + @param label New label to initialize +*/ +typedef void mpo_init_lctx_label_t( + struct label *label +); + +/** @brief Initialize devfs label @param label New label to initialize @@ -489,6 +498,14 @@ ); /** + @brief Destroy Login Context label + @param label The label to be destroyed +*/ +typedef void mpo_destroy_lctx_label_t( + struct label *label +); + +/** @brief Destroy devfs label @param label The label to be destroyed @@ -830,6 +847,29 @@ ); /** + @brief Externalize a Login Context label + @param label Label to be externalized + @param element_name Name of the label namespace for which labels should be + externalized + @param sb String buffer to be filled with a text representation of the label + + Produce an external representation of the label on a Login Context. + An externalized label consists of a text representation + of the label contents that can be used with user applications. + Policy-agnostic user space tools will display this externalized + version. + + @return 0 on success, return non-zero if an error occurs while + externalizing the label data. + +*/ +typedef int mpo_externalize_lctx_label_t( + struct label *label, + char *element_name, + struct sbuf *sb +); + +/** @brief Externalize a vnode label @param label Label to be externalized @param element_name Name of the label namespace for which labels should be @@ -901,6 +941,32 @@ ); /** + @brief Internalize a Login Context label + @param label Label to be internalized + @param element_name Name of the label namespace for which the label should + be internalized + @param element_data Text data to be internalized + + Produce a Login Context label from an external representation. An + externalized label consists of a text representation of the label + contents that can be used with user applications. Policy-agnostic + user space tools will forward text version to the kernel for + processing by individual policy modules. + + The policy's internalize entry points will be called only if the + policy has registered interest in the label namespace. + + @return 0 on success, Otherwise, return non-zero if an error occurs + while internalizing the label data. + +*/ +typedef int mpo_internalize_lctx_label_t( + struct label *label, + char *element_name, + char *element_data +); + +/** @brief Internalize a vnode label @param label Label to be internalized @param element_name Name of the label namespace for which the label should @@ -1708,6 +1774,50 @@ /*@}*/ /** + @brief A process has created a login context + @param p Subject + @param l Login Context +*/ +typedef void mpo_proc_create_lctx_t( + struct proc *p, + struct lctx *l +); + +/** + @brief A process has joined a login context + @param p Subject >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:23:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78A1416A423; Thu, 1 Dec 2005 21:23:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0DB4016A41F for ; Thu, 1 Dec 2005 21:23:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9199343D68 for ; Thu, 1 Dec 2005 21:23:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LN0Ii083600 for ; Thu, 1 Dec 2005 21:23:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LMxVJ083597 for perforce@freebsd.org; Thu, 1 Dec 2005 21:22:59 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:22:59 GMT Message-Id: <200512012122.jB1LMxVJ083597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=87605 Change 87605 by millert@millert_g4tower on 2005/12/01 21:22:48 Man page updates from DSEP Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/ps.1#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/file_cmds/ls/ls.1#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac.4#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac.conf.5#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_execve.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_free.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_get.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_is_present_np.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_set.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_text.3#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/maclabel.7#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/ps.1#3 (text+ko) ==== @@ -168,7 +168,8 @@ .It Fl Z Add label to the list of keywords for which .Nm -will display information. +will display information. This will display label information for +loaded MAC Framework policies, configured in /etc/mac.conf. .El .Pp A complete list of the available keywords are listed below. @@ -490,6 +491,7 @@ .Xr kill 1 , .Xr w 1 , .Xr kvm 3 , +.Xr mac.conf 5 , .Xr strftime 3 , .Xr procfs 5 , .Xr pstat 8 ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/file_cmds/ls/ls.1#3 (text+ko) ==== @@ -44,7 +44,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ACFLRSTWacdfgiklnoqrstux1 +.Op Fl ACFLRSTWZacdfgiklnoqrstux1 .Op Ar file ... .Sh DESCRIPTION For each operand that names a @@ -99,6 +99,9 @@ month, day, hour, minute, second, and year. .It Fl W Display whiteouts when scanning directories. +.It Fl Z +Display each file's MAC label; see +.Xr maclabel 7 . .It Fl a Include directory entries whose names begin with a dot (.). @@ -352,6 +355,7 @@ specification. .Sh SEE ALSO .Xr chmod 1 , +.Xr maclabel 7 , .Xr symlink 7 , .Xr sticky 8 .Sh STANDARDS ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#3 (text+ko) ==== @@ -16,6 +16,14 @@ $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ $(DESTDIR)/usr/lib $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a + $(INSTALL) -d $(DESTDIR)/usr/share/man/man3 + $(INSTALL) -d $(DESTDIR)/usr/share/man/man4 + $(INSTALL) -d $(DESTDIR)/usr/share/man/man7 + $(INSTALL) -c -m 444 mac.4 $(DSTROOT)/usr/share/man/man4/ + $(INSTALL) -c -m 444 maclabel.7 $(DSTROOT)/usr/share/man/man7/ + $(INSTALL) -c -m 444 mac.3 mac_free.3 mac_get.3 mac_is_present_np.3 \ + mac_prepare.3 mac_set.3 mac_text.3 mac_execve.3 mac_syscall.3 \ + $(DSTROOT)/usr/share/man/man3/ clean: rm -f lib$(LIB).a $(OBJS) security.c ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac.3#3 (text+ko) ==== @@ -1,4 +1,5 @@ .\" Copyright (c) 2001, 2003 Networks Associates Technology, Inc. +.\" Copyright (c) 2005 SPARTA, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -37,7 +38,7 @@ .Nm mac .Nd introduction to the MAC security API .Sh LIBRARY -.Lb libc +The MAC Framework Library (libmac, -lmac) .Sh SYNOPSIS .In sys/mac.h .Pp @@ -155,7 +156,6 @@ .Xr mac_text 3 , .Xr mac 4 , .Xr mac.conf 5 , -.Xr mac 9 .Sh STANDARDS These APIs are loosely based on the APIs described in POSIX.1e. POSIX.1e is described in IEEE POSIX.1e draft 17. @@ -182,6 +182,3 @@ .Fx . Sites considering production deployment should keep the experimental status of these services in mind during any deployment process. -See also -.Xr mac 9 -for related considerations regarding the kernel framework. ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac.conf.5#3 (text+ko) ==== @@ -89,7 +89,6 @@ .Xr mac_get 3 , .Xr mac_prepare 3 , .Xr mac 4 , -.Xr mac 9 .Sh HISTORY Support for Mandatory Access Control was introduced in .Fx 5.0 @@ -104,6 +103,3 @@ .Fx . Sites considering production deployment should keep the experimental status of these services in mind during any deployment process. -See also -.Xr mac 9 -for related considerations regarding the kernel framework. ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_free.3#3 (text+ko) ==== @@ -40,7 +40,7 @@ .Nm mac_free .Nd free MAC label .Sh LIBRARY -.Lb libc +The MAC Framework Library (libmac, -lmac) .Sh SYNOPSIS .In sys/mac.h .Ft int @@ -64,8 +64,7 @@ .Xr mac_prepare 3 , .Xr mac_set 3 , .Xr mac_text 3 , -.Xr mac 4 , -.Xr mac 9 +.Xr mac 4 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. Discussion of the draft ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_get.3#3 (text+ko) ==== @@ -36,10 +36,13 @@ .Sh NAME .Nm mac_get_file , .Nm mac_get_fd , +.Nm mac_get_lctx , +.Nm mac_get_lcid , +.Nm mac_get_pid , .Nm mac_get_proc .Nd get the label of a file, socket, socket peer or process .Sh LIBRARY -.Lb libc +The MAC Framework Library (libmac, -lmac) .Sh SYNOPSIS .In sys/mac.h .Ft int @@ -47,6 +50,10 @@ .Ft int .Fn mac_get_fd "int fd" "mac_t label" .Ft int +.Fn mac_get_lcid "pid_t lcid" "mac_t label" +.Ft int +.Fn mac_get_lctx "mac_t label" +.Ft int .Fn mac_get_pid "pid_t pid" "mac_t label" .Ft int .Fn mac_get_proc "mac_t label" @@ -70,6 +77,18 @@ .Xr getsockopt 2 . .Pp The +.Fn mac_get_lctx +and +.Fn mac_get_lcid +functions fill in +.Fa label +(which must first be allocated by +.Xr mac_prepare 3 ) +with the MAC label associated +with the Login Context of the requesting process +or the specified Login Context, respectively. +.Pp +The .Fn mac_get_proc and .Fn mac_get_pid @@ -113,8 +132,7 @@ .Xr mac_text 3 , .Xr mac_prepare 3 , .Xr mac_set 3 , -.Xr mac 4 , -.Xr mac 9 +.Xr mac 4 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. Discussion of the draft ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_is_present_np.3#3 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm mac_is_present_np .Nd report whether the running system has MAC support .Sh LIBRARY -.Lb libc +.Lb libmac .Sh SYNOPSIS .In sys/mac.h .Ft int @@ -77,5 +77,4 @@ .Xr mac_prepare 3 , .Xr mac_set 3 , .Xr mac_text 3 , -.Xr mac 4 , -.Xr mac 9 +.Xr mac 4 ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_set.3#3 (text+ko) ==== @@ -36,10 +36,11 @@ .Sh NAME .Nm mac_set_file , .Nm mac_set_fd , +.Nm mac_set_lctx , .Nm mac_set_proc -.Nd set the MAC label for a file or process +.Nd set the MAC label for a file, login context or process .Sh LIBRARY -.Lb libc +The MAC Framework Library (libmac, -lmac) .Sh SYNOPSIS .In sys/mac.h .Ft int @@ -49,6 +50,8 @@ .Ft int .Fn mac_set_fd "int fd" "mac_t label" .Ft int +.Fn mac_set_lctx "mac_t label" +.Ft int .Fn mac_set_proc "mac_t label" .Sh DESCRIPTION The @@ -73,6 +76,12 @@ .Fn mac_set_file , except that it does not follow symlinks. The +.Fn mac_set_lctx +function associates the MAC label +specified by +.Fa label +with the login context the current process is a member of, if any. +The .Fn mac_set_proc function associates the MAC label specified by @@ -85,7 +94,7 @@ the owner of the file, or has appropriate privileges. .Sh RETURN VALUES -.Rv -std mac_set_fd mac_set_file mac_set_link mac_set_proc +.Rv -std mac_set_fd mac_set_file mac_set_link mac_set_lctx mac_set_proc .Sh ERRORS .Bl -tag -width Er .It Bq Er EACCES ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/mac_text.3#3 (text+ko) ==== @@ -38,7 +38,7 @@ .Nm mac_to_text .Nd convert MAC label to/from text representation .Sh LIBRARY -.Lb libc +The MAC Framework Library (libmac, -lmac) .Sh SYNOPSIS .In sys/mac.h .Ft int From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:27:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 916E316A422; Thu, 1 Dec 2005 21:27:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 54BF516A41F for ; Thu, 1 Dec 2005 21:27:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0949743D5D for ; Thu, 1 Dec 2005 21:27:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LR5fW083842 for ; Thu, 1 Dec 2005 21:27:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LR5Hi083839 for perforce@freebsd.org; Thu, 1 Dec 2005 21:27:05 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:27:05 GMT Message-Id: <200512012127.jB1LR5Hi083839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:27:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=87606 Change 87606 by millert@millert_g4tower on 2005/12/01 21:26:41 Call get_ordered_context_list() with the correct arguments and pull in the appropriate header so we get its prototype. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wslogin.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/Makefile#4 (text+ko) ==== @@ -1,14 +1,14 @@ include ../../../Makeconfig +LIBSELINUX= $(SOURCE_ROOT)/sedarwin/libselinux OBJS = wslogin.o -CFLAGS+= -I$(SOURCE_ROOT)/sedarwin -CFLAGS+= $(DARWIN_HDRS) +CFLAGS+= -I$(SOURCE_ROOT)/sedarwin -I$(LIBSELINUX)/include $(DARWIN_HDRS) INSTALL?= install all: wslogin.dylib build/wsloginui.app wslogin.dylib: $(OBJS) - gcc -dynamiclib -o $@ $(OBJS) ../../libselinux/src/libselinux.a $(DARWIN_ROOT)/libmac/*.o + gcc -dynamiclib -o $@ $(OBJS) $(LIBSELINUX)/src/libselinux.a $(DARWIN_ROOT)/libmac/*.o build/wsloginui.app: LabelChooser.m LabelChooser.h main.m xcodebuild ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wslogin.c#4 (text+ko) ==== @@ -1,13 +1,15 @@ #include +#include #include -#include + #include #include #include #include #include -#include + +#include #define errexit(args...) \ { \ @@ -78,13 +80,12 @@ { char *labeltext, *queried, **contexts; - size_t ncontexts; - int n; + int n, ncontexts; FILE *fp; char userlabel[512]; - if (get_ordered_context_list(username, NULL, &contexts, - &ncontexts) < 0 || ncontexts == 0) + ncontexts = get_ordered_context_list(username, NULL, &contexts); + if (ncontexts <= 0) errexit ("Getting context list for %s: %s", username, strerror (errno)); #if 0 int retries = 3; From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:30:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B0AD16A52A; Thu, 1 Dec 2005 21:30:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F3E6616A50F for ; Thu, 1 Dec 2005 21:30:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4BCF43D81 for ; Thu, 1 Dec 2005 21:30:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LU9M0084195 for ; Thu, 1 Dec 2005 21:30:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LU9Ba084192 for perforce@freebsd.org; Thu, 1 Dec 2005 21:30:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:30:09 GMT Message-Id: <200512012130.jB1LU9Ba084192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=87607 Change 87607 by millert@millert_g4tower on 2005/12/01 21:29:28 ranlib the installed libselinux.a Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile#4 (text+ko) ==== @@ -39,8 +39,9 @@ install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) - install -m 644 $(LIBA) $(LIBDIR) - test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) + install -c -m 644 $(LIBA) $(LIBDIR) + ranlib $(LIBDIR)/$(LIBA) +# test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) # install -m 755 $(LIBSO) $(SHLIBDIR) # cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:31:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67B3716A422; Thu, 1 Dec 2005 21:31:12 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1EE9A16A41F for ; Thu, 1 Dec 2005 21:31:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 924D943D55 for ; Thu, 1 Dec 2005 21:31:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LVB2E084317 for ; Thu, 1 Dec 2005 21:31:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LVB1u084314 for perforce@freebsd.org; Thu, 1 Dec 2005 21:31:11 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:31:11 GMT Message-Id: <200512012131.jB1LVB1u084314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:31:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=87608 Change 87608 by millert@millert_g4tower on 2005/12/01 21:30:51 SEDarwin uses /etc/sedarwin not /etc/security/sedarwin since there is no existing /etc/security dir on Darwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.c#4 (text+ko) ==== @@ -4,25 +4,25 @@ char *selinux_default_type_path() { /*return _DEFTYPE_PATH;*/ - return "/etc/security/sedarwin/default_type"; + return "/etc/sedarwin/default_type"; } char *selinux_booleans_path() { - return "/etc/security/sedarwin/booleans"; + return "/etc/sedarwin/booleans"; } char *selinux_default_context_path() { - return "/etc/security/sedarwin/default_contexts"; + return "/etc/sedarwin/default_contexts"; } char *selinux_failsafe_context_path() { - return "/etc/security/sedarwin/failsafe_context"; + return "/etc/sedarwin/failsafe_context"; } char *selinux_user_contexts_path() { - return "/etc/security/sedarwin/user_context"; + return "/etc/sedarwin/user_context"; } From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:34:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6342916A423; Thu, 1 Dec 2005 21:34:16 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0840C16A41F for ; Thu, 1 Dec 2005 21:34:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C448D43D45 for ; Thu, 1 Dec 2005 21:34:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LYFfp084416 for ; Thu, 1 Dec 2005 21:34:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LYFWL084413 for perforce@freebsd.org; Thu, 1 Dec 2005 21:34:15 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:34:15 GMT Message-Id: <200512012134.jB1LYFWL084413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=87609 Change 87609 by millert@millert_g4tower on 2005/12/01 21:33:45 Call mac_check_name_port_access() with correct args. Dynamically alloc buffer instead of using gcc extension Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/check_context.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/check_context.c#3 (text+ko) ==== @@ -1,24 +1,24 @@ #include +#include +#include +#include #include -#include -#include +#include +#include #include -#include #include -#include -#include int security_check_context(security_context_t con) { kern_return_t kr; - char buf[strlen(con) + strlen(SEBSD_ID_STRING) + 2]; + char *buf; - strcpy(buf, SEBSD_ID_STRING); - strcat(buf, "/"); - strcat(buf, con); + if (asprintf(&buf, "%s/%s", SEBSD_ID_STRING, con) == -1) + return (-1); - kr = mac_check_name_port_access(mach_task_self(), mach_task_self(), - buf, "file", "read"); + kr = mac_check_name_port_access(mach_task_self(), buf, mach_task_self(), + "file", "read"); + free(buf); if (kr == KERN_INVALID_ARGUMENT) return (-1); else From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:35:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79B9516A423; Thu, 1 Dec 2005 21:35:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 22F7D16A422 for ; Thu, 1 Dec 2005 21:35:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E030D43D6B for ; Thu, 1 Dec 2005 21:35:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LZHPe084543 for ; Thu, 1 Dec 2005 21:35:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LZHAH084540 for perforce@freebsd.org; Thu, 1 Dec 2005 21:35:17 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:35:17 GMT Message-Id: <200512012135.jB1LZHAH084540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:35:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=87610 Change 87610 by millert@millert_g4tower on 2005/12/01 21:35:03 Remove blank lines that caused nroff to complain. Start sentences on a new line. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.1#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.1#3 (text+ko) ==== @@ -41,8 +41,7 @@ .Sh DESCRIPTION The .Nm sebsd_newrole -utility runs a new shell in a new security context. The new context is derived from the old context in which +utility runs a new shell in a new security context. +The new context is derived from the old context in which .Ar sebsd_newrole is originally executed. - - From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:44:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA96616A422; Thu, 1 Dec 2005 21:44:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7F58916A420 for ; Thu, 1 Dec 2005 21:44:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A90643D45 for ; Thu, 1 Dec 2005 21:44:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LiSt9084937 for ; Thu, 1 Dec 2005 21:44:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LiS2I084934 for perforce@freebsd.org; Thu, 1 Dec 2005 21:44:28 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:44:28 GMT Message-Id: <200512012144.jB1LiS2I084934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:44:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=87611 Change 87611 by millert@millert_g4tower on 2005/12/01 21:44:22 MAC.loginPlugin from DSEP SEDarwin plugin module from SEFOS This will replace the wslogin hack Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/English.lproj/InfoPlist.strings#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAClogin.conf.sample#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MACloginWindowController.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MACloginWindowController.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MACpolicyPlugin.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/NSBorderlessWindow.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/NSBorderlessWindow.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/PLUGIN.txt#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/README.txt#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/TODO.txt#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/lctx.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/loginPlugin.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/maclogin.sh#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/MLS.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/MLS.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/MLS.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/MLS.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/MLS.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/MLS/README.txt#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Test.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Test.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Test.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Test.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/Test/Test.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/sparta.tiff#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/version.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:49:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1557E16A422; Thu, 1 Dec 2005 21:49:56 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B49AE16A41F for ; Thu, 1 Dec 2005 21:49:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DFF143D99 for ; Thu, 1 Dec 2005 21:49:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LnZFL085772 for ; Thu, 1 Dec 2005 21:49:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LnZd3085769 for perforce@freebsd.org; Thu, 1 Dec 2005 21:49:35 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:49:35 GMT Message-Id: <200512012149.jB1LnZd3085769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:49:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=87612 Change 87612 by millert@millert_g4tower on 2005/12/01 21:48:52 Add a failsafe context of user_r:user_d so users not explicitly listed in the users file will still be able to login and have a sensible context. Also avoid duplicates of things in the policy dir that live in /etc/sedarwin proper. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/excludes#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/failsafe_context#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#5 (text+ko) ==== @@ -21,7 +21,7 @@ m4 -Imacros -s rules > rules.m4 fc.out: fc - sudo /Users/andrew/setfsmac -x -t -s fc /bin > fc.out + sudo ../../darwin/mac_cmds/setfsmac/setfsmac -x -t -s fc /bin > fc.out genfs: fc.out cat fc.out | sed -ne 's/^\/[a-zA-Z0-9\/\.]* *[^ ]*$$/genfscon hfs &/p' > genfs @@ -36,8 +36,9 @@ install: $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR} $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR} + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin - (cd $(CURDIR)/..; tar -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -) + (cd $(CURDIR)/..; tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -) cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile # Mig security classes and access vectors From owner-p4-projects@FreeBSD.ORG Thu Dec 1 21:51:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77EF816A422; Thu, 1 Dec 2005 21:51:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3B39916A41F for ; Thu, 1 Dec 2005 21:51:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE3AC43D62 for ; Thu, 1 Dec 2005 21:51:38 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1LpcNM085952 for ; Thu, 1 Dec 2005 21:51:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1LpcDi085949 for perforce@freebsd.org; Thu, 1 Dec 2005 21:51:38 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 21:51:38 GMT Message-Id: <200512012151.jB1LpcDi085949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 21:51:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=87613 Change 87613 by millert@millert_g4tower on 2005/12/01 21:50:57 Build and install the LoginWindow plugin instead of the wslogin dynamic lib hack. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/Makefile#4 (text+ko) ==== @@ -3,6 +3,7 @@ all: cd darwin && make for i in $(BUILD_MODULES); do cd $$i && make && cd ..; done + cd darwin/osx_cmds && make dist: install cd release && make dist @@ -11,6 +12,7 @@ cd release && make install cd darwin && make install for i in $(INSTALL_MODULES); do cd $$i && make install && cd ..; done + cd darwin/osx_cmds && make install package: cd release && make package @@ -23,6 +25,7 @@ cd release && make distclean cd darwin && make clean for i in $(BUILD_MODULES); do cd $$i && make clean && cd ..; done + cd darwin/osx_cmds && make Makeconfig: Makeconfig.in @echo "# Set this to the root of the source distribution." > $@ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#3 (text+ko) ==== @@ -2,23 +2,19 @@ SUBDIR= checkpolicy \ loadpolicy \ - wslogin \ newrole all: cd checkpolicy ; gnumake cd loadpolicy ; gnumake - cd wslogin ; gnumake cd newrole ; gnumake clean: cd checkpolicy ; gnumake clean cd loadpolicy ; gnumake clean - cd wslogin ; gnumake clean cd newrole ; gnumake clean install: cd checkpolicy ; gnumake install cd loadpolicy ; gnumake install - cd wslogin ; gnumake install cd newrole ; gnumake install From owner-p4-projects@FreeBSD.ORG Thu Dec 1 22:04:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAFA716A422; Thu, 1 Dec 2005 22:04:11 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9D19316A41F for ; Thu, 1 Dec 2005 22:04:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 694D143D64 for ; Thu, 1 Dec 2005 22:04:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1M47go086540 for ; Thu, 1 Dec 2005 22:04:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1M47rh086537 for perforce@freebsd.org; Thu, 1 Dec 2005 22:04:07 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 22:04:07 GMT Message-Id: <200512012204.jB1M47rh086537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 22:04:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=87616 Change 87616 by millert@millert_g4tower on 2005/12/01 22:03:55 Attempt to update to reality after wslogin -> LoginWindow plugin changes. apiabi.txt needs more work. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/apiabi.txt#3 edit .. //depot/projects/trustedbsd/sedarwin7/docs/build-instructions.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/apiabi.txt#3 (text+ko) ==== @@ -116,6 +116,9 @@ int getlcid(); int setlcid(); +int __mac_get_lcid(); +int __mac_get_lctx(); +int __mac_set_lctx(); New System Controls - MAC Framework @@ -362,13 +365,33 @@ Set the MAC label of the current process, then execute a command. + New Command Line Utilities - login contexts + +lcs(1) + +Show information about existing login contexts. + +getlcmac(8) + +Print login context related MAC labels. + +setlcmac(8) + +Change the MAC login context label. + New Command Line Utilities - SEDarwin checkpolicy(8) + +Check a policy for correctness and convert to binary format. + loadpolicy(8) -newrole(8) -relabel_gui -wslogin + +XXX - not yet supported. + +sebsd_newrole(8) + +Run a shell with a new role. Modifications to Existing System Services ==== //depot/projects/trustedbsd/sedarwin7/docs/build-instructions.txt#2 (text+ko) ==== @@ -2,9 +2,9 @@ evolves. -Step 1: Mac OS X Panther 10.3.3 +Step 1: Mac OS X Panther 10.3.8 - Install Mac OS X 10.3.3 using the directions found in system-setup.txt. + Install Mac OS X 10.3.8 using the directions found in system-setup.txt. If working within the McAfee Research development environment, install Perforce and configure the Perforce client using the directions found @@ -54,7 +54,7 @@ BUILD_MODULES ?= sedarwin ipctrace mactest mac_mls mac_none mac_stub \ stacktrace - INSTALL_MODULES ?= mac_mls + INSTALL_MODULES ?= sedarwin If modules are built but not installed, you can install them later by extracting the *.kext.tar tarfile from the module source directory @@ -90,7 +90,7 @@ including kernel, libraries, program binaries, and policy modules, run the following command from the root of the source tree: - make + $ make Step 5: Prepare distribution directory @@ -99,7 +99,7 @@ temporary distribution directory, run the following command from the top level of the source tree: - make install + $ make install Step 6: Create system upgrade tarfile @@ -108,14 +108,14 @@ binaries, run the following command from the top level of the source tree: - make dist + $ make dist This will create a compressed tarfile from the temporary distribution directory. The file will be called, "sedarwin.tgz" and it will be created in the root of the source tree. This tarfile can be used to install on the current machine, or any other - appropriately updated 10.3.3 system. The following steps presume that + appropriately updated 10.3.8 system. The following steps presume that you have copied the tar file to the target machine. @@ -137,8 +137,8 @@ the older modules will be incompatible. Remove the appropriate KEXT bundles from /System/Library/Extensions. For example: - sudo rm -rf /System/Library/Extensions/sedarwin.kext - sudo rm -rf /System/Library/Extensions/mac_test.kext + $ sudo rm -rf /System/Library/Extensions/sedarwin.kext + $ sudo rm -rf /System/Library/Extensions/mac_test.kext Step 8: Backup files @@ -153,36 +153,56 @@ Extract the distribution tarfile from the root of the target machine: - cd / - sudo gnutar xvzf sedarwin.tgz + $ cd / + $ sudo tar zxf sedarwin.tgz Note, there may be some remaining issues with the way in which the boot loader has been replaced. To be safe, it is best to run the bless command to make certain the partition will still be bootable: - sudo bless -folder /System/Library/CoreServices \ + $ sudo bless -folder /System/Library/CoreServices \ -bootinfo /usr/standalone/ppc/bootx.bootinfo Also note that if bless is being used to mark a partition that is different from the current partition that the appropriate /Volume/ path should be prepended each filename in the above command, and the - -setBoot option should also be added. + "-setBoot" option should also be added. + + +Step 10: Enable and Configure MAC.loginPlugin + + The MAC.loginPlugin must be enabled. After a new install the maclogin + command must be run to prepare the system for using the MAC.loginPlugin: + + $ sudo /usr/bin/maclogin + [follow instructions] + + After this is performed, further invocations of the maclogin script + allow the MAC.loginPlugin to be enabled and disabled. SEDarwin requires + that the MAC.loginPlugin to be enabled: + + $ sudo /usr/bin/maclogin enable + + Copy /etc/MAClogin.conf.sample to /etc/MAClogin.conf: + + $ sudo cp /etc/MAClogin.conf.sample /etc/MAClogin.conf + + The default values are correct for SEDarwin. -Step 10: Backup and Replace the WindowServer (SEDarwin only) +Step 11: Update PAM configuration - The distribution includes a shell script to replace Apple's Login Window - application with a wrapper that modifies the login process. Run the - script: + Add the following line: - sudo /etc/sedarwin/install-windowserver.sh + session required pam_lctx.so + at the end of the /etc/pam.d/login and /etc/pam.d/sshd files. -Step 11(a): Create Extended Attribute File (SEDarwin only) +Step 12(a): Create Extended Attribute File (SEDarwin only) The distribution includes a shell script that creates an extended attribute backing file for the SEDarwin policy module. Run the script: - sudo /etc/sedarwin/create-extattr.sh + $ sudo /etc/sedarwin/create-extattr.sh This will allocate storage space for MAC labels on the root file system. You may wish to run similar commands on other file systems, but it is @@ -195,49 +215,58 @@ 256 /Volumes/Spare/.attribute/system/sebsd -Step 11(b): Create Extended Attribute File (MLS only) +Step 12(b): Create Extended Attribute File (MLS only) Run the following two commands to allocate storage space for MLS labels on the root file system. - sudo mkdir -p /.attribute/system - sudo extattrctl initattr -p / 112 /.attribute/system/mac_mls + $ sudo mkdir -p /.attribute/system + $ sudo extattrctl initattr -p / 112 /.attribute/system/mac_mls -Step 12: Configure Policy path (SEDarwin only) +Step 13: Configure Policy path (SEDarwin only) The system boot loader needs to know where the SEDarwin policy file is located; at boot time, it reads the location from the system firmware. - Set the location in the firmware with the following command: + Set the location in the firmware with the following commands: - sudo nvram load_sebsd_policy=policy.16 + $ sudo nvram load_sebsd_policy=policy.16 + $ sudo nvram load_sebsd_migscs=sebsd_migscs Our sample policy file, users, ships with some predefined users. - Chances are, you'll want to add entries for your own user accounts - based on one of the existing entries. The policy sources were - installed into /etc/sedarwin/policy; make changes there, rebuild, - and install the binary policy file: + You should add entries for your own user accounts based on one + of the existing entries. The policy sources were installed into + /etc/sedarwin/policy; make changes there, rebuild, and install + the binary policy file: - cd /etc/sedarwin/policy + $ cd /etc/sedarwin/policy [edit as root] - sudo make - sudo make install + $ sudo make + $ sudo make install + + This step must be taken even if you make no changes to the policy + files. + + NOTE: If a user logs in who is not listed in the users file, the + contents of /etc/sedarwin/failsafe_context will be used as the + context for the user. If that file does not exist, the unlisted + user will be unable to login. -Step 13: Reboot in Single User Mode (SEDarwin only) +Step 14: Reboot in Single User Mode (SEDarwin only) At this point, you should now have a new Darwin kernel, support libraries, command line tools, and configuration files installed. Reboot to single-user mode by holding down Command-S during the boot. Check the file system and mount the root file system writable: - /sbin/fsck -y - /sbin/mount -uw / + $ /sbin/fsck -y + $ /sbin/mount -uw / Now set the label on various binaries so they can transition during system startup: - sudo /etc/sedarwin/sebsd-relabel.sh + $ sudo /etc/sedarwin/sebsd-relabel.sh Missing this step will result in the login window failing to start, login attempts failing, or the entire system not working if enforcing @@ -249,7 +278,7 @@ setfmac: traversing /usr/local/bin/*: No such file or directory -Step 14: Reboot +Step 15: Reboot A reboot is required in order for the extended attributes to be recognized by the system. @@ -258,8 +287,9 @@ 'reboot' from the console. Otherwise, restart the machine normally. -Step 15: Verify System Functionality +Step 16: Verify System Functionality + When you log in to the system After booting and logging into the system, verify that you have booted to the correct kernel by running 'uname -a'. From owner-p4-projects@FreeBSD.ORG Thu Dec 1 22:10:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ED7116A423; Thu, 1 Dec 2005 22:10:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 334CA16A41F for ; Thu, 1 Dec 2005 22:10:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB33143D5C for ; Thu, 1 Dec 2005 22:10:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1MAG0E086967 for ; Thu, 1 Dec 2005 22:10:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1MAG33086964 for perforce@freebsd.org; Thu, 1 Dec 2005 22:10:16 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 22:10:16 GMT Message-Id: <200512012210.jB1MAG33086964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 22:10:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=87619 Change 87619 by millert@millert_ibook on 2005/12/01 22:09:31 Fix pasto introduce in previous change. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/Makefile#5 (text+ko) ==== @@ -25,7 +25,7 @@ cd release && make distclean cd darwin && make clean for i in $(BUILD_MODULES); do cd $$i && make clean && cd ..; done - cd darwin/osx_cmds && make + cd darwin/osx_cmds && make clean Makeconfig: Makeconfig.in @echo "# Set this to the root of the source distribution." > $@ From owner-p4-projects@FreeBSD.ORG Thu Dec 1 22:11:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECC4816A422; Thu, 1 Dec 2005 22:11:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 AF2DB16A41F for ; Thu, 1 Dec 2005 22:11:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7964E43D45 for ; Thu, 1 Dec 2005 22:11:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1MBIgS087021 for ; Thu, 1 Dec 2005 22:11:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1MBIeV087018 for perforce@freebsd.org; Thu, 1 Dec 2005 22:11:18 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 22:11:18 GMT Message-Id: <200512012211.jB1MBIeV087018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 22:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=87620 Change 87620 by millert@millert_ibook on 2005/12/01 22:11:11 Remove latent MLS cruft. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#6 (text+ko) ==== @@ -251,10 +251,6 @@ close(fd); } - mac_t mac; - if (!mac_from_text(&mac, "mls/low(low-high)")) - mac_set_proc(mac); - /* pass our arguments on to init */ argv[0] = INIT_PATH; execv(argv[0], argv); @@ -849,10 +845,6 @@ sigemptyset(&mask); (void) sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL); - mac_t mac; - if (!mac_from_text(&mac, "mls/low(low-high)")) - mac_set_proc(mac); - execv(argv[0], argv); unix_fatal("Disabled server %x bootstrap %x: \"%s\": exec()", serverp->port, From owner-p4-projects@FreeBSD.ORG Thu Dec 1 22:13:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E953716A422; Thu, 1 Dec 2005 22:13:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 ADB2716A41F for ; Thu, 1 Dec 2005 22:13:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76DE743D5A for ; Thu, 1 Dec 2005 22:13:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB1MDLq7087229 for ; Thu, 1 Dec 2005 22:13:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB1MDLIp087226 for perforce@freebsd.org; Thu, 1 Dec 2005 22:13:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Dec 2005 22:13:21 GMT Message-Id: <200512012213.jB1MDLIp087226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 87621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 22:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=87621 Change 87621 by millert@millert_ibook on 2005/12/01 22:13:17 Man page updates missed in previous merge. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/man/man2/getlcid.2#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/man/man2/setlcid.2#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/man/man2/getlcid.2#2 (text+ko) ==== @@ -32,10 +32,8 @@ .Sh NAME .Nm getlcid .Nd "get login context" -.Sh LIBRARY -.Lb libc .Sh SYNOPSIS -.In unistd.h +.In sys/lctx.h .Ft pid_t .Fn getlcid "pid_t pid" .Sh DESCRIPTION @@ -56,7 +54,13 @@ .Fn setlcid call. .Sh RETURN VALUES -.Rv -std getlcid +If successful, +.Fn getlcid +returns a non-negative integer, the Login Context ID; otherwise the +value \-1 is returned and the global variable +.Fa errno +is set to indicate +the error. .Sh ERRORS The .Fn getlcid ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/man/man2/setlcid.2#2 (text+ko) ==== @@ -32,10 +32,8 @@ .Sh NAME .Nm setlcid .Nd "set login context" -.Sh LIBRARY -.Lb libc .Sh SYNOPSIS -.In unistd.h +.In sys/lctx.h .Ft int .Fn setlcid "pid_t pid" "pid_t lcid" .Sh DESCRIPTION From owner-p4-projects@FreeBSD.ORG Fri Dec 2 02:24:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06BF216A424; Fri, 2 Dec 2005 02:24:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 AFA4A16A422 for ; Fri, 2 Dec 2005 02:24:40 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A6CB43D45 for ; Fri, 2 Dec 2005 02:24:31 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB22OQRX005290 for ; Fri, 2 Dec 2005 02:24:26 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB22OQQL005287 for perforce@freebsd.org; Fri, 2 Dec 2005 02:24:26 GMT (envelope-from wsalamon@computer.org) Date: Fri, 2 Dec 2005 02:24:26 GMT Message-Id: <200512020224.jB22OQQL005287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 02:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=87630 Change 87630 by wsalamon@gretsch on 2005/12/02 02:23:53 Wrap the usage of audit arguments with conditionals to check that the argument was actually captured. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#30 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#30 (text+ko) ==== @@ -207,6 +207,10 @@ } while (0) #define FD_VNODE1_TOKENS do { \ + if (ARG_IS_VALID(kar, ARG_FD)) { \ + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); \ + kau_write(rec, tok); \ + } \ if (ARG_IS_VALID(kar, ARG_VNODE1)) { \ tok = au_to_attr32(&ar->ar_arg_vnode1); \ kau_write(rec, tok); \ @@ -222,10 +226,8 @@ } \ } while (0) -/* - * XXXAUDIT: We read ar_arg_pid without testing that it is valid first. - */ #define PROCESS_PID_TOKENS(argn) do { \ + if (ARG_IS_VALID(kar, ARG_PID)) { \ if ((ar->ar_arg_pid > 0) /* Kill a single process */ \ && (ARG_IS_VALID(kar, ARG_PROCESS))) { \ tok = au_to_process(ar->ar_arg_auid, \ @@ -239,7 +241,8 @@ ar->ar_arg_pid); \ kau_write(rec, tok); \ } \ - } while (0) \ + } \ +} while (0) \ /* * Implement auditing for the auditon() system call. The audit tokens that @@ -399,8 +402,10 @@ case AUE_RECVMSG: case AUE_SENDMSG: case AUE_SENDTO: - tok = au_to_arg32(1, "fd", ar->ar_arg_fd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } if (ARG_IS_VALID(kar, ARG_SADDRINET)) { tok = au_to_sock_inet( (struct sockaddr_in *)&ar->ar_arg_sockaddr); @@ -417,18 +422,25 @@ case AUE_SOCKET: case AUE_SOCKETPAIR: - tok = au_to_arg32(1,"domain", ar->ar_arg_sockinfo.so_domain); - kau_write(rec, tok); - tok = au_to_arg32(2,"type", ar->ar_arg_sockinfo.so_type); - kau_write(rec, tok); - tok = au_to_arg32(3,"protocol",ar->ar_arg_sockinfo.so_protocol); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SOCKINFO)) { + tok = au_to_arg32(1,"domain", + ar->ar_arg_sockinfo.so_domain); + kau_write(rec, tok); + tok = au_to_arg32(2,"type", + ar->ar_arg_sockinfo.so_type); + kau_write(rec, tok); + tok = au_to_arg32(3,"protocol", + ar->ar_arg_sockinfo.so_protocol); + kau_write(rec, tok); + } break; case AUE_SETSOCKOPT: case AUE_SHUTDOWN: - tok = au_to_arg32(1, "fd", ar->ar_arg_fd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } break; case AUE_ACCT: @@ -441,8 +453,10 @@ break; case AUE_SETAUID: - tok = au_to_arg32(2, "setauid", ar->ar_arg_auid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_AUID)) { + tok = au_to_arg32(2, "setauid", ar->ar_arg_auid); + kau_write(rec, tok); + } break; case AUE_SETAUDIT: @@ -471,8 +485,10 @@ case AUE_AUDITON: /* For AUDITON commands without own event, audit the cmd */ - tok = au_to_arg32(1, "cmd", ar->ar_arg_cmd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(1, "cmd", ar->ar_arg_cmd); + kau_write(rec, tok); + } /* fall thru */ case AUE_AUDITON_GETCAR: @@ -501,8 +517,11 @@ break; case AUE_EXIT: - tok = au_to_exit(ar->ar_arg_exitretval, ar->ar_arg_exitstatus); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_EXIT)) { + tok = au_to_exit(ar->ar_arg_exitretval, + ar->ar_arg_exitstatus); + kau_write(rec, tok); + } break; case AUE_ADJTIME: @@ -545,24 +564,32 @@ case AUE_CHFLAGS: case AUE_LCHFLAGS: - tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_CHMOD: case AUE_LCHMOD: - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_CHOWN: case AUE_LCHOWN: - tok = au_to_arg32(2, "new file uid", ar->ar_arg_uid); - kau_write(rec, tok); - tok = au_to_arg32(3, "new file gid", ar->ar_arg_gid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_UID)) { + tok = au_to_arg32(2, "new file uid", ar->ar_arg_uid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_GID)) { + tok = au_to_arg32(3, "new file gid", ar->ar_arg_gid); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; @@ -572,14 +599,18 @@ break; case AUE_CLOSE: - tok = au_to_arg32(2, "fd", ar->ar_arg_fd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(2, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_FCHMOD: - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + kau_write(rec, tok); + } FD_VNODE1_TOKENS; break; @@ -595,73 +626,100 @@ break; case AUE_FCHOWN: - tok = au_to_arg32(2, "new file uid", ar->ar_arg_uid); - kau_write(rec, tok); - tok = au_to_arg32(3, "new file gid", ar->ar_arg_gid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_UID)) { + tok = au_to_arg32(2, "new file uid", ar->ar_arg_uid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_GID)) { + tok = au_to_arg32(3, "new file gid", ar->ar_arg_gid); + kau_write(rec, tok); + } FD_VNODE1_TOKENS; break; case AUE_FCNTL: if (ar->ar_arg_cmd == F_GETLK || ar->ar_arg_cmd == F_SETLK || ar->ar_arg_cmd == F_SETLKW) { - tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); + kau_write(rec, tok); + } FD_VNODE1_TOKENS; } break; case AUE_FCHFLAGS: - tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } FD_VNODE1_TOKENS; break; case AUE_FLOCK: - tok = au_to_arg32(2, "operation", ar->ar_arg_cmd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "operation", ar->ar_arg_cmd); + kau_write(rec, tok); + } FD_VNODE1_TOKENS; break; case AUE_RFORK: - tok = au_to_arg32(1, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(1, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } /* fall through */ case AUE_FORK: case AUE_VFORK: - tok = au_to_arg32(0, "child PID", ar->ar_arg_pid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_PID)) { + tok = au_to_arg32(0, "child PID", ar->ar_arg_pid); + kau_write(rec, tok); + } break; case AUE_IOCTL: - tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); - kau_write(rec, tok); - tok = au_to_arg32(1, "arg", (u_int32_t)ar->ar_arg_addr); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_ADDR)) { + tok = au_to_arg32(1, "arg", (u_int32_t)ar->ar_arg_addr); + kau_write(rec, tok); + } if (ARG_IS_VALID(kar, ARG_VNODE1)) { FD_VNODE1_TOKENS; } else { if (ARG_IS_VALID(kar, ARG_SOCKINFO)) { - tok = kau_to_socket(&ar->ar_arg_sockinfo); - kau_write(rec, tok); + tok = kau_to_socket(&ar->ar_arg_sockinfo); + kau_write(rec, tok); } else { - tok = au_to_arg32(1, "fd", ar->ar_arg_fd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", + ar->ar_arg_fd); + kau_write(rec, tok); + } } } break; case AUE_KILL: - tok = au_to_arg32(2, "signal", ar->ar_arg_signum); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SIGNUM)) { + tok = au_to_arg32(2, "signal", ar->ar_arg_signum); + kau_write(rec, tok); + } PROCESS_PID_TOKENS(1); break; case AUE_KTRACE: - tok = au_to_arg32(2, "ops", ar->ar_arg_cmd); - kau_write(rec, tok); - tok = au_to_arg32(3, "trpoints", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "ops", ar->ar_arg_cmd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(3, "trpoints", ar->ar_arg_value); + kau_write(rec, tok); + } PROCESS_PID_TOKENS(4); UPATH1_VNODE1_TOKENS; break; @@ -673,22 +731,31 @@ break; case AUE_LOADSHFILE: - tok = au_to_arg32(4, "base addr", (u_int32_t)ar->ar_arg_addr); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_ADDR)) { + tok = au_to_arg32(4, "base addr", + (u_int32_t)ar->ar_arg_addr); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_MKDIR: - tok = au_to_arg32(2, "mode", ar->ar_arg_mode); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_MKNOD: - tok = au_to_arg32(2, "mode", ar->ar_arg_mode); - kau_write(rec, tok); - tok = au_to_arg32(3, "dev", ar->ar_arg_dev); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_DEV)) { + tok = au_to_arg32(3, "dev", ar->ar_arg_dev); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; @@ -698,26 +765,39 @@ case AUE_MLOCK: case AUE_MUNLOCK: case AUE_MINHERIT: - tok = au_to_arg32(1, "addr", (u_int32_t)ar->ar_arg_addr); - kau_write(rec, tok); - tok = au_to_arg32(2, "len", ar->ar_arg_len); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_ADDR)) { + tok = au_to_arg32(1, "addr", + (u_int32_t)ar->ar_arg_addr); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_LEN)) { + tok = au_to_arg32(2, "len", ar->ar_arg_len); + kau_write(rec, tok); + } if (ar->ar_event == AUE_MMAP) FD_VNODE1_TOKENS; if (ar->ar_event == AUE_MPROTECT) { - tok = au_to_arg32(3, "protection", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(3, "protection", + ar->ar_arg_value); + kau_write(rec, tok); + } } if (ar->ar_event == AUE_MINHERIT) { - tok = au_to_arg32(3, "inherit", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(3, "inherit", + ar->ar_arg_value); + kau_write(rec, tok); + } } break; case AUE_MOUNT: /* XXX Need to handle NFS mounts */ - tok = au_to_arg32(3, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(3, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } if (ARG_IS_VALID(kar, ARG_TEXT)) { tok = au_to_text(ar->ar_arg_text); kau_write(rec, tok); @@ -742,14 +822,20 @@ case AUE_MSGGET: if (ar->ar_errno == 0) { - tok = au_to_ipc(AT_IPC_MSG, ar->ar_arg_svipc_id); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_ipc(AT_IPC_MSG, + ar->ar_arg_svipc_id); + kau_write(rec, tok); + } } break; case AUE_RESETSHFILE: - tok = au_to_arg32(1, "base addr", (u_int32_t)ar->ar_arg_addr); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_ADDR)) { + tok = au_to_arg32(1, "base addr", + (u_int32_t)ar->ar_arg_addr); + kau_write(rec, tok); + } break; case AUE_OPEN_RC: @@ -759,8 +845,10 @@ case AUE_OPEN_WC: case AUE_OPEN_WTC: /* case AUE_O_CREAT: */ /* AUE_O_CREAT == AUE_OPEN_RWTC */ - tok = au_to_arg32(3, "mode", ar->ar_arg_mode); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } /* fall through */ case AUE_OPEN_R: @@ -769,94 +857,143 @@ case AUE_OPEN_RWT: case AUE_OPEN_W: case AUE_OPEN_WT: - tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_PTRACE: - tok = au_to_arg32(1, "request", ar->ar_arg_cmd); - kau_write(rec, tok); - tok = au_to_arg32(3, "addr", (u_int32_t)ar->ar_arg_addr); - kau_write(rec, tok); - tok = au_to_arg32(4, "data", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(1, "request", ar->ar_arg_cmd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_ADDR)) { + tok = au_to_arg32(3, "addr", + (u_int32_t)ar->ar_arg_addr); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(4, "data", ar->ar_arg_value); + kau_write(rec, tok); + } PROCESS_PID_TOKENS(2); break; case AUE_QUOTACTL: - tok = au_to_arg32(2, "command", ar->ar_arg_cmd); - kau_write(rec, tok); - tok = au_to_arg32(3, "uid", ar->ar_arg_uid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "command", ar->ar_arg_cmd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_UID)) { + tok = au_to_arg32(3, "uid", ar->ar_arg_uid); + kau_write(rec, tok); + } UPATH1_VNODE1_TOKENS; break; case AUE_REBOOT: - tok = au_to_arg32(1, "howto", ar->ar_arg_cmd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(1, "howto", ar->ar_arg_cmd); + kau_write(rec, tok); + } break; case AUE_SEMCTL: ar->ar_event = semctl_to_event(ar->ar_arg_svipc_cmd); /* Fall through */ case AUE_SEMOP: - tok = au_to_arg32(1, "sem ID", ar->ar_arg_svipc_id); - kau_write(rec, tok); - if (ar->ar_errno != EINVAL) { - tok = au_to_ipc(AT_IPC_SEM, ar->ar_arg_svipc_id); + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_arg32(1, "sem ID", ar->ar_arg_svipc_id); kau_write(rec, tok); + if (ar->ar_errno != EINVAL) { + tok = au_to_ipc(AT_IPC_SEM, + ar->ar_arg_svipc_id); + kau_write(rec, tok); + } } break; case AUE_SEMGET: if (ar->ar_errno == 0) { - tok = au_to_ipc(AT_IPC_SEM, ar->ar_arg_svipc_id); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_ipc(AT_IPC_SEM, + ar->ar_arg_svipc_id); + kau_write(rec, tok); + } } break; case AUE_SETEGID: - tok = au_to_arg32(1, "gid", ar->ar_arg_egid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_EGID)) { + tok = au_to_arg32(1, "gid", ar->ar_arg_egid); + kau_write(rec, tok); + } break; case AUE_SETEUID: - tok = au_to_arg32(1, "uid", ar->ar_arg_euid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_EUID)) { + tok = au_to_arg32(1, "uid", ar->ar_arg_euid); + kau_write(rec, tok); + } break; case AUE_SETREGID: - tok = au_to_arg32(1, "rgid", ar->ar_arg_rgid); - kau_write(rec, tok); - tok = au_to_arg32(2, "egid", ar->ar_arg_egid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_RGID)) { + tok = au_to_arg32(1, "rgid", ar->ar_arg_rgid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_EGID)) { + tok = au_to_arg32(2, "egid", ar->ar_arg_egid); + kau_write(rec, tok); + } break; case AUE_SETREUID: - tok = au_to_arg32(1, "ruid", ar->ar_arg_ruid); - kau_write(rec, tok); - tok = au_to_arg32(2, "euid", ar->ar_arg_euid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_RUID)) { + tok = au_to_arg32(1, "ruid", ar->ar_arg_ruid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_EUID)) { + tok = au_to_arg32(2, "euid", ar->ar_arg_euid); + kau_write(rec, tok); + } break; case AUE_SETRESGID: - tok = au_to_arg32(1, "rgid", ar->ar_arg_rgid); - kau_write(rec, tok); - tok = au_to_arg32(2, "egid", ar->ar_arg_egid); - kau_write(rec, tok); - tok = au_to_arg32(3, "sgid", ar->ar_arg_sgid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_RGID)) { + tok = au_to_arg32(1, "rgid", ar->ar_arg_rgid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_EGID)) { + tok = au_to_arg32(2, "egid", ar->ar_arg_egid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_SGID)) { + tok = au_to_arg32(3, "sgid", ar->ar_arg_sgid); + kau_write(rec, tok); + } break; case AUE_SETRESUID: - tok = au_to_arg32(1, "ruid", ar->ar_arg_ruid); - kau_write(rec, tok); - tok = au_to_arg32(2, "euid", ar->ar_arg_euid); - kau_write(rec, tok); - tok = au_to_arg32(3, "suid", ar->ar_arg_suid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_RUID)) { + tok = au_to_arg32(1, "ruid", ar->ar_arg_ruid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_EUID)) { + tok = au_to_arg32(2, "euid", ar->ar_arg_euid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_SUID)) { + tok = au_to_arg32(3, "suid", ar->ar_arg_suid); + kau_write(rec, tok); + } break; case AUE_SETGID: - tok = au_to_arg32(1, "gid", ar->ar_arg_gid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_GID)) { + tok = au_to_arg32(1, "gid", ar->ar_arg_gid); + kau_write(rec, tok); + } break; case AUE_SETUID: - tok = au_to_arg32(1, "uid", ar->ar_arg_uid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_UID)) { + tok = au_to_arg32(1, "uid", ar->ar_arg_uid); + kau_write(rec, tok); + } break; case AUE_SETGROUPS: if (ARG_IS_VALID(kar, ARG_GROUPSET)) { @@ -876,62 +1013,68 @@ break; case AUE_SETPRIORITY: - tok = au_to_arg32(1, "which", ar->ar_arg_cmd); - kau_write(rec, tok); - tok = au_to_arg32(2, "who", ar->ar_arg_uid); - kau_write(rec, tok); - tok = au_to_arg32(2, "priority", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(1, "which", ar->ar_arg_cmd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_UID)) { + tok = au_to_arg32(2, "who", ar->ar_arg_uid); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(2, "priority", ar->ar_arg_value); + kau_write(rec, tok); + } break; case AUE_SETPRIVEXEC: - tok = au_to_arg32(1, "flag", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(1, "flag", ar->ar_arg_value); + kau_write(rec, tok); + } break; /* AUE_SHMAT, AUE_SHMCTL, AUE_SHMDT and AUE_SHMGET are SysV IPC */ case AUE_SHMAT: - tok = au_to_arg32(1, "shmid", ar->ar_arg_svipc_id); - kau_write(rec, tok); - tok = au_to_arg32(2, "shmaddr", (int)ar->ar_arg_svipc_addr); - kau_write(rec, tok); - if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_arg32(1, "shmid", ar->ar_arg_svipc_id); + kau_write(rec, tok); + /* XXXAUDIT: Does having the ipc token make sense? */ tok = au_to_ipc(AT_IPC_SHM, ar->ar_arg_svipc_id); kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_SVIPC_ADDR)) { + tok = au_to_arg32(2, "shmaddr", + (int)ar->ar_arg_svipc_addr); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { tok = au_to_ipc_perm(&ar->ar_arg_svipc_perm); kau_write(rec, tok); } break; case AUE_SHMCTL: - tok = au_to_arg32(1, "shmid", ar->ar_arg_svipc_id); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_arg32(1, "shmid", ar->ar_arg_svipc_id); + kau_write(rec, tok); + /* XXXAUDIT: Does having the ipc token make sense? */ + tok = au_to_ipc(AT_IPC_SHM, ar->ar_arg_svipc_id); + kau_write(rec, tok); + } switch (ar->ar_arg_svipc_cmd) { case IPC_STAT: ar->ar_event = AUE_SHMCTL_STAT; - if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { - tok = au_to_ipc(AT_IPC_SHM, - ar->ar_arg_svipc_id); - kau_write(rec, tok); - } break; case IPC_RMID: ar->ar_event = AUE_SHMCTL_RMID; - if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { - tok = au_to_ipc(AT_IPC_SHM, - ar->ar_arg_svipc_id); - kau_write(rec, tok); - } break; case IPC_SET: ar->ar_event = AUE_SHMCTL_SET; if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { - tok = au_to_ipc(AT_IPC_SHM, - ar->ar_arg_svipc_id); - kau_write(rec, tok); tok = au_to_ipc_perm(&ar->ar_arg_svipc_perm); kau_write(rec, tok); - } + } break; default: break; /* We will audit a bad command */ @@ -939,17 +1082,22 @@ break; case AUE_SHMDT: - tok = au_to_arg32(1, "shmaddr", (int)ar->ar_arg_svipc_addr); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SVIPC_ADDR)) { + tok = au_to_arg32(1, "shmaddr", + (int)ar->ar_arg_svipc_addr); + kau_write(rec, tok); + } break; case AUE_SHMGET: /* This is unusual; the return value is in an argument token */ - tok = au_to_arg32(0, "shmid", ar->ar_arg_svipc_id); - kau_write(rec, tok); - if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { + if (ARG_IS_VALID(kar, ARG_SVIPC_ID)) { + tok = au_to_arg32(0, "shmid", ar->ar_arg_svipc_id); + kau_write(rec, tok); tok = au_to_ipc(AT_IPC_SHM, ar->ar_arg_svipc_id); kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { tok = au_to_ipc_perm(&ar->ar_arg_svipc_perm); kau_write(rec, tok); } @@ -958,10 +1106,14 @@ /* AUE_SHMOPEN, AUE_SHMUNLINK, AUE_SEMOPEN, AUE_SEMCLOSE * and AUE_SEMUNLINK are Posix IPC */ case AUE_SHMOPEN: - tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); - tok = au_to_arg32(3, "mode", ar->ar_arg_mode); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_SVIPC_ADDR)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } case AUE_SHMUNLINK: if (ARG_IS_VALID(kar, ARG_TEXT)) { tok = au_to_text(ar->ar_arg_text); @@ -983,12 +1135,18 @@ break; case AUE_SEMOPEN: - tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); - kau_write(rec, tok); - tok = au_to_arg32(3, "mode", ar->ar_arg_mode); - kau_write(rec, tok); - tok = au_to_arg32(4, "value", ar->ar_arg_value); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + tok = au_to_arg32(4, "value", ar->ar_arg_value); + kau_write(rec, tok); + } /* fall through */ case AUE_SEMUNLINK: if (ARG_IS_VALID(kar, ARG_TEXT)) { @@ -1011,8 +1169,10 @@ break; case AUE_SEMCLOSE: - tok = au_to_arg32(1, "sem", ar->ar_arg_fd); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "sem", ar->ar_arg_fd); + kau_write(rec, tok); + } break; case AUE_SYMLINK: @@ -1041,15 +1201,19 @@ break; case AUE_UMASK: - tok = au_to_arg32(1, "new mask", ar->ar_arg_mask); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_MASK)) { + tok = au_to_arg32(1, "new mask", ar->ar_arg_mask); + kau_write(rec, tok); + } tok = au_to_arg32(0, "prev mask", ar->ar_retval); kau_write(rec, tok); break; case AUE_WAIT4: - tok = au_to_arg32(0, "pid", ar->ar_arg_pid); - kau_write(rec, tok); + if (ARG_IS_VALID(kar, ARG_PID)) { + tok = au_to_arg32(0, "pid", ar->ar_arg_pid); + kau_write(rec, tok); + } break; default: /* We shouldn't fall through to here. */ From owner-p4-projects@FreeBSD.ORG Fri Dec 2 05:49:37 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1C1116A422; Fri, 2 Dec 2005 05:49:36 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 999D216A41F for ; Fri, 2 Dec 2005 05:49:36 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2734343D46 for ; Fri, 2 Dec 2005 05:49:36 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB25nZBD021515 for ; Fri, 2 Dec 2005 05:49:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB25nZoj021512 for perforce@freebsd.org; Fri, 2 Dec 2005 05:49:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 2 Dec 2005 05:49:35 GMT Message-Id: <200512020549.jB25nZoj021512@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 Cc: Subject: PERFORCE change 87637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 05:49:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=87637 Change 87637 by sam@sam_ebb on 2005/12/02 05:49:19 device polling Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#118 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#118 (text+ko) ==== @@ -44,6 +44,9 @@ * is greatly appreciated. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif #include "opt_inet.h" #include @@ -490,6 +493,7 @@ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); + ifp->if_capabilities |= IFCAP_POLLING; ic->ic_ifp = ifp; ic->ic_reset = ath_reset; @@ -634,6 +638,10 @@ DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags %x\n", __func__, ifp->if_flags); +#ifdef DEVICE_POLLING + if (ifp->if_capenable & IFCAP_POLLING) + ether_poll_deregister(ifp); +#endif ath_stop(ifp); bpfdetach(ifp); /* @@ -705,34 +713,25 @@ } /* - * Interrupt handler. Most of the actual processing is deferred. + * Set/enable interrupts. We actually enable + * interrupts only if we are not polling. */ -void -ath_intr(void *arg) +static __inline void +ath_intrset(struct ath_softc *sc, u_int32_t mask) +{ + struct ath_hal *ah = sc->sc_ah; + + if (sc->sc_ifp->if_capenable & IFCAP_POLLING) + mask &= ~HAL_INT_GLOBAL; + ath_hal_intrset(ah, mask); +} + +static void +ath_intr_body(struct ath_softc *sc, int count) { - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; HAL_INT status; - if (sc->sc_invalid) { - /* - * The hardware is not ready/present, don't touch anything. - * Note this can happen early on if the IRQ is shared. - */ - DPRINTF(sc, ATH_DEBUG_ANY, "%s: invalid; ignored\n", __func__); - return; - } - if (!ath_hal_intrpend(ah)) /* shared irq, not for us */ - return; - if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & - IFF_DRV_RUNNING))) { - DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags 0x%x\n", - __func__, ifp->if_flags); - ath_hal_getisr(ah, &status); /* clear ISR */ - ath_hal_intrset(ah, 0); /* disable further intr's */ - return; - } /* * Figure out the reason(s) for the interrupt. Note * that the hal returns a pseudo-ISR that may include @@ -800,11 +799,58 @@ * clear whatever condition caused the interrupt. */ ath_hal_mibevent(ah, &sc->sc_halstats); - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); } } } +/* + * Interrupt handler. Most of the actual processing is deferred. + */ +void +ath_intr(void *arg) +{ + struct ath_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; + struct ath_hal *ah = sc->sc_ah; + + if (ifp->if_capenable & IFCAP_POLLING) + return; + if (sc->sc_invalid) { + /* + * The hardware is not ready/present, don't touch anything. + * Note this can happen early on if the IRQ is shared. + */ + DPRINTF(sc, ATH_DEBUG_ANY, "%s: invalid; ignored\n", __func__); + return; + } + if (!ath_hal_intrpend(ah)) /* shared irq, not for us */ + return; + if ((ifp->if_flags & IFF_UP) == 0 || + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + HAL_INT status; + + DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags 0x%x\n", + __func__, ifp->if_flags); + ath_hal_getisr(ah, &status); /* clear ISR */ + ath_hal_intrset(ah, 0); /* disable further intr's */ + return; + } + ath_intr_body(sc, 1); +} + +/* + * Polling callback. + */ +static void +ath_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct ath_softc *sc = ifp->if_softc; + + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ath_intr_body(sc, count); +} + static void ath_fatal_proc(void *arg, int pending) { @@ -951,7 +997,7 @@ */ if (sc->sc_needmib && ic->ic_opmode == IEEE80211_M_STA) sc->sc_imask |= HAL_INT_MIB; - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); ifp->if_drv_flags |= IFF_DRV_RUNNING; ic->ic_state = IEEE80211_S_INIT; @@ -1093,7 +1139,7 @@ ath_chan_change(sc, c); if (ic->ic_state == IEEE80211_S_RUN) ath_beacon_config(sc); /* restart beacons */ - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); ath_start(ifp); /* restart xmit */ return 0; @@ -2686,7 +2732,7 @@ ath_hal_intrset(ah, 0); ath_hal_beacontimers(ah, &bs); sc->sc_imask |= HAL_INT_BMISS; - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); } else { ath_hal_intrset(ah, 0); if (nexttbtt == intval) @@ -2725,7 +2771,7 @@ } ath_hal_beaconinit(ah, nexttbtt, intval); sc->sc_bmisscount = 0; - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); /* * When using a self-linked beacon descriptor in * ibss mode load it once here. @@ -4705,7 +4751,7 @@ /* * Re-enable interrupts. */ - ath_hal_intrset(ah, sc->sc_imask); + ath_intrset(sc, sc->sc_imask); } return 0; } @@ -4852,7 +4898,7 @@ /* * NB: disable interrupts so we don't rx frames. */ - ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); + ath_intrset(sc, sc->sc_imask &~ HAL_INT_GLOBAL); /* * Notify the rate control algorithm. */ @@ -4948,8 +4994,7 @@ sc->sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER; sc->sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER; } else { - ath_hal_intrset(ah, - sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS)); + ath_intrset(sc, sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS)); sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); } done: @@ -5470,6 +5515,22 @@ case SIOCGATHDIAG: error = ath_ioctl_diag(sc, (struct ath_diag *) ifr); break; + case SIOCSIFCAP: +#ifdef DEVICE_POLLING + if ((ifr->ifr_reqcap ^ ifp->if_capenable) & IFCAP_POLLING) { + if (ifr->ifr_reqcap & IFCAP_POLLING) { + error = ether_poll_register(ath_poll, ifp); + if (!error) + ifp->if_capenable |= IFCAP_POLLING; + } else { + error = ether_poll_deregister(ifp); + /* NB: enable interrupts even if error */ + ifp->if_capenable &= ~IFCAP_POLLING; + } + ath_intrset(sc, sc->sc_imask); + } +#endif + break; default: error = ieee80211_ioctl(ic, cmd, data); if (error == ENETRESET) { From owner-p4-projects@FreeBSD.ORG Fri Dec 2 15:31:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DAD516A422; Fri, 2 Dec 2005 15:31:31 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DA4C516A41F for ; Fri, 2 Dec 2005 15:31:30 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B5F43D62 for ; Fri, 2 Dec 2005 15:31:30 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2FVUXF061468 for ; Fri, 2 Dec 2005 15:31:30 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2FVTKd061465 for perforce@freebsd.org; Fri, 2 Dec 2005 15:31:30 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 2 Dec 2005 15:31:30 GMT Message-Id: <200512021531.jB2FVTKd061465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 87650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 15:31:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=87650 Change 87650 by soc-bushman@soc-bushman_stinger on 2005/12/02 15:30:40 some minor bugfixes in the daemon now user can't invalidate the cachename, that performs actual lookups some profiling and debugging was made - errors in addrinfo and ipnode marshalling/unmarshalling functions were fixed Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#17 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#16 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#11 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/name6.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscache.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nsdispatch.c#13 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#17 (text+ko) ==== @@ -8,9 +8,9 @@ SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c -CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" -DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} -LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} +CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" -pthread -pg +DPADD+=${LIBM} ${LIBUTIL} +LDADD+=${LIBM} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic FILESGROUPS=STARTUP CONF ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#16 (text+ko) ==== @@ -70,7 +70,7 @@ }; static struct timeval s_time; -static pthread_rwlock_t s_time_lock = PTHREAD_RWLOCK_INITIALIZER; +static pthread_rwlock_t s_time_lock; static pthread_t s_time_thread; static void accept_connection(struct kevent *, struct runtime_env *, @@ -117,6 +117,8 @@ int res; TRACE_IN(init_global_timer); + pthread_rwlock_init(&s_time_lock, NULL); + memset(&s_time, 0, sizeof(struct timeval)); res = pthread_create(&s_time_thread, NULL, get_time_thread, NULL); TRACE_OUT(init_global_timer); @@ -286,7 +288,7 @@ uid_t euid; gid_t egid; - + TRACE_IN(accept_connection); fd = accept(event_data->ident, NULL, NULL); if (fd == -1) { @@ -316,6 +318,8 @@ EV_SET(&eventlist[1], fd, EVFILT_READ, EV_ADD | EV_ONESHOT, NOTE_LOWAT, qstate->kevent_watermark, qstate); res = kevent(env->queue, eventlist, 2, NULL, 0, &timeout); + if (res < 0) + LOG_ERR_2("accept_connection", "kevent error"); TRACE_OUT(accept_connection); } @@ -516,8 +520,6 @@ struct query_state *qstate; TRACE_IN(process_timer_event); - LOG_MSG_2("process_timer_event", "timer event received - " - "abandoning request"); qstate = (struct query_state *)event_data->udata; destroy_query_state(qstate); close(event_data->ident); @@ -544,7 +546,7 @@ for (;;) { nevents = kevent(env->queue, NULL, 0, eventlist, eventlist_size, NULL); - + LOG_ERR_2("KEVENT", "KEVENT %d", nevents); /* * we can only receive 1 event on success */ @@ -556,13 +558,13 @@ for (i = 0; i < event_data->data; ++i) accept_connection(event_data, env, config); - EV_SET(eventlist, s_runtime_env->sockfd, - EVFILT_READ, EV_ADD | EV_ONESHOT, - 0, 0, 0); - memset(&timeout, 0, - sizeof(struct timespec)); - kevent(s_runtime_env->queue, eventlist, - 1, NULL, 0, &timeout); + EV_SET(eventlist, s_runtime_env->sockfd, + EVFILT_READ, EV_ADD | EV_ONESHOT, + 0, 0, 0); + memset(&timeout, 0, + sizeof(struct timespec)); + kevent(s_runtime_env->queue, eventlist, + 1, NULL, 0, &timeout); } else { switch (event_data->filter) { @@ -617,9 +619,15 @@ void get_time_func(struct timeval *time) { - pthread_rwlock_rdlock(&s_time_lock); + struct timespec res; +/* pthread_rwlock_rdlock(&s_time_lock); memcpy(time, &s_time, sizeof(struct timeval)); - pthread_rwlock_unlock(&s_time_lock); + pthread_rwlock_unlock(&s_time_lock);*/ + memset(&res, 0, sizeof(struct timespec)); + clock_gettime(CLOCK_UPTIME, &res); + + time->tv_sec = res.tv_sec; + time->tv_usec = 0; } /* @@ -745,12 +753,12 @@ memset(&connection_params, 0, sizeof(struct cached_connection_params)); connection_params.socket_path = DEFAULT_SOCKET_PATH; - connection = open_cached_connection(&connection_params); + connection = open_cached_connection__(&connection_params); if (connection == INVALID_CACHED_CONNECTION) errx(EXIT_FAILURE, "Can't connect to the daemon."); if (clear_user_cache_entries != 0) { - result = cached_transform(connection, + result = cached_transform__(connection, user_config_entry_name, TT_USER); if (result != 0) LOG_MSG_1("main", @@ -766,7 +774,7 @@ errx(EXIT_FAILURE, "Only root can initiate " "global cache transformation."); - result = cached_transform(connection, + result = cached_transform__(connection, global_config_entry_name, TT_ALL); if (result != 0) LOG_MSG_1("main", @@ -778,7 +786,7 @@ "succeeded"); } - close_cached_connection(connection); + close_cached_connection__(connection); free(user_config_entry_name); free(global_config_entry_name); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#16 (text+ko) ==== @@ -108,7 +108,6 @@ { struct configuration_entry *retval; size_t size; - pthread_mutexattr_t attr; int res; TRACE_IN(create_configuration_entry); @@ -117,54 +116,41 @@ assert(negative_params != NULL); assert(mp_params != NULL); - - res = pthread_mutexattr_init(&attr); - if (res != 0) { - TRACE_OUT(create_configuration_entry); - return (NULL); - } - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); - retval = (struct configuration_entry *)malloc( sizeof(struct configuration_entry)); assert(retval != NULL); memset(retval, 0, sizeof(struct configuration_entry)); - res = pthread_mutex_init(&retval->positive_cache_lock, &attr); + res = pthread_mutex_init(&retval->positive_cache_lock, NULL); if (res != 0) { free(retval); - pthread_mutexattr_destroy(&attr); LOG_ERR_2("create_configuration_entry", "can't create positive cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } - res = pthread_mutex_init(&retval->negative_cache_lock, &attr); + res = pthread_mutex_init(&retval->negative_cache_lock, NULL); if (res != 0) { pthread_mutex_destroy(&retval->positive_cache_lock); free(retval); - pthread_mutexattr_destroy(&attr); LOG_ERR_2("create_configuration_entry", "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } - res = pthread_mutex_init(&retval->mp_cache_lock, &attr); + res = pthread_mutex_init(&retval->mp_cache_lock, NULL); if (res != 0) { pthread_mutex_destroy(&retval->positive_cache_lock); pthread_mutex_destroy(&retval->negative_cache_lock); free(retval); - pthread_mutexattr_destroy(&attr); LOG_ERR_2("create_configuration_entry", "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } - pthread_mutexattr_destroy(&attr); - memcpy(&retval->positive_cache_params, positive_params, sizeof(struct common_cache_entry_params)); memcpy(&retval->negative_cache_params, negative_params, ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#16 (text+ko) ==== @@ -30,8 +30,8 @@ #define TRACE_WANTED 32 -/*#ifndef NDEBUG*/ -#if 0 +#ifndef NDEBUG +//#if 0 #define TRACE_IN(x) __trace_in(#x, __FILE__, __LINE__) #define TRACE_POINT() __trace_point(__FILE__, __LINE__) #define TRACE_MSG(x) __trace_msg(x, __FILE__, __LINE__) ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#16 (text+ko) ==== @@ -304,6 +304,7 @@ qstate->process_func = on_mp_read_session_response_write1; qstate->kevent_watermark = sizeof(int); qstate->kevent_filter = EVFILT_WRITE; + TRACE_OUT(on_mp_read_session_request_process); return (0); } @@ -319,6 +320,7 @@ &qstate->response); result = qstate->write_func(qstate, &c_mp_rs_response->error_code, sizeof(int)); + if (result != sizeof(int)) { LOG_ERR_3("on_mp_read_session_response_write1", "write failed"); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#16 (text+ko) ==== @@ -647,6 +647,7 @@ read_response = get_cache_read_response(&qstate->response); read_request = get_cache_read_request(&qstate->request); + LOG_ERR_2("READ","READ %s", read_request->entry); qstate->config_entry = configuration_find_entry( s_configuration, read_request->entry); if (qstate->config_entry == NULL) { @@ -939,6 +940,7 @@ { struct cache_transform_request *transform_request; struct cache_transform_response *transform_response; + struct configuration_entry *config_entry; size_t i, size; TRACE_IN(on_transform_request_process); @@ -948,12 +950,15 @@ switch (transform_request->transformation_type) { case TT_USER: - if (transform_request->entry == NULL) { + if (transform_request->entry == NULL) { size = configuration_get_entries_size(s_configuration); - for (i = 0; i < size; ++i) { - clear_config_entry_part(configuration_get_entry( - s_configuration, i), qstate->eid_str, - qstate->eid_str_length); + for (i = 0; i < size; ++i) { + config_entry = configuration_get_entry( + s_configuration, i); + + if (config_entry->perform_actual_lookups == 0) + clear_config_entry_part(config_entry, + qstate->eid_str, qstate->eid_str_length); } } else { qstate->config_entry = configuration_find_entry( @@ -968,6 +973,15 @@ goto fin; } + if (qstate->config_entry->perform_actual_lookups != 0) { + LOG_ERR_2("transform_request", + "can't transform the cache entry %s" + ", because it ised for actual lookups", + transform_request->entry); + transform_response->error_code = -1; + goto fin; + } + clear_config_entry_part(qstate->config_entry, qstate->eid_str, qstate->eid_str_length); } @@ -1122,7 +1136,7 @@ return (-1); } - result = recv(qstate->sockfd, buf, nbytes, 0); + result = read(qstate->sockfd, buf, nbytes); if ((result == -1) || (result < nbytes)) qstate->socket_failed = 1; @@ -1144,7 +1158,7 @@ return (-1); } - result = send(qstate->sockfd, buf, nbytes, 0); + result = write(qstate->sockfd, buf, nbytes); if ((result == -1) || (result < nbytes)) qstate->socket_failed = 1; ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#16 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#6 (text+ko) ==== @@ -1637,10 +1637,9 @@ desired_size = sizeof(size_t); ai_size = 0; for (cai = ai; cai != NULL; cai = cai->ai_next) { - desired_size = sizeof(struct addrinfo) + cai->ai_addrlen + - sizeof(size_t); + desired_size += sizeof(struct addrinfo) + cai->ai_addrlen; if (cai->ai_canonname != NULL) - desired_size += strlen(cai->ai_canonname) + 1; + desired_size += strlen(cai->ai_canonname); ++ai_size; } @@ -1670,9 +1669,6 @@ memcpy(p, cai->ai_canonname, size); p += size + 1; - } else { - memset(p, 0, sizeof(size_t)); - p += sizeof(size_t); } } @@ -1697,20 +1693,23 @@ for (ai_i = 0; ai_i < ai_size; ++ai_i) { memcpy(&new_ai, p, sizeof(struct addrinfo)); p += sizeof(struct addrinfo); - size = new_ai.ai_addrlen + sizeof(struct addrinfo) + _ALIGNBYTES; + size = new_ai.ai_addrlen + sizeof(struct addrinfo) + + _ALIGNBYTES; sentinel = (struct addrinfo *)malloc(size); memset(sentinel, 0, size); memcpy(sentinel, &new_ai, sizeof(struct addrinfo)); - sentinel->ai_addr = (struct sockaddr *)_ALIGN(sentinel + + sentinel->ai_addr = (struct sockaddr *)_ALIGN((char *)sentinel + sizeof(struct addrinfo)); + memcpy(sentinel->ai_addr, p, new_ai.ai_addrlen); p += new_ai.ai_addrlen; - memcpy(&size, p, sizeof(size_t)); - p += sizeof(size_t); - if (size > 0) { + if (new_ai.ai_canonname != NULL) { + memcpy(&size, p, sizeof(size_t)); + p += sizeof(size_t); + sentinel->ai_canonname = (char *)malloc(size + 1); memset(sentinel->ai_canonname, 0, size + 1); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/name6.c#8 (text+ko) ==== @@ -469,17 +469,13 @@ int err; ht = &new_ht; - orig_buf = buffer; memcpy(ht, buffer, sizeof(struct hostent)); memcpy(&p, buffer + sizeof(struct hostent), sizeof(char *)); - orig_buf = (char *)_ALIGN(orig_buf); - memcpy(orig_buf, buffer + sizeof(struct hostent) + sizeof(char *) + - _ALIGN(p) - (size_t)p, - buffer_size - sizeof(struct hostent) - sizeof(char *) - - _ALIGN(p) + (size_t)p); - p = (char *)_ALIGN(p); + orig_buf = buffer + sizeof(struct hostent) + sizeof(char *) + + _ALIGN(p) - (size_t)p; + p = (char *)_ALIGN(p); NS_APPLY_OFFSET(ht->h_name, orig_buf, p, char *); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscache.c#8 (text+ko) ==== @@ -314,6 +314,7 @@ } else res = 0; } else { + free(buffer); close_cached_mp_read_session(rs); rs = INVALID_CACHED_MP_READ_SESSION; cache_info->set_mp_rs_func(rs); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nsdispatch.c#13 (text+ko) ==== @@ -684,7 +684,7 @@ #ifdef NS_CACHING if ((cache_data_p != NULL) && - (result & NS_NOTFOUND) && (cache_flag == 0)) { + (result & (NS_NOTFOUND | NS_SUCCESS)) && (cache_flag == 0)) { va_start(ap, defaults); if (result == NS_SUCCESS) { if (cache_data.info->id_func != NULL) From owner-p4-projects@FreeBSD.ORG Fri Dec 2 19:41:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49B9116A422; Fri, 2 Dec 2005 19:41:31 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 22F3A16A41F for ; Fri, 2 Dec 2005 19:41:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C89A443D4C for ; Fri, 2 Dec 2005 19:41:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2JfUci077446 for ; Fri, 2 Dec 2005 19:41:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2JfUJF077443 for perforce@freebsd.org; Fri, 2 Dec 2005 19:41:30 GMT (envelope-from sam@freebsd.org) Date: Fri, 2 Dec 2005 19:41:30 GMT Message-Id: <200512021941.jB2JfUJF077443@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 Cc: Subject: PERFORCE change 87652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 19:41:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=87652 Change 87652 by sam@sam_ebb on 2005/12/02 19:41:06 show channel flags in debug msg so we can identify, e.g. 11b vs 11g Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#119 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#119 (text+ko) ==== @@ -4700,13 +4700,14 @@ hchan.channel = chan->ic_freq; hchan.channelFlags = ath_chan2flags(chan); - DPRINTF(sc, ATH_DEBUG_RESET, "%s: %u (%u MHz) -> %u (%u MHz)\n", + DPRINTF(sc, ATH_DEBUG_RESET, + "%s: %u (%u MHz, hal flags 0x%x) -> %u (%u MHz, hal flags 0x%x)\n", __func__, ath_hal_mhz2ieee(ah, sc->sc_curchan.channel, sc->sc_curchan.channelFlags), - sc->sc_curchan.channel, + sc->sc_curchan.channel, sc->sc_curchan.channelFlags, ath_hal_mhz2ieee(ah, hchan.channel, hchan.channelFlags), - hchan.channel); + hchan.channel, hchan.channelFlags); if (hchan.channel != sc->sc_curchan.channel || hchan.channelFlags != sc->sc_curchan.channelFlags) { HAL_STATUS status; From owner-p4-projects@FreeBSD.ORG Fri Dec 2 20:45:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE1816A422; Fri, 2 Dec 2005 20:45:50 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 12A1216A41F for ; Fri, 2 Dec 2005 20:45:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74C1D43D5D for ; Fri, 2 Dec 2005 20:45:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2KjnEv079644 for ; Fri, 2 Dec 2005 20:45:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2KjnWQ079641 for perforce@freebsd.org; Fri, 2 Dec 2005 20:45:49 GMT (envelope-from sam@freebsd.org) Date: Fri, 2 Dec 2005 20:45:49 GMT Message-Id: <200512022045.jB2KjnWQ079641@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 Cc: Subject: PERFORCE change 87655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 20:45:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=87655 Change 87655 by sam@sam_ebb on 2005/12/02 20:45:17 correct initial media setting; strip media_status mode bits since they are incorrect Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#33 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#33 (text+ko) ==== @@ -62,6 +62,9 @@ "sturboA", /* IEEE80211_MODE_STURBO_A */ }; +static int media_status(enum ieee80211_opmode , + const struct ieee80211_channel *); + /* list of all instances */ SLIST_HEAD(ieee80211_list, ieee80211com); static struct ieee80211_list ieee80211_list = @@ -354,7 +357,6 @@ ifmedia_add(&(_ic)->ic_media, \ IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) struct ifnet *ifp = ic->ic_ifp; - struct ifmediareq imr; int i, j, mode, rate, maxrate, mword, mopt, r; struct ieee80211_rateset *rs; struct ieee80211_rateset allrates; @@ -444,8 +446,9 @@ if (ic->ic_caps & IEEE80211_C_MONITOR) ADD(ic, mword, IFM_IEEE80211_MONITOR); } - ieee80211_media_status(ifp, &imr); - ifmedia_set(&ic->ic_media, imr.ifm_active); + /* NB: strip explicit mode; we're actually in autoselect */ + ifmedia_set(&ic->ic_media, + media_status(ic->ic_opmode, ic->ic_curchan) &~ IFM_MMASK); if (maxrate) ifp->if_baudrate = IF_Mbps(maxrate); @@ -752,6 +755,8 @@ status |= IFM_IEEE80211_MONITOR; break; case IEEE80211_M_AHDEMO: + status |= IFM_IEEE80211_ADHOC | IFM_FLAG0; + break; case IEEE80211_M_WDS: /* should not come here */ break; From owner-p4-projects@FreeBSD.ORG Fri Dec 2 21:22:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62E6316A422; Fri, 2 Dec 2005 21:22:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 25A8A16A41F for ; Fri, 2 Dec 2005 21:22:34 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1CA443D58 for ; Fri, 2 Dec 2005 21:22:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2LMXKv087916 for ; Fri, 2 Dec 2005 21:22:33 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2LMXLl087913 for perforce@freebsd.org; Fri, 2 Dec 2005 21:22:33 GMT (envelope-from jhb@freebsd.org) Date: Fri, 2 Dec 2005 21:22:33 GMT Message-Id: <200512022122.jB2LMXLl087913@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 Cc: Subject: PERFORCE change 87656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 21:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=87656 Change 87656 by jhb@jhb_slimer on 2005/12/02 21:21:58 Suggestion from Kris. Affected files ... .. //depot/projects/smpng/sys/notes#67 edit Differences ... ==== //depot/projects/smpng/sys/notes#67 (text+ko) ==== @@ -75,6 +75,10 @@ - arm, powerpc? - fork counts? - Add a cache-line padded mtx_aligned union and use it for the mutex pools. +- Add a per-thread counter of the number of sleep mutexes held (including + recursion) and panic if we try to sleep with any held to provide a cheaper + version of the current WITNESS check that doesn't bog the system down quite + as bad. Active child branches: - jhb_intr - fast ithreads and MSI? (perhaps do MSI in jhb_acpipci) From owner-p4-projects@FreeBSD.ORG Fri Dec 2 21:30:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62E6816A422; Fri, 2 Dec 2005 21:30:45 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3EA4B16A41F for ; Fri, 2 Dec 2005 21:30:45 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B15FA43D64 for ; Fri, 2 Dec 2005 21:30:44 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2LUiIP088180 for ; Fri, 2 Dec 2005 21:30:44 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2LUinX088177 for perforce@freebsd.org; Fri, 2 Dec 2005 21:30:44 GMT (envelope-from alc@freebsd.org) Date: Fri, 2 Dec 2005 21:30:44 GMT Message-Id: <200512022130.jB2LUinX088177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 87658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 21:30:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=87658 Change 87658 by alc@alc_sp01 on 2005/12/02 21:29:46 Modify preempt_contig_alloc() so that it fails instead of allocating a base page. Add an assertion to new_reserve() that disallows reservations no larger than a base page. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#12 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#12 (text+ko) ==== @@ -236,6 +236,7 @@ static reservation_t new_reserve(int level, vm_object_t object) { + KASSERT(level > -1, ("level > -1")); reservation_t sp = uma_zalloc(sp_zone, M_NOWAIT | M_ZERO); KASSERT(sp,("new_reservation, uma_zalloc failed")); sp->level = level; @@ -558,7 +559,7 @@ } /* Downgrade level, retry free, rres... */ - while (lev >= 0) { + while (lev > 0) { lev--; if (free_pool) { From owner-p4-projects@FreeBSD.ORG Fri Dec 2 22:36:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A25B16A423; Fri, 2 Dec 2005 22:36:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5120016A420 for ; Fri, 2 Dec 2005 22:36:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0954D43D55 for ; Fri, 2 Dec 2005 22:36:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2Ma3ri090022 for ; Fri, 2 Dec 2005 22:36:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2Ma3sw090019 for perforce@freebsd.org; Fri, 2 Dec 2005 22:36:03 GMT (envelope-from sam@freebsd.org) Date: Fri, 2 Dec 2005 22:36:03 GMT Message-Id: <200512022236.jB2Ma3sw090019@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 Cc: Subject: PERFORCE change 87660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 22:36:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=87660 Change 87660 by sam@sam_ebb on 2005/12/02 22:35:47 cleanups for setting channel: o when checking for an 11g channel upgrade search the entire table instead of assuming b channels are sorted before g o set ic_curchan for monitor+wds modes since the INIT -> RUN transition starts operation on that channel and not the desired channel (which may not be set) o break out channel set code; it's large enough now Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#55 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#55 (text+ko) ==== @@ -1350,10 +1350,19 @@ } static int -find11gchannel(struct ieee80211com *ic, int i, int freq) +find11gchannel(struct ieee80211com *ic, int start, int freq) { - for (; i < ic->ic_nchans; i++) { - const struct ieee80211_channel *c = &ic->ic_channels[i]; + const struct ieee80211_channel *c; + int i; + + for (i = start+1; i < ic->ic_nchans; i++) { + c = &ic->ic_channels[i]; + if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c)) + return 1; + } + /* NB: should not be needed but in case things are mis-sorted */ + for (i = 0; i < start; i++) { + c = &ic->ic_channels[i]; if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c)) return 1; } @@ -1391,7 +1400,7 @@ * are present. */ if (!IEEE80211_IS_CHAN_B(c) || - !find11gchannel(ic, i+1, c->ic_freq)) + !find11gchannel(ic, i, c->ic_freq)) return c; } else { if ((c->ic_flags & modeflags) == modeflags) @@ -1413,16 +1422,94 @@ return (IEEE80211_IS_CHAN_ANYG(c)); case IEEE80211_MODE_11A: return (IEEE80211_IS_CHAN_A(c)); -#ifdef IEEE80211_MODE_TURBO_STATIC_A - case IEEE80211_MODE_TURBO_STATIC_A: - return (IEEE80211_IS_CHAN_A(c) && IEEE80211_IS_CHAN_STURBO(c)); -#endif + case IEEE80211_MODE_STURBO_A: + return (IEEE80211_IS_CHAN_STURBO(c)); } return 1; } static int +ieee80211_ioctl_setchannel(struct ieee80211com *ic, + const struct ieee80211req *ireq) +{ + int error; + + /* XXX 0xffff overflows 16-bit signed */ + if (ireq->i_val == 0 || + ireq->i_val == (int16_t) IEEE80211_CHAN_ANY) { + ic->ic_des_chan = IEEE80211_CHAN_ANYC; + } else if ((u_int) ireq->i_val > IEEE80211_CHAN_MAX) { + return EINVAL; + } else { + struct ieee80211_channel *c, *c2; + + c = findchannel(ic, ireq->i_val, ic->ic_des_mode); + if (c == NULL) { + c = findchannel(ic, ireq->i_val, + IEEE80211_MODE_AUTO); + if (c == NULL) + return EINVAL; + } + /* + * Fine tune channel selection based on desired mode: + * if 11b is requested, find the 11b version of any + * 11g channel returned, + * if static turbo, find the turbo version of any + * 11a channel return, + * otherwise we should be ok with what we've got. + */ + switch (ic->ic_des_mode) { + case IEEE80211_MODE_11B: + if (IEEE80211_IS_CHAN_ANYG(c)) { + c2 = findchannel(ic, ireq->i_val, + IEEE80211_MODE_11B); + /* NB: should not happen, =>'s 11g w/o 11b */ + if (c2 != NULL) + c = c2; + } + break; + case IEEE80211_MODE_TURBO_A: + if (IEEE80211_IS_CHAN_A(c)) { + c2 = findchannel(ic, ireq->i_val, + IEEE80211_MODE_TURBO_A); + if (c2 != NULL) + c = c2; + } + break; + default: /* NB: no static turboG */ + break; + } + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + !check_mode_consistency(c, ic->ic_des_mode)) + return EINVAL; + if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan) + return 0; /* NB: nothing to do */ + ic->ic_des_chan = c; + } + error = 0; + if ((ic->ic_opmode == IEEE80211_M_MONITOR || + ic->ic_opmode == IEEE80211_M_WDS) && + ic->ic_des_chan != IEEE80211_CHAN_ANYC) { + /* + * Monitor and wds modes can switch directly. + */ + ic->ic_curchan = ic->ic_des_chan; + if (ic->ic_state == IEEE80211_S_RUN) + ic->ic_set_channel(ic); + } else { + /* + * Need to go through the state machine in case we + * need to reassociate or the like. The state machine + * will pickup the desired channel and avoid scanning. + */ + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); + } + return error; +} + +static int ieee80211_ioctl_set80211(struct ieee80211com *ic, u_long cmd, struct ieee80211req *ireq) { static const u_int8_t zerobssid[IEEE80211_ADDR_LEN]; @@ -1547,78 +1634,7 @@ error = ieee80211_init(ic, RESCAN); break; case IEEE80211_IOC_CHANNEL: - /* XXX 0xffff overflows 16-bit signed */ - if (ireq->i_val == 0 || - ireq->i_val == (int16_t) IEEE80211_CHAN_ANY) { - ic->ic_des_chan = IEEE80211_CHAN_ANYC; - } else if ((u_int) ireq->i_val > IEEE80211_CHAN_MAX) { - return EINVAL; - } else { - struct ieee80211_channel *c, *c2; - - c = findchannel(ic, ireq->i_val, ic->ic_des_mode); - if (c == NULL) { - c = findchannel(ic, ireq->i_val, - IEEE80211_MODE_AUTO); - if (c == NULL) - return EINVAL; - } - /* - * Fine tune channel selection based on desired mode: - * if 11b is requested, find the 11b version of any - * 11g channel returned, - * if static turbo, find the turbo version of any - * 11a channel return, - * otherwise we should be ok with what we've got. - */ - switch (ic->ic_des_mode) { - case IEEE80211_MODE_11B: - if (IEEE80211_IS_CHAN_ANYG(c)) { - c2 = findchannel(ic, ireq->i_val, - IEEE80211_MODE_11B); - /* NB: should not happen, =>'s 11g w/o 11b */ - if (c2 != NULL) - c = c2; - } - break; - case IEEE80211_MODE_TURBO_A: - if (IEEE80211_IS_CHAN_A(c)) { - c2 = findchannel(ic, ireq->i_val, - IEEE80211_MODE_TURBO_A); - if (c2 != NULL) - c = c2; - } - break; - default: /* NB: no static turboG */ - break; - } - if (ic->ic_opmode == IEEE80211_M_HOSTAP && - !check_mode_consistency(c, ic->ic_des_mode)) - return EINVAL; - if (ic->ic_state == IEEE80211_S_RUN && - c == ic->ic_bsschan) - break; - ic->ic_des_chan = c; - } - if ((ic->ic_opmode == IEEE80211_M_MONITOR || - ic->ic_opmode == IEEE80211_M_WDS) && - ic->ic_des_chan != IEEE80211_CHAN_ANYC) { - /* - * Monitor and wds modes can switch directly. - */ - if (ic->ic_state == IEEE80211_S_RUN) { - ic->ic_curchan = ic->ic_des_chan; - ic->ic_set_channel(ic); - } - } else { - /* - * Need to go through the state machine in case we - * need to reassociate or the like. The state machine - * will pickup the desired channel and avoid scanning. - */ - if (IS_UP_AUTO(ic)) - error = ieee80211_init(ic, RESCAN); - } + error = ieee80211_ioctl_setchannel(ic, ireq); break; case IEEE80211_IOC_POWERSAVE: switch (ireq->i_val) { From owner-p4-projects@FreeBSD.ORG Fri Dec 2 23:12:49 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EB8416A422; Fri, 2 Dec 2005 23:12:49 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E48B816A41F for ; Fri, 2 Dec 2005 23:12:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A896F43D4C for ; Fri, 2 Dec 2005 23:12:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2NCmi1090927 for ; Fri, 2 Dec 2005 23:12:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2NCmxx090924 for perforce@freebsd.org; Fri, 2 Dec 2005 23:12:48 GMT (envelope-from sam@freebsd.org) Date: Fri, 2 Dec 2005 23:12:48 GMT Message-Id: <200512022312.jB2NCmxx090924@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 Cc: Subject: PERFORCE change 87661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 23:12:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=87661 Change 87661 by sam@sam_ebb on 2005/12/02 23:12:18 allow tx+rx buffer counts to be specified with options Affected files ... .. //depot/projects/wifi/sys/conf/options#22 edit .. //depot/projects/wifi/sys/dev/ath/if_ath.c#120 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#47 edit Differences ... ==== //depot/projects/wifi/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.513 2005/07/27 21:47:55 pjd Exp $ +# $FreeBSD: src/sys/conf/options,v 1.517 2005/10/14 18:24:58 jhb Exp $ # # On the handling of kernel options # @@ -327,7 +327,7 @@ BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h -BRIDGE opt_bdg.h +DEVICE_POLLING DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h @@ -478,7 +478,6 @@ LOCKF_DEBUG opt_debug_lockf.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h -SX_DEBUG opt_debug_sx.h # Fb options FB_DEBUG opt_fb.h @@ -623,7 +622,6 @@ EISA_SLOTS opt_eisa.h # ed driver -ED_NO_MIIBUS opt_ed.h ED_HPP opt_ed.h ED_3C503 opt_ed.h ED_SIC opt_ed.h @@ -634,9 +632,6 @@ # wi driver WI_SYMBOL_FIRMWARE opt_wi.h -# XXX bogusly global. -DEVICE_POLLING opt_global.h - SOCKBUF_DEBUG opt_global.h # options for ubsec driver @@ -692,9 +687,21 @@ AH_SUPPORT_5111 opt_ah.h AH_SUPPORT_5112 opt_ah.h AH_SUPPORT_2413 opt_ah.h +AH_SUPPORT_2316 opt_ah.h +AH_SUPPORT_5413 opt_ah.h AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h +AH_DEBUG_COUNTRY opt_ah.h AH_ASSERT opt_ah.h +AH_SUPPORT_DFS opt_ah.h +AH_SUPPORT_XR opt_ah.h +AH_RADAR_CALIBRATE opt_ah.h +AH_NEED_DESC_SWAP opt_ah.h +AH_PRIVATE_DIAG opt_ah.h + +# options for the ath driver +ATH_TXBUF opt_ath.h +ATH_RXBUF opt_ath.h # dcons options DCONS_BUF_SIZE opt_dcons.h ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#120 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_device_polling.h" #endif #include "opt_inet.h" +#include "opt_ath.h" #include #include @@ -212,6 +213,15 @@ SYSCTL_INT(_hw_ath, OID_AUTO, regdomain, CTLFLAG_RD, &ath_regdomain, 0, "regulatory domain"); +static int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */ +SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RD, &ath_rxbuf, + 0, "rx buffers allocated"); +TUNABLE_INT("hw.ath.rxbuf", &ath_rxbuf); +static int ath_txbuf = ATH_TXBUF; /* # tx buffers to allocate */ +SYSCTL_INT(_hw_ath, OID_AUTO, txbuf, CTLFLAG_RD, &ath_txbuf, + 0, "tx buffers allocated"); +TUNABLE_INT("hw.ath.txbuf", &ath_txbuf); + #ifdef AR_DEBUG static int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, @@ -2941,12 +2951,12 @@ int error; error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf, - "rx", ATH_RXBUF, 1); + "rx", ath_rxbuf, 1); if (error != 0) return error; error = ath_descdma_setup(sc, &sc->sc_txdma, &sc->sc_txbuf, - "tx", ATH_TXBUF, ATH_TXDESC); + "tx", ath_txbuf, ATH_TXDESC); if (error != 0) { ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf); return error; ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#47 (text+ko) ==== @@ -49,8 +49,12 @@ #define ATH_TIMEOUT 1000 +#ifndef ATH_RXBUF #define ATH_RXBUF 40 /* number of RX buffers */ +#endif +#ifndef ATH_TXBUF #define ATH_TXBUF 200 /* number of TX buffers */ +#endif #define ATH_TXDESC 10 /* number of descriptors per buffer */ #define ATH_TXMAXTRY 11 /* max number of transmit attempts */ #define ATH_TXMGTTRY 4 /* xmit attempts for mgt/ctl frames */ From owner-p4-projects@FreeBSD.ORG Fri Dec 2 23:57:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4243D16A422; Fri, 2 Dec 2005 23:57:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 05F7216A41F for ; Fri, 2 Dec 2005 23:57:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C44A343D55 for ; Fri, 2 Dec 2005 23:57:42 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2Nvg4L091987 for ; Fri, 2 Dec 2005 23:57:42 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2NvgRr091984 for perforce@freebsd.org; Fri, 2 Dec 2005 23:57:42 GMT (envelope-from wsalamon@computer.org) Date: Fri, 2 Dec 2005 23:57:42 GMT Message-Id: <200512022357.jB2NvgRr091984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 23:57:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=87662 Change 87662 by wsalamon@gretsch on 2005/12/02 23:57:14 Add a test case for a failed FCHDIR record. Clean up some other things. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#4 (text+ko) ==== @@ -25,12 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include #include #include #include -#include -#include -#include +#include /* * Test the auditing of some of the dir-related system calls. @@ -61,6 +62,7 @@ /* The next calls should generate AUE_CHDIR audit records */ chdir(tempname); + /* This next call is necessasry so we can find the audit log file. */ chdir(".."); aut_assert(AUE_CHDIR); @@ -78,8 +80,11 @@ /* The next calls should generate AUE_FCHDIR audit records */ fchdir(temp_fd); - temp_fd = dirfd(opendir("..")); - fchdir(temp_fd); + chdir(".."); + aut_assert(AUE_FCHDIR); + + /* Generate a failure AUE_FCHDIR record */ + fchdir(999); aut_assert(AUE_FCHDIR); /* The next call should generate a AUE_RMDIR audit record */ From owner-p4-projects@FreeBSD.ORG Fri Dec 2 23:59:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5262A16A422; Fri, 2 Dec 2005 23:59:47 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 143AC16A41F for ; Fri, 2 Dec 2005 23:59:47 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7E4143D49 for ; Fri, 2 Dec 2005 23:59:45 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2NxjLH092102 for ; Fri, 2 Dec 2005 23:59:45 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2NxjcT092099 for perforce@freebsd.org; Fri, 2 Dec 2005 23:59:45 GMT (envelope-from wsalamon@computer.org) Date: Fri, 2 Dec 2005 23:59:45 GMT Message-Id: <200512022359.jB2NxjcT092099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2005 23:59:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=87663 Change 87663 by wsalamon@gretsch on 2005/12/02 23:58:50 Audit the fd only once when dealing with a fd-based operation. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#31 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#31 (text+ko) ==== @@ -207,17 +207,13 @@ } while (0) #define FD_VNODE1_TOKENS do { \ - if (ARG_IS_VALID(kar, ARG_FD)) { \ - tok = au_to_arg32(1, "fd", ar->ar_arg_fd); \ - kau_write(rec, tok); \ - } \ if (ARG_IS_VALID(kar, ARG_VNODE1)) { \ - tok = au_to_attr32(&ar->ar_arg_vnode1); \ - kau_write(rec, tok); \ if (ARG_IS_VALID(kar, ARG_FD)) { \ tok = au_to_arg32(1, "fd", ar->ar_arg_fd); \ kau_write(rec, tok); \ } \ + tok = au_to_attr32(&ar->ar_arg_vnode1); \ + kau_write(rec, tok); \ } else { \ if (ARG_IS_VALID(kar, ARG_FD)) { \ tok = au_to_arg32(1, "non-file: fd", ar->ar_arg_fd);\ From owner-p4-projects@FreeBSD.ORG Sat Dec 3 00:25:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5805516A422; Sat, 3 Dec 2005 00:25:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 148A916A41F for ; Sat, 3 Dec 2005 00:25:17 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0ED143D45 for ; Sat, 3 Dec 2005 00:25:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB30PGqo092790 for ; Sat, 3 Dec 2005 00:25:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB30PGRM092787 for perforce@freebsd.org; Sat, 3 Dec 2005 00:25:16 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 00:25:16 GMT Message-Id: <200512030025.jB30PGRM092787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 00:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=87664 Change 87664 by wsalamon@gretsch on 2005/12/03 00:25:04 Define the AUE_FSYNC event. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#25 (text+ko) ==== @@ -354,6 +354,7 @@ #define AUE_EACCESS 376 /* FreeBSD */ #define AUE_KQUEUE 377 /* FreeBSD */ #define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_FSYNC 379 /* * XXXRW: Values not yet assigned. @@ -361,7 +362,6 @@ #define AUE_DUP AUE_NULL #define AUE_FSCTL AUE_NULL #define AUE_FSTATV AUE_NULL -#define AUE_FSYNC AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL #define AUE_GETEGID AUE_NULL From owner-p4-projects@FreeBSD.ORG Sat Dec 3 00:36:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 432AC16A422; Sat, 3 Dec 2005 00:36:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DCA2316A41F for ; Sat, 3 Dec 2005 00:36:31 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0FEB43D5F for ; Sat, 3 Dec 2005 00:36:30 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB30aUWS093073 for ; Sat, 3 Dec 2005 00:36:30 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB30aUq5093070 for perforce@freebsd.org; Sat, 3 Dec 2005 00:36:30 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 00:36:30 GMT Message-Id: <200512030036.jB30aUq5093070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 00:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=87665 Change 87665 by wsalamon@gretsch on 2005/12/03 00:36:18 Integrate FSYNC event change from openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#11 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#11 (text+ko) ==== @@ -354,6 +354,7 @@ #define AUE_EACCESS 376 /* FreeBSD */ #define AUE_KQUEUE 377 /* FreeBSD */ #define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_FSYNC 379 /* * XXXRW: Values not yet assigned. @@ -361,7 +362,6 @@ #define AUE_DUP AUE_NULL #define AUE_FSCTL AUE_NULL #define AUE_FSTATV AUE_NULL -#define AUE_FSYNC AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL #define AUE_GETEGID AUE_NULL From owner-p4-projects@FreeBSD.ORG Sat Dec 3 00:38:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F9E816A423; Sat, 3 Dec 2005 00:38:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 046B016A41F for ; Sat, 3 Dec 2005 00:38:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFB6C43D5E for ; Sat, 3 Dec 2005 00:38:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB30cXae093136 for ; Sat, 3 Dec 2005 00:38:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB30cXP8093133 for perforce@freebsd.org; Sat, 3 Dec 2005 00:38:33 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 00:38:33 GMT Message-Id: <200512030038.jB30cXP8093133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 00:38:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=87666 Change 87666 by wsalamon@gretsch on 2005/12/03 00:38:32 Integrate FSYNC change from src/contrib/openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#12 (text+ko) ==== @@ -354,6 +354,7 @@ #define AUE_EACCESS 376 /* FreeBSD */ #define AUE_KQUEUE 377 /* FreeBSD */ #define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_FSYNC 379 /* * XXXRW: Values not yet assigned. @@ -361,7 +362,6 @@ #define AUE_DUP AUE_NULL #define AUE_FSCTL AUE_NULL #define AUE_FSTATV AUE_NULL -#define AUE_FSYNC AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL #define AUE_GETEGID AUE_NULL From owner-p4-projects@FreeBSD.ORG Sat Dec 3 00:48:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C8316A422; Sat, 3 Dec 2005 00:48:47 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 05F7A16A41F for ; Sat, 3 Dec 2005 00:48:47 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9E4743D5A for ; Sat, 3 Dec 2005 00:48:46 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB30mkmW000844 for ; Sat, 3 Dec 2005 00:48:46 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB30mkU1000841 for perforce@freebsd.org; Sat, 3 Dec 2005 00:48:46 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 00:48:46 GMT Message-Id: <200512030048.jB30mkU1000841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 00:48:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=87667 Change 87667 by wsalamon@gretsch on 2005/12/03 00:48:17 Assign the AUE_FSYNC event to the fm class. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#7 (text+ko) ==== @@ -305,6 +305,7 @@ 376:AUE_EACCESS:eaccess(2):fa 377:AUE_KQUEUE:kqueue(2):no 378:AUE_KEVENT:kevent(2):no +379:AUE_FSYNC:fsync(2):fm 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Sat Dec 3 00:51:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 981F616A422; Sat, 3 Dec 2005 00:51:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5817C16A420 for ; Sat, 3 Dec 2005 00:51:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF12C43D68 for ; Sat, 3 Dec 2005 00:51:51 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB30po3N000969 for ; Sat, 3 Dec 2005 00:51:50 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB30poNa000966 for perforce@freebsd.org; Sat, 3 Dec 2005 00:51:50 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 00:51:50 GMT Message-Id: <200512030051.jB30poNa000966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 00:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=87668 Change 87668 by wsalamon@gretsch on 2005/12/03 00:50:55 Integrate the AUE_FSYNC event from openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#6 (text+ko) ==== @@ -305,6 +305,7 @@ 376:AUE_EACCESS:eaccess(2):fa 377:AUE_KQUEUE:kqueue(2):no 378:AUE_KEVENT:kevent(2):no +379:AUE_FSYNC:fsync(2):fm 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Sat Dec 3 01:06:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C36C216A422; Sat, 3 Dec 2005 01:06:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 72CFE16A41F for ; Sat, 3 Dec 2005 01:06:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B47A43D49 for ; Sat, 3 Dec 2005 01:06:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB31694D001514 for ; Sat, 3 Dec 2005 01:06:09 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB3168Fw001511 for perforce@freebsd.org; Sat, 3 Dec 2005 01:06:08 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 01:06:08 GMT Message-Id: <200512030106.jB3168Fw001511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 01:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=87671 Change 87671 by wsalamon@gretsch on 2005/12/03 01:05:13 Add a test case for fsync(2). Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#4 (text+ko) ==== @@ -145,6 +145,11 @@ AUT_PERROR("flock()"); aut_assert(AUE_FLOCK); + /* Generate a success AUE_FSYNC audit record */ + if ((fsync(temp_fd)) < 0) + AUT_PERROR("fsync()"); + aut_assert(AUE_FSYNC); + /* Generate a failure AUE_FCHFLAGS audit record */ fchflags(255, UF_NODUMP); From owner-p4-projects@FreeBSD.ORG Sat Dec 3 01:06:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A21D16A430; Sat, 3 Dec 2005 01:06:10 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C5FCE16A41F for ; Sat, 3 Dec 2005 01:06:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BBA443D49 for ; Sat, 3 Dec 2005 01:06:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB3169do001520 for ; Sat, 3 Dec 2005 01:06:09 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB3169C2001517 for perforce@freebsd.org; Sat, 3 Dec 2005 01:06:09 GMT (envelope-from wsalamon@computer.org) Date: Sat, 3 Dec 2005 01:06:09 GMT Message-Id: <200512030106.jB3169C2001517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 87672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 01:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=87672 Change 87672 by wsalamon@gretsch on 2005/12/03 01:05:55 Complete the auditing for fchdir(), fchown(), mknod(), and fsync() system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#19 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#32 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#19 (text+ko) ==== @@ -688,6 +688,7 @@ int vfslocked; int error; + AUDIT_ARG(fd, uap->fd); if ((error = getvnode(fdp, uap->fd, &fp)) != 0) return (error); vp = fp->f_vnode; @@ -1186,6 +1187,7 @@ int vfslocked; AUDIT_ARG(mode, mode); + AUDIT_ARG(dev, dev); switch (mode & S_IFMT) { case S_IFCHR: @@ -2756,6 +2758,7 @@ int vfslocked; int error; + AUDIT_ARG(fd, uap->fd); AUDIT_ARG(owner, uap->uid, uap->gid); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); @@ -3185,10 +3188,12 @@ int vfslocked; int error; + AUDIT_ARG(fd, uap->fd);; if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = fp->f_vnode; vfslocked = VFS_LOCK_GIANT(vp->v_mount); + AUDIT_ARG(vnode, vp, ARG_VNODE1); if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#32 (text+ko) ==== @@ -614,6 +614,7 @@ case AUE_FPATHCONF: case AUE_FSTAT: /* XXX Need to handle sockets and shm */ case AUE_FSTATFS: + case AUE_FSYNC: case AUE_FTRUNCATE: case AUE_FUTIMES: case AUE_GETDIRENTRIES: From owner-p4-projects@FreeBSD.ORG Sat Dec 3 04:33:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C29C16A423; Sat, 3 Dec 2005 04:33:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D25E316A420 for ; Sat, 3 Dec 2005 04:33:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97B0243D5A for ; Sat, 3 Dec 2005 04:33:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB34XLLW008274 for ; Sat, 3 Dec 2005 04:33:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB34XLKC008271 for perforce@freebsd.org; Sat, 3 Dec 2005 04:33:21 GMT (envelope-from sam@freebsd.org) Date: Sat, 3 Dec 2005 04:33:21 GMT Message-Id: <200512030433.jB34XLKC008271@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 Cc: Subject: PERFORCE change 87680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 04:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=87680 Change 87680 by sam@sam_ebb on 2005/12/03 04:32:58 add tsf to radiotap on the tx side Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#121 edit .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#13 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#121 (text+ko) ==== @@ -4169,6 +4169,9 @@ if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m0); if (sc->sc_drvbpf) { + u_int64_t tsf = ath_hal_gettsf64(ah); + + sc->sc_tx_th.wt_tsf = htole64(tsf); sc->sc_tx_th.wt_flags = sc->sc_hwmap[txrate].txflags; if (iswep) sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP; ==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#13 (text+ko) ==== @@ -148,7 +148,7 @@ struct ath_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; u_int64_t wr_tsf; - u_int8_t wr_flags; /* XXX for padding */ + u_int8_t wr_flags; u_int8_t wr_rate; u_int16_t wr_chan_freq; u_int16_t wr_chan_flags; @@ -158,6 +158,7 @@ }; #define ATH_TX_RADIOTAP_PRESENT ( \ + (1 << IEEE80211_RADIOTAP_TSFT) | \ (1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ @@ -167,7 +168,8 @@ struct ath_tx_radiotap_header { struct ieee80211_radiotap_header wt_ihdr; - u_int8_t wt_flags; /* XXX for padding */ + u_int64_t wt_tsf; + u_int8_t wt_flags; u_int8_t wt_rate; u_int16_t wt_chan_freq; u_int16_t wt_chan_flags; From owner-p4-projects@FreeBSD.ORG Sat Dec 3 05:17:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2225A16A422; Sat, 3 Dec 2005 05:17:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F050B16A41F for ; Sat, 3 Dec 2005 05:17:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D6C943D4C for ; Sat, 3 Dec 2005 05:17:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB35HGPP016675 for ; Sat, 3 Dec 2005 05:17:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB35HGGN016672 for perforce@freebsd.org; Sat, 3 Dec 2005 05:17:16 GMT (envelope-from sam@freebsd.org) Date: Sat, 3 Dec 2005 05:17:16 GMT Message-Id: <200512030517.jB35HGGN016672@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 Cc: Subject: PERFORCE change 87683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 05:17:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=87683 Change 87683 by sam@sam_ebb on 2005/12/03 05:16:49 allow bssid to be set in any mode; especially useful for ibss and ahdemo modes Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#56 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#56 (text+ko) ==== @@ -1831,9 +1831,6 @@ error = (ic->ic_flags & IEEE80211_F_WPA) ? ENETRESET : 0; break; case IEEE80211_IOC_BSSID: - /* NB: should only be set when in STA mode */ - if (ic->ic_opmode != IEEE80211_M_STA) - return EINVAL; if (ireq->i_len != sizeof(tmpbssid)) return EINVAL; error = copyin(ireq->i_data, tmpbssid, ireq->i_len); From owner-p4-projects@FreeBSD.ORG Sat Dec 3 05:19:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1A9516A423; Sat, 3 Dec 2005 05:19:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BCA3116A420 for ; Sat, 3 Dec 2005 05:19:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78D8043D49 for ; Sat, 3 Dec 2005 05:19:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB35JJhm016730 for ; Sat, 3 Dec 2005 05:19:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB35JJB1016727 for perforce@freebsd.org; Sat, 3 Dec 2005 05:19:19 GMT (envelope-from sam@freebsd.org) Date: Sat, 3 Dec 2005 05:19:19 GMT Message-Id: <200512030519.jB35JJB1016727@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 Cc: Subject: PERFORCE change 87684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 05:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=87684 Change 87684 by sam@sam_ebb on 2005/12/03 05:18:19 ahdemo mode fixups: o set bssid on create, default to all zero's o setup discovered neighbors to have wme+ff's as locally configured; in particular enabling wme use lets us create ack-free networks trivially Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#71 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#71 (text+ko) ==== @@ -279,6 +279,11 @@ IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_des_bssid); else ni->ni_bssid[0] |= 0x02; /* local bit for IBSS */ + } else if (ic->ic_opmode == IEEE80211_M_AHDEMO) { + if (ic->ic_flags & IEEE80211_F_DESBSSID) + IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_des_bssid); + else + memset(ni->ni_bssid, 0, IEEE80211_ADDR_LEN); } /* * Fix the channel and related attributes. @@ -898,6 +903,19 @@ ni->ni_rates = ic->ic_bss->ni_rates; if (ic->ic_newassoc != NULL) ic->ic_newassoc(ni, 1); + if (ic->ic_opmode == IEEE80211_M_AHDEMO) { + /* + * In adhoc demo mode there are no management + * frames to use to discover neighbor capabilities, + * so blindly propagate the local configuration + * so we can do interesting things (e.g. use + * WME to disable ACK's). + */ + if (ic->ic_flags & IEEE80211_F_WME) + ni->ni_flags |= IEEE80211_NODE_QOS; + if (ic->ic_flags & IEEE80211_F_FF) + ni->ni_flags |= IEEE80211_NODE_FF; + } /* XXX not right for 802.1x/WPA */ ieee80211_node_authorize(ni); } From owner-p4-projects@FreeBSD.ORG Sat Dec 3 05:19:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB83A16A433; Sat, 3 Dec 2005 05:19:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3AA6A16A44A for ; Sat, 3 Dec 2005 05:19:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AEDF43D62 for ; Sat, 3 Dec 2005 05:19:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB35JJ7O016736 for ; Sat, 3 Dec 2005 05:19:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB35JJT1016733 for perforce@freebsd.org; Sat, 3 Dec 2005 05:19:19 GMT (envelope-from sam@freebsd.org) Date: Sat, 3 Dec 2005 05:19:19 GMT Message-Id: <200512030519.jB35JJT1016733@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 Cc: Subject: PERFORCE change 87685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 05:19:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=87685 Change 87685 by sam@sam_ebb on 2005/12/03 05:18:46 add support for ahdemo mode Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#122 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#48 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#122 (text+ko) ==== @@ -517,6 +517,7 @@ IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ + | IEEE80211_C_AHDEMO /* adhoc demo mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ @@ -964,7 +965,7 @@ */ sc->sc_curchan.channel = ic->ic_curchan->ic_freq; sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan); - if (!ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, AH_FALSE, &status)) { + if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); goto done; @@ -1132,7 +1133,7 @@ ath_draintxq(sc); /* stop xmit side */ ath_stoprecv(sc); /* stop recv side */ /* NB: indicate channel change so we do a full reset */ - if (!ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, AH_TRUE, &status)) + if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_TRUE, &status)) if_printf(ifp, "%s: unable to reset hardware; hal status %u\n", __func__, status); ath_update_txpow(sc); /* update tx power state */ @@ -1770,8 +1771,20 @@ error = ieee80211_media_change(ifp); if (error == ENETRESET) { + struct ath_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + + if (ic->ic_opmode == IEEE80211_M_AHDEMO) { + /* + * Adhoc demo mode is just ibss mode w/o beacons + * (mostly). The hal knows nothing about it; + * tell it we're operating in ibss mode. + */ + sc->sc_opmode = HAL_M_IBSS; + } else + sc->sc_opmode = ic->ic_opmode; if (IS_UP(ifp)) - ath_init(ifp->if_softc); /* XXX lose error */ + ath_init(sc); /* XXX lose error */ error = 0; } return error; @@ -4734,7 +4747,7 @@ ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* clear pending tx frames */ ath_stoprecv(sc); /* turn off frame recv */ - if (!ath_hal_reset(ah, ic->ic_opmode, &hchan, AH_TRUE, &status)) { + if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) { if_printf(ic->ic_ifp, "%s: unable to reset " "channel %u (%u Mhz, flags 0x%x hal flags 0x%x)\n", __func__, ieee80211_chan2ieee(ic, chan), @@ -4922,9 +4935,7 @@ ni = ic->ic_bss; rfilt = ath_calcrxfilter(sc); - stamode = (ic->ic_opmode == IEEE80211_M_STA || - ic->ic_opmode == IEEE80211_M_IBSS || - ic->ic_opmode == IEEE80211_M_AHDEMO); + stamode = (sc->sc_opmode == HAL_M_STA || sc->sc_opmode == HAL_M_IBSS); if (stamode && nstate == IEEE80211_S_RUN) { sc->sc_curaid = ni->ni_associd; IEEE80211_ADDR_COPY(sc->sc_curbssid, ni->ni_bssid); @@ -4952,9 +4963,7 @@ */ ath_rate_newstate(sc, nstate); - if (ic->ic_opmode == IEEE80211_M_MONITOR) { - /* nothing to do */; - } else if (nstate == IEEE80211_S_RUN) { + if (nstate == IEEE80211_S_RUN) { DPRINTF(sc, ATH_DEBUG_STATE, "%s(RUN): ic_flags=0x%08x iv=%d bssid=%s " "capinfo=0x%04x chan=%d\n" @@ -4982,6 +4991,7 @@ error = ath_beacon_alloc(sc, ni); if (error != 0) goto bad; + ath_beacon_config(sc); break; case IEEE80211_M_STA: /* @@ -4991,16 +5001,11 @@ sc->sc_hasclrkey && ni->ni_ucastkey.wk_keyix == IEEE80211_KEYIX_NONE) ath_setup_stationkey(ni); + ath_beacon_config(sc); break; default: break; } - - /* - * Configure the beacon and sleep timers. - */ - ath_beacon_config(sc); - /* * Reset rssi stats; maybe not the best place... */ ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#48 (text+ko) ==== @@ -224,6 +224,7 @@ const HAL_RATE_TABLE *sc_quarter_rates;/* quarter rate table */ const HAL_RATE_TABLE *sc_currates; /* current rate table */ enum ieee80211_phymode sc_curmode; /* current phy mode */ + HAL_OPMODE sc_opmode; /* current operating mode */ u_int16_t sc_curtxpow; /* current tx power limit */ u_int16_t sc_curaid; /* current association id */ HAL_CHANNEL sc_curchan; /* current h/w channel */ From owner-p4-projects@FreeBSD.ORG Sat Dec 3 23:31:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E72516A427; Sat, 3 Dec 2005 23:31:16 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 95FBC16A420 for ; Sat, 3 Dec 2005 23:31:15 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 009BD43D5C for ; Sat, 3 Dec 2005 23:31:15 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB3NVENI076505 for ; Sat, 3 Dec 2005 23:31:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB3NVE4k076502 for perforce@freebsd.org; Sat, 3 Dec 2005 23:31:14 GMT (envelope-from sam@freebsd.org) Date: Sat, 3 Dec 2005 23:31:14 GMT Message-Id: <200512032331.jB3NVE4k076502@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 Cc: Subject: PERFORCE change 87699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 23:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=87699 Change 87699 by sam@sam_ebb on 2005/12/03 23:30:32 don't panic if a fixed rate isn't found in the rate set; this can happen for various reasons and we'll be called again later once things settle (if necessary) Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#16 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#16 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#8 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#16 (text+ko) ==== @@ -299,7 +299,6 @@ /* NB: the rate set is assumed sorted */ for (; srate >= 0 && RATE(srate) > 72; srate--) ; - KASSERT(srate >= 0, ("bogus rate set")); } } else { /* @@ -313,10 +312,14 @@ srate = ni->ni_rates.rs_nrates - 1; for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; - KASSERT(srate >= 0, - ("fixed rate %d not in rate set", ic->ic_fixed_rate)); } - ath_rate_update(sc, ni, srate); + /* + * The selected rate may not be available due to races + * and mode settings. Also orphaned nodes created in + * adhoc mode may not have any rate set so this lookup + * can fail. This is not fatal. + */ + ath_rate_update(sc, ni, srate < 0 ? 0 : srate); #undef RATE } ==== //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#16 (text+ko) ==== @@ -283,7 +283,6 @@ /* NB: the rate set is assumed sorted */ for (; srate >= 0 && RATE(srate) > 72; srate--) ; - KASSERT(srate >= 0, ("bogus rate set")); } } else { /* @@ -297,10 +296,14 @@ srate = ni->ni_rates.rs_nrates - 1; for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; - KASSERT(srate >= 0, - ("fixed rate %d not in rate set", ic->ic_fixed_rate)); } - ath_rate_update(sc, ni, srate); + /* + * The selected rate may not be available due to races + * and mode settings. Also orphaned nodes created in + * adhoc mode may not have any rate set so this lookup + * can fail. This is not fatal. + */ + ath_rate_update(sc, ni, srate < 0 ? 0 : srate); #undef RATE } ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#8 (text+ko) ==== @@ -690,16 +690,20 @@ * A fixed rate is to be used; ic_fixed_rate is the * IEEE code for this rate (sans basic bit). Convert this * to the index into the negotiated rate set for - * the node. We know the rate is there because the - * rate set is checked when the station associates. + * the node. */ /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; - KASSERT(srate >= 0, - ("fixed rate %d not in rate set", ic->ic_fixed_rate)); - sn->static_rate_ndx = srate; + /* + * The fixed rate may not be available due to races + * and mode settings. Also orphaned nodes created in + * adhoc mode may not have any rate set so this lookup + * can fail. + */ + if (srate >= 0) + sn->static_rate_ndx = srate; } DPRINTF(sc, "%s: %s size 1600 rate/tt", __func__, ether_sprintf(ni->ni_macaddr));