From owner-p4-projects@FreeBSD.ORG Sun Dec 5 07:00:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0949C16A555; Sun, 5 Dec 2004 07:00:12 +0000 (GMT) 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 CFEFC16A553 for ; Sun, 5 Dec 2004 07:00:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACA1A43D48 for ; Sun, 5 Dec 2004 07:00:11 +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 iB570Bpu062515 for ; Sun, 5 Dec 2004 07:00:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB570Bgg062512 for perforce@freebsd.org; Sun, 5 Dec 2004 07:00:11 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Dec 2004 07:00:11 GMT Message-Id: <200412050700.iB570Bgg062512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 07:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=66438 Change 66438 by sam@sam_ebb on 2004/12/05 07:00:01 correct max segment size (should have no effect) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#4 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#4 (text+ko) ==== @@ -169,7 +169,7 @@ NULL, NULL, /* filter, filterarg */ 0x3ffff, /* maxsize XXX */ ATH_MAX_SCATTER, /* nsegments */ - 0xffff, /* maxsegsize XXX */ + BUS_SPACE_MAXADDR, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ From owner-p4-projects@FreeBSD.ORG Sun Dec 5 07:06:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A69E616A4D0; Sun, 5 Dec 2004 07:06:20 +0000 (GMT) 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 60AA716A4CE for ; Sun, 5 Dec 2004 07:06:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 306DE43D4C for ; Sun, 5 Dec 2004 07:06: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 iB576KXE062721 for ; Sun, 5 Dec 2004 07:06:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB576JHM062718 for perforce@freebsd.org; Sun, 5 Dec 2004 07:06:19 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Dec 2004 07:06:19 GMT Message-Id: <200412050706.iB576JHM062718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 07:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=66439 Change 66439 by sam@sam_ebb on 2004/12/05 07:05:37 Revamp descriptor allocation to improve success on systems with fragment memory and for forthcoming multi-*ssid support. o encapsulate descriptor+buffer state in new ath_dmadesc struct o manage tx+rx+beacon dma state independently o remove some assumptions about there being only one beacon frame o improve error handling on failures during tx/rx setup Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#38 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#15 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#38 (text+ko) ==== @@ -122,6 +122,8 @@ static void ath_bstuck_proc(void *, int); static void ath_beacon_free(struct ath_softc *); static void ath_beacon_config(struct ath_softc *); +static void ath_descdma_cleanup(struct ath_softc *sc, + struct ath_descdma *, ath_bufhead *); static int ath_desc_alloc(struct ath_softc *); static void ath_desc_free(struct ath_softc *); static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *); @@ -236,6 +238,8 @@ #define KEYPRINTF(sc, k, ix, mac) #endif +MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers"); + int ath_attach(u_int16_t devid, struct ath_softc *sc) { @@ -1679,12 +1683,17 @@ static int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_node *ni) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ni->ni_ic; struct ath_buf *bf; struct mbuf *m; int error; - bf = sc->sc_bcbuf; + bf = STAILQ_FIRST(&sc->sc_bbuf); + if (bf == NULL) { + DPRINTF(sc, ATH_DEBUG_BEACON, "%s: no dma buffers\n", __func__); + sc->sc_stats.ast_be_nombuf++; /* XXX */ + return ENOMEM; /* XXX */ + } if (bf->bf_m != NULL) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); @@ -1724,8 +1733,8 @@ #define USE_SHPREAMBLE(_ic) \ (((_ic)->ic_flags & (IEEE80211_F_SHPREAMBLE | IEEE80211_F_USEBARKER))\ == IEEE80211_F_SHPREAMBLE) - struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni = bf->bf_node; + struct ieee80211com *ic = ni->ni_ic; struct mbuf *m = bf->bf_m; struct ath_hal *ah = sc->sc_ah; struct ath_node *an = ATH_NODE(ni); @@ -1798,8 +1807,9 @@ ath_beacon_proc(void *arg, int pending) { struct ath_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - struct ath_buf *bf = sc->sc_bcbuf; + struct ath_buf *bf = STAILQ_FIRST(&sc->sc_bbuf); + struct ieee80211_node *ni = bf->bf_node; + struct ieee80211com *ic = ni->ni_ic; struct ath_hal *ah = sc->sc_ah; struct mbuf *m; int ncabq, error, otherant; @@ -1935,14 +1945,15 @@ static void ath_beacon_free(struct ath_softc *sc) { - struct ath_buf *bf = sc->sc_bcbuf; + struct ath_buf *bf; - if (bf->bf_m != NULL) { - bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); - m_freem(bf->bf_m); - bf->bf_m = NULL; - bf->bf_node = NULL; - } + STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) + if (bf->bf_m != NULL) { + bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); + m_freem(bf->bf_m); + bf->bf_m = NULL; + bf->bf_node = NULL; + } } /* @@ -2088,121 +2099,162 @@ } static int -ath_desc_alloc(struct ath_softc *sc) +ath_descdma_setup(struct ath_softc *sc, + struct ath_descdma *dd, ath_bufhead *head, + const char *name, int nbuf, int ndesc) { -#define DS2PHYS(_sc, _ds) \ - ((_sc)->sc_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_sc)->sc_desc)) - int i, bsize, error; +#define DS2PHYS(_dd, _ds) \ + ((_dd)->dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)->dd_desc)) + struct ifnet *ifp = &sc->sc_if; struct ath_desc *ds; struct ath_buf *bf; + int i, bsize, error; + DPRINTF(sc, ATH_DEBUG_RESET, "%s: %s DMA: %u buffers %u desc/buf\n", + __func__, name, nbuf, ndesc); + + dd->dd_name = name; + /* allocate descriptors */ - sc->sc_desc_len = sizeof(struct ath_desc) * - (ATH_TXBUF * ATH_TXDESC + ATH_RXBUF + 1); - error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &sc->sc_ddmamap); - if (error != 0) + dd->dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc; + error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &dd->dd_dmamap); + if (error != 0) { + if_printf(ifp, "unable to create dmamap for %s descriptors, " + "error %u\n", dd->dd_name, error); return error; + } - error = bus_dmamem_alloc(sc->sc_dmat, (void**) &sc->sc_desc, - BUS_DMA_NOWAIT, &sc->sc_ddmamap); - if (error != 0) + error = bus_dmamem_alloc(sc->sc_dmat, (void**) &dd->dd_desc, + BUS_DMA_NOWAIT, &dd->dd_dmamap); + if (error != 0) { + if_printf(ifp, "unable to alloc memory for %u %s descriptors, " + "error %u\n", nbuf * ndesc, dd->dd_name, error); goto fail0; + } - error = bus_dmamap_load(sc->sc_dmat, sc->sc_ddmamap, - sc->sc_desc, sc->sc_desc_len, - ath_load_cb, &sc->sc_desc_paddr, + error = bus_dmamap_load(sc->sc_dmat, dd->dd_dmamap, + dd->dd_desc, dd->dd_desc_len, + ath_load_cb, &dd->dd_desc_paddr, BUS_DMA_NOWAIT); - if (error != 0) + if (error != 0) { + if_printf(ifp, "unable to map %s descriptors, error %u\n", + dd->dd_name, error); goto fail1; + } - ds = sc->sc_desc; - DPRINTF(sc, ATH_DEBUG_ANY, "%s: DMA map: %p (%lu) -> %p (%lu)\n", - __func__, ds, (u_long) sc->sc_desc_len, (caddr_t) sc->sc_desc_paddr, - /*XXX*/ (u_long) sc->sc_desc_len); + ds = dd->dd_desc; + DPRINTF(sc, ATH_DEBUG_RESET, "%s: %s DMA map: %p (%lu) -> %p (%lu)\n", + __func__, dd->dd_name, ds, (u_long) dd->dd_desc_len, + (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len); - /* allocate buffers */ - bsize = sizeof(struct ath_buf) * (ATH_TXBUF + ATH_RXBUF + 1); - bf = malloc(bsize, M_DEVBUF, M_NOWAIT | M_ZERO); - if (bf == NULL) + /* allocate rx buffers */ + bsize = sizeof(struct ath_buf) * nbuf; + bf = malloc(bsize, M_ATHDEV, M_NOWAIT | M_ZERO); + if (bf == NULL) { + if_printf(ifp, "malloc of %s buffers failed, size %u\n", + dd->dd_name, bsize); goto fail2; - sc->sc_bufptr = bf; - - STAILQ_INIT(&sc->sc_rxbuf); - for (i = 0; i < ATH_RXBUF; i++, bf++, ds++) { - bf->bf_desc = ds; - bf->bf_daddr = DS2PHYS(sc, ds); - error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, - &bf->bf_dmamap); - if (error != 0) - break; - STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); } + dd->dd_bufptr = bf; - STAILQ_INIT(&sc->sc_txbuf); - for (i = 0; i < ATH_TXBUF; i++, bf++, ds += ATH_TXDESC) { + STAILQ_INIT(head); + for (i = 0; i < nbuf; i++, bf++, ds += ndesc) { bf->bf_desc = ds; - bf->bf_daddr = DS2PHYS(sc, ds); + bf->bf_daddr = DS2PHYS(dd, ds); error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, - &bf->bf_dmamap); - if (error != 0) - break; - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + &bf->bf_dmamap); + if (error != 0) { + if_printf(ifp, "unable to create dmamap for %s " + "buffer %u, error %u\n", dd->dd_name, i, error); + ath_descdma_cleanup(sc, dd, head); + return error; + } + STAILQ_INSERT_TAIL(head, bf, bf_list); } - - /* beacon buffer */ - bf->bf_desc = ds; - bf->bf_daddr = DS2PHYS(sc, ds); - error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &bf->bf_dmamap); - if (error != 0) - return error; - sc->sc_bcbuf = bf; return 0; - fail2: - bus_dmamap_unload(sc->sc_dmat, sc->sc_ddmamap); + bus_dmamap_unload(sc->sc_dmat, dd->dd_dmamap); fail1: - bus_dmamem_free(sc->sc_dmat, sc->sc_desc, sc->sc_ddmamap); + bus_dmamem_free(sc->sc_dmat, dd->dd_desc, dd->dd_dmamap); fail0: - bus_dmamap_destroy(sc->sc_dmat, sc->sc_ddmamap); - sc->sc_ddmamap = NULL; + bus_dmamap_destroy(sc->sc_dmat, dd->dd_dmamap); + memset(dd, 0, sizeof(*dd)); return error; #undef DS2PHYS } static void -ath_desc_free(struct ath_softc *sc) +ath_descdma_cleanup(struct ath_softc *sc, + struct ath_descdma *dd, ath_bufhead *head) { struct ath_buf *bf; + struct ieee80211_node *ni; - bus_dmamap_unload(sc->sc_dmat, sc->sc_ddmamap); - bus_dmamem_free(sc->sc_dmat, sc->sc_desc, sc->sc_ddmamap); - bus_dmamap_destroy(sc->sc_dmat, sc->sc_ddmamap); + bus_dmamap_unload(sc->sc_dmat, dd->dd_dmamap); + bus_dmamem_free(sc->sc_dmat, dd->dd_desc, dd->dd_dmamap); + bus_dmamap_destroy(sc->sc_dmat, dd->dd_dmamap); - /* - * NB: TX queues have already been freed in ath_draintxq(), - * which must be called before calling this function. - */ - - STAILQ_FOREACH(bf, &sc->sc_txbuf, bf_list) - bus_dmamap_destroy(sc->sc_dmat, bf->bf_dmamap); - STAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { + STAILQ_FOREACH(bf, head, bf_list) { if (bf->bf_m) { - bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); - bus_dmamap_destroy(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); bf->bf_m = NULL; } + if (bf->bf_dmamap != NULL) { + bus_dmamap_destroy(sc->sc_dmat, bf->bf_dmamap); + bf->bf_dmamap = NULL; + } + ni = bf->bf_node; + bf->bf_node = NULL; + if (ni != NULL) { + /* + * Reclaim node reference. + */ + ieee80211_free_node(ni); + } } - if (sc->sc_bcbuf != NULL) { - bus_dmamap_unload(sc->sc_dmat, sc->sc_bcbuf->bf_dmamap); - bus_dmamap_destroy(sc->sc_dmat, sc->sc_bcbuf->bf_dmamap); - sc->sc_bcbuf = NULL; + + STAILQ_INIT(head); + free(dd->dd_bufptr, M_ATHDEV); + memset(dd, 0, sizeof(*dd)); +} + +static int +ath_desc_alloc(struct ath_softc *sc) +{ + int error; + + error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf, + "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); + if (error != 0) { + ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf); + return error; + } + + error = ath_descdma_setup(sc, &sc->sc_bdma, &sc->sc_bbuf, + "beacon", 1, 1); + if (error != 0) { + ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf); + ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf); + return error; } + return 0; +} - STAILQ_INIT(&sc->sc_rxbuf); - STAILQ_INIT(&sc->sc_txbuf); - free(sc->sc_bufptr, M_DEVBUF); - sc->sc_bufptr = NULL; +static void +ath_desc_free(struct ath_softc *sc) +{ + + if (sc->sc_bdma.dd_desc_len != 0) + ath_descdma_cleanup(sc, &sc->sc_bdma, &sc->sc_bbuf); + if (sc->sc_txdma.dd_desc_len != 0) + ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf); + if (sc->sc_rxdma.dd_desc_len != 0) + ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf); } static struct ieee80211_node * @@ -2296,11 +2348,9 @@ struct ath_hal *ah = sc->sc_ah; int error; struct mbuf *m; -struct mbuf *morig; /*XXX*/ struct ath_desc *ds; m = bf->bf_m; -morig = m; /* XXX */ if (m == NULL) { /* * NB: by assigning a page to the rx dma buffer we @@ -2320,7 +2370,8 @@ bf->bf_m = m; m->m_pkthdr.len = m->m_len = m->m_ext.ext_size; - error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, + error = bus_dmamap_load_mbuf(sc->sc_dmat, + bf->bf_dmamap, m, ath_mbuf_load_cb, bf, BUS_DMA_NOWAIT); if (error != 0) { @@ -2333,7 +2384,6 @@ KASSERT(bf->bf_nseg == 1, ("%s: multi-segment packet; nseg %u", __func__, bf->bf_nseg)); } - KASSERT(m->m_next == NULL, ("m_next %p morig %p (2)", m->m_next, morig)); bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREREAD); /* @@ -2428,8 +2478,8 @@ ath_rx_proc(void *arg, int npending) { #define PA2DESC(_sc, _pa) \ - ((struct ath_desc *)((caddr_t)(_sc)->sc_desc + \ - ((_pa) - (_sc)->sc_desc_paddr))) + ((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \ + ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr))) struct ath_softc *sc = arg; struct ath_buf *bf; struct ieee80211com *ic = &sc->sc_ic; @@ -2482,10 +2532,6 @@ #endif if (status == HAL_EINPROGRESS) break; - if (m->m_next != NULL) { /* XXX */ - if_printf(ifp, "m_next %p, patching!\n", m->m_next); - m->m_next = NULL; - } STAILQ_REMOVE_HEAD(&sc->sc_rxbuf, bf_list); if (ds->ds_rxstat.rs_more) { /* @@ -2535,7 +2581,7 @@ len = ds->ds_rxstat.rs_datalen; if (len >= sizeof (struct ieee80211_frame)) { bus_dmamap_sync(sc->sc_dmat, - bf->bf_dmamap, + bf->bf_dmamap, BUS_DMASYNC_POSTREAD); ieee80211_notify_michael_failure(ic, mtod(m, struct ieee80211_frame *), @@ -2562,7 +2608,7 @@ * when the rx descriptor is setup again to receive * another frame. */ - bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, + bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); bf->bf_m = NULL; @@ -2956,7 +3002,6 @@ bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); bf->bf_m = m0; bf->bf_node = ni; /* NB: held reference */ -{ struct mbuf *n; bf->bf_nm = 0; for (n = bf->bf_m; n != NULL; n = n->m_next) bf->bf_mshadow[bf->bf_nm++] = n; }/*XXX*/ /* setup descriptors */ ds = bf->bf_desc; @@ -3548,8 +3593,8 @@ ath_stoprecv(struct ath_softc *sc) { #define PA2DESC(_sc, _pa) \ - ((struct ath_desc *)((caddr_t)(_sc)->sc_desc + \ - ((_pa) - (_sc)->sc_desc_paddr))) + ((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \ + ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr))) struct ath_hal *ah = sc->sc_ah; ath_hal_stoppcurecv(ah); /* disable PCU */ ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#15 (text+ko) ==== @@ -83,16 +83,28 @@ struct ath_buf { STAILQ_ENTRY(ath_buf) bf_list; int bf_nseg; - bus_dmamap_t bf_dmamap; /* DMA map of the buffer */ struct ath_desc *bf_desc; /* virtual addr of desc */ bus_addr_t bf_daddr; /* physical addr of desc */ + bus_dmamap_t bf_dmamap; /* DMA map for mbuf chain */ struct mbuf *bf_m; /* mbuf for buf */ struct ieee80211_node *bf_node; /* pointer to the node */ bus_size_t bf_mapsize; #define ATH_MAX_SCATTER 64 bus_dma_segment_t bf_segs[ATH_MAX_SCATTER]; -struct mbuf *bf_mshadow[ATH_MAX_SCATTER];/*XXX*/ -int bf_nm; +}; +typedef STAILQ_HEAD(, ath_buf) ath_bufhead; + +/* + * DMA state for tx/rx descriptors. + */ +struct ath_descdma { + const char* dd_name; + struct ath_desc *dd_desc; /* descriptors */ + bus_addr_t dd_desc_paddr; /* physical addr of dd_desc */ + bus_addr_t dd_desc_len; /* size of dd_desc */ + bus_dma_segment_t dd_dseg; + bus_dmamap_t dd_dmamap; /* DMA map for descriptors */ + struct ath_buf *dd_bufptr; /* associated buffers */ }; /* @@ -191,36 +203,32 @@ } u_rx_rt; int sc_rx_th_len; - struct ath_desc *sc_desc; /* TX/RX descriptors */ - bus_dma_segment_t sc_dseg; - bus_dmamap_t sc_ddmamap; /* DMA map for descriptors */ - bus_addr_t sc_desc_paddr; /* physical addr of sc_desc */ - bus_addr_t sc_desc_len; /* size of sc_desc */ - struct task sc_fataltask; /* fatal int processing */ - STAILQ_HEAD(, ath_buf) sc_rxbuf; /* receive buffer */ + struct ath_descdma sc_rxdma; /* RX descriptos */ + ath_bufhead sc_rxbuf; /* receive buffer */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ struct task sc_rxtask; /* rx int processing */ struct task sc_rxorntask; /* rxorn int processing */ u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/ + struct ath_descdma sc_txdma; /* TX descriptors */ + ath_bufhead sc_txbuf; /* transmit buffer */ + struct mtx sc_txbuflock; /* txbuf lock */ int sc_tx_timer; /* transmit timeout */ - STAILQ_HEAD(, ath_buf) sc_txbuf; /* transmit buffer */ - struct mtx sc_txbuflock; /* txbuf lock */ u_int sc_txqsetup; /* h/w queues setup */ u_int sc_txintrperiod;/* tx interrupt batching */ struct ath_txq sc_txq[HAL_NUM_TX_QUEUES]; struct ath_txq *sc_ac2q[5]; /* WME AC -> h/w q map */ struct task sc_txtask; /* tx int processing */ + struct ath_descdma sc_bdma; /* beacon descriptors */ + ath_bufhead sc_bbuf; /* beacon buffers */ u_int sc_bhalq; /* HAL q for outgoing beacons */ u_int sc_bmisscount; /* missed beacon transmits */ u_int32_t sc_ant_tx[8]; /* recent tx frames/antenna */ struct ath_txq *sc_cabq; /* tx q for cab frames */ - struct ath_buf *sc_bcbuf; /* beacon buffer */ - struct ath_buf *sc_bufptr; /* allocated buffer ptr */ struct ieee80211_beacon_offsets sc_boff;/* dynamic update state */ struct task sc_bmisstask; /* bmiss int processing */ struct task sc_bstucktask; /* stuck beacon processing */ From owner-p4-projects@FreeBSD.ORG Sun Dec 5 19:25:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49E4C16A4FA; Sun, 5 Dec 2004 19:25:31 +0000 (GMT) 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 F3B9A16A4E7 for ; Sun, 5 Dec 2004 19:25:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D22E43D46 for ; Sun, 5 Dec 2004 19:25: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 iB5JPU7v008521 for ; Sun, 5 Dec 2004 19:25:30 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5JPUL9008518 for perforce@freebsd.org; Sun, 5 Dec 2004 19:25:30 GMT (envelope-from wsalamon@computer.org) Date: Sun, 5 Dec 2004 19:25:30 GMT Message-Id: <200412051925.iB5JPUL9008518@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 Subject: PERFORCE change 66481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 19:25:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=66481 Change 66481 by wsalamon@rickenbacker on 2004/12/05 19:25:25 Fix makesyscalls to fill in the audit event for COMPAT and LIBCOMPAT system calls; corresponding change to the system call table. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/kern/makesyscalls.sh#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN }, /* 5 = open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_NULL }, /* 7 = wait4 */ - { compat(SYF_MPSAFE | AS(ocreat_args),creat) }, /* 8 = old creat */ + { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_O_CREAT }, /* 8 = old creat */ { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ @@ -47,8 +47,8 @@ { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(AS(freebsd4_getfsstat_args),getfsstat) }, /* 18 = old getfsstat */ - { compat(AS(olseek_args),lseek) }, /* 19 = old lseek */ + { compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT }, /* 18 = old getfsstat */ + { compat(AS(olseek_args),lseek), AUE_LSEEK }, /* 19 = old lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ @@ -67,21 +67,21 @@ { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ - { compat(AS(ostat_args),stat) }, /* 38 = old stat */ + { compat(AS(ostat_args),stat), AUE_STAT }, /* 38 = old stat */ { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ - { compat(AS(olstat_args),lstat) }, /* 40 = old lstat */ + { compat(AS(olstat_args),lstat), AUE_LSTAT }, /* 40 = old lstat */ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(SYF_MPSAFE | AS(osigaction_args),sigaction) }, /* 46 = old sigaction */ + { compat(SYF_MPSAFE | AS(osigaction_args),sigaction), AUE_SIGACTION }, /* 46 = old sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask) }, /* 48 = old sigprocmask */ + { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK }, /* 48 = old sigprocmask */ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(SYF_MPSAFE | 0,sigpending) }, /* 52 = old sigpending */ + { compat(SYF_MPSAFE | 0,sigpending), AUE_SIGPENDING }, /* 52 = old sigpending */ { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGPENDING }, /* 53 = sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ @@ -91,16 +91,16 @@ { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve, AUE_EXECVE }, /* 59 = execve */ { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { compat(SYF_MPSAFE | AS(ofstat_args),fstat) }, /* 62 = old fstat */ - { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo) }, /* 63 = old getkerninfo */ - { compat(SYF_MPSAFE | 0,getpagesize) }, /* 64 = old getpagesize */ + { compat(SYF_MPSAFE | AS(ofstat_args),fstat), AUE_FSTAT }, /* 62 = old fstat */ + { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo), AUE_NULL }, /* 63 = old getkerninfo */ + { compat(SYF_MPSAFE | 0,getpagesize), AUE_O_GETPAGESIZE }, /* 64 = old getpagesize */ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ - { compat(SYF_MPSAFE | AS(ommap_args),mmap) }, /* 71 = old mmap */ + { compat(SYF_MPSAFE | AS(ommap_args),mmap), AUE_MMAP }, /* 71 = old mmap */ { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ @@ -113,11 +113,11 @@ { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER }, /* 83 = setitimer */ - { compat(SYF_MPSAFE | 0,wait) }, /* 84 = old wait */ + { compat(SYF_MPSAFE | 0,wait), AUE_O_WAIT }, /* 84 = old wait */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 85 = swapon */ { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER }, /* 86 = getitimer */ - { compat(SYF_MPSAFE | AS(gethostname_args),gethostname) }, /* 87 = old gethostname */ - { compat(SYF_MPSAFE | AS(sethostname_args),sethostname) }, /* 88 = old sethostname */ + { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_O_GETHOSTNAME }, /* 87 = old gethostname */ + { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_O_SETHOSTNAME }, /* 88 = old sethostname */ { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ @@ -128,22 +128,22 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ - { compat(SYF_MPSAFE | AS(accept_args),accept) }, /* 99 = old accept */ + { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_ACCEPT }, /* 99 = old accept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { compat(SYF_MPSAFE | AS(osend_args),send) }, /* 101 = old send */ - { compat(SYF_MPSAFE | AS(orecv_args),recv) }, /* 102 = old recv */ - { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn) }, /* 103 = old sigreturn */ + { compat(SYF_MPSAFE | AS(osend_args),send), AUE_O_SEND }, /* 101 = old send */ + { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_O_RECV }, /* 102 = old recv */ + { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_SIGRETURN }, /* 103 = old sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { compat(SYF_MPSAFE | AS(osigvec_args),sigvec) }, /* 108 = old sigvec */ - { compat(SYF_MPSAFE | AS(osigblock_args),sigblock) }, /* 109 = old sigblock */ - { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask) }, /* 110 = old sigsetmask */ - { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend) }, /* 111 = old sigsuspend */ - { compat(SYF_MPSAFE | AS(osigstack_args),sigstack) }, /* 112 = old sigstack */ - { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg) }, /* 113 = old recvmsg */ - { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg) }, /* 114 = old sendmsg */ + { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_O_SIGVEC }, /* 108 = old sigvec */ + { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_O_SIGBLOCK }, /* 109 = old sigblock */ + { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_O_SIGSETMASK }, /* 110 = old sigsetmask */ + { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_SIGSUSPEND }, /* 111 = old sigsuspend */ + { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_O_SIGSTACK }, /* 112 = old sigstack */ + { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_O_RECVMSG }, /* 113 = old recvmsg */ + { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_O_SENDMSG }, /* 114 = old sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = gettimeofday */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 117 = getrusage */ @@ -154,12 +154,12 @@ { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 122 = settimeofday */ { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom) }, /* 125 = old recvfrom */ + { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom), AUE_RECVFROM }, /* 125 = old recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_O_SETREUID }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_O_SETREGID }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { compat(AS(otruncate_args),truncate) }, /* 129 = old truncate */ - { compat(AS(oftruncate_args),ftruncate) }, /* 130 = old ftruncate */ + { compat(AS(otruncate_args),truncate), AUE_O_TRUNCATE }, /* 129 = old truncate */ + { compat(AS(oftruncate_args),ftruncate), AUE_O_FTRUNCATE }, /* 130 = old ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ @@ -170,24 +170,24 @@ { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME }, /* 140 = adjtime */ - { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername) }, /* 141 = old getpeername */ - { compat(SYF_MPSAFE | 0,gethostid) }, /* 142 = old gethostid */ - { compat(SYF_MPSAFE | AS(osethostid_args),sethostid) }, /* 143 = old sethostid */ - { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit) }, /* 144 = old getrlimit */ - { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit) }, /* 145 = old setrlimit */ - { compat(SYF_MPSAFE | AS(okillpg_args),killpg) }, /* 146 = old killpg */ + { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_O_GETPEERNAME }, /* 141 = old getpeername */ + { compat(SYF_MPSAFE | 0,gethostid), AUE_O_GETHOSTID }, /* 142 = old gethostid */ + { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_O_SETHOSTID }, /* 143 = old sethostid */ + { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_O_GETRLIMIT }, /* 144 = old getrlimit */ + { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_O_SETRLIMIT }, /* 145 = old setrlimit */ + { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_O_KILLPG }, /* 146 = old killpg */ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ - { compat(SYF_MPSAFE | 0,quota) }, /* 149 = old quota */ - { compat(SYF_MPSAFE | AS(getsockname_args),getsockname) }, /* 150 = old getsockname */ + { compat(SYF_MPSAFE | 0,quota), AUE_O_QUOTA }, /* 149 = old quota */ + { compat(SYF_MPSAFE | AS(getsockname_args),getsockname), AUE_GETSOCKNAME }, /* 150 = old getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries) }, /* 156 = old getdirentries */ - { compat4(AS(freebsd4_statfs_args),statfs) }, /* 157 = old statfs */ - { compat4(AS(freebsd4_fstatfs_args),fstatfs) }, /* 158 = old fstatfs */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_O_GETDIRENTRIES }, /* 156 = old getdirentries */ + { compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */ + { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS }, /* 158 = old fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ { AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_NULL }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)getfh, AUE_GETFH }, /* 161 = getfh */ @@ -326,7 +326,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(AS(freebsd4_fhstatfs_args),fhstatfs) }, /* 297 = old fhstatfs */ + { compat4(AS(freebsd4_fhstatfs_args),fhstatfs), AUE_NULL }, /* 297 = old fhstatfs */ { AS(fhopen_args), (sy_call_t *)fhopen, AUE_NULL }, /* 298 = fhopen */ { AS(fhstat_args), (sy_call_t *)fhstat, AUE_NULL }, /* 299 = fhstat */ { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ @@ -365,15 +365,15 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile) }, /* 336 = old sendfile */ + { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile), AUE_NULL }, /* 336 = old sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_NULL }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK }, /* 340 = sigprocmask */ { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND }, /* 341 = sigsuspend */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction) }, /* 342 = old sigaction */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION }, /* 342 = old sigaction */ { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING }, /* 343 = sigpending */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn) }, /* 344 = old sigreturn */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN }, /* 344 = old sigreturn */ { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_NULL }, /* 345 = sigtimedwait */ { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL }, /* 346 = sigwaitinfo */ { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ ==== //depot/projects/trustedbsd/audit3/sys/kern/makesyscalls.sh#3 (text+ko) ==== @@ -401,10 +401,10 @@ argalias) > sysarg printf("%s\t%s%s(struct thread *, struct %s *);\n", rettype, prefix, funcname, argalias) > outdcl - printf("\t{ %s(%s%s,%s) },", - wrap, mpsafe, argssize, funcname) > sysent + printf("\t{ %s(%s%s,%s), %s },", + wrap, mpsafe, argssize, funcname, auditev) > sysent align_sysent_comment(8 + 9 + length(mpsafe) + \ - length(argssize) + 1 + length(funcname) + 4) + length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", funcalias, syscall, funcalias) > sysnames @@ -417,10 +417,10 @@ ncompat++ parseline() printf("%s\to%s();\n", rettype, funcname) > syscompatdcl - printf("\t{ compat(%s%s,%s) },", - mpsafe, argssize, funcname) > sysent + printf("\t{ compat(%s%s,%s), %s },", + mpsafe, argssize, funcname, auditev) > sysent align_sysent_comment(8 + 9 + length(mpsafe) + \ - length(argssize) + 1 + length(funcname) + 4) + length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", funcalias, syscall, funcalias) > sysnames From owner-p4-projects@FreeBSD.ORG Sun Dec 5 20:11:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A36C16A4D1; Sun, 5 Dec 2004 20:11:27 +0000 (GMT) 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 2C48116A4CF for ; Sun, 5 Dec 2004 20:11:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A5DE43D60 for ; Sun, 5 Dec 2004 20:11: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 iB5KBQ1n010028 for ; Sun, 5 Dec 2004 20:11:26 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5KBQak010025 for perforce@freebsd.org; Sun, 5 Dec 2004 20:11:26 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Dec 2004 20:11:26 GMT Message-Id: <200412052011.iB5KBQak010025@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 Subject: PERFORCE change 66483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 20:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66483 Change 66483 by peter@peter_melody on 2004/12/05 20:10:58 make this compile Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#39 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#39 (text+ko) ==== @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 5 20:12:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA10116A4D0; Sun, 5 Dec 2004 20:12:29 +0000 (GMT) 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 7DFC116A4CE for ; Sun, 5 Dec 2004 20:12:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF5CC43D31 for ; Sun, 5 Dec 2004 20:12: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 iB5KCSIo010048 for ; Sun, 5 Dec 2004 20:12:28 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5KCSZQ010045 for perforce@freebsd.org; Sun, 5 Dec 2004 20:12:28 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Dec 2004 20:12:28 GMT Message-Id: <200412052012.iB5KCSZQ010045@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 Subject: PERFORCE change 66484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 20:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=66484 Change 66484 by peter@peter_melody on 2004/12/05 20:11:48 start backing out the includedir mess. there is much more pain here than I wanted to go anywhere near. Affected files ... .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#9 edit .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#8 edit .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#6 edit .. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#4 edit .. //depot/projects/hammer/gnu/usr.bin/grep/Makefile#7 edit .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#9 edit .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#6 edit .. //depot/projects/hammer/lib/librpcsvc/Makefile#5 edit .. //depot/projects/hammer/usr.bin/kdump/Makefile#3 edit .. //depot/projects/hammer/usr.bin/truss/Makefile#7 edit .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#5 edit .. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/keyserv/Makefile#6 edit .. //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#7 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#9 (text+ko) ==== @@ -27,7 +27,7 @@ # gnu must be before lib to pick correct regex.h CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \ - -I${DESTDIR}${INCLUDEDIR}/gnu \ + -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib -I${CVSDIR}/diff -I. DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} ==== //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#8 (text+ko) ==== @@ -12,7 +12,7 @@ INTERNALLIB= # gnu must be before lib to pick correct regex.h -CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}${INCLUDEDIR}/gnu \ +CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H YFLAGS= ==== //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#6 (text+ko) ==== @@ -10,7 +10,7 @@ INTERNALLIB= # gnu must be before lib to pick correct regex.h -CFLAGS+= -I../lib -I${DESTDIR}${INCLUDEDIR}/gnu \ +CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib -DHAVE_CONFIG_H SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \ ==== //depot/projects/hammer/gnu/usr.bin/diff/Makefile#4 (text+ko) ==== @@ -10,7 +10,7 @@ CFLAGS+=-funsigned-char CFLAGS+=-I${.CURDIR}/../../../contrib/diff \ - -I${DESTDIR}${INCLUDEDIR}/gnu + -I${DESTDIR}/usr/include/gnu CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" ==== //depot/projects/hammer/gnu/usr.bin/grep/Makefile#7 (text+ko) ==== @@ -7,7 +7,7 @@ isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \ xstrtoumax.c -CFLAGS+=-I${.CURDIR} -I${DESTDIR}${INCLUDEDIR}/gnu -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep ==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#9 (text+ko) ==== @@ -30,7 +30,7 @@ CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h -RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc +RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCGEN= rpcgen -C crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h ==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#6 (text+ko) ==== @@ -7,7 +7,7 @@ SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c -RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/yp.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCGEN= rpcgen -C yp_xdr.c: ${RPCSRC} ==== //depot/projects/hammer/lib/librpcsvc/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 # $FreeBSD: src/lib/librpcsvc/Makefile,v 1.18 2004/11/13 20:40:29 bz Exp $ -.PATH: ${DESTDIR}${INCLUDEDIR}/rpcsvc +.PATH: ${DESTDIR}/usr/include/rpcsvc LIB= rpcsvc ==== //depot/projects/hammer/usr.bin/kdump/Makefile#3 (text+ko) ==== @@ -10,6 +10,6 @@ CLEANFILES= ioctl.c ioctl.c: mkioctls - sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} + sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} .include ==== //depot/projects/hammer/usr.bin/truss/Makefile#7 (text+ko) ==== @@ -29,6 +29,6 @@ ${.CURDIR}/i386.conf ioctl.c: ${.CURDIR}/../kdump/mkioctls - sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} + sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} .include ==== //depot/projects/hammer/usr.sbin/amd/Makefile.inc#5 (text+ko) ==== @@ -31,8 +31,8 @@ LIBAMU= ${LIBAMUDIR}/libamu.a RPCCOM= rpcgen -MOUNT_X= ${DESTDIR}${INCLUDEDIR}/rpcsvc/mount.x -NFS_PROT_X= ${DESTDIR}${INCLUDEDIR}/rpcsvc/nfs_prot.x +MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x +NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" ==== //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#4 (text+ko) ==== @@ -23,7 +23,7 @@ CLEANFILES+= nfs_prot_x.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \ - -I${DESTDIR}${INCLUDEDIR}/rpcsvc + -I${DESTDIR}/usr/include/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} ==== //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#5 (text+ko) ==== @@ -13,7 +13,7 @@ CLEANFILES= ${GENSRCS} -RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x bootparam_prot_svc.c: ${RPCSRC} rpcgen -C -m -o ${.TARGET} ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#4 (text+ko) ==== @@ -10,7 +10,7 @@ CLEANFILES= ${GENSRCS} -RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x bootparam_prot_clnt.c: ${RPCSRC} rpcgen -l -o ${.TARGET} ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/keyserv/Makefile#6 (text+ko) ==== @@ -9,7 +9,7 @@ DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} LDADD= -lmp -lcrypto -lrpcsvc -RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc +RPCDIR= ${DESTDIR}/usr/include/rpcsvc CLEANFILES= crypt_svc.c crypt.h ==== //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#5 (text+ko) ==== @@ -6,7 +6,7 @@ MLINKS= rpc.lockd.8 lockd.8 SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c -CFLAGS+= -I. -I${DESTDIR}${INCLUDEDIR}/rpcsvc +CFLAGS+= -I. -I${DESTDIR}$/usr/include/rpcsvc #WARNS?= 2 DPADD= ${LIBRPCSVC} ${LIBUTIL} @@ -14,7 +14,7 @@ CLEANFILES= nlm_prot_svc.c nlm_prot.h test -RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/nlm_prot.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x RPCGEN= rpcgen -L -C nlm_prot_svc.c: ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#5 (text+ko) ==== @@ -12,7 +12,7 @@ CLEANFILES= sm_inter_svc.c sm_inter.h -RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/sm_inter.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCGEN= rpcgen -L -C sm_inter_svc.c: ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $ -RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc +RPCDIR= ${DESTDIR}/usr/include/rpcsvc .PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} ==== //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#5 (text+ko) ==== @@ -16,7 +16,7 @@ CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h -RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc +RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that ==== //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#7 (text+ko) ==== @@ -45,7 +45,7 @@ .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -CFLAGS+= -I${DESTDIR}${INCLUDEDIR}/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H +CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION From owner-p4-projects@FreeBSD.ORG Sun Dec 5 20:19:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF03516A4F0; Sun, 5 Dec 2004 20:19:38 +0000 (GMT) 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 8F15516A4EE for ; Sun, 5 Dec 2004 20:19:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FC5343D2F for ; Sun, 5 Dec 2004 20:19:38 +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 iB5KJckM010288 for ; Sun, 5 Dec 2004 20:19:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5KJcp6010285 for perforce@freebsd.org; Sun, 5 Dec 2004 20:19:38 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Dec 2004 20:19:38 GMT Message-Id: <200412052019.iB5KJcp6010285@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 Subject: PERFORCE change 66486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 20:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=66486 Change 66486 by peter@peter_melody on 2004/12/05 20:19:30 revert more of this mistake, and fix a typo Affected files ... .. //depot/projects/hammer/Makefile.inc1#81 edit .. //depot/projects/hammer/lib/librpcsvc/Makefile#6 edit .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#6 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#81 (text+ko) ==== @@ -228,8 +228,7 @@ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 \ - INCLUDEDIR=/usr/include32 + SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ @@ -239,8 +238,7 @@ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 \ - INCLUDEDIR=/usr/include32 + SHLIBDIR=/usr/lib32 .endif # install stage @@ -436,14 +434,11 @@ install32: mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree - mkdir -p ${DESTDIR}/usr/include32 - cd ${.CURDIR}/include; ${LIB32MAKE} install cd ${.CURDIR}/lib; ${LIB32MAKE} install cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install .if !defined(NOCRYPT) cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install .endif - cd ${.CURDIR}/gnu/usr.bin/cc/include; ${LIB32MAKE} install cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install .endif ==== //depot/projects/hammer/lib/librpcsvc/Makefile#6 (text+ko) ==== @@ -18,7 +18,7 @@ RPCCOM = rpcgen -C -INCDIRS= -I${DESTDIR}${INCLUDEDIR}/rpcsvc +INCDIRS= -I${DESTDIR}/usr/include/rpcsvc CFLAGS+= -DYP ${INCDIRS} ==== //depot/projects/hammer/usr.sbin/amd/amd/Makefile#5 (text+ko) ==== @@ -23,7 +23,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \ - -I${DESTDIR}${INCLUDEDIR}/rpcsvc + -I${DESTDIR}/usr/include/rpcsvc DPADD= ${LIBAMU} LDADD= ${LIBAMU} ==== //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#6 (text+ko) ==== @@ -6,7 +6,7 @@ MLINKS= rpc.lockd.8 lockd.8 SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c -CFLAGS+= -I. -I${DESTDIR}$/usr/include/rpcsvc +CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc #WARNS?= 2 DPADD= ${LIBRPCSVC} ${LIBUTIL} From owner-p4-projects@FreeBSD.ORG Mon Dec 6 03:53:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B90216A500; Mon, 6 Dec 2004 03:53:57 +0000 (GMT) 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 E4CEF16A4D0 for ; Mon, 6 Dec 2004 03:53:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C77B443D31 for ; Mon, 6 Dec 2004 03:53:56 +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 iB63ruhm040987 for ; Mon, 6 Dec 2004 03:53:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB63ruCl040984 for perforce@freebsd.org; Mon, 6 Dec 2004 03:53:56 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 03:53:56 GMT Message-Id: <200412060353.iB63ruCl040984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 03:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=66512 Change 66512 by sam@sam_ebb on 2004/12/06 03:53:41 Fix memory allocation for dma descriptors: use a tag/descriptor block so we specify the proper size of memory to allocate instead of inheriting maxmem from the tag used for frame handling. This reduces memory use on i386 from ~900K to ~90K. Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#39 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#39 (text+ko) ==== @@ -2114,32 +2114,52 @@ __func__, name, nbuf, ndesc); dd->dd_name = name; + dd->dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc; + + /* + * Setup DMA descriptor area. + */ + error = bus_dma_tag_create(NULL, /* parent */ + PAGE_SIZE, 0, /* alignment, bounds */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + dd->dd_desc_len, /* maxsize */ + 1, /* nsegments */ + BUS_SPACE_MAXADDR, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &dd->dd_dmat); + if (error != 0) { + if_printf(ifp, "cannot allocate %s DMA tag\n", dd->dd_name); + return error; + } /* allocate descriptors */ - dd->dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc; - error = bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &dd->dd_dmamap); + error = bus_dmamap_create(dd->dd_dmat, BUS_DMA_NOWAIT, &dd->dd_dmamap); if (error != 0) { if_printf(ifp, "unable to create dmamap for %s descriptors, " "error %u\n", dd->dd_name, error); - return error; + goto fail0; } - error = bus_dmamem_alloc(sc->sc_dmat, (void**) &dd->dd_desc, + error = bus_dmamem_alloc(dd->dd_dmat, (void**) &dd->dd_desc, BUS_DMA_NOWAIT, &dd->dd_dmamap); if (error != 0) { if_printf(ifp, "unable to alloc memory for %u %s descriptors, " "error %u\n", nbuf * ndesc, dd->dd_name, error); - goto fail0; + goto fail1; } - error = bus_dmamap_load(sc->sc_dmat, dd->dd_dmamap, + error = bus_dmamap_load(dd->dd_dmat, dd->dd_dmamap, dd->dd_desc, dd->dd_desc_len, ath_load_cb, &dd->dd_desc_paddr, BUS_DMA_NOWAIT); if (error != 0) { if_printf(ifp, "unable to map %s descriptors, error %u\n", dd->dd_name, error); - goto fail1; + goto fail2; } ds = dd->dd_desc; @@ -2153,7 +2173,7 @@ if (bf == NULL) { if_printf(ifp, "malloc of %s buffers failed, size %u\n", dd->dd_name, bsize); - goto fail2; + goto fail3; } dd->dd_bufptr = bf; @@ -2172,12 +2192,14 @@ STAILQ_INSERT_TAIL(head, bf, bf_list); } return 0; +fail3: + bus_dmamap_unload(dd->dd_dmat, dd->dd_dmamap); fail2: - bus_dmamap_unload(sc->sc_dmat, dd->dd_dmamap); + bus_dmamem_free(dd->dd_dmat, dd->dd_desc, dd->dd_dmamap); fail1: - bus_dmamem_free(sc->sc_dmat, dd->dd_desc, dd->dd_dmamap); + bus_dmamap_destroy(dd->dd_dmat, dd->dd_dmamap); fail0: - bus_dmamap_destroy(sc->sc_dmat, dd->dd_dmamap); + bus_dma_tag_destroy(dd->dd_dmat); memset(dd, 0, sizeof(*dd)); return error; #undef DS2PHYS @@ -2190,9 +2212,10 @@ struct ath_buf *bf; struct ieee80211_node *ni; - bus_dmamap_unload(sc->sc_dmat, dd->dd_dmamap); - bus_dmamem_free(sc->sc_dmat, dd->dd_desc, dd->dd_dmamap); - bus_dmamap_destroy(sc->sc_dmat, dd->dd_dmamap); + bus_dmamap_unload(dd->dd_dmat, dd->dd_dmamap); + bus_dmamem_free(dd->dd_dmat, dd->dd_desc, dd->dd_dmamap); + bus_dmamap_destroy(dd->dd_dmat, dd->dd_dmamap); + bus_dma_tag_destroy(dd->dd_dmat); STAILQ_FOREACH(bf, head, bf_list) { if (bf->bf_m) { ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#16 (text+ko) ==== @@ -103,6 +103,7 @@ bus_addr_t dd_desc_paddr; /* physical addr of dd_desc */ bus_addr_t dd_desc_len; /* size of dd_desc */ bus_dma_segment_t dd_dseg; + bus_dma_tag_t dd_dmat; /* bus DMA tag */ bus_dmamap_t dd_dmamap; /* DMA map for descriptors */ struct ath_buf *dd_bufptr; /* associated buffers */ }; From owner-p4-projects@FreeBSD.ORG Mon Dec 6 06:18:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ADC816A4D1; Mon, 6 Dec 2004 06:18:53 +0000 (GMT) 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 3902816A4CE for ; Mon, 6 Dec 2004 06:18:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0952943D73 for ; Mon, 6 Dec 2004 06:18:53 +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 iB66Iqcn052564 for ; Mon, 6 Dec 2004 06:18:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66IqTg052561 for perforce@freebsd.org; Mon, 6 Dec 2004 06:18:52 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 06:18:52 GMT Message-Id: <200412060618.iB66IqTg052561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 06:18:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=66517 Change 66517 by sam@sam_ebb on 2004/12/06 06:17:59 o add os-specific wrapper for loading modules o acquire Giant around call to linker_load_module now that ioctl doesn't grab it for us; this generates LOR's big time (as does holding the softc lock over the blocking mallocs) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#15 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ */ #include #include -#include #include @@ -249,9 +248,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, "%s: unregistered cipher %u, load module %s\n", __func__, cipher, cipher_modnames[cipher]); - /* XXX check return */ - linker_load_module(cipher_modnames[cipher], NULL, - NULL, NULL, NULL); + ieee80211_load_module(cipher_modnames[cipher]); /* * If cipher module loaded it should immediately * call ieee80211_crypto_register which will fill ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#7 (text+ko) ==== @@ -34,8 +34,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -295,6 +297,18 @@ } } +void +ieee80211_load_module(const char *modname) +{ + struct thread *td = curthread; + + if (suser(td) == 0 && securelevel_gt(td->td_ucred, 0) == 0) { + mtx_lock(&Giant); + (void) linker_load_module(modname, NULL, NULL, NULL, NULL); + mtx_unlock(&Giant); + } +} + /* * Module glue. * ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#9 (text+ko) ==== @@ -179,6 +179,8 @@ void ieee80211_sysctl_attach(struct ieee80211com *); void ieee80211_sysctl_detach(struct ieee80211com *); +void ieee80211_load_module(const char *); + /* XXX this stuff belongs elsewhere */ /* * Message formats for messages from the net80211 layer to user ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#15 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include @@ -181,10 +180,8 @@ { if (auth >= IEEE80211_AUTH_MAX) return NULL; - if (authenticators[auth] == NULL) { - /* XXX check return */ - linker_load_module(auth_modnames[auth], NULL, NULL, NULL, NULL); - } + if (authenticators[auth] == NULL) + ieee80211_load_module(auth_modnames[auth]); return authenticators[auth]; } @@ -231,7 +228,7 @@ ieee80211_aclator_get(const char *name) { if (acl == NULL) - linker_load_module("wlan_acl", NULL, NULL, NULL, NULL); + ieee80211_load_module("wlan_acl"); return acl != NULL && strcmp(acl->iac_name, name) == 0 ? acl : NULL; } From owner-p4-projects@FreeBSD.ORG Mon Dec 6 06:18:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB50E16A4E5; Mon, 6 Dec 2004 06:18:53 +0000 (GMT) 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 695EB16A4CF for ; Mon, 6 Dec 2004 06:18:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 577F143D39 for ; Mon, 6 Dec 2004 06:18:53 +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 iB66IrK7052570 for ; Mon, 6 Dec 2004 06:18:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66IrER052567 for perforce@freebsd.org; Mon, 6 Dec 2004 06:18:53 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 06:18:53 GMT Message-Id: <200412060618.iB66IrER052567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 06:18:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=66518 Change 66518 by sam@sam_ebb on 2004/12/06 06:18:40 filling+hookup mac acl stuff Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#26 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#16 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#26 (text+ko) ==== @@ -1682,6 +1682,31 @@ } static int +ieee80211_ioctl_macmac(struct ieee80211com *ic, struct ieee80211req *ireq) +{ + u_int8_t mac[IEEE80211_ADDR_LEN]; + const struct ieee80211_aclator *acl = ic->ic_acl; + int error; + + if (ireq->i_len != sizeof(mac)) + return EINVAL; + error = copyin(ireq->i_data, mac, ireq->i_len); + if (error) + return error; + if (acl == NULL) { + acl = ieee80211_aclator_get("mac"); + if (acl == NULL || !acl->iac_attach(ic)) + return EINVAL; + ic->ic_acl = acl; + } + if (ireq->i_type == IEEE80211_IOC_ADDMAC) + acl->iac_add(ic, mac); + else + acl->iac_remove(ic, mac); + return 0; +} + +static int ieee80211_ioctl_maccmd(struct ieee80211com *ic, struct ieee80211req *ireq) { const struct ieee80211_aclator *acl = ic->ic_acl; @@ -2241,6 +2266,10 @@ if (error == 0) /* XXX background scan */ error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; + case IEEE80211_IOC_ADDMAC: + case IEEE80211_IOC_DELMAC: + error = ieee80211_ioctl_macmac(ic, ireq); + break; case IEEE80211_IOC_MACCMD: error = ieee80211_ioctl_maccmd(ic, ireq); break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#16 (text+ko) ==== @@ -421,6 +421,8 @@ #define IEEE80211_IOC_WME_ACKPOLICY 51 /* WME: ACK policy (!bss only)*/ #define IEEE80211_IOC_DTIM_PERIOD 52 /* DTIM period (beacons) */ #define IEEE80211_IOC_BEACON_INTERVAL 53 /* beacon interval (ms) */ +#define IEEE80211_IOC_ADDMAC 54 /* add sta to MAC ACL table */ +#define IEEE80211_IOC_DELMAC 55 /* del sta from MAC ACL table */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. From owner-p4-projects@FreeBSD.ORG Mon Dec 6 06:19:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7720116A4D0; Mon, 6 Dec 2004 06:19:55 +0000 (GMT) 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 3BC2F16A4CE for ; Mon, 6 Dec 2004 06:19:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17DD543D60 for ; Mon, 6 Dec 2004 06:19:55 +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 iB66JsZL052595 for ; Mon, 6 Dec 2004 06:19:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66Js5K052592 for perforce@freebsd.org; Mon, 6 Dec 2004 06:19:54 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 06:19:54 GMT Message-Id: <200412060619.iB66Js5K052592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 06:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=66519 Change 66519 by sam@sam_ebb on 2004/12/06 06:18:54 fix parsing of RSN ie's Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#24 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#24 (text+ko) ==== @@ -1487,6 +1487,7 @@ wh, "RSN", "too short, len %u", len); return IEEE80211_REASON_IE_INVALID; } + frm += 2; w = LE_READ_2(frm); if (w != RSN_VERSION) { IEEE80211_DISCARD_IE(ic, From owner-p4-projects@FreeBSD.ORG Mon Dec 6 06:20:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5124C16A4D0; Mon, 6 Dec 2004 06:20:57 +0000 (GMT) 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 159F116A4CE for ; Mon, 6 Dec 2004 06:20:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E50A543D5E for ; Mon, 6 Dec 2004 06:20:56 +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 iB66KuQA052680 for ; Mon, 6 Dec 2004 06:20:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66Kud2052677 for perforce@freebsd.org; Mon, 6 Dec 2004 06:20:56 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 06:20:56 GMT Message-Id: <200412060620.iB66Kud2052677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 06:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=66520 Change 66520 by sam@sam_ebb on 2004/12/06 06:19:56 mac acl support Affected files ... .. //depot/projects/wifi/sys/conf/files#8 edit .. //depot/projects/wifi/sys/modules/wlan_acl/Makefile#1 add Differences ... ==== //depot/projects/wifi/sys/conf/files#8 (text+ko) ==== @@ -1289,6 +1289,7 @@ net80211/ieee80211_output.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_xauth.c optional wlan_xauth +net80211/ieee80211_acl.c optional wlan_acl netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk From owner-p4-projects@FreeBSD.ORG Mon Dec 6 06:20:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15BB516A507; Mon, 6 Dec 2004 06:20:57 +0000 (GMT) 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 5339F16A4CE for ; Mon, 6 Dec 2004 06:20:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB0843D4C for ; Mon, 6 Dec 2004 06:20: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 iB66KvvT052687 for ; Mon, 6 Dec 2004 06:20:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66KuwS052683 for perforce@freebsd.org; Mon, 6 Dec 2004 06:20:56 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Dec 2004 06:20:56 GMT Message-Id: <200412060620.iB66KuwS052683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 06:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=66521 Change 66521 by sam@sam_ebb on 2004/12/06 06:20:52 checkpoint mac acl stuff Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#29 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#29 (text+ko) ==== @@ -571,6 +571,43 @@ set80211(s, IEEE80211_IOC_BEACON_INTERVAL, atoi(val), 0, NULL); } +static void +set80211macmac(int s, int op, const char *val) +{ + char *temp; + struct sockaddr_dl sdl; + + temp = malloc(strlen(val) + 1); + if (temp == NULL) + errx(1, "malloc failed"); + temp[0] = ':'; + strcpy(temp + 1, val); + sdl.sdl_len = sizeof(sdl); + link_addr(temp, &sdl); + free(temp); + if (sdl.sdl_alen != IEEE80211_ADDR_LEN) + errx(1, "malformed link-level address"); + set80211(s, op, 0, IEEE80211_ADDR_LEN, LLADDR(&sdl)); +} + +static +DECL_CMD_FUNC(set80211addmac, val, d) +{ + set80211macmac(s, IEEE80211_IOC_ADDMAC, val); +} + +static +DECL_CMD_FUNC(set80211delmac, val, d) +{ + set80211macmac(s, IEEE80211_IOC_DELMAC, val); +} + +static +DECL_CMD_FUNC(set80211maccmd, val, d) +{ + set80211(s, IEEE80211_IOC_MACCMD, d, 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1728,6 +1765,16 @@ DEF_CMD_ARG2("bss:txoplimit", set80211bsstxoplimit), DEF_CMD_ARG("dtimperiod", set80211dtimperiod), DEF_CMD_ARG("bintval", set80211bintval), + DEF_CMD("mac:open", IEEE80211_MACCMD_POLICY_OPEN, set80211maccmd), + DEF_CMD("mac:allow", IEEE80211_MACCMD_POLICY_ALLOW, set80211maccmd), + DEF_CMD("mac:deny", IEEE80211_MACCMD_POLICY_DENY, set80211maccmd), + DEF_CMD("mac:flush", IEEE80211_MACCMD_FLUSH, set80211maccmd), + DEF_CMD("mac:detach", IEEE80211_MACCMD_DETACH, set80211maccmd), + DEF_CMD_ARG("mac:add", set80211addmac), + DEF_CMD_ARG("mac:del", set80211delmac), +#if 0 + DEF_CMD_ARG("mac:kick", set80211kickmac), +#endif }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", From owner-p4-projects@FreeBSD.ORG Mon Dec 6 19:19:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 094B516A4D0; Mon, 6 Dec 2004 19:19:24 +0000 (GMT) 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 BA52F16A4CE for ; Mon, 6 Dec 2004 19:19:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CDBB43D79 for ; Mon, 6 Dec 2004 19:19:23 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB6JItsb001342 for ; Mon, 6 Dec 2004 19:18:55 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB6JIsKW001339 for perforce@freebsd.org; Mon, 6 Dec 2004 19:18:54 GMT (envelope-from areisse@nailabs.com) Date: Mon, 6 Dec 2004 19:18:54 GMT Message-Id: <200412061918.iB6JIsKW001339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 19:19:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=66561 Change 66561 by areisse@areisse_tislabs on 2004/12/06 19:18:23 First pass at merging changes from new selinux policy. The policy almost certainly does not build now. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/httpadm.te#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/kernel.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/auth-net.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/fcron.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/startx.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/userspace_objmgr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/xclient.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/checkpolicy.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/chkpwd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crond.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crontab.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dmesg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/fsadm.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/hostname.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ifconfig.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/init.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/klogd.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ldconfig.te#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/load_policy.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/login.te#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/logrotate.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/modutil.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mount.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/netutils.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/newrole.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/restorecon.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/setfiles.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/su.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sulogin.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/tmpreaper.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unconfined.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/useradd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/user.te#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#4 (text+ko) ==== @@ -3,24 +3,31 @@ ################################# # sysadm_t is the system administrator domain. -type sysadm_t, domain, privlog, privowner, admin, userdomain, web_client_domain, privhome; +type sysadm_t, domain, privlog, privowner, admin, userdomain, web_client_domain, privhome, etc_writer, privmodule +ifdef(`unrestricted_admin', `,etc_writer, fs_domain, privmem, privlog, privowner, sysctl_kernel_writer, auth, auth_write') +ifdef(`direct_sysadm_daemon', `, priv_system_role') +; dnl end of sysadm_t type declaration + allow privhome home_root_t:dir search; # system_r is authorized for sysadm_t for single-user mode. role system_r types sysadm_t; -# sysadm_r is authorized for sysadm_t for the initial login domain. -role sysadm_r types sysadm_t; - general_proc_read_access(sysadm_t) -general_domain_access(sysadm_t) # sysadm_t is also granted permissions specific to administrator domains. admin_domain(sysadm) # Allow administrator domains to set the enforcing flag. -can_setenforce(admin) +can_setenforce(sysadm_t) + +# Allow administrator domains to set policy booleans. +can_setbool(sysadm_t) + +# for su +allow sysadm_t userdomain:fd use; define(`admin_tty_type', `{ sysadm_tty_device_t sysadm_devpts_t }') - +# Add/remove user home directories +file_type_auto_trans(sysadm_t, home_root_t, user_home_dir_t, dir) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/kernel.te#4 (text+ko) ==== @@ -11,16 +11,20 @@ # kernel_t is the domain of kernel threads. # It is also the target type when checking permissions in the system class. # -type kernel_t, domain; +type kernel_t, domain, privmodule, privlog, sysctl_kernel_writer ifdef(`nfs_export_all_rw',`,etc_writer') ; role system_r types kernel_t; general_domain_access(kernel_t) general_proc_read_access(kernel_t) base_file_read_access(kernel_t) uses_shlib(kernel_t) +can_exec(kernel_t, shell_exec_t) # Use capabilities. allow kernel_t self:capability *; +allow kernel_t sysfs_t:dir search; +allow kernel_t { usbfs_t usbdevfs_t sysfs_t }:dir search; + # Run init in the init_t domain. domain_auto_trans(kernel_t, init_exec_t, init_t) @@ -30,9 +34,6 @@ # Mount and unmount file systems. allow kernel_t fs_type:filesystem mount_fs_perms; -# Search the persistent label mapping. -allow kernel_t file_labels_t:dir search; - # Send signal to any process. allow kernel_t domain:process signal; @@ -59,12 +60,6 @@ # Load the policy configuration. can_loadpol(kernel_t) -ifdef(`modutil.te', ` -# Run insmod (for kernel module loader). -domain_auto_trans(kernel_t,insmod_exec_t,insmod_t) -allow kernel_t insmod_exec_t:lnk_file read; -') - # /proc/sys/kernel/modprobe is set to /bin/true if not using modules. can_exec(kernel_t, bin_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/auth-net.te#2 (text+ko) ==== @@ -1,4 +1,3 @@ #DESC Policy for using network servers for authenticating users (IE PAM-LDAP) can_network(auth) -allow auth resolv_conf_t:file { getattr read }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/fcron.te#2 (text+ko) ==== @@ -9,7 +9,7 @@ # Use capabilities. allow crond_t self:capability { dac_override dac_read_search }; -# differences betweenr_dir_perms and rw_dir_perms +# differences between r_dir_perms and rw_dir_perms allow crond_t cron_spool_t:dir { add_name remove_name write }; ifdef(`mta.te', ` @@ -18,12 +18,13 @@ allow { system_mail_t mta_user_agent } cron_spool_t:file { read write getattr }; ') -ifdef(`dpkg.te', ` +ifdef(`debian', ` can_exec(dpkg_t, crontab_exec_t) -file_type_auto_trans(dpkg_t, cron_spool_t, sysadm_cron_spool_t) +file_type_auto_trans(dpkg_t, cron_spool_t, sysadm_cron_spool_t, file) ') rw_dir_create_file(crond_t, cron_spool_t) +can_setfscreate(crond_t) # for /var/run/fcron.fifo file_type_auto_trans(crond_t, var_run_t, crond_var_run_t, sock_file) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/startx.te#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/checkpolicy.te#2 (text+ko) ==== @@ -11,6 +11,7 @@ type checkpolicy_t, domain; role sysadm_r types checkpolicy_t; +role system_r types checkpolicy_t; type checkpolicy_exec_t, file_type, exec_type, sysadmfile; @@ -22,7 +23,7 @@ # able to create and modify binary policy files allow checkpolicy_t policy_config_t:dir rw_dir_perms; -allow checkpolicy_t policy_config_t:notdevfile_class_set create_file_perms; +allow checkpolicy_t policy_config_t:file create_file_perms; ########################### # constrain what checkpolicy can use as source files @@ -30,10 +31,10 @@ # only allow read of policy source files allow checkpolicy_t policy_src_t:dir r_dir_perms; -allow checkpolicy_t policy_src_t:notdevfile_class_set r_file_perms; +allow checkpolicy_t policy_src_t:{ file lnk_file } r_file_perms; # allow test policies to be created in src directories -file_type_auto_trans(checkpolicy_t, policy_src_t, policy_config_t) +file_type_auto_trans(checkpolicy_t, policy_src_t, policy_config_t, file) # directory search permissions for path to source and binary policy files allow checkpolicy_t root_t:dir search; @@ -45,7 +46,7 @@ `allow checkpolicy_t sshd_devpts_t:dir r_dir_perms;') # Other access -allow checkpolicy_t admin_tty_type:chr_file { read write ioctl getattr }; +allow checkpolicy_t { initrc_devpts_t admin_tty_type }:chr_file { read write ioctl getattr }; uses_shlib(checkpolicy_t) allow checkpolicy_t self:capability dac_override; @@ -56,6 +57,9 @@ # so it can be used without privilege to write real binary policy file can_exec(user_t, checkpolicy_exec_t) -allow checkpolicy_t privfd:fd use; -allow checkpolicy_t checkpolicy_t:fd { use create }; +allow checkpolicy_t { userdomain privfd }:fd use; +allow checkpolicy_t fs_t:filesystem getattr; +allow checkpolicy_t console_device_t:chr_file { read write }; +allow checkpolicy_t init_t:fd { use }; +allow checkpolicy_t selinux_config_t:dir { search }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/chkpwd.te#2 (text+ko) ==== @@ -9,5 +9,10 @@ # type chkpwd_exec_t, file_type, sysadmfile, exec_type; +chkpwd_domain(system) +dontaudit system_chkpwd_t privfd:fd use; +role sysadm_r types system_chkpwd_t; +in_user_role(system_chkpwd_t) + # Everything else is in the chkpwd_domain macro in # macros/program/chkpwd_macros.te. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crond.te#4 (text+ko) ==== @@ -9,8 +9,11 @@ # Stephen Smalley and Timothy Fraser # -# Domain for crond. It needs auth to check for locked accounts. -daemon_domain(crond, `, privrole, privmail, auth, privfd') +# NB The constraints file has some entries for crond_t, this makes it +# different from all other domains... + +# Domain for crond. It needs auth_chkpwd to check for locked accounts. +daemon_domain(crond, `, privmail, auth_chkpwd, privfd') # This domain is granted permissions common to most domains (including can_net) general_domain_access(crond_t) @@ -20,63 +23,51 @@ # Type for temporary files. tmp_domain(crond) +can_ypbind(crond_t) -# Domain for system cron jobs. -type system_crond_t, domain, privlog, privmail; +crond_domain(system) -# Read and write console and ttys. -allow system_crond_t devtty_t:chr_file rw_file_perms; - -# Read system information files in /proc. -allow system_crond_t proc_t:dir r_dir_perms; -allow system_crond_t proc_t:file r_file_perms; allow system_crond_t proc_t:lnk_file read; +allow system_crond_t proc_t:filesystem getattr; +allow system_crond_t usbdevfs_t:filesystem getattr; ifdef(`mta.te', ` allow mta_user_agent system_crond_t:fd use; ') -# to stop killall type operations from filling our logs -dontaudit system_crond_t domain:dir search; - # read files in /etc -allow system_crond_t etc_t:{ file lnk_file } r_file_perms; +allow system_crond_t etc_t:file r_file_perms; allow system_crond_t etc_runtime_t:file read; -read_locale({ crond_t system_crond_t }) +read_locale(crond_t) -# Type for log files. -type cron_log_t, file_type, sysadmfile, logfile; -# Use this type when creating files in /var/log. -file_type_auto_trans(crond_t, var_log_t, cron_log_t) +log_domain(crond) # Use capabilities. -allow crond_t crond_t:capability { sys_resource setgid setuid net_bind_service }; +allow crond_t self:capability { dac_override setgid setuid net_bind_service }; +dontaudit crond_t self:capability sys_resource; # Get security policy decisions. can_getsecurity(crond_t) # for finding binaries and /bin/sh allow crond_t { bin_t sbin_t }:dir search; -allow crond_t bin_t:lnk_file read; +allow crond_t { bin_t sbin_t }:lnk_file read; # Read from /var/spool/cron. -allow crond_t var_t:dir search; allow crond_t var_lib_t:dir search; allow crond_t var_spool_t:dir r_dir_perms; allow crond_t cron_spool_t:dir r_dir_perms; allow crond_t cron_spool_t:file r_file_perms; -# Read system crontabs -allow crond_t system_crond_script_t:file r_file_perms; -allow crond_t system_crond_script_t:dir r_dir_perms; - # Read /etc/security/default_contexts. -allow crond_t default_context_t:file r_file_perms; +r_dir_file(crond_t, default_context_t) allow crond_t etc_t:file { getattr read }; allow crond_t etc_t:lnk_file read; +allow crond_t default_t:dir { search }; + # crond tries to search /root. Not sure why. allow crond_t sysadm_home_dir_t:dir r_dir_perms; @@ -87,29 +78,17 @@ # Run a shell. can_exec(crond_t, shell_exec_t) -ifdef(`rpm.te', -`# Run the rpm program in the rpm_t domain. Allow creation of RPM log files +ifdef(`redhat', ` +# Run the rpm program in the rpm_t domain. Allow creation of RPM log files # via redirection of standard out. -allow crond_t var_log_rpm_t: file create_file_perms; +allow crond_t rpm_log_t: file create_file_perms; system_crond_entry(rpm_exec_t, rpm_t) -allow system_crond_t var_log_rpm_t: file create_file_perms;') +allow system_crond_t rpm_log_t:file create_file_perms; +') -# This system_r role is authorized for this domain. -role system_r types system_crond_t; - -uses_shlib(system_crond_t); -general_domain_access(system_crond_t); allow system_crond_t var_log_t:file r_file_perms; -# Type for system crontab files. -type system_crond_script_t, file_type, sysadmfile; - -# Permit crond_t to transition to this domain. -# The transition is requested explicitly by the modified crond -# via execve_secure. There is no way to set up an automatic -# transition, since crontabs are configuration files, not executables. -domain_trans(crond_t, shell_exec_t, system_crond_t) # Set exec context. can_setexec(crond_t) @@ -119,40 +98,24 @@ domain_auto_trans(initrc_t, anacron_exec_t, system_crond_t) # Access log files -file_type_auto_trans(system_crond_t, var_log_t, cron_log_t) +file_type_auto_trans(system_crond_t, var_log_t, crond_log_t, file) -# Inherit and use descriptors from init. +# Inherit and use descriptors from init for anacron. allow system_crond_t init_t:fd use; -# Inherit and use descriptors from initrc. +# Inherit and use descriptors from initrc for anacron. allow system_crond_t initrc_t:fd use; +allow system_crond_t initrc_devpts_t:chr_file { read write }; -# Write to a socket from initrc. -allow system_crond_t initrc_t:udp_socket rw_socket_perms; - # Use capabilities. -allow system_crond_t system_crond_t:capability { setgid setuid dac_override fowner net_bind_service fsetid }; +allow system_crond_t self:capability { chown setgid setuid fowner net_bind_service fsetid }; # Read the system crontabs. -allow system_crond_t system_crond_script_t:file r_file_perms; +allow system_crond_t system_cron_spool_t:file r_file_perms; -# -# Since crontab files are not directly executed, -# crond must ensure that the crontab file has -# a type that is appropriate for the domain of -# the system cron job. It performs an entrypoint -# permission check for this purpose. -# -allow system_crond_t system_crond_script_t:file entrypoint; -ifdef(`fcron.te', ` -allow system_crond_t sysadm_cron_spool_t:file entrypoint; -') +allow crond_t system_cron_spool_t:dir r_dir_perms; +allow crond_t system_cron_spool_t:file r_file_perms; -# Run helper programs in the system_crond_t domain. -allow system_crond_t { bin_t sbin_t }:dir r_dir_perms; -allow system_crond_t { bin_t sbin_t }:lnk_file read; -can_exec(system_crond_t, { bin_t sbin_t exec_type etc_t }) - # Read from /var/spool/cron. allow system_crond_t cron_spool_t:dir r_dir_perms; allow system_crond_t cron_spool_t:file r_file_perms; @@ -170,14 +133,9 @@ # Write /var/lock/makewhatis.lock. lock_domain(system_crond) -# Modutils are now combined, so we can no longer distinguish them. -# Let crond run the insmod executable in the insmod_t domain. -ifdef(`modutil.te', ` -system_crond_entry(insmod_exec_t, insmod_t) -') - # for if /var/mail is a symlink allow crond_t mail_spool_t:lnk_file read; +allow crond_t mail_spool_t:dir search; # Run logrotate in the logrotate_t domain. ifdef(`logrotate.te', ` @@ -189,7 +147,8 @@ ') # Stat any file and search any directory for find. -allow system_crond_t file_type:file_class_set getattr; +allow system_crond_t { root_dir_type file_type fs_type }:notdevfile_class_set getattr; +allow system_crond_t device_type:{ chr_file blk_file } getattr; allow system_crond_t file_type:dir { read search getattr }; # Create temporary files. @@ -198,17 +157,10 @@ # /sbin/runlevel ask for w access to utmp, but will operate # correctly without it. Do not audit write denials to utmp. -dontaudit system_crond_t initrc_var_run_t:file { read write }; - -# Access accounting summary files. -allow system_crond_t var_log_sa_t:file create_file_perms; -allow system_crond_t var_log_sa_t:dir rw_dir_perms; +# /sbin/runlevel needs lock access however +dontaudit system_crond_t initrc_var_run_t:file write; +allow system_crond_t initrc_var_run_t:file { getattr read lock }; -allow system_crond_t fs_t:filesystem getattr; - -allow system_crond_t { sysctl_t sysctl_kernel_t }:dir search; -allow system_crond_t sysctl_kernel_t:file { getattr read }; - # Access other spool directories like # /var/spool/anacron and /var/spool/slrnpull. allow system_crond_t var_spool_t:file create_file_perms; @@ -218,3 +170,37 @@ dontaudit system_crond_t unlabeled_t:dir r_dir_perms; dontaudit system_crond_t unlabeled_t:file r_file_perms; +# +# reading /var/spool/cron/mailman +# +allow crond_t var_spool_t:file { getattr read }; +allow system_crond_t devpts_t:filesystem getattr; +allow system_crond_t sysfs_t:filesystem getattr; +allow system_crond_t tmpfs_t:filesystem getattr; +allow system_crond_t rpc_pipefs_t:filesystem getattr; + +# +# These rules are here to allow system cron jobs to su +# +ifdef(`su.te', ` +su_restricted_domain(system_crond,system) +role system_r types system_crond_su_t; +allow system_crond_su_t crond_t:fifo_file { ioctl }; +') +allow system_crond_t self:passwd rootok; +# +# prelink tells init to restart it self, we either need to allow or dontaudit +# +allow system_crond_t initctl_t:fifo_file { write }; +dontaudit userdomain system_crond_t:fd { use }; + +r_dir_file(crond_t, selinux_config_t) + +# Allow system cron jobs to relabel filesystem for restoring file contexts. +bool cron_can_relabel false; +if (cron_can_relabel) { +domain_auto_trans(system_crond_t, setfiles_exec_t, setfiles_t) +} else { +r_dir_file(system_crond_t, file_context_t) +can_getsecurity(system_crond_t) +} ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crontab.te#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/fsadm.te#4 (text+ko) ==== @@ -12,12 +12,15 @@ # administration. # fsadm_exec_t is the type of the corresponding programs. # -type fsadm_t, domain, privlog; +type fsadm_t, domain, privlog, fs_domain; role system_r types fsadm_t; role sysadm_r types fsadm_t; general_domain_access(fsadm_t) +# for swapon +allow fsadm_t sysfs_t:dir { search getattr }; + # Read system information files in /proc. allow fsadm_t proc_t:dir r_dir_perms; allow fsadm_t proc_t:notdevfile_class_set r_file_perms; @@ -43,24 +46,28 @@ type fsadm_exec_t, file_type, sysadmfile, exec_type; domain_auto_trans(initrc_t, fsadm_exec_t, fsadm_t) +ifdef(`unrestricted_admin', ` +allow sysadm_t fixed_disk_device_t:devfile_class_set rw_file_perms; +allow sysadm_t removable_device_t:devfile_class_set rw_file_perms; +', ` domain_auto_trans(sysadm_t, fsadm_exec_t, fsadm_t) +') -type fsadm_tmp_t, file_type, sysadmfile, tmpfile; -file_type_auto_trans(fsadm_t, tmp_t, fsadm_tmp_t) +tmp_domain(fsadm) # remount file system to apply changes allow fsadm_t fs_t:filesystem remount; +allow fsadm_t fs_t:filesystem getattr; + # mkreiserfs needs this allow fsadm_t proc_t:filesystem getattr; -allow fsadm_t device_t:filesystem getattr; - # mkreiserfs and other programs need this for UUID -allow fsadm_t random_device_t:chr_file { getattr read }; +allow fsadm_t { urandom_device_t random_device_t }:chr_file { getattr read }; # Use capabilities. ipc_lock is for losetup -allow fsadm_t self:capability { ipc_lock sys_rawio sys_admin }; +allow fsadm_t self:capability { ipc_lock sys_rawio sys_admin sys_tty_config }; # Write to /etc/mtab. file_type_auto_trans(fsadm_t, etc_t, etc_runtime_t, file) @@ -98,10 +105,18 @@ allow fsadm_t kernel_t:system syslog_console; # Access terminals. -allow fsadm_t admin_tty_type:chr_file rw_file_perms; +allow fsadm_t { initrc_devpts_t admin_tty_type }:chr_file rw_file_perms; ifdef(`gnome-pty-helper.te', `allow fsadm_t sysadm_gph_t:fd use;') allow fsadm_t privfd:fd use; +allow fsadm_t devpts_t:dir getattr; read_locale(fsadm_t) allow fsadm_t fs_type:filesystem getattr; + +# for smartctl cron jobs +system_crond_entry(fsadm_exec_t, fsadm_t) + +# Access to /initrd devices +allow fsadm_t { file_t unlabeled_t }:dir rw_dir_perms; +allow fsadm_t { file_t unlabeled_t }:blk_file rw_file_perms; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#5 (text+ko) ==== @@ -8,10 +8,10 @@ # # Rules for the getty_t domain. # -daemon_domain(getty, `, mlstrustedwriter, privfd') +init_service_domain(getty, `, mlstrustedwriter, privfd') -type etc_getty_t, file_type, sysadmfile; -r_dir_file(getty_t, etc_getty_t) +etcdir_domain(getty) +typealias getty_etc_t alias etc_getty_t; allow getty_t console_device_t:chr_file setattr; @@ -23,31 +23,27 @@ allow getty_t self:process { getpgid getsession }; allow getty_t self:unix_dgram_socket create_socket_perms; allow getty_t self:unix_stream_socket create_socket_perms; -allow getty_t self:fd { create use }; - -# for ldap and other authentication services -allow getty_t resolv_conf_t:file { getattr read }; # to allow w to display everyone... -#allow userdomain ttyfile:chr_file getattr; +bool user_ttyfile_stat false; +if (user_ttyfile_stat) { +allow userdomain ttyfile:chr_file getattr; +} # Use capabilities. -allow getty_t getty_t:capability { dac_override chown sys_tty_config }; +allow getty_t self:capability { dac_override chown sys_resource sys_tty_config }; # fbgetty needs fsetid for some reason -allow getty_t getty_t:capability fsetid; +#allow getty_t getty_t:capability fsetid; -# Run getty in its own domain. -domain_auto_trans(init_t, getty_exec_t, getty_t) - -# Inherit and use descriptors from init. -allow getty_t init_t:fd use; +read_locale(getty_t) # Run login in local_login_t domain. allow getty_t bin_t:dir search; domain_auto_trans(getty_t, login_exec_t, local_login_t) # Write to /var/run/utmp. +allow getty_t { var_t var_run_t }:dir search; allow getty_t initrc_var_run_t:file rw_file_perms; # Write to /var/log/wtmp. @@ -56,7 +52,13 @@ # Chown, chmod, read and write ttys. allow getty_t tty_device_t:chr_file { setattr rw_file_perms }; allow getty_t ttyfile:chr_file { setattr rw_file_perms }; +allow getty_t initrc_devpts_t:chr_file { setattr rw_file_perms }; +dontaudit getty_t { user_devpts_t sysadm_devpts_t }:chr_file { read write }; +# for error condition handling +allow getty_t fs_t:filesystem getattr; + rw_dir_create_file(getty_t, var_lock_t) dontaudit getty_t staff_home_dir_t:dir search; +r_dir_file(getty_t, sysfs_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ifconfig.te#4 (text+ko) ==== @@ -11,7 +11,7 @@ # ifconfig_t is the domain for the ifconfig program. # ifconfig_exec_t is the type of the corresponding program. # -type ifconfig_t, domain, privlog; +type ifconfig_t, domain, privlog, privmodule; type ifconfig_exec_t, file_type, sysadmfile, exec_type; role system_r types ifconfig_t; @@ -23,14 +23,19 @@ domain_auto_trans(initrc_t, ifconfig_exec_t, ifconfig_t) domain_auto_trans(sysadm_t, ifconfig_exec_t, ifconfig_t) +# for /sbin/ip +allow ifconfig_t self:netlink_route_socket { bind create getattr nlmsg_read nlmsg_write read write }; +allow ifconfig_t self:tcp_socket { create ioctl }; +allow ifconfig_t etc_t:file { getattr read }; + +allow ifconfig_t self:socket create_socket_perms; + # Use capabilities. -allow ifconfig_t ifconfig_t:capability { sys_module net_admin }; +allow ifconfig_t self:capability net_admin; +dontaudit ifconfig_t self:capability sys_module; # Inherit and use descriptors from init. -allow ifconfig_t init_t:fd use; - -# Execute insmod. -domain_auto_trans(ifconfig_t, insmod_exec_t, insmod_t) +allow ifconfig_t { kernel_t init_t }:fd use; # Access /proc allow ifconfig_t proc_t:dir r_dir_perms; @@ -41,12 +46,13 @@ allow ifconfig_t boot_t:file r_file_perms; allow ifconfig_t privfd:fd use; +allow ifconfig_t run_init_t:fd use; # Create UDP sockets, necessary when called from dhcpc allow ifconfig_t self:udp_socket create_socket_perms; # Access terminals. -allow ifconfig_t { initrc_devpts_t admin_tty_type }:chr_file rw_file_perms; +allow ifconfig_t { user_tty_type initrc_devpts_t admin_tty_type }:chr_file rw_file_perms; ifdef(`gnome-pty-helper.te', `allow ifconfig_t sysadm_gph_t:fd use;') allow ifconfig_t tun_tap_device_t:chr_file { read write }; @@ -58,5 +64,11 @@ allow ifconfig_t fs_t:filesystem getattr; +read_locale(ifconfig_t) +allow ifconfig_t lib_t:file { getattr read }; + +rhgb_domain(ifconfig_t) +allow ifconfig_t userdomain:fd use; + # read /etc/mac.conf allow ifconfig_t etc_t:file r_file_perms; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/init.te#4 (text+ko) ==== @@ -13,14 +13,17 @@ # initctl_t is the type of the named pipe created # by init during initialization. This pipe is used # to communicate with init. -# sulogin_exec_t is the type of sulogin. # -type init_t, domain, privlog, mlstrustedreader, mlstrustedwriter; +type init_t, domain, privlog, mlstrustedreader, mlstrustedwriter, sysctl_kernel_writer; role system_r types init_t; uses_shlib(init_t); type init_exec_t, file_type, sysadmfile, exec_type; type initctl_t, file_type, sysadmfile; -type sulogin_exec_t, file_type, exec_type, sysadmfile; + +# for init to determine whether SE Linux is active so it can know whether to +# activate it +allow init_t security_t:dir search; +allow init_t security_t:file { getattr read }; allow init_t self:fd { create use }; @@ -33,9 +36,8 @@ # Run /etc/rc.sysinit, /etc/rc, /etc/rc.local in the initrc_t domain. domain_auto_trans(init_t, initrc_exec_t, initrc_t) -# Run the shell or sulogin in the sysadm_t domain for single-user mode. +# Run the shell in the sysadm_t domain for single-user mode. domain_auto_trans(init_t, shell_exec_t, sysadm_t) -domain_auto_trans(init_t, sulogin_exec_t, sysadm_t) # Run /sbin/update in the init_t domain. can_exec(init_t, sbin_t) @@ -60,6 +62,7 @@ # Allow access to log files allow init_t var_t:dir search; allow init_t var_log_t:dir search; +allow init_t var_log_t:file rw_file_perms; read_locale(init_t) @@ -69,11 +72,8 @@ allow init_t self:fifo_file rw_file_perms; # Permissions required for system startup -allow init_t bin_t:dir { read getattr lock search ioctl }; -allow init_t bin_t:{ file lnk_file sock_file fifo_file } { read getattr lock ioctl }; -allow init_t exec_type:{ file lnk_file } { read getattr lock ioctl }; -allow init_t sbin_t:dir { read getattr lock search ioctl }; -allow init_t sbin_t:{ file lnk_file sock_file fifo_file } { read getattr lock ioctl }; +allow init_t { bin_t sbin_t }:dir r_dir_perms; +allow init_t { bin_t sbin_t }:{ file lnk_file } { read getattr lock ioctl }; # allow init to fork allow init_t self:process { fork sigchld }; @@ -88,9 +88,11 @@ # Shutdown permissions allow init_t proc_t:dir r_dir_perms; allow init_t proc_t:lnk_file r_file_perms; +allow init_t proc_t:file r_file_perms; allow init_t self:dir r_dir_perms; allow init_t self:lnk_file r_file_perms; -allow init_t devpts_t:dir r_file_perms; +allow init_t self:file r_file_perms; +allow init_t devpts_t:dir r_dir_perms; # Modify wtmp. allow init_t wtmp_t:file rw_file_perms; @@ -107,6 +109,12 @@ # since you may have compromised system security. allow unlabeled_t init_t:process sigchld; +# for loading policy +allow init_t policy_config_t:file r_file_perms; + +# Set booleans. +can_setbool(init_t) + # Read and write the console and ttys. allow init_t console_device_t:chr_file rw_file_perms; allow init_t tty_device_t:chr_file rw_file_perms; @@ -115,9 +123,19 @@ # Run system executables. can_exec(init_t,bin_t) +ifdef(`consoletype.te', ` +can_exec(init_t, consoletype_exec_t) +') # Run /etc/X11/prefdm. can_exec(init_t,etc_t) -# for initrd pivot_root seems to access this -dontaudit init_t file_labels_t:dir { search }; +allow init_t lib_t:file { getattr read }; + +ifdef(`rhgb.te', ` +allow init_t devtty_t:chr_file { read write }; +allow init_t ramfs_t:dir search; +') +r_dir_file(init_t, sysfs_t) + +r_dir_file(init_t, selinux_config_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#5 (text+ko) ==== @@ -13,14 +13,20 @@ # ifdef(`sendmail.te', ` # do not use privmail for sendmail as it creates a type transition conflict -type initrc_t, domain, privlog, privowner; +type initrc_t, ifdef(`unlimitedRC', `admin, etc_writer, fs_domain, privmem, auth_write, ') domain, privlog, privowner, privmodule, sysctl_kernel_writer; +allow system_mail_t initrc_t:fd use; +allow system_mail_t initrc_t:fifo_file write; ', ` -type initrc_t, domain, privlog, privowner, privmail; +type initrc_t, ifdef(`unlimitedRC', `admin, etc_writer, fs_domain, privmem,auth_write, ') domain, privlog, privowner, privmodule, sysctl_kernel_writer, privmail; ') role system_r types initrc_t; uses_shlib(initrc_t); +can_ypbind(initrc_t) type initrc_exec_t, file_type, sysadmfile, exec_type; +# for halt to down interfaces +allow initrc_t self:udp_socket create_socket_perms; + allow initrc_t self:fd { create use }; # read files in /etc/init.d @@ -29,13 +35,15 @@ read_locale(initrc_t) +r_dir_file(initrc_t, usr_t) + # Read system information files in /proc. allow initrc_t proc_t:dir r_dir_perms; allow initrc_t proc_t:{ file lnk_file } r_file_perms; # Allow IPC with self allow initrc_t self:unix_dgram_socket create_socket_perms; -allow initrc_t self:unix_stream_socket create_socket_perms; +allow initrc_t self:unix_stream_socket { connectto create_stream_socket_perms }; allow initrc_t self:fifo_file rw_file_perms; # Read the root directory of a usbdevfs filesystem, and @@ -48,31 +56,25 @@ allow initrc_t device_t:dir r_dir_perms; # allow initrc to fork and renice itself -allow initrc_t self:process { fork sigchld setsched }; +allow initrc_t self:process { fork sigchld setsched setpgid setrlimit }; # Can create ptys for open_init_pty can_create_pty(initrc) -type initrc_tmp_t, file_type, sysadmfile, tmpfile; -file_type_auto_trans(initrc_t, tmp_t, initrc_tmp_t) +tmp_domain(initrc) var_run_domain(initrc) allow initrc_t var_run_t:{ file sock_file lnk_file } unlink; +allow initrc_t var_run_t:dir { create rmdir }; allow initrc_t framebuf_device_t:chr_file r_file_perms; # Use capabilities. -allow initrc_t initrc_t:capability ~sys_module; +allow initrc_t self:capability ~{ sys_admin sys_module }; # Use system operations. allow initrc_t kernel_t:system *; -# Allow initrc_t to set the enforcing flag. -# The initrc_t domain is granted this permission for -# people who want to use a development kernel and toggle -# into enforcing mode from an /etc/rc.d script. -can_setenforce(initrc_t) - # Set values in /proc/sys. can_sysctl(initrc_t) @@ -84,7 +86,17 @@ can_exec(initrc_t, bin_t) can_exec(initrc_t, sbin_t) can_exec(initrc_t, exec_type) +# +# These rules are here to allow init scripts to su +# +ifdef(`su.te', ` +su_restricted_domain(initrc,system) +role system_r types initrc_su_t; +') +allow initrc_t self:passwd rootok; +# read /lib/modules +allow initrc_t modules_object_t:dir { search read }; # Read conf.modules. allow initrc_t modules_conf_t:file r_file_perms; @@ -102,17 +114,13 @@ ifdef(`portmap.te', `can_udp_send(initrc_t, portmap_t)') ifdef(`ypbind.te', `can_udp_send(initrc_t, ypbind_t)') -# Search persistent label mappings. -allow initrc_t file_labels_t:dir r_dir_perms; -allow initrc_t file_labels_t:file stat_file_perms; - # Read /proc/PID directories for all domains. -allow initrc_t domain:notdevfile_class_set r_file_perms; -allow initrc_t domain:dir r_dir_perms; +r_dir_file(initrc_t, domain) +allow initrc_t domain:process { getattr getsession }; # Mount and unmount file systems. allow initrc_t fs_type:filesystem mount_fs_perms; -allow initrc_t file_t:dir { read search getattr mounton }; +allow initrc_t { file_t default_t }:dir { read search getattr mounton }; # Create runtime files in /etc, e.g. /etc/mtab, /etc/HOSTNAME. file_type_auto_trans(initrc_t, etc_t, etc_runtime_t, file) @@ -126,11 +134,14 @@ allow initrc_t sendmail_exec_t:lnk_file read; ') -ifdef(`xfs.te', -`# Unlink the xfs socket. +ifdef(`xfs.te', ` +# Unlink the xfs socket. allow initrc_t xfs_tmp_t:dir rw_dir_perms; allow initrc_t xfs_tmp_t:dir rmdir; -allow initrc_t xfs_tmp_t:sock_file { read getattr unlink };') +allow initrc_t xfs_tmp_t:sock_file { read getattr unlink }; +allow initrc_t fonts_t:dir create_dir_perms; +allow initrc_t fonts_t:file create_file_perms; +') # Update /var/log/wtmp and /var/log/dmesg. allow initrc_t wtmp_t:file { setattr rw_file_perms }; @@ -159,11 +170,8 @@ allow initrc_t pidfile:file { getattr read unlink }; # Write to /dev/urandom. -allow initrc_t random_device_t:chr_file rw_file_perms; +allow initrc_t urandom_device_t:chr_file rw_file_perms; -# Access /dev/psaux (for kudzu). -allow initrc_t psaux_t:chr_file rw_file_perms; - # Set device ownerships/modes. allow initrc_t framebuf_device_t:lnk_file read; allow initrc_t framebuf_device_t:devfile_class_set setattr; @@ -171,9 +179,10 @@ allow initrc_t device_t:devfile_class_set setattr; allow initrc_t fixed_disk_device_t:devfile_class_set setattr; allow initrc_t removable_device_t:devfile_class_set setattr; +allow initrc_t device_t:lnk_file read; # Stat any file. -allow initrc_t file_type:file_class_set getattr; +allow initrc_t file_type:notdevfile_class_set getattr; allow initrc_t file_type:dir { search getattr }; # Read and write console and ttys. @@ -191,36 +200,39 @@ allow initrc_t var_spool_t:dir create_dir_perms; allow initrc_t var_spool_t:file { create_file_perms unlink }; -ifdef(`rpm.te', ` -# Create and read /boot/kernel.h. +ifdef(`redhat', ` +# Create and read /boot/kernel.h and /boot/System.map. # Redhat systems typically create this file at boot time. -allow initrc_t boot_t:lnk_file r_file_perms; -file_type_auto_trans(initrc_t, boot_t, boot_runtime_t) +allow initrc_t boot_t:lnk_file rw_file_perms; +file_type_auto_trans(initrc_t, boot_t, boot_runtime_t, file) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 6 22:49:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1BA616A4D0; Mon, 6 Dec 2004 22:49:10 +0000 (GMT) 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 BA27716A4CE for ; Mon, 6 Dec 2004 22:49:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4507D43D53 for ; Mon, 6 Dec 2004 22:49:10 +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 iB6MnA0V017718 for ; Mon, 6 Dec 2004 22:49:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB6Mn9h2017715 for perforce@freebsd.org; Mon, 6 Dec 2004 22:49:09 GMT (envelope-from peter@freebsd.org) Date: Mon, 6 Dec 2004 22:49:09 GMT Message-Id: <200412062249.iB6Mn9h2017715@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 Subject: PERFORCE change 66590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 22:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=66590 Change 66590 by peter@peter_daintree on 2004/12/06 22:48:56 IFC @66589 Affected files ... .. //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.c#5 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#22 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#8 integrate .. //depot/projects/hammer/etc/network.subr#9 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#5 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/init.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/init.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#7 integrate .. //depot/projects/hammer/lib/libc/gen/getcontext.3#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/makecontext.c#5 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#16 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#19 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#7 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#28 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#6 integrate .. //depot/projects/hammer/share/man/man4/gif.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/hammer/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/hammer/share/man/man9/Makefile#45 integrate .. //depot/projects/hammer/share/man/man9/jumbo.9#3 delete .. //depot/projects/hammer/share/man/man9/zero_copy.9#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#119 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/hammer/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#13 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/hammer/sys/conf/files#95 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#39 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#50 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#14 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#8 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#11 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#13 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#20 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#29 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#6 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#12 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#19 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#17 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#10 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#18 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_eventhandler.c#4 integrate .. //depot/projects/hammer/sys/kern/uipc_jumbo.c#8 delete .. //depot/projects/hammer/sys/kern/vfs_default.c#29 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#64 integrate .. //depot/projects/hammer/sys/modules/if_gif/Makefile#4 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#9 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#8 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#21 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#34 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.c#5 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.h#3 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfs_subs.c#3 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vn_subs.c#3 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#15 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#14 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.h#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#8 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/hammer/sys/nfsclient/nfsm_subs.h#4 integrate .. //depot/projects/hammer/sys/nfsclient/nfsmount.h#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#10 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#23 integrate .. //depot/projects/hammer/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#24 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/hammer/sys/sys/eventhandler.h#6 integrate .. //depot/projects/hammer/sys/sys/jumbo.h#3 delete .. //depot/projects/hammer/sys/sys/kernel.h#13 integrate .. //depot/projects/hammer/sys/sys/mount.h#26 integrate .. //depot/projects/hammer/sys/sys/vnode.h#37 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#37 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#24 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#25 integrate .. //depot/projects/hammer/tools/regression/aio/aiotest/Makefile#1 branch .. //depot/projects/hammer/tools/regression/aio/aiotest/aiotest.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#14 integrate .. //depot/projects/hammer/tools/tools/raidtest/Makefile#3 delete .. //depot/projects/hammer/tools/tools/raidtest/README#3 delete .. //depot/projects/hammer/tools/tools/raidtest/raidtest.c#3 delete .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#28 integrate .. //depot/projects/hammer/usr.bin/calendar/day.c#2 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#7 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#5 integrate .. //depot/projects/hammer/usr.bin/make/buf.h#4 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#10 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#8 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#4 integrate .. //depot/projects/hammer/usr.bin/make/for.c#8 integrate .. //depot/projects/hammer/usr.bin/make/hash.c#5 integrate .. //depot/projects/hammer/usr.bin/make/hash.h#4 integrate .. //depot/projects/hammer/usr.bin/make/job.c#15 integrate .. //depot/projects/hammer/usr.bin/make/main.c#22 integrate .. //depot/projects/hammer/usr.bin/make/make.1#15 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#7 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#17 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#9 integrate .. //depot/projects/hammer/usr.bin/make/var.c#13 integrate .. //depot/projects/hammer/usr.bin/make/var.h#3 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#4 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#7 integrate .. //depot/projects/hammer/usr.sbin/pppd/cbcp.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/kern.c#5 integrate Differences ... ==== //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.c#5 (text+ko) ==== @@ -1339,12 +1339,22 @@ hints.ai_family = ai_fam_templ; hints.ai_socktype = SOCK_DGRAM; +#ifdef DEBUG + if (debug) + printf("Looking for host %s and service %s\n", serv, service); +#endif + error = getaddrinfo(serv, service, &hints, &addrResult); if (error != 0) { fprintf(stderr, "Error : %s\n", gai_strerror(error)); msyslog(LOG_ERR, "can't find host %s\n", serv); return; } +#ifdef DEBUG + else if (debug) { + fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr)); + } +#endif server = (struct server *)emalloc(sizeof(struct server)); memset((char *)server, 0, sizeof(struct server)); ==== //depot/projects/hammer/etc/etc.sparc64/ttys#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.7 2004/10/04 03:39:52 kensmith Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.8 2004/12/04 14:03:45 marius Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -35,6 +35,8 @@ screen "/usr/libexec/getty Pc" cons25 on secure ttya "/usr/libexec/getty 3wire.9600" cons25 on secure ttyb "/usr/libexec/getty 3wire.9600" cons25 off secure +ttyz0 "/usr/libexec/getty 3wire.9600" cons25 on secure +ttyz1 "/usr/libexec/getty 3wire.9600" cons25 off secure # #ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.112 2004/05/31 07:34:40 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.113 2004/12/04 23:30:36 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -269,53 +269,245 @@ .. .. locale + af + LC_MESSAGES + .. + .. + am + LC_MESSAGES + .. + .. + ar + LC_MESSAGES + .. + .. + az + LC_MESSAGES + .. + .. bg + LC_MESSAGES + .. + .. + bn + LC_MESSAGES + .. .. + br + LC_MESSAGES + .. + .. + bs + LC_MESSAGES + .. + .. + cy + LC_MESSAGES + .. + .. da + LC_MESSAGES + .. .. de + LC_MESSAGES + .. + .. + dk + LC_MESSAGES + .. + .. + ee + LC_MESSAGES + .. .. en + LC_MESSAGES + .. + .. + en_CA + LC_MESSAGES + .. .. en_GB + LC_MESSAGES + .. .. eo + LC_MESSAGES + .. .. es + LC_MESSAGES + .. + .. + es_ES + LC_MESSAGES + .. + .. + es_MX + LC_MESSAGES + .. .. et + LC_MESSAGES + .. + .. + eu + LC_MESSAGES + .. + .. + fa + LC_MESSAGES + .. .. fr + LC_MESSAGES + .. + .. + ga + LC_MESSAGES + .. + .. + gu + LC_MESSAGES + .. .. he + LC_MESSAGES + .. + .. + hi + LC_MESSAGES + .. .. hr + LC_MESSAGES + .. .. hu + LC_MESSAGES + .. .. id + LC_MESSAGES + .. + .. + is + LC_MESSAGES + .. .. it + LC_MESSAGES + .. .. ja + LC_MESSAGES + .. .. + ka + LC_MESSAGES + .. + .. + kn + LC_MESSAGES + .. + .. lt + LC_MESSAGES + .. + .. + lv + LC_MESSAGES + .. .. + mk + LC_MESSAGES + .. + .. + ml + LC_MESSAGES + .. + .. + mn + LC_MESSAGES + .. + .. ms + LC_MESSAGES + .. .. nb + LC_MESSAGES + .. .. nl + LC_MESSAGES + .. .. + or + LC_MESSAGES + .. + .. + pa + LC_MESSAGES + .. + .. pt_BR + LC_MESSAGES + .. + .. + pt_PT + LC_MESSAGES + .. .. ru + LC_MESSAGES + .. + .. + sr@Latn + LC_MESSAGES + .. + .. + sq + LC_MESSAGES + .. .. sv + LC_MESSAGES + .. + .. + ta + LC_MESSAGES + .. .. + th + LC_MESSAGES + .. + .. tr + LC_MESSAGES + .. + .. + vi + LC_MESSAGES + .. + .. + wa + LC_MESSAGES + .. + .. + zh + LC_MESSAGES + .. .. + zh_CN.GB2312 + LC_MESSAGES + .. + .. zh_TW.Big5 + LC_MESSAGES + .. .. .. misc ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.24 2004/05/31 07:34:40 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.25 2004/12/04 23:30:36 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -458,126 +458,340 @@ .. locale af + LC_MESSAGES + .. .. am + LC_MESSAGES + .. + .. + ar + LC_MESSAGES + .. .. az + LC_MESSAGES + .. .. be + LC_MESSAGES + .. .. bg + LC_MESSAGES + .. .. + bn + LC_MESSAGES + .. + .. bs + LC_MESSAGES + .. .. ca + LC_MESSAGES + .. .. cs + LC_MESSAGES + .. .. cy + LC_MESSAGES + .. .. da + LC_MESSAGES + .. .. de + LC_MESSAGES + .. + .. + de_AT + LC_MESSAGES + .. .. el + LC_MESSAGES + .. .. en + LC_MESSAGES + .. .. + en_AU + LC_MESSAGES + .. + .. en_CA + LC_MESSAGES + .. .. en_GB + LC_MESSAGES + .. .. eo + LC_MESSAGES + .. .. es + LC_MESSAGES + .. .. es_ES + LC_MESSAGES + .. .. es_MX + LC_MESSAGES + .. .. et + LC_MESSAGES + .. + .. + eu + LC_MESSAGES + .. .. fa + LC_MESSAGES + .. + .. + fa_IR + LC_MESSAGES + .. .. fi + LC_MESSAGES + .. .. fr + LC_MESSAGES + .. .. + fr_FR + LC_MESSAGES + .. + .. ga + LC_MESSAGES + .. .. gl + LC_MESSAGES + .. + .. + gu + LC_MESSAGES + .. .. he + LC_MESSAGES + .. + .. + hi + LC_MESSAGES + .. .. hr + LC_MESSAGES + .. .. hu + LC_MESSAGES + .. .. id + LC_MESSAGES + .. .. + is + LC_MESSAGES + .. + .. it + LC_MESSAGES + .. .. ja + LC_MESSAGES + .. + .. + ka + LC_MESSAGES + .. .. kn + LC_MESSAGES + .. .. ko + LC_MESSAGES + .. + .. + li + LC_MESSAGES + .. .. lt + LC_MESSAGES + .. .. lv + LC_MESSAGES + .. .. mk + LC_MESSAGES + .. .. ml + LC_MESSAGES + .. .. + mn + LC_MESSAGES + .. + .. ms + LC_MESSAGES + .. + .. + nb + LC_MESSAGES + .. + .. + ne + LC_MESSAGES + .. .. nl + LC_MESSAGES + .. .. nn + LC_MESSAGES + .. .. no + LC_MESSAGES + .. .. + or + LC_MESSAGES + .. + .. + pa + LC_MESSAGES + .. + .. pl + LC_MESSAGES + .. .. pt + LC_MESSAGES + .. .. pt_BR + LC_MESSAGES + .. .. pt_PT + LC_MESSAGES + .. .. ro + LC_MESSAGES + .. .. ru + LC_MESSAGES + .. .. sk + LC_MESSAGES + .. .. sl + LC_MESSAGES + .. .. sq + LC_MESSAGES + .. .. sr + LC_MESSAGES + .. .. sr@Latn + LC_MESSAGES + .. .. sv + LC_MESSAGES + .. .. ta + LC_MESSAGES + .. .. + tg + LC_MESSAGES + .. + .. th + LC_MESSAGES + .. + .. + tk + LC_MESSAGES + .. .. tr + LC_MESSAGES + .. .. uk + LC_MESSAGES + .. + .. + uz + LC_MESSAGES + .. .. + wa + LC_MESSAGES + .. + .. vi + LC_MESSAGES + .. .. + zh + LC_MESSAGES + .. + .. zh_CN + LC_MESSAGES + .. .. + zh_CN.GB2312 + LC_MESSAGES + .. + .. zh_TW + LC_MESSAGES + .. .. zh_TW.Big5 + LC_MESSAGES + .. .. .. .. ==== //depot/projects/hammer/etc/network.subr#9 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.157 2004/10/30 13:44:05 pjd Exp $ +# $FreeBSD: src/etc/network.subr,v 1.160 2004/12/05 21:45:36 pjd Exp $ # # @@ -256,7 +256,7 @@ ifnet_rename() { - _ifn_list="`list_net_interfaces all`" + _ifn_list="`ifconfig -l`" [ -z "$_ifn_list" ] && return 0 for _if in ${_ifn_list} ; do eval _ifname=\$ifconfig_${_if}_name @@ -274,7 +274,6 @@ # argument can be any of the following: # nodhcp - all interfaces, excluding DHCP configured interfaces # dhcp - list only DHCP configured interfaces -# all - all interfaces # If no argument is specified all network interfaces are output. # Note that the list will include cloned interfaces if applicable. # Cloned interfaces must already exist to have a chance to appear @@ -300,7 +299,7 @@ return 0 fi - # Separate out dhcp and non-dhcp intefraces + # Separate out dhcp and non-dhcp interfaces # _aprefix= _bprefix= @@ -343,9 +342,6 @@ dhcp) echo $_dhcplist ;; - all) - echo $_nodhcplist $_dhcplist - ;; esac return 0 } ==== //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.11 2004/11/30 05:12:35 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.12 2004/12/05 04:08:22 marcel Exp $ VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -19,6 +19,10 @@ TARGET_ARCH?= ${MACHINE_ARCH} TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif + .if !defined(INFO) .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.2 2004/11/30 05:12:35 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $ .if !defined(GDB_CROSS_DEBUGGER) -LIBSRCS+= core-regset.c solib-legacy.c +LIBSRCS+= core-regset.c solib.c solib-legacy.c solib-svr4.c LIBSRCS+= alphabsd-nat.c .endif LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -174,7 +174,9 @@ #define GDB_TM_FILE config/alpha/tm-fbsd.h /* nativefile */ +#ifndef CROSS_DEBUGGER #define GDB_NM_FILE config/alpha/nm-fbsd.h +#endif /* Define to 1 so gets a definition of anon_hdl. Works around a problem on IRIX 5. */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/init.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/init.c,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/init.c,v 1.2 2004/12/05 06:58:59 marcel Exp $ */ /* Do not modify this file. */ /* It is created automatically by the Makefile. */ @@ -120,14 +120,18 @@ _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); +#ifndef CROSS_DEBUGGER _initialize_kernel_u_addr (); _initialize_infptrace (); _initialize_inftarg (); _initialize_solib (); _initialize_svr4_solib (); _initialize_svr4_lm (); +#endif _initialize_corelow (); +#ifndef CROSS_DEBUGGER _initialize_core_regset (); +#endif _initialize_remote (); _initialize_dcache (); _initialize_sr_support (); ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#3 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c .endif +LIBSRCS+= solib.c solib-svr4.c LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ i386fbsd-tdep.c i387-tdep.c ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -174,7 +174,9 @@ #define GDB_TM_FILE config/i386/tm-fbsd.h /* nativefile */ +#ifndef CROSS_DEBUGGER #define GDB_NM_FILE config/i386/nm-fbsd64.h +#endif /* Define to 1 so gets a definition of anon_hdl. Works around a problem on IRIX 5. */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/init.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/init.c,v 1.2 2004/08/10 12:20:00 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/init.c,v 1.3 2004/12/05 06:58:59 marcel Exp $ */ /* Do not modify this file. */ /* It is created automatically by the Makefile. */ @@ -129,6 +129,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 6 22:55:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F16E16A4D0; Mon, 6 Dec 2004 22:55:18 +0000 (GMT) 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 6108E16A4CE for ; Mon, 6 Dec 2004 22:55:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28B5E43D68 for ; Mon, 6 Dec 2004 22:55:18 +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 iB6MtIj6017919 for ; Mon, 6 Dec 2004 22:55:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB6MtHAC017916 for perforce@freebsd.org; Mon, 6 Dec 2004 22:55:17 GMT (envelope-from peter@freebsd.org) Date: Mon, 6 Dec 2004 22:55:17 GMT Message-Id: <200412062255.iB6MtHAC017916@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 Subject: PERFORCE change 66591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 22:55:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=66591 Change 66591 by peter@peter_daintree on 2004/12/06 22:54:51 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#57 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#15 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#31 (text+ko) ==== @@ -204,8 +204,6 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; - /* XXX */ - td->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); } else { /* ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#57 (text+ko) ==== @@ -330,25 +330,21 @@ cpu_reset() { #ifdef SMP - if (smp_active == 0) { - cpu_reset_real(); - /* NOTREACHED */ - } else { - u_int map; + u_int map; - printf("cpu_reset called on cpu#%d\n", PCPU_GET(cpuid)); - map = PCPU_GET(other_cpus) & ~ stopped_cpus; + if (smp_active) { + map = PCPU_GET(other_cpus) & ~stopped_cpus; if (map != 0) { printf("cpu_reset: Stopping other CPUs\n"); - stop_cpus(map); /* Stop all other CPUs */ + stop_cpus(map); } DELAY(1000000); cpu_reset_real(); /* NOTREACHED */ } -#else +#endif cpu_reset_real(); -#endif + /* NOTREACHED */ } static void @@ -357,7 +353,7 @@ /* * Attempt to do a CPU reset via the keyboard controller, - * do not turn of the GateA20, as any machine that fails + * do not turn off GateA20, as any machine that fails * to do the reset here would then end up in no man's land. */ @@ -365,7 +361,8 @@ DELAY(500000); /* wait 0.5 sec to see if that did it */ printf("Keyboard reset did not work, attempting CPU shutdown\n"); DELAY(1000000); /* wait 1 sec for printf to complete */ - /* force a shutdown by unmapping entire address space ! */ + + /* Force a shutdown by unmapping entire address space. */ bzero((caddr_t)PML4map, PAGE_SIZE); /* "good night, sweet prince .... " */ ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#15 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Dec 7 00:52:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3102B16A4D0; Tue, 7 Dec 2004 00:52:41 +0000 (GMT) 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 0789116A4CF for ; Tue, 7 Dec 2004 00:52:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBDF543D66 for ; Tue, 7 Dec 2004 00:52: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 iB70qeGF028099 for ; Tue, 7 Dec 2004 00:52:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB70qej4028096 for perforce@freebsd.org; Tue, 7 Dec 2004 00:52:40 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 00:52:40 GMT Message-Id: <200412070052.iB70qej4028096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 00:52:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=66595 Change 66595 by sam@sam_ebb on 2004/12/07 00:52:26 update for wme changes Affected files ... .. //depot/projects/wifi/sys/dev/awi/awi.c#5 edit Differences ... ==== //depot/projects/wifi/sys/dev/awi/awi.c#5 (text+ko) ==== @@ -2155,8 +2155,8 @@ wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA; *(u_int16_t *)wh->i_dur = 0; *(u_int16_t *)wh->i_seq = - htole16(ni->ni_txseq << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseq++; + htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[0]++; if (ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_AHDEMO) { wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; From owner-p4-projects@FreeBSD.ORG Tue Dec 7 00:53:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29FC716A4D0; Tue, 7 Dec 2004 00:53:43 +0000 (GMT) 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 DB07E16A4CE for ; Tue, 7 Dec 2004 00:53:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A69FA43D48 for ; Tue, 7 Dec 2004 00:53: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 iB70rgZj028123 for ; Tue, 7 Dec 2004 00:53:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB70rg8a028120 for perforce@freebsd.org; Tue, 7 Dec 2004 00:53:42 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 00:53:42 GMT Message-Id: <200412070053.iB70rg8a028120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 00:53:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=66596 Change 66596 by sam@sam_ebb on 2004/12/07 00:53:40 o yank useless ie union used by ray driver (it'll get moved over there if still needed) o define structs for tim and country ie's Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#5 (text+ko) ==== @@ -390,56 +390,8 @@ } __packed; /* - * Management information element payloads + * Management information element payloads. */ -union ieee80211_information { - char ssid[IEEE80211_NWID_LEN+1]; - struct rates { - u_int8_t *p; - } rates; - struct fh { - u_int16_t dwell; - u_int8_t set; - u_int8_t pattern; - u_int8_t index; - } fh; - struct ds { - u_int8_t channel; - } ds; - struct cf { - u_int8_t count; - u_int8_t period; - u_int8_t maxdur[2]; - u_int8_t dur[2]; - } cf; - struct tim { - u_int8_t count; - u_int8_t period; - u_int8_t bitctl; - /* u_int8_t pvt[251]; The driver needs to use this. */ - } tim; - struct ibss { - u_int16_t atim; - } ibss; - struct challenge { - u_int8_t *p; - u_int8_t len; - } challenge; - struct erp { - u_int8_t flags; - } erp; - struct country { - u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ - struct { - u_int8_t schan; /* starting channel */ - u_int8_t nchan; /* number channels */ - u_int8_t maxtxpwr; - } band[4]; /* up to 4 sub bands */ - } country; - struct ath { - u_int8_t flags; - } ath; -}; enum { IEEE80211_ELEMID_SSID = 0, @@ -460,6 +412,26 @@ IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ }; +struct ieee80211_tim_ie { + u_int8_t tim_ie; /* IEEE80211_ELEMID_TIM */ + u_int8_t tim_len; + u_int8_t tim_count; /* DTIM count */ + u_int8_t tim_period; /* DTIM period */ + u_int8_t tim_bitctl; /* bitmap control */ + u_int8_t tim_bitmap[1]; /* variable-length bitmap */ +} __packed; + +struct ieee80211_country_ie { + u_int8_t ie; /* IEEE80211_ELEMID_COUNTRY */ + u_int8_t len; + u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ + struct { + u_int8_t schan; /* starting channel */ + u_int8_t nchan; /* number channels */ + u_int8_t maxtxpwr; /* tx power cap */ + } band[4] __packed; /* up to 4 sub bands */ +} __packed; + #define IEEE80211_CHALLENGE_LEN 128 #define IEEE80211_RATE_BASIC 0x80 From owner-p4-projects@FreeBSD.ORG Tue Dec 7 00:54:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFEFB16A4D0; Tue, 7 Dec 2004 00:54:44 +0000 (GMT) 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 996CF16A4CE for ; Tue, 7 Dec 2004 00:54:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69EF043D68 for ; Tue, 7 Dec 2004 00:54:44 +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 iB70siRZ028148 for ; Tue, 7 Dec 2004 00:54:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB70siqY028145 for perforce@freebsd.org; Tue, 7 Dec 2004 00:54:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 00:54:44 GMT Message-Id: <200412070054.iB70siqY028145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 00:54:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=66597 Change 66597 by sam@sam_ebb on 2004/12/07 00:54:05 cleanup dtim code to use a struct Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#22 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#22 (text+ko) ==== @@ -1359,12 +1359,15 @@ *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ bo->bo_tim_len = 0; } else { - *frm++ = IEEE80211_ELEMID_TIM; - *frm++ = 4; /* length */ - *frm++ = 0; /* DTIM count */ - *frm++ = 1; /* DTIM period */ - *frm++ = 0; /* bitmap control */ - *frm++ = 0; /* Partial Virtual Bitmap (variable length) */ + struct ieee80211_tim_ie *tie = (struct ieee80211_tim_ie *) frm; + + tie->tim_ie = IEEE80211_ELEMID_TIM; + tie->tim_len = 4; /* length */ + tie->tim_count = 0; /* DTIM count */ + tie->tim_period = ic->ic_dtim_period; /* DTIM period */ + tie->tim_bitctl = 0; /* bitmap control */ + tie->tim_bitmap[0] = 0; /* Partial Virtual Bitmap */ + frm += sizeof(struct ieee80211_tim_ie); bo->bo_tim_len = 1; } bo->bo_trailer = frm; @@ -1462,6 +1465,8 @@ } if (ic->ic_opmode == IEEE80211_M_HOSTAP) { /* NB: no IBSS support*/ + struct ieee80211_tim_ie *tie = + (struct ieee80211_tim_ie *) bo->bo_tim; if (ic->ic_flags & IEEE80211_F_TIMUPDATE) { u_int timlen, timoff, i; /* @@ -1498,18 +1503,18 @@ } if (timlen != bo->bo_tim_len) { /* copy up/down trailer */ - ovbcopy(bo->bo_trailer, bo->bo_tim + 5 + timlen, + ovbcopy(bo->bo_trailer, tie->tim_bitmap+timlen, bo->bo_trailer_len); - bo->bo_trailer = bo->bo_tim + 5 + timlen; + bo->bo_trailer = tie->tim_bitmap+timlen; bo->bo_wme = bo->bo_trailer; bo->bo_tim_len = timlen; /* update information element */ - bo->bo_tim[1] = 3 + timlen; - bo->bo_tim[4] = timoff; + tie->tim_len = 3 + timlen; + tie->tim_bitctl = timoff; len_changed = 1; } - memcpy(bo->bo_tim + 5, ic->ic_tim_bitmap + timoff, + memcpy(tie->tim_bitmap, ic->ic_tim_bitmap + timoff, bo->bo_tim_len); ic->ic_flags &= ~IEEE80211_F_TIMUPDATE; @@ -1519,21 +1524,15 @@ __func__, ic->ic_ps_pending, timoff, timlen); } /* count down DTIM period */ - if (bo->bo_tim[2] == 0) { - /* - * NB: update both from ic_dtim_period - * so we automatically collect any - * new DTIM period. - */ - bo->bo_tim[2] = ic->ic_dtim_period - 1; - bo->bo_tim[3] = ic->ic_dtim_period; - } else - bo->bo_tim[2]--; - /* update TIM state regarding buffered multicast frames */ - if (mcast && (bo->bo_tim[2] == 1 || bo->bo_tim[3] == 1)) - bo->bo_tim[4] |= 1; + if (tie->tim_count == 0) + tie->tim_count = tie->tim_period - 1; + else + tie->tim_count--; + /* update state for buffered multicast frames on DTIM */ + if (mcast && (tie->tim_count == 1 || tie->tim_period == 1)) + tie->tim_bitctl |= 1; else - bo->bo_tim[4] &= ~1; + tie->tim_bitctl &= ~1; } IEEE80211_BEACON_UNLOCK(ic); From owner-p4-projects@FreeBSD.ORG Tue Dec 7 00:54:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9892716A4D7; Tue, 7 Dec 2004 00:54:45 +0000 (GMT) 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 DD63216A4DF for ; Tue, 7 Dec 2004 00:54:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B599043D68 for ; Tue, 7 Dec 2004 00:54:44 +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 iB70sio6028154 for ; Tue, 7 Dec 2004 00:54:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB70siHI028151 for perforce@freebsd.org; Tue, 7 Dec 2004 00:54:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 00:54:44 GMT Message-Id: <200412070054.iB70siHI028151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 00:54:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66598 Change 66598 by sam@sam_ebb on 2004/12/07 00:54:23 can't dtim on the fly; stations must re-associate Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#27 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#27 (text+ko) ==== @@ -2290,9 +2290,8 @@ return EINVAL; if (IEEE80211_DTIM_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_DTIM_MAX) { - IEEE80211_BEACON_LOCK(ic); ic->ic_dtim_period = ireq->i_val; - IEEE80211_BEACON_UNLOCK(ic); + error = ENETRESET; /* requires restart */ } else error = EINVAL; break; From owner-p4-projects@FreeBSD.ORG Tue Dec 7 01:10:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C32EE16A4D0; Tue, 7 Dec 2004 01:10:03 +0000 (GMT) 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 9FC9816A4CE for ; Tue, 7 Dec 2004 01:10:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A89743D5D for ; Tue, 7 Dec 2004 01:10:03 +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 iB71A3nD028601 for ; Tue, 7 Dec 2004 01:10:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB71A3b1028598 for perforce@freebsd.org; Tue, 7 Dec 2004 01:10:03 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 01:10:03 GMT Message-Id: <200412070110.iB71A3b1028598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 01:10:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=66599 Change 66599 by sam@sam_ebb on 2004/12/07 01:09:51 fix compile w/o MBUF_GUARD option Affected files ... .. //depot/projects/wifi/sys/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/wifi/sys/sys/mbuf.h#4 (text+ko) ==== @@ -61,6 +61,7 @@ } while (0) #else #define MLEN (MSIZE - sizeof(struct m_hdr)) /* normal data len */ +#define MBUF_GUARDCHECK(m) #endif #define MHLEN (MLEN - sizeof(struct pkthdr)) /* data len w/pkthdr */ #define MINCLSIZE (MHLEN + 1) /* smallest amount to put in cluster */ From owner-p4-projects@FreeBSD.ORG Tue Dec 7 02:33:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA6FD16A4D0; Tue, 7 Dec 2004 02:33:49 +0000 (GMT) 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 B69AF16A4CE for ; Tue, 7 Dec 2004 02:33:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8AB843D31 for ; Tue, 7 Dec 2004 02:33: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 iB72XnlD031115 for ; Tue, 7 Dec 2004 02:33:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB72XnZ4031112 for perforce@freebsd.org; Tue, 7 Dec 2004 02:33:49 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 02:33:49 GMT Message-Id: <200412070233.iB72XnZ4031112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 02:33:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=66601 Change 66601 by sam@sam_ebb on 2004/12/07 02:33:46 bring over ieee80211_information so it builds again Affected files ... .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ray/if_rayvar.h#2 (text+ko) ==== @@ -323,3 +323,41 @@ #ifndef RAY_MAP_CM #define RAY_MAP_CM(sc) #endif /* RAY_MAP_CM */ + +/* + * Management information element payloads + */ +union ieee80211_information { + char ssid[IEEE80211_NWID_LEN+1]; + struct rates { + u_int8_t *p; + } rates; + struct fh { + u_int16_t dwell; + u_int8_t set; + u_int8_t pattern; + u_int8_t index; + } fh; + struct ds { + u_int8_t channel; + } ds; + struct cf { + u_int8_t count; + u_int8_t period; + u_int8_t maxdur[2]; + u_int8_t dur[2]; + } cf; + struct tim { + u_int8_t count; + u_int8_t period; + u_int8_t bitctl; + /* u_int8_t pvt[251]; The driver needs to use this. */ + } tim; + struct ibss { + u_int16_t atim; + } ibss; + struct challenge { + u_int8_t *p; + u_int8_t len; + } challenge; +}; From owner-p4-projects@FreeBSD.ORG Tue Dec 7 02:35:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDE9D16A4D0; Tue, 7 Dec 2004 02:35:52 +0000 (GMT) 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 C9B0316A4CE for ; Tue, 7 Dec 2004 02:35:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CF2F43D67 for ; Tue, 7 Dec 2004 02:35:52 +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 iB72Zqtc031223 for ; Tue, 7 Dec 2004 02:35:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB72Zq8U031220 for perforce@freebsd.org; Tue, 7 Dec 2004 02:35:52 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 02:35:52 GMT Message-Id: <200412070235.iB72Zq8U031220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 02:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=66602 Change 66602 by sam@sam_ebb on 2004/12/07 02:34:52 more debug msg cleanups Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#23 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#23 (text+ko) ==== @@ -139,19 +139,19 @@ if ((m->m_flags & M_LINK0) != 0 && ni->ni_challenge != NULL) { m->m_flags &= ~M_LINK0; IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: encrypting frame for %s\n", - __func__, ether_sprintf(wh->i_addr1)); + "[%s] encrypting frame (%s)\n", + ether_sprintf(wh->i_addr1), __func__); wh->i_fc[1] |= IEEE80211_FC1_WEP; } #ifdef IEEE80211_DEBUG /* avoid printing too many frames */ if ((ieee80211_msg_debug(ic) && doprint(ic, type)) || ieee80211_msg_dumppkts(ic)) { - if_printf(ifp, "sending %s to %s on channel %u\n", + printf("[%s] send %s on channel %u\n", + ether_sprintf(wh->i_addr1), ieee80211_mgt_subtype_name[ - (type & IEEE80211_FC0_SUBTYPE_MASK) - >> IEEE80211_FC0_SUBTYPE_SHIFT], - ether_sprintf(wh->i_addr1), + (type & IEEE80211_FC0_SUBTYPE_MASK) >> + IEEE80211_FC0_SUBTYPE_SHIFT], ieee80211_chan2ieee(ic, ni->ni_chan)); } #endif @@ -452,7 +452,8 @@ key = ieee80211_crypto_getkey(ic, eh.ether_dhost, ni); if (key == NULL && eh.ether_type != htons(ETHERTYPE_PAE)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "%s: No default transmit key\n", __func__); + "[%s] no default transmit key\n", + ether_sprintf(ni->ni_macaddr)); /* XXX statistic */ } } else @@ -1076,7 +1077,8 @@ 4 * sizeof(u_int16_t) + IEEE80211_CHALLENGE_LEN; if (arg == IEEE80211_AUTH_SHARED_RESPONSE) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: request encrypt frame\n", __func__); + "[%s] request encrypt frame (%s)\n", + ether_sprintf(ni->ni_macaddr), __func__); m->m_flags |= M_LINK0; /* WEP-encrypt, please */ } } else @@ -1102,7 +1104,7 @@ case IEEE80211_FC0_SUBTYPE_DEAUTH: IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "send station %s deauthenticate (reason %d)\n", + "[%s] send station deauthenticate (reason %d)\n", ether_sprintf(ni->ni_macaddr), arg); m = ieee80211_getmgtframe(&frm, sizeof(u_int16_t)); if (m == NULL) @@ -1236,7 +1238,7 @@ case IEEE80211_FC0_SUBTYPE_DISASSOC: IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "send station %s disassociate (reason %d)\n", + "[%s] send station disassociate (reason %d)\n", ether_sprintf(ni->ni_macaddr), arg); m = ieee80211_getmgtframe(&frm, sizeof(u_int16_t)); if (m == NULL) @@ -1250,7 +1252,8 @@ default: IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: invalid mgmt frame type %u\n", __func__, type); + "[%s] invalid mgmt frame type %u\n", + ether_sprintf(ni->ni_macaddr), type); senderr(EINVAL, is_tx_unknownmgt); /* NOTREACHED */ } From owner-p4-projects@FreeBSD.ORG Tue Dec 7 03:17:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60B7D16A4D0; Tue, 7 Dec 2004 03:17:45 +0000 (GMT) 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 3D4A616A4CE for ; Tue, 7 Dec 2004 03:17:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D3F043D6B for ; Tue, 7 Dec 2004 03:17: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 iB73HjJ9033058 for ; Tue, 7 Dec 2004 03:17:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB73Hilr033055 for perforce@freebsd.org; Tue, 7 Dec 2004 03:17:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 03:17:44 GMT Message-Id: <200412070317.iB73Hilr033055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 03:17:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66606 Change 66606 by sam@sam_ebb on 2004/12/07 03:16:53 Go back to holding a reference on a station when we start authentication rather than when we receive a probe request. The race condition that motivated the original decision won't happen 'cuz of the node table changes and populating the station table based on probe requests is bad in a dense environment. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#25 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#25 (text+ko) ==== @@ -873,7 +873,8 @@ ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) return; - } + } else + (void) ieee80211_ref_node(ni); ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); @@ -1023,8 +1024,10 @@ return; } allocbs = 1; - } else + } else { + (void) ieee80211_ref_node(ni); allocbs = 0; + } ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; if (!alloc_challenge(ic, ni)) { @@ -2011,12 +2014,14 @@ wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], "%s", "recv'd rate set invalid"); - if (allocbs) /* reclaim immediately */ - ieee80211_free_node(ni); } else { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); } + if (allocbs && ic->ic_opmode != IEEE80211_M_IBSS) { + /* reclaim immediately */ + ieee80211_free_node(ni); + } break; } From owner-p4-projects@FreeBSD.ORG Tue Dec 7 04:56:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8024F16A4D0; Tue, 7 Dec 2004 04:56:45 +0000 (GMT) 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 592EC16A4CE for ; Tue, 7 Dec 2004 04:56:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45A8143D39 for ; Tue, 7 Dec 2004 04:56: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 iB74ujDu042687 for ; Tue, 7 Dec 2004 04:56:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB74uiDW042684 for perforce@freebsd.org; Tue, 7 Dec 2004 04:56:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 04:56:44 GMT Message-Id: <200412070456.iB74uiDW042684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 04:56:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66609 Change 66609 by sam@sam_ebb on 2004/12/07 04:56:05 purge ath_rate_node_copy; it's officially nuked from the api Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#3 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#3 edit .. //depot/projects/wifi/sys/dev/ath/if_athrate.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#3 (text+ko) ==== @@ -110,16 +110,6 @@ } void -ath_rate_node_copy(struct ath_softc *sc, - struct ath_node *dst, const struct ath_node *src) -{ - struct amrr_node *adst = ATH_NODE_AMRR(dst); - const struct amrr_node *asrc = (const struct amrr_node *)&src[1]; - - memcpy(adst, asrc, sizeof(struct amrr_node)); -} - -void ath_rate_findrate(struct ath_softc *sc, struct ath_node *an, HAL_BOOL shortPreamble, size_t frameLen, u_int8_t *rix, int *try0, u_int8_t *txrate) ==== //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#3 (text+ko) ==== @@ -132,16 +132,6 @@ } void -ath_rate_node_copy(struct ath_softc *sc, - struct ath_node *dst, const struct ath_node *src) -{ - struct onoe_node *odst = ATH_NODE_ONOE(dst); - const struct onoe_node *osrc = (const struct onoe_node *)&src[1]; - - memcpy(odst, osrc, sizeof(struct onoe_node)); -} - -void ath_rate_findrate(struct ath_softc *sc, struct ath_node *an, HAL_BOOL shortPreamble, size_t frameLen, u_int8_t *rix, int *try0, u_int8_t *txrate) ==== //depot/projects/wifi/sys/dev/ath/if_athrate.h#2 (text+ko) ==== @@ -98,12 +98,6 @@ */ void ath_rate_node_cleanup(struct ath_softc *, struct ath_node *); /* - * Copy per-node state; currently used only to duplicate bss on - * station association. - */ -void ath_rate_node_copy(struct ath_softc *, - struct ath_node *, const struct ath_node *); -/* * Update rate control state on station associate/reassociate * (when operating as an ap or for nodes discovered when operating * in ibss mode). From owner-p4-projects@FreeBSD.ORG Tue Dec 7 18:38:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79F2C16A4D0; Tue, 7 Dec 2004 18:38:25 +0000 (GMT) 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 4EFD716A4CF for ; Tue, 7 Dec 2004 18:38:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8299643D70 for ; Tue, 7 Dec 2004 18:38: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 iB7IcOI0097448 for ; Tue, 7 Dec 2004 18:38:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB7IcNwV097445 for perforce@freebsd.org; Tue, 7 Dec 2004 18:38:23 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Dec 2004 18:38:23 GMT Message-Id: <200412071838.iB7IcNwV097445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2004 18:38:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=66633 Change 66633 by sam@sam_ebb on 2004/12/07 18:37:27 IFC @ 66632 Affected files ... .. //depot/projects/wifi/Makefile#3 integrate .. //depot/projects/wifi/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/wifi/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/wifi/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/wifi/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/wifi/etc/network.subr#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/ia64/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/sparc64/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/wifi/include/unistd.h#2 integrate .. //depot/projects/wifi/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#4 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/wifi/share/man/man4/acpi.4#2 integrate .. //depot/projects/wifi/share/man/man4/ddb.4#2 integrate .. //depot/projects/wifi/share/man/man4/gif.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/wifi/share/man/man9/EVENTHANDLER.9#2 integrate .. //depot/projects/wifi/share/man/man9/Makefile#4 integrate .. //depot/projects/wifi/share/man/man9/jumbo.9#2 delete .. //depot/projects/wifi/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/wifi/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/wifi/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/wifi/sys/conf/files#9 edit .. //depot/projects/wifi/sys/conf/kmod.mk#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/wifi/sys/dev/amr/amr.c#2 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/wifi/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#2 integrate .. //depot/projects/wifi/sys/i386/i386/bios.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/wifi/sys/isa/isavar.h#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/wifi/sys/kern/init_main.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_subr.c#3 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_jumbo.c#3 delete .. //depot/projects/wifi/sys/kern/vfs_init.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/wifi/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/wifi/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/wifi/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/wifi/sys/netinet/in_gif.c#2 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/wifi/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/wifi/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/wifi/sys/nfs/nfs_common.h#2 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfs_subs.c#3 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfsnode.h#4 integrate .. //depot/projects/wifi/sys/pci/if_ti.c#2 integrate .. //depot/projects/wifi/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/wifi/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/wifi/sys/sys/eventhandler.h#2 integrate .. //depot/projects/wifi/sys/sys/jumbo.h#2 delete .. //depot/projects/wifi/sys/sys/kernel.h#4 integrate .. //depot/projects/wifi/sys/sys/mount.h#5 integrate .. //depot/projects/wifi/sys/sys/systm.h#5 integrate .. //depot/projects/wifi/sys/sys/vnode.h#6 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/wifi/tools/regression/aio/aiotest/Makefile#1 branch .. //depot/projects/wifi/tools/regression/aio/aiotest/aiotest.c#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#6 integrate .. //depot/projects/wifi/tools/tools/README#2 integrate .. //depot/projects/wifi/tools/tools/raidtest/Makefile#3 delete .. //depot/projects/wifi/tools/tools/raidtest/README#3 delete .. //depot/projects/wifi/tools/tools/raidtest/raidtest.c#3 delete .. //depot/projects/wifi/usr.bin/calendar/day.c#2 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#4 integrate .. //depot/projects/wifi/usr.bin/make/compat.c#5 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#4 integrate .. //depot/projects/wifi/usr.bin/make/dir.h#3 integrate .. //depot/projects/wifi/usr.bin/make/for.c#4 integrate .. //depot/projects/wifi/usr.bin/make/hash.c#4 integrate .. //depot/projects/wifi/usr.bin/make/hash.h#4 integrate .. //depot/projects/wifi/usr.bin/make/job.c#8 integrate .. //depot/projects/wifi/usr.bin/make/job.h#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.h#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstClose.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEachFrom.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsAtEnd.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstMember.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstNext.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstOpen.c#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#4 integrate .. //depot/projects/wifi/usr.bin/make/main.c#8 integrate .. //depot/projects/wifi/usr.bin/make/make.c#5 integrate .. //depot/projects/wifi/usr.bin/make/make.h#2 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#3 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#5 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#4 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#4 integrate .. //depot/projects/wifi/usr.bin/make/var.c#4 integrate .. //depot/projects/wifi/usr.bin/make/var_modify.c#4 integrate .. //depot/projects/wifi/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/wifi/usr.sbin/pppd/cbcp.c#4 integrate .. //depot/projects/wifi/usr.sbin/rpc.lockd/kern.c#2 integrate Differences ... ==== //depot/projects/wifi/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ # # The user-driven targets are: # @@ -217,6 +217,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ ==== //depot/projects/wifi/contrib/ntp/ntpdate/ntpdate.c#2 (text+ko) ==== @@ -1339,7 +1339,10 @@ hints.ai_family = ai_fam_templ; hints.ai_socktype = SOCK_DGRAM; - printf("Looking for host %s and service %s\n", serv, service); +#ifdef DEBUG + if (debug) + printf("Looking for host %s and service %s\n", serv, service); +#endif error = getaddrinfo(serv, service, &hints, &addrResult); if (error != 0) { @@ -1347,9 +1350,11 @@ msyslog(LOG_ERR, "can't find host %s\n", serv); return; } - else { +#ifdef DEBUG + else if (debug) { fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr)); } +#endif server = (struct server *)emalloc(sizeof(struct server)); memset((char *)server, 0, sizeof(struct server)); ==== //depot/projects/wifi/etc/etc.sparc64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.7 2004/10/04 03:39:52 kensmith Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.8 2004/12/04 14:03:45 marius Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -35,6 +35,8 @@ screen "/usr/libexec/getty Pc" cons25 on secure ttya "/usr/libexec/getty 3wire.9600" cons25 on secure ttyb "/usr/libexec/getty 3wire.9600" cons25 off secure +ttyz0 "/usr/libexec/getty 3wire.9600" cons25 on secure +ttyz1 "/usr/libexec/getty 3wire.9600" cons25 off secure # #ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ==== //depot/projects/wifi/etc/mtree/BSD.local.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.112 2004/05/31 07:34:40 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.113 2004/12/04 23:30:36 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -269,53 +269,245 @@ .. .. locale + af + LC_MESSAGES + .. + .. + am + LC_MESSAGES + .. + .. + ar + LC_MESSAGES + .. + .. + az + LC_MESSAGES + .. + .. bg + LC_MESSAGES + .. + .. + bn + LC_MESSAGES + .. .. + br + LC_MESSAGES + .. + .. + bs + LC_MESSAGES + .. + .. + cy + LC_MESSAGES + .. + .. da + LC_MESSAGES + .. .. de + LC_MESSAGES + .. + .. + dk + LC_MESSAGES + .. + .. + ee + LC_MESSAGES + .. .. en + LC_MESSAGES + .. + .. + en_CA + LC_MESSAGES + .. .. en_GB + LC_MESSAGES + .. .. eo + LC_MESSAGES + .. .. es + LC_MESSAGES + .. + .. + es_ES + LC_MESSAGES + .. + .. + es_MX + LC_MESSAGES + .. .. et + LC_MESSAGES + .. + .. + eu + LC_MESSAGES + .. + .. + fa + LC_MESSAGES + .. .. fr + LC_MESSAGES + .. + .. + ga + LC_MESSAGES + .. + .. + gu + LC_MESSAGES + .. .. he + LC_MESSAGES + .. + .. + hi + LC_MESSAGES + .. .. hr + LC_MESSAGES + .. .. hu + LC_MESSAGES + .. .. id + LC_MESSAGES + .. + .. + is + LC_MESSAGES + .. .. it + LC_MESSAGES + .. .. ja + LC_MESSAGES + .. .. + ka + LC_MESSAGES + .. + .. + kn + LC_MESSAGES + .. + .. lt + LC_MESSAGES + .. + .. + lv + LC_MESSAGES + .. .. + mk + LC_MESSAGES + .. + .. + ml + LC_MESSAGES + .. + .. + mn + LC_MESSAGES + .. + .. ms + LC_MESSAGES + .. .. nb + LC_MESSAGES + .. .. nl + LC_MESSAGES + .. .. + or + LC_MESSAGES + .. + .. + pa + LC_MESSAGES + .. + .. pt_BR + LC_MESSAGES + .. + .. + pt_PT + LC_MESSAGES + .. .. ru + LC_MESSAGES + .. + .. + sr@Latn + LC_MESSAGES + .. + .. + sq + LC_MESSAGES + .. .. sv + LC_MESSAGES + .. + .. + ta + LC_MESSAGES + .. .. + th + LC_MESSAGES + .. + .. tr + LC_MESSAGES + .. + .. + vi + LC_MESSAGES + .. + .. + wa + LC_MESSAGES + .. + .. + zh + LC_MESSAGES + .. .. + zh_CN.GB2312 + LC_MESSAGES + .. + .. zh_TW.Big5 + LC_MESSAGES + .. .. .. misc ==== //depot/projects/wifi/etc/mtree/BSD.x11-4.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.24 2004/05/31 07:34:40 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.25 2004/12/04 23:30:36 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -458,126 +458,340 @@ .. locale af + LC_MESSAGES + .. .. am + LC_MESSAGES + .. + .. + ar + LC_MESSAGES + .. .. az + LC_MESSAGES + .. .. be + LC_MESSAGES + .. .. bg + LC_MESSAGES + .. .. + bn + LC_MESSAGES + .. + .. bs + LC_MESSAGES + .. .. ca + LC_MESSAGES + .. .. cs + LC_MESSAGES + .. .. cy + LC_MESSAGES + .. .. da + LC_MESSAGES + .. .. de + LC_MESSAGES + .. + .. + de_AT + LC_MESSAGES + .. .. el + LC_MESSAGES + .. .. en + LC_MESSAGES + .. .. + en_AU + LC_MESSAGES + .. + .. en_CA + LC_MESSAGES + .. .. en_GB + LC_MESSAGES + .. .. eo + LC_MESSAGES + .. .. es + LC_MESSAGES + .. .. es_ES + LC_MESSAGES + .. .. es_MX + LC_MESSAGES + .. .. et + LC_MESSAGES + .. + .. + eu + LC_MESSAGES + .. .. fa + LC_MESSAGES + .. + .. + fa_IR + LC_MESSAGES + .. .. fi + LC_MESSAGES + .. .. fr + LC_MESSAGES + .. .. + fr_FR + LC_MESSAGES + .. + .. ga + LC_MESSAGES + .. .. gl + LC_MESSAGES + .. + .. + gu + LC_MESSAGES + .. .. he + LC_MESSAGES + .. + .. + hi + LC_MESSAGES + .. .. hr + LC_MESSAGES + .. .. hu + LC_MESSAGES + .. .. id + LC_MESSAGES + .. .. + is + LC_MESSAGES + .. + .. it + LC_MESSAGES + .. .. ja + LC_MESSAGES + .. + .. + ka + LC_MESSAGES + .. .. kn + LC_MESSAGES + .. .. ko + LC_MESSAGES + .. + .. + li + LC_MESSAGES + .. .. lt + LC_MESSAGES + .. .. lv + LC_MESSAGES + .. .. mk + LC_MESSAGES + .. .. ml + LC_MESSAGES + .. .. + mn + LC_MESSAGES + .. + .. ms + LC_MESSAGES + .. + .. + nb + LC_MESSAGES + .. + .. + ne + LC_MESSAGES + .. .. nl + LC_MESSAGES + .. .. nn + LC_MESSAGES + .. .. no + LC_MESSAGES + .. .. + or + LC_MESSAGES + .. + .. + pa + LC_MESSAGES + .. + .. pl + LC_MESSAGES + .. .. pt + LC_MESSAGES + .. .. pt_BR + LC_MESSAGES + .. .. pt_PT + LC_MESSAGES + .. .. ro + LC_MESSAGES + .. .. ru + LC_MESSAGES + .. .. sk + LC_MESSAGES + .. .. sl + LC_MESSAGES + .. .. sq + LC_MESSAGES + .. .. sr + LC_MESSAGES + .. .. sr@Latn + LC_MESSAGES + .. .. sv + LC_MESSAGES + .. .. ta + LC_MESSAGES + .. .. + tg + LC_MESSAGES + .. + .. th + LC_MESSAGES + .. + .. + tk + LC_MESSAGES + .. .. tr + LC_MESSAGES + .. .. uk + LC_MESSAGES + .. + .. + uz + LC_MESSAGES + .. .. + wa + LC_MESSAGES + .. + .. vi + LC_MESSAGES + .. .. + zh + LC_MESSAGES + .. + .. zh_CN + LC_MESSAGES + .. .. + zh_CN.GB2312 + LC_MESSAGES + .. + .. zh_TW + LC_MESSAGES + .. .. zh_TW.Big5 + LC_MESSAGES + .. .. .. .. ==== //depot/projects/wifi/etc/network.subr#3 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.157 2004/10/30 13:44:05 pjd Exp $ +# $FreeBSD: src/etc/network.subr,v 1.160 2004/12/05 21:45:36 pjd Exp $ # # @@ -256,7 +256,7 @@ ifnet_rename() { - _ifn_list="`list_net_interfaces all`" + _ifn_list="`ifconfig -l`" [ -z "$_ifn_list" ] && return 0 for _if in ${_ifn_list} ; do eval _ifname=\$ifconfig_${_if}_name @@ -274,7 +274,6 @@ # argument can be any of the following: # nodhcp - all interfaces, excluding DHCP configured interfaces # dhcp - list only DHCP configured interfaces -# all - all interfaces # If no argument is specified all network interfaces are output. # Note that the list will include cloned interfaces if applicable. # Cloned interfaces must already exist to have a chance to appear @@ -300,7 +299,7 @@ return 0 fi - # Separate out dhcp and non-dhcp intefraces + # Separate out dhcp and non-dhcp interfaces # _aprefix= _bprefix= @@ -343,9 +342,6 @@ dhcp) echo $_dhcplist ;; - all) - echo $_nodhcplist $_dhcplist - ;; esac return 0 } ==== //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.11 2004/11/30 05:12:35 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.12 2004/12/05 04:08:22 marcel Exp $ VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -19,6 +19,10 @@ TARGET_ARCH?= ${MACHINE_ARCH} TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif + .if !defined(INFO) .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.2 2004/11/30 05:12:35 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $ .if !defined(GDB_CROSS_DEBUGGER) -LIBSRCS+= core-regset.c solib-legacy.c +LIBSRCS+= core-regset.c solib.c solib-legacy.c solib-svr4.c LIBSRCS+= alphabsd-nat.c .endif LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -174,7 +174,9 @@ #define GDB_TM_FILE config/alpha/tm-fbsd.h /* nativefile */ +#ifndef CROSS_DEBUGGER #define GDB_NM_FILE config/alpha/nm-fbsd.h +#endif /* Define to 1 so gets a definition of anon_hdl. Works around a problem on IRIX 5. */ ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/init.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/init.c,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/init.c,v 1.2 2004/12/05 06:58:59 marcel Exp $ */ /* Do not modify this file. */ /* It is created automatically by the Makefile. */ @@ -120,14 +120,18 @@ _initialize_ser_hardwire (); _initialize_ser_pipe (); _initialize_ser_tcp (); +#ifndef CROSS_DEBUGGER _initialize_kernel_u_addr (); _initialize_infptrace (); _initialize_inftarg (); _initialize_solib (); _initialize_svr4_solib (); _initialize_svr4_lm (); +#endif _initialize_corelow (); +#ifndef CROSS_DEBUGGER _initialize_core_regset (); +#endif _initialize_remote (); _initialize_dcache (); _initialize_sr_support (); ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/Makefile#3 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.3 2004/12/05 06:58:59 marcel Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 8 01:49:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FE3416A4D0; Wed, 8 Dec 2004 01:49:16 +0000 (GMT) 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 DD46616A4CE for ; Wed, 8 Dec 2004 01:49:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D16C743D1F for ; Wed, 8 Dec 2004 01:49: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 iB81nFUm024501 for ; Wed, 8 Dec 2004 01:49:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB81nFd2024498 for perforce@freebsd.org; Wed, 8 Dec 2004 01:49:15 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Dec 2004 01:49:15 GMT Message-Id: <200412080149.iB81nFd2024498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2004 01:49:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=66650 Change 66650 by sam@sam_ebb on 2004/12/08 01:48:31 correct comparison order during ap selection Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#25 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#25 (text+ko) ==== @@ -551,7 +551,7 @@ rssia = ic->ic_node_getrssi(a); rssib = ic->ic_node_getrssi(b); if (maxa != maxb && abs(rssib - rssia) < 5) - return maxb - maxa; + return maxa - maxb; /* XXX use freq for channel preference */ /* for now just prefer 5Ghz band to all other bands */ @@ -563,7 +563,7 @@ return -1; /* all things being equal, use signal level */ - return rssib - rssia; + return rssia - rssib; } /* @@ -683,7 +683,7 @@ if (ieee80211_match_bss(ic, ni) == 0) { if (selbs == NULL) selbs = ni; - else if (ieee80211_node_compare(ic, ni, selbs) < 0) { + else if (ieee80211_node_compare(ic, ni, selbs) > 0) { ieee80211_unref_node(&selbs); selbs = ni; } else From owner-p4-projects@FreeBSD.ORG Wed Dec 8 06:02:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEBA516A4D0; Wed, 8 Dec 2004 06:02:26 +0000 (GMT) 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 8168216A4CE for ; Wed, 8 Dec 2004 06:02:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09D8643D53 for ; Wed, 8 Dec 2004 06:02:26 +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 iB862PSk039631 for ; Wed, 8 Dec 2004 06:02:26 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB862OF8039628 for perforce@freebsd.org; Wed, 8 Dec 2004 06:02:24 GMT (envelope-from marcel@freebsd.org) Date: Wed, 8 Dec 2004 06:02:24 GMT Message-Id: <200412080602.iB862OF8039628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 66662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2004 06:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66662 Change 66662 by marcel@marcel_nfs on 2004/12/08 06:01:47 IFC @66661 Affected files ... .. //depot/projects/ia64/MAINTAINERS#43 integrate .. //depot/projects/ia64/Makefile#42 integrate .. //depot/projects/ia64/Makefile.inc1#98 integrate .. //depot/projects/ia64/UPDATING#73 integrate .. //depot/projects/ia64/bin/ps/ps.1#24 integrate .. //depot/projects/ia64/bin/sh/jobs.c#21 integrate .. //depot/projects/ia64/bin/sh/sh.1#27 integrate .. //depot/projects/ia64/contrib/ntp/ntpdate/ntpdate.c#5 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#57 integrate .. //depot/projects/ia64/etc/devd.conf#15 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#24 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/ia64/etc/network.subr#12 integrate .. //depot/projects/ia64/etc/usbd.conf#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/ia64/include/unistd.h#25 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/getcontext.3#3 integrate .. //depot/projects/ia64/lib/libc/i386/gen/makecontext.c#5 integrate .. //depot/projects/ia64/lib/libc/sys/mount.2#11 integrate .. //depot/projects/ia64/lib/libc/sys/statfs.2#7 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#14 integrate .. //depot/projects/ia64/release/i386/mkisoimages.sh#7 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#21 integrate .. //depot/projects/ia64/sbin/devd/devd.8#11 integrate .. //depot/projects/ia64/sbin/dump/dump.h#16 integrate .. //depot/projects/ia64/sbin/dump/itime.c#9 integrate .. //depot/projects/ia64/sbin/mount/mntopts.h#7 integrate .. //depot/projects/ia64/sbin/mount/mount.8#18 integrate .. //depot/projects/ia64/sbin/mount/mount.c#18 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.8#9 integrate .. //depot/projects/ia64/sbin/sconfig/sconfig.8#4 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#14 integrate .. //depot/projects/ia64/share/man/man4/Makefile#78 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#23 integrate .. //depot/projects/ia64/share/man/man4/ddb.4#8 integrate .. //depot/projects/ia64/share/man/man4/gif.4#10 integrate .. //depot/projects/ia64/share/man/man4/smp.4#8 integrate .. //depot/projects/ia64/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/ia64/share/man/man7/security.7#11 integrate .. //depot/projects/ia64/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/ia64/share/man/man9/Makefile#48 integrate .. //depot/projects/ia64/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/ia64/share/man/man9/jumbo.9#3 delete .. //depot/projects/ia64/share/man/man9/style.9#26 integrate .. //depot/projects/ia64/share/man/man9/vfs_mount.9#6 integrate .. //depot/projects/ia64/share/man/man9/zero_copy.9#6 integrate .. //depot/projects/ia64/share/zoneinfo/europe#8 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#8 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/ia64/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#28 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#44 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/ia64/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#5 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#25 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#13 integrate .. //depot/projects/ia64/sys/boot/ficl/ficl.h#3 integrate .. //depot/projects/ia64/sys/boot/ficl/loader.c#7 integrate .. //depot/projects/ia64/sys/boot/forth/beastie.4th#8 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/ia64/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#8 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/i386/loader/help.i386#5 integrate .. //depot/projects/ia64/sys/boot/i386/loader/loader.rc#3 delete .. //depot/projects/ia64/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/metadata.c#5 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#12 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#15 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.h#7 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#33 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#21 integrate .. //depot/projects/ia64/sys/conf/files#122 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#48 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#38 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#18 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/achware.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acinterp.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#17 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acoutput.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl2.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#19 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlresrc.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#17 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsutils.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconvrt.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exprep.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#17 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwtimer.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nswalk.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psopcode.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsxface.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxfroot.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utalloc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utclib.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmath.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#10 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#10 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#56 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#22 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#21 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#24 integrate .. //depot/projects/ia64/sys/dev/amr/amr_cam.c#9 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#15 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#16 integrate .. //depot/projects/ia64/sys/dev/mii/mii.c#12 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#43 integrate .. //depot/projects/ia64/sys/dev/sound/isa/es1888.c#5 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#33 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_ia64.c#8 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#42 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#63 integrate .. //depot/projects/ia64/sys/fs/deadfs/dead_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#16 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#15 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#19 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo.h#4 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#30 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs.h#8 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_subr.c#6 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#27 integrate .. //depot/projects/ia64/sys/fs/msdosfs/denode.h#7 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#18 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#31 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#29 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs.h#6 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/fs/nullfs/null.h#6 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_subr.c#10 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vfsops.c#14 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_node.c#9 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vfsops.c#15 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#10 integrate .. //depot/projects/ia64/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/ia64/sys/fs/portalfs/portal_vfsops.c#16 integrate .. //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#16 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#16 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs.c#13 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vncache.c#16 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#25 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs.h#8 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_node.c#15 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#23 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#25 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#28 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap.h#4 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#16 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vnops.c#7 integrate .. //depot/projects/ia64/sys/fs/unionfs/union.h#9 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#19 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#18 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/ia64/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#36 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#31 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_extern.h#9 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#30 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#25 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#10 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#6 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#32 integrate .. //depot/projects/ia64/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/legacy.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#40 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#83 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#41 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/ia64/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#11 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#114 integrate .. //depot/projects/ia64/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#12 integrate .. //depot/projects/ia64/sys/isa/isavar.h#6 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#28 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#25 integrate .. //depot/projects/ia64/sys/isofs/cd9660/iso.h#9 integrate .. //depot/projects/ia64/sys/kern/init_main.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#74 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#35 integrate .. //depot/projects/ia64/sys/kern/subr_eventhandler.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_param.c#15 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#22 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/ia64/sys/kern/uipc_jumbo.c#10 delete .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#28 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#34 integrate .. //depot/projects/ia64/sys/kern/vfs_export.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_init.c#16 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#72 integrate .. //depot/projects/ia64/sys/modules/if_gif/Makefile#5 integrate .. //depot/projects/ia64/sys/net/bpf.c#33 integrate .. //depot/projects/ia64/sys/net/if.c#39 integrate .. //depot/projects/ia64/sys/net/if_var.h#27 integrate .. //depot/projects/ia64/sys/netatalk/ddp_input.c#11 integrate .. //depot/projects/ia64/sys/netgraph/atm/sscop/ng_sscop_cust.h#3 integrate .. //depot/projects/ia64/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_misc.c#8 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#8 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/ia64/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/ia64/sys/netgraph/ng_cisco.c#10 integrate .. //depot/projects/ia64/sys/netgraph/ng_ppp.c#16 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#20 integrate .. //depot/projects/ia64/sys/netgraph/ng_source.c#11 integrate .. //depot/projects/ia64/sys/netgraph/ng_tty.c#11 integrate .. //depot/projects/ia64/sys/netinet/in_gif.c#11 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#24 integrate .. //depot/projects/ia64/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#44 integrate .. //depot/projects/ia64/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#55 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#28 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#45 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#20 integrate .. //depot/projects/ia64/sys/netinet6/scope6.c#7 integrate .. //depot/projects/ia64/sys/nfs/nfs_common.c#8 integrate .. //depot/projects/ia64/sys/nfs/nfs_common.h#4 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vn_subs.c#3 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vnops.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#22 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#17 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#30 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#19 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.h#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#11 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_node.c#15 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#23 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_subs.c#18 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#32 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#37 integrate .. //depot/projects/ia64/sys/nfsclient/nfsm_subs.h#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfsmount.h#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#25 integrate .. //depot/projects/ia64/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#34 integrate .. //depot/projects/ia64/sys/posix4/posix4_mib.c#6 integrate .. //depot/projects/ia64/sys/powerpc/include/psl.h#3 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/ia64/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/ia64/sys/sparc64/isa/isa.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/ia64/sys/sys/bus.h#18 integrate .. //depot/projects/ia64/sys/sys/domain.h#5 integrate .. //depot/projects/ia64/sys/sys/eventhandler.h#11 integrate .. //depot/projects/ia64/sys/sys/file.h#22 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#21 integrate .. //depot/projects/ia64/sys/sys/jumbo.h#4 delete .. //depot/projects/ia64/sys/sys/kernel.h#21 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#35 integrate .. //depot/projects/ia64/sys/sys/mount.h#28 integrate .. //depot/projects/ia64/sys/sys/pioctl.h#4 integrate .. //depot/projects/ia64/sys/sys/reboot.h#6 integrate .. //depot/projects/ia64/sys/sys/socket.h#22 integrate .. //depot/projects/ia64/sys/sys/systm.h#40 integrate .. //depot/projects/ia64/sys/sys/uio.h#17 integrate .. //depot/projects/ia64/sys/sys/vnode.h#43 integrate .. //depot/projects/ia64/sys/tools/vnode_if.awk#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#41 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#16 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#42 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#78 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#29 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#49 integrate .. //depot/projects/ia64/tools/regression/aio/aiotest/Makefile#1 branch .. //depot/projects/ia64/tools/regression/aio/aiotest/aiotest.c#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#15 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/shell_test#2 delete .. //depot/projects/ia64/tools/regression/usr.bin/make/shell_test.sh#1 branch .. //depot/projects/ia64/tools/tools/README#17 integrate .. //depot/projects/ia64/tools/tools/nanobsd/Customize/NET4801#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/Customize/comconsole#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/Customize/default#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/Customize/nobeastie#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/Makefile#5 integrate .. //depot/projects/ia64/tools/tools/nanobsd/customize.sh#2 integrate .. //depot/projects/ia64/tools/tools/nanobsd/i386.diskimage#6 integrate .. //depot/projects/ia64/tools/tools/nanobsd/make.conf#5 integrate .. //depot/projects/ia64/tools/tools/raidtest/Makefile#3 delete .. //depot/projects/ia64/tools/tools/raidtest/README#3 delete .. //depot/projects/ia64/tools/tools/raidtest/raidtest.c#3 delete .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#49 integrate .. //depot/projects/ia64/usr.bin/calendar/day.c#7 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#14 integrate .. //depot/projects/ia64/usr.bin/make/arch.c#10 integrate .. //depot/projects/ia64/usr.bin/make/buf.c#6 integrate .. //depot/projects/ia64/usr.bin/make/buf.h#5 integrate .. //depot/projects/ia64/usr.bin/make/compat.c#14 integrate .. //depot/projects/ia64/usr.bin/make/cond.c#12 integrate .. //depot/projects/ia64/usr.bin/make/dir.c#12 integrate .. //depot/projects/ia64/usr.bin/make/dir.h#5 integrate .. //depot/projects/ia64/usr.bin/make/for.c#8 integrate .. //depot/projects/ia64/usr.bin/make/hash.c#6 integrate .. //depot/projects/ia64/usr.bin/make/hash.h#5 integrate .. //depot/projects/ia64/usr.bin/make/job.c#17 integrate .. //depot/projects/ia64/usr.bin/make/job.h#10 integrate .. //depot/projects/ia64/usr.bin/make/lst.h#6 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstAppend.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstAtEnd.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstAtFront.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstClose.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstConcat.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDatum.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDeQueue.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDestroy.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDupl.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstEnQueue.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstFind.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstFindFrom.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstFirst.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstForEach.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstForEachFrom.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInit.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInsert.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInt.h#3 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstIsAtEnd.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstIsEmpty.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstLast.c#3 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstMember.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstNext.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstOpen.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstRemove.c#4 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstReplace.c#4 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstSucc.c#4 delete .. //depot/projects/ia64/usr.bin/make/main.c#26 integrate .. //depot/projects/ia64/usr.bin/make/make.1#18 integrate .. //depot/projects/ia64/usr.bin/make/make.c#9 integrate .. //depot/projects/ia64/usr.bin/make/make.h#9 integrate .. //depot/projects/ia64/usr.bin/make/nonints.h#12 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#19 integrate .. //depot/projects/ia64/usr.bin/make/str.c#11 integrate .. //depot/projects/ia64/usr.bin/make/suff.c#10 integrate .. //depot/projects/ia64/usr.bin/make/targ.c#10 integrate .. //depot/projects/ia64/usr.bin/make/util.c#4 integrate .. //depot/projects/ia64/usr.bin/make/var.c#18 integrate .. //depot/projects/ia64/usr.bin/make/var.h#2 integrate .. //depot/projects/ia64/usr.bin/make/var_modify.c#3 integrate .. //depot/projects/ia64/usr.bin/ncal/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/bundle.c#11 integrate .. //depot/projects/ia64/usr.sbin/ppp/bundle.h#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#20 integrate .. //depot/projects/ia64/usr.sbin/ppp/main.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#23 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#16 integrate .. //depot/projects/ia64/usr.sbin/pppd/cbcp.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.lockd/kern.c#9 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.c#9 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#43 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ +$FreeBSD: src/MAINTAINERS,v 1.101 2004/11/30 20:04:47 eik Exp $ subsystem login notes ----------------------------- @@ -102,6 +102,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +pkg_install eik Pre-commit review or approval from portmgr@ requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/ia64/Makefile#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ # # The user-driven targets are: # @@ -217,6 +217,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ ==== //depot/projects/ia64/Makefile.inc1#98 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -415,6 +415,10 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif .endfor +.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib + cd ${.CURDIR}/${_dir}; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} obj +.endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools ==== //depot/projects/ia64/UPDATING#73 (text+ko) ==== @@ -195,12 +195,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -423,8 +421,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +577,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1973,4 +1963,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ ==== //depot/projects/ia64/bin/ps/ps.1#24 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -249,7 +249,9 @@ .Nm will use the one which was specified last. .It Fl Z -Add label to the list of keywords for which +Add +.Xr mac 4 +label to the list of keywords for which .Nm will display information. .El @@ -601,9 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .It Pa /boot/kernel/kernel default system namelist @@ -618,7 +617,7 @@ .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , -.Xr lomac 4 , +.Xr mac 4 , .Xr procfs 5 , .Xr pstat 8 , .Xr sysctl 8 , ==== //depot/projects/ia64/bin/sh/jobs.c#21 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.67 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $"); #include #include @@ -926,7 +926,8 @@ in_dowait--; if (breakwaitcmd != 0) { breakwaitcmd = 0; - return -1; + if (pid <= 0) + return -1; } if (pid <= 0) return pid; ==== //depot/projects/ia64/bin/sh/sh.1#27 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.94 2004/12/02 13:13:27 maxim Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -269,7 +269,7 @@ If this option is not set, traps are executed after the child exits, as specified in -.St -p1003.2 +.St -p1003.2 . This nonstandard option is useful for putting guarding shells around children that block signals. The surrounding shell may kill the child ==== //depot/projects/ia64/contrib/ntp/ntpdate/ntpdate.c#5 (text+ko) ==== @@ -1339,7 +1339,10 @@ hints.ai_family = ai_fam_templ; hints.ai_socktype = SOCK_DGRAM; - printf("Looking for host %s and service %s\n", serv, service); +#ifdef DEBUG + if (debug) + printf("Looking for host %s and service %s\n", serv, service); +#endif error = getaddrinfo(serv, service, &hints, &addrResult); if (error != 0) { @@ -1347,9 +1350,11 @@ msyslog(LOG_ERR, "can't find host %s\n", serv); return; } - else { +#ifdef DEBUG + else if (debug) { fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr)); } +#endif server = (struct server *)emalloc(sizeof(struct server)); memset((char *)server, 0, sizeof(struct server)); ==== //depot/projects/ia64/etc/defaults/rc.conf#57 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -61,7 +61,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). ==== //depot/projects/ia64/etc/devd.conf#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,6 +66,13 @@ action "kbdcontrol -k /dev/kbd0 < /dev/console"; }; +# The entry below starts moused when a mouse is plugged in. Moused +# stops automatically (actually it bombs :) when the device disappears. +attach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused start $device-name"; +}; + # # Rescan scsi device-names on attach, but not detach. # ==== //depot/projects/ia64/etc/etc.sparc64/ttys#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.7 2004/10/04 03:39:52 kensmith Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.8 2004/12/04 14:03:45 marius Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -35,6 +35,8 @@ screen "/usr/libexec/getty Pc" cons25 on secure ttya "/usr/libexec/getty 3wire.9600" cons25 on secure ttyb "/usr/libexec/getty 3wire.9600" cons25 off secure +ttyz0 "/usr/libexec/getty 3wire.9600" cons25 on secure +ttyz1 "/usr/libexec/getty 3wire.9600" cons25 off secure # #ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.112 2004/05/31 07:34:40 kris Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.113 2004/12/04 23:30:36 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -269,53 +269,245 @@ .. .. locale + af + LC_MESSAGES + .. + .. + am + LC_MESSAGES + .. + .. + ar + LC_MESSAGES + .. + .. + az + LC_MESSAGES + .. + .. bg + LC_MESSAGES + .. + .. + bn + LC_MESSAGES + .. .. + br + LC_MESSAGES + .. + .. + bs + LC_MESSAGES + .. + .. + cy + LC_MESSAGES + .. + .. da + LC_MESSAGES + .. .. de + LC_MESSAGES + .. + .. + dk + LC_MESSAGES + .. + .. + ee + LC_MESSAGES + .. .. en + LC_MESSAGES + .. + .. + en_CA + LC_MESSAGES + .. .. en_GB + LC_MESSAGES + .. .. eo + LC_MESSAGES + .. .. es + LC_MESSAGES + .. + .. + es_ES + LC_MESSAGES + .. + .. + es_MX + LC_MESSAGES + .. .. et + LC_MESSAGES + .. + .. + eu + LC_MESSAGES + .. + .. + fa + LC_MESSAGES + .. .. fr + LC_MESSAGES + .. + .. + ga + LC_MESSAGES + .. + .. + gu + LC_MESSAGES + .. .. he + LC_MESSAGES + .. + .. + hi + LC_MESSAGES + .. .. hr + LC_MESSAGES + .. .. hu + LC_MESSAGES + .. .. id + LC_MESSAGES + .. + .. + is + LC_MESSAGES + .. .. it + LC_MESSAGES + .. .. ja + LC_MESSAGES + .. .. + ka + LC_MESSAGES + .. + .. + kn + LC_MESSAGES + .. + .. lt + LC_MESSAGES + .. + .. + lv + LC_MESSAGES + .. .. + mk + LC_MESSAGES + .. + .. + ml + LC_MESSAGES + .. + .. + mn + LC_MESSAGES + .. + .. ms + LC_MESSAGES + .. .. nb + LC_MESSAGES + .. .. nl + LC_MESSAGES + .. .. + or + LC_MESSAGES + .. + .. + pa + LC_MESSAGES + .. + .. pt_BR + LC_MESSAGES + .. + .. + pt_PT + LC_MESSAGES + .. .. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 8 15:06:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECE3916A4D1; Wed, 8 Dec 2004 15:06:31 +0000 (GMT) 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 AA19616A4CF for ; Wed, 8 Dec 2004 15:06:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0435943D3F for ; Wed, 8 Dec 2004 15:06:31 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB8F6UM7071317 for ; Wed, 8 Dec 2004 15:06:30 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB8F6UYF071313 for perforce@freebsd.org; Wed, 8 Dec 2004 15:06:30 GMT (envelope-from areisse@nailabs.com) Date: Wed, 8 Dec 2004 15:06:30 GMT Message-Id: <200412081506.iB8F6UYF071313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2004 15:06:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=66682 Change 66682 by areisse@areisse_tislabs on 2004/12/08 15:05:48 More merging of new selinux policy pieces. Still in progress. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/COPYING#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#13 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/VERSION#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/attrib.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/constraints#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/acct.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/amanda.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/amavis.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/anaconda.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apache.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apmd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/asterisk.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/atd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/audio-entropyd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/auditd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/authbind.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/automount.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/backup.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/bluetooth.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/bootloader.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/calamaris.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/canna.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cardmgr.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/chroot.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ciped.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/clamav.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/consoletype.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/courier.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cpucontrol.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cpuspeed.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/crack.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cups.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cyrus.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dbusd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ddt-client.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/devfsd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpc.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dictd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/distcc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dnsmasq.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dovecot.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dpkg.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/fingerd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/firstboot.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/fs_daemon.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ftpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/games.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gatekeeper.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gnome-pty-helper.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gpg-agent.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gpg.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gpm.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/hald.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/hotplug.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/howl.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/hwclock.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/i18n_input.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/imazesrv.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/inetd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/innd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ipchains.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ipsec.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/iptables.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/irc.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ircd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/irqbalance.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/jabberd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/kcheckpass.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/kerberos.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/kudzu.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lcd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/loadkeys.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lpr.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lrrd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lvm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mailman.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mdadm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/monopd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mozilla.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mrtg.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mta.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mysqld.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nagios.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/named.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nessusd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/netsaint.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/netscape.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nrpe.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nscd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nsd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ntpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/oav-update.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/openca-ca.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/openvpn.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pam.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pamconsole.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/perdition.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ping.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/portmap.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/portslave.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/postfix.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/postgresql.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/postgrey.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pppd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/prelink.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/privoxy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/procmail.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pump.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pxe.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/qmail.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/quota.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/radius.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/radvd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rhgb.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rlogind.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpcd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpm.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rshd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/samba.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/saslauthd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/scannerdaemon.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/screen.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/screensaver.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/selopt.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/seuser.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/slapd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/slocate.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/slrnpull.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/snmpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/snort.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sound-server.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sound.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/spamassassin.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/spamc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/spamd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/speedmgmt.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/squid.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ssh-agent.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sudo.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sxid.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sysstat.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/tcpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/tftpd.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/tinydns.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/traceroute.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/transproxy.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/udev.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/uml.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/uml_net.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/updfstab.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/uptimed.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/usbmodules.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/userhelper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/usernetctl.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/utempter.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/uwimapd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/vmware.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/watchdog.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/webalizer.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xauth.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xdm.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xfs.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xprint.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xserver.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ypbind.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ypserv.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/zebra.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/fs_use#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/admin_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/base_user_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/core_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/mini_user_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/apache_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/chkpwd_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/chroot_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/clamav_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crond_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crontab_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/fingerd_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/games_domain.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gpg_agent_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gpg_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gph_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/irc_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/login_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/lpr_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mount_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mozilla_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mta_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/netscape_macros.te#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/newrole_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/rhgb_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/run_program_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/screen_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/screensaver_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/sendmail_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/slocate_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/spamassassin_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/ssh_agent_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/ssh_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/su_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/sudo_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/uml_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/userhelper_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/x_client_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/xauth_macros.te#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/xserver_macros.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/ypbind_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/user_macros.te#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/mls#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/net_contexts#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/policy.spec#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/rbac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/selinux-policy-strict.spec#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/selinux-policy-targeted.spec#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/serviceusers#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/users#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/COPYING#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,115 @@ +1.16 2004-08-16 + * Added nscd definitions. + * Converted many tunables to policy booleans. + * Added crontab permission. + * Merged diffs from Dan Walsh. + This included diffs from Thomas Bleher, Russell Coker, and Colin Walters as well. + * Merged diffs from Russell Coker. + * Adjusted constraints for crond restart. + * Merged dbus/userspace object manager policy from Colin Walters. + * Merged dbus definitions from Matthew Rickard. + * Merged dnsmasq policy from Greg Norris. + * Merged gpg-agent policy from Thomas Bleher. + +1.14 2004-06-28 + * Removed vmware-config.pl from vmware.fc. + * Added crond entry to root_default_contexts. + * Merged patch from Dan Walsh. + * Merged mdadm and postfix changes from Colin Walters. + * Merged reiserfs and rpm changes from Russell Coker. + * Merged runaway .* glob fix from Valdis Kletnieks. + * Merged diff from Dan Walsh. + * Merged fine-grained netlink classes and permissions. + * Merged changes for new /etc/selinux layout. + * Changed mkaccess_vector.sh to provide stable order. + * Merged diff from Dan Walsh. + * Fix restorecon path in restorecon.fc. + * Merged pax class and access vector definition from Joshua Brindle. + +1.12 2004-05-12 + * Added targeted policy. + * Merged atd/at into crond/crontab domains. + * Exclude bind mounts from relabeling to avoid aliasing. + * Removed some obsolete types and remapped their initial SIDs to unlabeled. + * Added SE-X related security classes and policy framework. + * Added devnull initial SID and context. + * Merged diffs from Fedora policy. + +1.10 2004-04-07 + * Merged ipv6 support from James Morris of RedHat. + * Merged policy diffs from Dan Walsh. + * Updated call to genhomedircon to reflect new usage. + * Merged policy diffs from Dan Walsh and Russell Coker. + * Removed config-users and config-services per Dan's request. + +1.8 2004-03-09 + * Merged genhomedircon patch from Karl MacMillan of Tresys. + * Added restorecon domain. + * Added unconfined_domain macro. + * Added default_t for /.* file_contexts entry and replaced some + uses of file_t with default_t in the policy. + * Added su_restricted_domain() macro and use it for initrc_t. + * Merged policy diffs from Dan Walsh and Russell Coker. + These included a merge of an earlier patch by Chris PeBenito + to rename the etc types to be consistent with other types. + +1.6 2004-02-18 + * Merged xfs support from Chris PeBenito. + * Merged conditional rules for ping.te. + * Defined setbool permission, added can_setbool macro. + * Partial network policy cleanup. + * Merged with Russell Coker's policy. + * Renamed netscape macro and domain to mozilla and renamed + ipchains domain to iptables for consistency with Russell. + * Merged rhgb macro and domain from Russell Coker. + * Merged tunable.te from Russell Coker. + Only define direct_sysadm_daemon by default in our copy. + * Added rootok permission to passwd class. + * Merged Makefile change from Dan Walsh to generate /home + file_contexts entries for staff users. + * Added automatic role and domain transitions for init scripts and + daemons. Added an optional third argument (nosysadm) to + daemon_domain to omit the direct transition from sysadm_r when + the same executable is also used as an application, in which + case the daemon must be restarted via the init script to obtain + the proper security context. Added system_r to the authorized roles + for admin users at least until support for automatic user identity + transitions exist so that a transition to system_u can be provided + transparently. + * Added support to su domain for using pam_selinux. + Added entries to default_contexts for the su domains to + provide reasonable defaults. Removed user_su_t. + * Tighten restriction on user identity and role transitions in constraints. + * Merged macro for newrole-like domains from Russell Coker. + * Merged stub dbusd domain from Russell Coker. + * Merged stub prelink domain from Dan Walsh. + * Merged updated userhelper and config tool domains from Dan Walsh. + * Added send_msg/recv_msg permissions to can_network macro. + * Merged patch by Chris PeBenito for sshd subsystems. + * Merged patch by Chris PeBenito for passing class to var_run_domain. + * Merged patch by Yuichi Nakamura for append_log_domain macros. + * Merged patch by Chris PeBenito for rpc_pipefs labeling. + * Merged patch by Colin Walters to apply m4 once so that + source file info is preserved for checkpolicy. + +1.4 2003-12-01 + * Merged patches from Russell Coker. + * Revised networking permissions. + * Added new node_bind permission. + * Added new siginh, rlimitinh, and setrlimit permissions. + * Added proc_t:file read permission for new is_selinux_enabled logic. + * Added failsafe_context configuration file to appconfig. + * Moved newrules.pl to policycoreutils, renamed to audit2allow. + * Merged newrules.pl patch from Yuichi Nakamura. + +1.2 2003-09-30 + * More policy merging with Russell Coker. + * Transferred newrules.pl script from the old SELinux. + * Merged MLS configuration patch from Karl MacMillan of Tresys. + * Limit staff_t to reading /proc entries for unpriv_userdomain. + * Updated Makefile and spec file to allow non-root builds, + based on patch by Paul Nasrat. + 1.1 2003-08-13 * Merged Makefile check-all and te-includes patches from Colin Walters. * Merged x-debian-packages.patch from Colin Walters. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#13 (text+ko) ==== @@ -16,93 +16,144 @@ MLS= n FLASKDIR = flask/ - +PREFIX = /usr +LOADPOLICY = $(DESTDIR)/sbin/sebsd_loadpolicy CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy -LOADPOLICY = $(DESTDIR)/sbin/sebsd_loadpolicy SETFILES = $(DESTDIR)/sbin/sebsd_setfiles +POLICYVER := policy.$(shell $(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ') +INSTALLDIR = $(DESTDIR)/etc/security/sebsd +POLICYPATH = $(INSTALLDIR)/policy +SRCPATH = $(INSTALLDIR)/src +CONTEXTPATH = $(INSTALLDIR)/contexts +LOADPATH = $(POLICYPATH)/$(POLICYVER) +FCPATH = $(CONTEXTPATH)/files/file_contexts + +ALL_PROGRAM_MACROS := $(wildcard macros/program/*.te) +ALL_MACROS := $(ALL_PROGRAM_MACROS) $(wildcard macros/*.te) +ALL_TYPES := $(wildcard types/*.te) +ALL_DOMAINS := $(wildcard domains/*.te domains/misc/*.te domains/program/*.te) +ALLTEFILES := attrib.te tmp/program_used_flags.te $(ALL_MACROS) $(ALL_TYPES) $(ALL_DOMAINS) assert.te +TE_RBAC_FILES := $(ALLTEFILES) rbac +ALL_TUNABLES := $(wildcard tunables/*.tun ) + +POLICYFILES = $(addprefix $(FLASKDIR),security_classes initial_sids access_vectors) +ifeq ($(MLS),y) +POLICYFILES += mls +endif +POLICYFILES += $(ALL_TUNABLES) $(TE_RBAC_FILES) +POLICYFILES += users serviceusers +POLICYFILES += constraints initial_sid_contexts fs_use genfs_contexts net_contexts + M4 = $(REALDESTDIR)/usr/bin/m4 -Imacros -s - -POLICYVER := policy.16 INSTALLCMD = install -c -o root -g wheel -m 400 -INSTALLDIR = $(DESTDIR)/etc/security/sebsd APPCONFDIR = $(DESTDIR)/etc/security -LOADPATH = $(INSTALLDIR)/$(POLICYVER) -SRCINSTALLDIR = $(INSTALLDIR)/src -POLICYCONF = $(SRCINSTALLDIR)/policy.conf MULTILABELMOUNTS != /sbin/mount -t ufs -p | \ /usr/bin/awk '{if (match($$4, "multilabel")) {print $$2}}' -FLASKFILES = $(FLASKDIR)/security_classes $(FLASKDIR)/initial_sids $(FLASKDIR)/access_vectors +UNUSED_TE_FILES := $(wildcard domains/program/unused/*.te) + +FC = file_contexts/file_contexts +FCFILES=file_contexts/types.fc $(wildcard file_contexts/misc/*.fc) $(patsubst domains/program/%.te,file_contexts/program/%.fc, $(wildcard domains/program/*.te)) + +APPDIR=$(CONTEXTPATH) +APPFILES = $(addprefix $(APPDIR)/,default_contexts default_type initrc_context failsafe_context userhelper_context) +ROOTFILES = $(addprefix $(APPDIR)/users/,root) + +install: $(APPFILES) $(ROOTFILES) $(LOADPATH) $(FCPATH) + +$(APPDIR)/default_contexts: appconfig/default_contexts + mkdir -p $(APPDIR) + install -m 644 $< $@ + +$(APPDIR)/default_type: appconfig/default_type + mkdir -p $(APPDIR) + install -m 644 $< $@ -CONTEXTFILES = tmp/program_used_flags.te tmp/all_macros.te constraints \ - initial_sid_contexts fs_use genfs_contexts net_contexts +$(APPDIR)/userhelper_context: appconfig/userhelper_context + mkdir -p $(APPDIR) + install -m 644 $< $@ -MACROPROGRAMFILES != echo macros/program/*.te -MACROFILES != echo macros/*.te -MACROFILES += $(MACROPROGRAMFILES) +$(APPDIR)/initrc_context: appconfig/initrc_context + mkdir -p $(APPDIR) + install -m 644 $< $@ -PROGRAMFILES != echo domains/program/*.te -MISCFILES != echo domains/misc/*.te -TYPEFILES != echo types/*.te +$(APPDIR)/failsafe_context: appconfig/failsafe_context + mkdir -p $(APPDIR) + install -m 644 $< $@ -FC = file_contexts/file_contexts -FCTEFILES = ${PROGRAMFILES:S/^domains\/program\//file_contexts\/program\//} -FCFILES = file_contexts/types.fc file_contexts/runtime.fc -FCFILES += ${FCTEFILES:S/.te$/.fc/} +$(APPDIR)/users/root: appconfig/root_default_contexts + mkdir -p $(APPDIR)/users + install -m 644 $< $@ -ALLTEFILES := attrib.te tmp/program_used_flags.te tmp/all_macros.te \ - tmp/all_types.te tmp/all_domains.te assert.te -ALLDOMAINS != echo domains/*.te domains/misc/*.te domains/program/*.te +$(LOADPATH): policy.conf $(CHECKPOLICY) + mkdir -p $(POLICYPATH) + $(CHECKPOLICY) -o $@ policy.conf +# Note: Can't use install, so not sure how to deal with mode, user, and group +# other than by default. -all: $(POLICYVER) $(FC) +policy: $(POLICYVER) -$(POLICYVER): tmp policy.conf +$(POLICYVER): policy.conf $(CHECKPOLICY) $(CHECKPOLICY) -o $@ policy.conf -install: $(POLICYVER) - $(INSTALLCMD) $(POLICYVER) $(INSTALLDIR) - $(INSTALLCMD) appconfig/default_type $(APPCONFDIR) - $(INSTALLCMD) appconfig/default_contexts $(APPCONFDIR) - $(INSTALLCMD) appconfig/initrc_context $(APPCONFDIR) +reload tmp/load: $(LOADPATH) $(FCPATH) + $(LOADPOLICY) $(POLICYPATH)/$(POLICYVER) + touch tmp/load + +load: tmp/load -policy.conf: $(FLASKFILES) tmp/te-rbac.m4 users tmp/constraints-contexts.m4 - cat $> > $@ +enableaudit: policy.conf + grep -v dontaudit policy.conf > policy.audit + mv policy.audit policy.conf -$(FC): $(FCFILES) - cat $> > $@ +policy.conf: $(POLICYFILES) + mkdir -p tmp + m4 $(M4PARAM) -Imacros -s $^ > $@.tmp + mv $@.tmp $@ -tmp/all.te: $(ALLTEFILES) - cat $> > $@ +install-src: /etc/security/sebsd + rm -rf $(INSTALLDIR)/policy.old + -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old + cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) -tmp/all_macros.te: $(MACROFILES) - cat $> > $@ +tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program + mkdir -p tmp + ( cd domains/program/ ; for n in *.te ; do echo "define(\`$$n')"; done ) > $@.tmp + ( cd domains/misc/ ; for n in *.te ; do echo "define(\`$$n')"; done ) >> $@.tmp + mv $@.tmp $@ -tmp/all_types.te: $(TYPEFILES) - cat $> > $@ +FILESYSTEMS= $(MULTILABELMOUNTS) -tmp/all_domains.te: $(ALLDOMAINS) - cat $> > $@ +checklabels: $(SETFILES) + $(SETFILES) -v -n $(FC) $(FILESYSTEMS) -tmp/te-rbac.m4: tmp/all.te rbac - $(M4) tmp/all.te rbac > $@ +restorelabels: $(SETFILES) + $(SETFILES) -v $(FC) $(FILESYSTEMS) -tmp/constraints-contexts.m4: $(CONTEXTFILES) - $(M4) $> > $@ +relabel: $(FC) $(SETFILES) + $(SETFILES) $(FC) $(FILESYSTEMS) -tmp/program_used_flags.te: $(PROGRAMFILES) $(MISCFILES) - ( cd domains/program/ ; for n in *.te ; do echo "define(\`$$n')"; done ) > $@ - ( cd domains/misc/ ; for n in *.te ; do echo "define(\`$$n')"; done ) >> $@ +file_contexts/misc: + mkdir -p file_contexts/misc -tmp: - @mkdir tmp +$(FCPATH): $(FC) + @mkdir -p $(CONTEXTPATH)/files + install -m 644 $(FC) $(FCPATH) -relabel: $(FC) - $(SETFILES) $(FC) $(MULTILABELMOUNTS) +$(FC): $(FCFILES) $(ALL_TUNABLES) domains/program domains/misc file_contexts/program file_contexts/misc users /etc/passwd + @echo "Building file_contexts ..." + @m4 $(ALL_TUNABLES) $(FCFILES) > $@.tmp + @grep -v "^/root" $@.tmp > $@.root + @/usr/sbin/genhomedircon . $@.root > $@ + @grep "^/root" $@.tmp >> $@ + @-rm $@.tmp $@.root clean: - rm -f $(POLICYVER) policy.conf $(FC) tmp/* + rm -f policy.conf + rm -f tmp/* + rm -f $(FC) install-src: /etc/security/sebsd rm -rf $(INSTALLDIR)/policy.old ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/README#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.1 +1.16 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#4 (text+ko) ==== @@ -27,55 +27,75 @@ neverallow domain ~domain:process transition; # -# Verify that only the insmod_t, ifconfig_t, and kernel_t domains +# Verify that only the insmod_t and kernel_t domains # have the sys_module capability. # -neverallow ~{ insmod_t ifconfig_t kernel_t } self:capability sys_module; +neverallow {domain ifdef(`unrestricted_admin', `-admin') -insmod_t -kernel_t ifdef(`anaconda.te', `-anaconda_t') ifdef(`firstboot.te', `-firstboot_t') ifdef(`unconfined.te', `-unconfined_t') } self:capability sys_module; # # Verify that executable types, the system dynamic loaders, and the # system shared libraries can only be modified by administrators. # -neverallow ~{ldconfig_t admin} { exec_type ld_so_t shlib_t }:file { write append unlink rename }; +neverallow {domain ifdef(`nfs_export_all_rw',`-kernel_t') ifdef(`ldconfig.te', `-ldconfig_t') -admin} { exec_type ld_so_t shlib_t }:file { write append unlink rename }; +neverallow {domain ifdef(`ldconfig.te', `-ldconfig_t') -change_context -admin } { exec_type ld_so_t shlib_t }:file relabelto; + +# +# Verify that only appropriate domains can access /etc/shadow +neverallow { domain -auth -auth_write } shadow_t:file ~getattr; +neverallow { domain -auth_write } shadow_t:file ~r_file_perms; + +# +# Verify that only appropriate domains can write to /etc (IE mess with +# /etc/passwd) +neverallow {domain -auth_write -etc_writer } etc_t:dir ~rw_dir_perms; +neverallow {domain -auth_write -etc_writer } etc_t:lnk_file ~r_file_perms; +neverallow {domain -auth_write -etc_writer } etc_t:file ~{ execute_no_trans rx_file_perms }; # # Verify that other system software can only be modified by administrators. # -neverallow ~{ldconfig_t admin} { lib_t bin_t sbin_t }:dir { add_name remove_name rename }; -neverallow ~admin { lib_t bin_t sbin_t }:file { write append unlink rename }; +neverallow {domain ifdef(`nfs_export_all_rw',`-kernel_t') ifdef(`ldconfig.te', `-ldconfig_t') -admin } { lib_t bin_t sbin_t }:dir { add_name remove_name rename }; +neverallow { domain ifdef(`nfs_export_all_rw',`-kernel_t') -admin } { lib_t bin_t sbin_t }:file { write append unlink rename }; # # Verify that only certain domains have access to the raw disk devices. # -neverallow ~{ ifdef(`bootloader.te', `bootloader_t') fsadm_t mount_t } fixed_disk_device_t:devfile_class_set { read write append }; +neverallow { domain -fs_domain } fixed_disk_device_t:devfile_class_set { read write append }; # # Verify that only the X server and klogd have access to memory devices. # -neverallow ~privmem memory_device_t:devfile_class_set { read write append }; +neverallow { domain -privmem } memory_device_t:devfile_class_set { read write append }; # # Verify that /proc/kmsg is only accessible to klogd. # -neverallow ~klogd_t proc_kmsg_t:file ~stat_file_perms; +ifdef(`klogd.te', ` +neverallow {domain ifdef(`firstboot.te', `-firstboot_t') ifdef(`unrestricted_admin', `-admin') -klogd_t ifdef(`anaconda.te', `-anaconda_t') ifdef(`unconfined.te', `-unconfined_t') } proc_kmsg_t:file ~stat_file_perms; +', ` +ifdef(`syslogd.te', ` +neverallow {domain ifdef(`unrestricted_admin', `-admin') ifdef(`unconfined.te', `-unconfined_t') -syslogd_t ifdef(`anaconda.te', `-anaconda_t') } proc_kmsg_t:file ~stat_file_perms; +')dnl end if syslogd +')dnl end if klogd # # Verify that /proc/kcore is inaccessible. # -neverallow * proc_kcore_t:file ~stat_file_perms; + +neverallow { domain ifdef(`unrestricted_admin', `-admin') ifdef(`unconfined.te', `-unconfined_t') ifdef(`firstboot.te', `-firstboot_t') ifdef(`anaconda.te', `-anaconda_t') } proc_kcore_t:file ~stat_file_perms; # # Verify that sysctl variables are only changeable # by initrc and administrators. # -neverallow ~{ initrc_t admin kernel_t insmod_t } sysctl_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_fs_t:file { write append }; -neverallow ~{ init_t initrc_t admin kernel_t insmod_t } sysctl_kernel_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_net_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_net_unix_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_vm_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_dev_t:file { write append }; -neverallow ~{ initrc_t admin } sysctl_modprobe_t:file { write append }; +neverallow { domain -initrc_t -admin -kernel_t -insmod_t } sysctl_t:file { write append }; +neverallow { domain -initrc_t -admin } sysctl_fs_t:file { write append }; +neverallow { domain -admin -sysctl_kernel_writer } sysctl_kernel_t:file { write append }; +neverallow { domain -initrc_t -admin -sysctl_net_writer } sysctl_net_t:file { write append }; +neverallow { domain -initrc_t -admin } sysctl_net_unix_t:file { write append }; +neverallow { domain -initrc_t -admin } sysctl_vm_t:file { write append }; +neverallow { domain -initrc_t -admin } sysctl_dev_t:file { write append }; +neverallow { domain -initrc_t -admin } sysctl_modprobe_t:file { write append }; # # Verify that certain domains are limited to only being @@ -90,8 +110,7 @@ `assert_execute($1) assert_execute(shift($@))')') ifdef(`getty.te', `assert_execute(getty)') -assert_execute(klogd) -ifdef(`atd.te', `assert_execute(atd)') +ifdef(`klogd.te', `assert_execute(klogd)') ifdef(`tcpd.te', `assert_execute(tcpd)') ifdef(`portmap.te', `assert_execute(portmap)') ifdef(`syslogd.te', `assert_execute(syslogd)') @@ -102,8 +121,8 @@ ifdef(`gpm.te', `assert_execute(gpm)') ifdef(`login.te', ` -neverallow { local_login_t remote_login_t } ~login_exec_t:file entrypoint; -neverallow { local_login_t remote_login_t } ~ld_so_t:file execute_no_trans; +neverallow { local_login_t remote_login_t } ~{ login_exec_t ifdef(`pam.te', `pam_exec_t') }:file entrypoint; +neverallow { local_login_t remote_login_t } ~{ ld_so_t ifdef(`pam.te', `pam_exec_t') }:file execute_no_trans; ') # @@ -111,17 +130,28 @@ # entrypoint type and can only execute the dynamic loader # and the ordinary passwd program without a transition to another domain. # -ifdef(`passwd.te', -`neverallow passwd_t ~{ admin_passwd_exec_t passwd_exec_t }:file entrypoint; -neverallow passwd_t ~{ ld_so_t }:file execute_no_trans;') +ifdef(`passwd.te', ` +neverallow passwd_t ~{ passwd_exec_t }:file entrypoint; +neverallow sysadm_passwd_t ~{ admin_passwd_exec_t }:file entrypoint; +neverallow { passwd_t sysadm_passwd_t } ~{ bin_t sbin_t shell_exec_t ld_so_t }:file execute_no_trans; +') # # Verify that only the admin domains and initrc_t have setenforce. # -#neverallow ~{ admin initrc_t } security_t:security setenforce; -neverallow ~{ admin initrc_t } kernel_t:system avc_toggle; +neverallow { domain -admin -initrc_t } security_t:security setenforce; # # Verify that only the kernel and load_policy_t have load_policy. # -neverallow ~{ kernel_t load_policy_t } security_t:security load_policy; + +neverallow { domain ifdef(`unrestricted_admin', `-admin') ifdef(`anaconda.te', `-anaconda_t') ifdef(`firstboot.te', `-firstboot_t') ifdef(`unconfined.te', `-unconfined_t') -kernel_t -load_policy_t } security_t:security load_policy; + +# +# for gross mistakes in policy +neverallow * domain:dir ~r_dir_perms; +neverallow * domain:file_class_set ~rw_file_perms; +neverallow { domain unlabeled_t } file_type:process *; + +neverallow { domain unlabeled_t } file_type:process *; +neverallow ~{ domain unlabeled_t } *:process *; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/attrib.te#4 (text+ko) ==== @@ -41,8 +41,7 @@ # The domain attribute identifies every type that can be # assigned to a process. This attribute is used in TE rules # that should be applied to all domains, e.g. permitting -# init to kill all processes or permitting all processes -# to read a particular file. +# init to kill all processes. attribute domain; # The privuser attribute identifies every domain that can @@ -50,7 +49,8 @@ # in the constraints configuration. NOTE: This attribute # is not required for domains that merely change the Linux # uid attributes, only for domains that must change the -# SELinux user identity. +# SELinux user identity. Also note that this attribute makes +# no sense without the privrole attribute. attribute privuser; # The privrole attribute identifies every domain that can @@ -58,9 +58,20 @@ # constraints configuration. attribute privrole; +# The userspace_objmgr attribute identifies every domain +# which enforces its own policy. +attribute userspace_objmgr; + +# The priv_system_role attribute identifies every domain that can +# change role from a user role to system_r role, and identity from a user +# identity to system_u. It is used in the constraints configuration. +attribute priv_system_role; + # The privowner attribute identifies every domain that can -# assign a different SELinux user identity to a file. This -# attribute is used in the constraints configuration. +# assign a different SELinux user identity to a file, or that +# can create a file with an identity that's not the same as the +# process identity. This attribute is used in the constraints +# configuration. attribute privowner; # The privlog attribute identifies every domain that can @@ -73,6 +84,11 @@ # XXX it is just an optional convenience for domain writers. attribute privlog; +# The privmodule attribute identifies every domain that can run +# modprobe, there is an assertion that other domains can not do it, +# and an allow rule to permit it +attribute privmodule; + # The privmem attribute identifies every domain that can # access kernel memory devices. # This attribute is used in the TE assertions to verify @@ -90,20 +106,38 @@ attribute privhome; # The auth attribute identifies every domain that needs -# to perform user authentication and requires access to -# the corresponding authentication data. -# XXX This attribute is no longer in use except in type declarations. -# XXX It was introduced for the original attempt to put /etc/shadow into -# XXX a separate type and to limit read access to certain domains. -# XXX Doing so transparently to applications is problematic due to -# XXX the fact that both /etc/passwd and /etc/shadow are recreated -# XXX by the same processes and live in the same directory, so file type -# XXX transition rules cannot specify different default types. Relocating -# XXX /etc/shadow to a separate subdirectory was tried, but required -# XXX modifications to a lot of applications even after changing -# XXX the pwdb shared library. +# to read /etc/shadow, and grants the permission. attribute auth; +# The auth_write attribute identifies every domain that can have write or +# relabel access to /etc/shadow, but does not grant it. +attribute auth_write; + +# The auth_chkpwd attribute identifies every system domain that can +# authenticate users by running unix_chkpwd +attribute auth_chkpwd; + +# The change_context attribute identifies setfiles_t, restorecon_t, and other +# system domains that change the context of most/all files on the system +attribute change_context; + +# The etc_writer attribute identifies every domain that can write to etc_t +attribute etc_writer; + +# The sysctl_kernel_writer attribute identifies domains that can write to +# sysctl_kernel_t, in addition the admin attribute is permitted write access +attribute sysctl_kernel_writer; + +# the sysctl_net_writer attribute identifies domains that can write to +# sysctl_net_t files. +attribute sysctl_net_writer; + +# The sysctl_type attribute identifies every type that is assigned +# to a sysctl entry. This can be used in allow rules to grant +# permissions to all sysctl entries without enumerating each individual +# type, but should be used with care. +attribute sysctl_type; + # The admin attribute identifies every administrator domain. # It is used in TE assertions when verifying that only administrator # domains have certain permissions. @@ -119,9 +153,22 @@ # to all user domains. attribute userdomain; +# for a small domain that can only be used for newrole +attribute user_mini_domain; + +# pty for the mini domain +attribute mini_pty_type; + +# pty created by a server such as sshd +attribute server_pty; + # attribute for all non-administrative devpts types attribute userpty_type; +# The user_tty_type identifies every type for a tty or pty owned by an +# unpriviledged user +attribute user_tty_type; + # The user_crond_domain attribute identifies every user_crond domain, presently # user_crond_t and sysadm_crond_t. It is used in TE rules that should be # applied to all user domains. @@ -138,7 +185,12 @@ # descriptors created by these domains. attribute gphdomain; +# The fs_domain identifies every domain that may directly access a fixed disk +attribute fs_domain; +# This attribute is for all domains for the userhelper program. +attribute userhelperdomain; + ############################ # Attributes for file types: # @@ -150,6 +202,9 @@ # appropriate. attribute file_type; +# The device_type attribute identifies all types assigned to device nodes +attribute device_type; + # The sysadmfile attribute identifies all types assigned to files # that should be completely accessible to administrators. It is used # in TE rules to grant such access for administrator domains. @@ -282,8 +337,48 @@ # user attribute mta_delivery_agent; +# For domains that make outbound TCP port 25 connections to send mail from the +# mail server. +attribute mail_server_sender; + +# For a mail server process that takes TCP connections on port 25 +attribute mail_server_domain; + # For web clients such as netscape and squid attribute web_client_domain; -# For a mail server process that takes TCP connections on port 25 -attribute mail_server_domain; +# For a dbus client +attribute dbus_client_domain; + +# For X Window System server domains +attribute xserver; + +# For X Window System client domains +attribute xclient; + +# For X Window System protocol extensions +attribute xextension; + +# For X Window System property types +attribute xproperty; + +# For a special files in the homedirectory +# This will be used for associating mount points with homedirectories +# +attribute homedirfile; + +# +# For file systems that do not have extended attributes but need to be +# r/w by users +# +attribute noexattrfile; + +# +# For filetypes that the usercan read +# +attribute usercanread; + +# +# For serial devices +# +attribute serial_device; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/constraints#4 (text+ko) ==== @@ -34,14 +34,24 @@ # constrain process transition - ( u1 == u2 or t1 == privuser + ( u1 == u2 or ( t1 == privuser and t2 == userdomain ) ifdef(`crond.te', ` - or (t1 == crond_t and t2 == user_crond_domain) + or (t1 == crond_t and (t2 == user_crond_domain or u2 == system_u)) ') +ifdef(`userhelper.te', + `or (t1 == userhelperdomain)') + or (t1 == priv_system_role and u2 == system_u ) ); constrain process transition - ( r1 == r2 or t1 == privrole) ; + ( r1 == r2 or ( t1 == privrole and t2 == userdomain ) +ifdef(`crond.te', ` + or (t1 == crond_t and t2 == user_crond_domain) +') +ifdef(`userhelper.te', + `or (t1 == userhelperdomain)') + or (t1 == priv_system_role and r2 == system_r ) + ); # # Restrict the ability to label objects with other ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/acct.te#2 (text+ko) ==== @@ -15,11 +15,15 @@ system_crond_entry(acct_exec_t, acct_t) # for monthly cron job -file_type_auto_trans(acct_t, var_log_t, wtmp_t) +file_type_auto_trans(acct_t, var_log_t, wtmp_t, file) ') +# for SSP +allow acct_t urandom_device_t:chr_file read; + ifdef(`logrotate.te', ` allow acct_t logrotate_exec_t:file getattr; +r_dir_file(logrotate_t, acct_data_t) ') type acct_data_t, file_type, sysadmfile; @@ -32,7 +36,7 @@ allow acct_t var_t:dir { getattr search }; rw_dir_create_file(acct_t, acct_data_t) -can_exec(acct_t, { shell_exec_t bin_t etc_t acct_exec_t }) +can_exec(acct_t, { shell_exec_t bin_t initrc_exec_t acct_exec_t }) allow acct_t { bin_t sbin_t }:dir search; allow acct_t bin_t:lnk_file read; @@ -52,9 +56,12 @@ dontaudit acct_t sysadm_home_dir_t:dir { getattr search }; +# for nscd +dontaudit acct_t var_run_t:dir search; + # not sure why we need this, the command "last" is reported as using it dontaudit acct_t self:capability kill; allow acct_t devtty_t:chr_file { read write }; -allow acct_t etc_runtime_t:file { read getattr }; +allow acct_t { etc_t etc_runtime_t }:file { read getattr }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 9 00:39:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D5EE16A4D0; Thu, 9 Dec 2004 00:39:15 +0000 (GMT) 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 0DF0F16A4CE for ; Thu, 9 Dec 2004 00:39:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 851B743D62 for ; Thu, 9 Dec 2004 00:39:14 +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 iB90dEYG008994 for ; Thu, 9 Dec 2004 00:39:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB90dDDa008990 for perforce@freebsd.org; Thu, 9 Dec 2004 00:39:13 GMT (envelope-from peter@freebsd.org) Date: Thu, 9 Dec 2004 00:39:13 GMT Message-Id: <200412090039.iB90dDDa008990@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 Subject: PERFORCE change 66708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 00:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=66708 Change 66708 by peter@peter_daintree on 2004/12/09 00:38:47 IFC @66705 Affected files ... .. //depot/projects/hammer/Makefile#28 integrate .. //depot/projects/hammer/UPDATING#68 integrate .. //depot/projects/hammer/include/unistd.h#13 integrate .. //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/ifconfig/af_atalk.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_inet.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_ipx.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_link.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifclone.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#21 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmac.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.c#5 integrate .. //depot/projects/hammer/share/man/man4/Makefile#59 integrate .. //depot/projects/hammer/share/man/man4/ath.4#18 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#6 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#5 integrate .. //depot/projects/hammer/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/hammer/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/hammer/share/man/man9/mbuf.9#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#32 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/hammer/sys/conf/files#96 integrate .. //depot/projects/hammer/sys/conf/files.i386#46 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#40 integrate .. //depot/projects/hammer/sys/conf/options#63 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#7 delete .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#21 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#13 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#11 integrate .. //depot/projects/hammer/sys/dev/mii/mii.c#10 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#30 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#12 integrate .. //depot/projects/hammer/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/FILES#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#30 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#58 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#11 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#37 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#46 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#11 integrate .. //depot/projects/hammer/sys/isa/isavar.h#5 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#23 integrate .. //depot/projects/hammer/sys/kern/init_main.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#32 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#31 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#45 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#65 integrate .. //depot/projects/hammer/sys/modules/Makefile#61 integrate .. //depot/projects/hammer/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#24 integrate .. //depot/projects/hammer/sys/net/if.c#37 integrate .. //depot/projects/hammer/sys/net/if_var.h#25 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#14 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#21 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#11 integrate .. //depot/projects/hammer/sys/sys/bus.h#13 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#35 integrate .. //depot/projects/hammer/sys/sys/mount.h#27 integrate .. //depot/projects/hammer/sys/sys/systm.h#28 integrate .. //depot/projects/hammer/sys/sys/uio.h#10 integrate .. //depot/projects/hammer/sys/sys/vnode.h#38 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#27 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#45 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#20 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#26 integrate .. //depot/projects/hammer/tools/regression/net80211/ccmp/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/ccmp/test_ccmp.c#1 branch .. //depot/projects/hammer/tools/regression/net80211/tkip/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/tkip/test_tkip.c#1 branch .. //depot/projects/hammer/tools/regression/net80211/wep/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/wep/test_wep.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#15 integrate .. //depot/projects/hammer/tools/tools/README#12 integrate .. //depot/projects/hammer/tools/tools/ath/80211debug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/80211stats.c#3 integrate .. //depot/projects/hammer/tools/tools/ath/Makefile#5 integrate .. //depot/projects/hammer/tools/tools/ath/athdebug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats.c#5 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#8 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#11 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#11 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#9 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#5 integrate .. //depot/projects/hammer/usr.bin/make/for.c#9 integrate .. //depot/projects/hammer/usr.bin/make/job.c#16 integrate .. //depot/projects/hammer/usr.bin/make/job.h#11 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#6 integrate .. //depot/projects/hammer/usr.bin/make/main.c#23 integrate .. //depot/projects/hammer/usr.bin/make/make.c#8 integrate .. //depot/projects/hammer/usr.bin/make/make.h#5 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#8 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#18 integrate .. //depot/projects/hammer/usr.bin/make/str.c#8 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#10 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#8 integrate .. //depot/projects/hammer/usr.bin/make/var.c#14 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#5 integrate Differences ... ==== //depot/projects/hammer/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ # # The user-driven targets are: # @@ -217,6 +217,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ ==== //depot/projects/hammer/UPDATING#68 (text+ko) ==== @@ -195,12 +195,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -423,8 +421,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +577,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1973,4 +1963,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ ==== //depot/projects/hammer/include/unistd.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.73 2004/02/23 04:51:07 ache Exp $ + * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ */ #ifndef _UNISTD_H_ @@ -494,7 +494,6 @@ char *mktemp(char *); #define _MKTEMP_DECLARED #endif -int nfsclnt(int, void *); int nfssvc(int, void *); int profil(char *, size_t, vm_offset_t, int); int rcmd(char **, int, const char *, const char *, const char *, int *); ==== //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $"); #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" @@ -77,7 +77,7 @@ Floating-point rounding mode and exception flags. ------------------------------------------------------------------------------- */ -fp_rnd float_rounding_mode = float_round_nearest_even; +fp_rnd_t float_rounding_mode = float_round_nearest_even; fp_except float_exception_flags = 0; /* ==== //depot/projects/hammer/sbin/ifconfig/Makefile#4 (text+ko) ==== @@ -1,36 +1,37 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.26 2004/12/08 19:18:07 sam Exp $ PROG= ifconfig -SRCS= ifconfig.c -#comment out to exclude SIOC[GS]IFMEDIA support -SRCS+= ifmedia.c -CFLAGS+=-DUSE_IF_MEDIA -CFLAGS+=-DINET6 +SRCS= ifconfig.c # base support -#comment out to exclude SIOC[GS]ETVLAN support -SRCS+= ifvlan.c -CFLAGS+=-DUSE_VLANS +# +# NB: The order here defines the order in which the constructors +# are called. This in turn defines the default order in which +# status is displayed. Probably should add a priority mechanism +# to the registration process so we don't depend on this aspect +# of the toolchain. +# +SRCS+= af_link.c # LLC support +SRCS+= af_inet.c # IPv4 support +SRCS+= af_inet6.c # IPv6 support +SRCS+= af_atalk.c # AppleTalk support -#comment out to exclude SIOC[GS]IEEE80211 support -SRCS+= ifieee80211.c -CFLAGS+=-DUSE_IEEE80211 +SRCS+= ifclone.c # clone device support +SRCS+= ifmac.c # MAC support +SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support +SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support -#comment out to exclude MAC support -SRCS+= ifmac.c -CFLAGS+=-DUSE_MAC - -MAN= ifconfig.8 - -.if defined(RELEASE_CRUNCH) -CFLAGS+=-DNO_IPX -.else +.if !defined(RELEASE_CRUNCH) +SRCS+= af_ipx.c # IPX support DPADD= ${LIBIPX} LDADD= -lipx .endif -CFLAGS+=-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ +MAN= ifconfig.8 + +CFLAGS+= -g -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ -Wnested-externs -I.. WARNS?= 0 ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#19 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.86 2004/11/06 13:38:45 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.87 2004/12/08 19:18:07 sam Exp $ .\" -.Dd July 26, 2004 +.Dd Nov 2, 2004 .Dt IFCONFIG 8 .Os .Sh NAME @@ -55,6 +55,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Ar address_family .Nm .Fl l @@ -66,6 +67,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Fl C .Sh DESCRIPTION The @@ -596,64 +598,101 @@ It happens automatically when setting the first address on an interface. If the interface was reset when previously marked down, the hardware will be re-initialized. -.It Cm ssid Ar ssid -For IEEE 802.11 wireless interfaces, set the desired Service Set -Identifier (aka network name). -The SSID is a string up to 32 characters -in length and may be specified as either a normal string or in -hexadecimal when proceeded by -.Ql 0x . -Additionally, the SSID may be cleared by setting it to -.Ql - . -.It Cm nwid Ar ssid -Another name for the -.Cm ssid -parameter. -Included for -.Nx -compatibility. -.It Cm stationname Ar name -For IEEE 802.11 wireless interfaces, set the name of this station. -It appears that the station name is not really part of the IEEE 802.11 -protocol though all interfaces seem to support it. -As such it only -seems to be meaningful to identical or virtually identical equipment. -Setting the station name is identical in syntax to setting the SSID. -.It Cm station Ar name -Another name for the -.Cm stationname -parameter. -Included for -.Bsx -compatibility. -.It Cm channel Ar number -For IEEE 802.11 wireless interfaces, set the desired channel. -Channels range from 1 to 14, but the exact selection available -depends on the region your adaptor was manufactured for. -Setting -the channel to 0 will give you the default for your adaptor. -Many -adaptors ignore this setting unless you are in ad-hoc mode. +.El +.Pp +The following parameters are specific to IEEE 802.11 wireless interfaces: +.Bl -tag -width indent +.It Cm apbridge +When operating as an access point pass packets between +wireless clients directly (default). +To instead let them pass up through the +system and be forwarded using some other mechanism use +.Dq Li -apbridge. +Disabling the internal bridging +is useful when traffic is to be processed with +packet filtering. .It Cm authmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired authentication mode -in infrastructure mode. +Set the desired authentication mode in infrastructure mode. Not all adaptors support all modes. The set of valid modes is .Dq Li none , .Dq Li open , +.Dq Li shared (shared key), +.Dq Li 8021x (IEEE 802.1x), +or +.Dq Li wpa (IEEE WPA/WPA2/802.11i). +The +.Dq Li 8021x and -.Dq Li shared . +.Dq Li wpa +modes are only useful when used an authentication service +(a supplicant for client operation or an authenticator when +operating as an access point). Modes are case insensitive. +.It Cm bssid Ar address +Specify the MAC address of the access point to use when operating +as a station in a BSS network. +This overrides any automatic selection done by the system. +To disable a previously selected access point supply +.Dq Li any , +.Dq Li none , +or +.Dq Li - +for the address. +This option is useful when more than one access points have the same SSID. +Another name for the +.Cm bssid +parameter is +.Cm ap . +.It Cm chanlist Ar channels +Set the desired channels to use when scanning for access +points, neighbors in an IBSS network, or looking for unoccupied +channels when operating as an access point. +The set of channels is specified as a comma-separated list with +each element in the list either a single channel number of a range +of the form +.Dq Li a-b . +Channel numbers must be in the range 1 to 255 and be permissible +according to the operating characteristics of the device. +.It Cm channel Ar number +Set a single desired channel. +Channels range from 1 to 255, but the exact selection available +depends on the region your adaptor was manufactured for. +Setting +the channel to +.Dq Li 0 , +.Dq Li any , +or +.Dq Li - +will give you the default for your adaptor. +Many +adaptors ignore this setting unless you are in ad-hoc mode. +Alternatively the frequency, in megahertz, may be specified +instead of the channel number. +.It Cm hidessid +When operating as an access point do not broadcast the SSID +in beacon frames. +By default the SSID is included in beacon frames. +To re-enable the broadcast of the SSID use +.Fl hidessid . .It Cm powersave -For IEEE 802.11 wireless interfaces, enable powersave mode. -.It Fl powersave -For IEEE 802.11 wireless interfaces, disable powersave mode. +Enable powersave operation. +When operating as a client the station will conserve power by +periodically turning off the radio and listening for +messages from the access point telling it there are packets waiting. +The station must then retrieve the packets. +When operating as an access point the station must honor power +save operation of associated clients. +Not all devices support power save operation, either as a client +or as an access point. +Use +.Fl powersave +to disable powersave operation. .It Cm powersavesleep Ar sleep -For IEEE 802.11 wireless interfaces, set the desired max powersave sleep -time in milliseconds. +Set the desired max powersave sleep time in milliseconds. .It Cm protmode Ar technique -For IEEE 802.11 wireless interfaces operating in 11g, use the specified +For interfaces operating in 802.11g, use the specified .Ar technique for protecting OFDM frames in a mixed 11b/11g network. The set of valid techniques is @@ -664,8 +703,25 @@ .Dq Li rtscts (RTS/CTS). Technique names are case insensitive. +.It Cm roaming Ar mode +When operating as a station, control how the system will +behave when communication with the current access point +is broken. +.I Mode +may be one of +.Dq Li device +(leave it to the hardware device to decide), +.Dq Li auto +(handle either in the device or the operating system--as appropriate), +.Dq Li manual +(do nothing until explicitly instructed). +By the default the device is left to handle this if it is +capable; otherwise the operating system will automatically +attempt to reestablish communication. +Manual mode is mostly useful when an application wants to +control the selection of an access point. .It Cm rtsthreshold Ar length -For IEEE 802.11 wireless interfaces, set the threshold for which +Set the threshold for which transmitted frames are preceded by transmission of an RTS control frame. @@ -674,8 +730,26 @@ argument is the frame size in bytes and must be in the range 1 to 2312. Not all adaptors support setting the RTS threshold. +.It Cm ssid Ar ssid +Set the desired Service Set Identifier (aka network name). +The SSID is a string up to 32 characters +in length and may be specified as either a normal string or in +hexadecimal when proceeded by +.Ql 0x . +Additionally, the SSID may be cleared by setting it to +.Ql - . +.It Cm scan +Display the current set of scanned neighbors and/or trigger a new scan. +Only the super-user can trigger a scan. +.It Cm stationname Ar name +Set the name of this station. +It appears that the station name is not really part of the IEEE 802.11 +protocol though all interfaces seem to support it. +As such it only +seems to be meaningful to identical or virtually identical equipment. +Setting the station name is identical in syntax to setting the SSID. .It Cm txpower Ar power -For IEEE 802.11 wireless interfaces, set the power used to transmit frames. +Set the power used to transmit frames. The .Ar power argument @@ -686,7 +760,7 @@ the driver will use the setting closest to the specified value. Not all adaptors support changing the transmit power. .It Cm wepmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired WEP mode. +Set the desired WEP mode. Not all adaptors support all modes. The set of valid modes is .Dq Li off , @@ -706,10 +780,9 @@ .Dq Li mixed . Modes are case insensitive. .It Cm weptxkey Ar index -For IEEE 802.11 wireless interfaces, set the WEP key to be used for -transmission. +Set the WEP key to be used for transmission. .It Cm wepkey Ar key Ns | Ns Ar index : Ns Ar key -For IEEE 802.11 wireless interfaces, set the selected WEP key. +Set the selected WEP key. If an .Ar index is not given, key 1 is set. @@ -732,6 +805,31 @@ If that is the case, then the first four keys (1-4) will be the standard temporary keys and any others will be adaptor specific keys such as permanent keys stored in NVRAM. +.It Cm wme +Enable Wireless Media Extensions (WME) support, if available, +for the specified interface. +WME is a subset of the IEEE 802.11e standard to support the +efficient communication of realtime and multimedia data. +To disable WME support use +.Fl wme . +.El +.Pp +The following parameters are support for compatibility with other systems: +.Bl -tag -width indent +.It Cm nwid Ar ssid +Another name for the +.Cm ssid +parameter. +Included for +.Nx +compatibility. +.It Cm station Ar name +Another name for the +.Cm stationname +parameter. +Included for +.Bsx +compatibility. .It Cm wep Another way of saying .Cm wepmode on . @@ -746,9 +844,7 @@ compatibility. .It Cm nwkey key Another way of saying: -.Pp .Dq Li "wepmode on weptxkey 1 wepkey 1:key wepkey 2:- wepkey 3:- wepkey 4:-" . -.Pp Included for .Nx compatibility. @@ -758,16 +854,13 @@ .Sm on .Xc Another way of saying -.Pp .Dq Li "wepmode on weptxkey n wepkey 1:k1 wepkey 2:k2 wepkey 3:k3 wepkey 4:k4" . -.Pp Included for .Nx compatibility. .It Fl nwkey Another way of saying .Cm wepmode off . -.Pp Included for .Nx compatibility. @@ -820,6 +913,10 @@ (only list interfaces that are up). .Pp The +.Fl v +flag may be used to get more verbose status for an interface. +.Pp +The .Fl C flag may be used to list all of the interface cloners available on the system, with no additional information. ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.107 2004/09/01 18:22:14 brooks Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; #endif /* not lint */ #include @@ -62,21 +62,6 @@ #include #include -#ifdef INET6 -#include /* Define ND6_INFINITE_LIFETIME */ -#endif - -#ifndef NO_IPX -/* IPX */ -#define IPXIP -#define IPTUNNEL -#include -#include -#endif - -/* Appletalk */ -#include - #include #include #include @@ -85,34 +70,15 @@ #include #include #include -#include #include "ifconfig.h" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - /* * Since "struct ifreq" is composed of various union members, callers * should pay special attention to interprete the value. * (.e.g. little/big endian difference in the structure.) */ -struct ifreq ifr, ridreq; -struct ifaliasreq addreq; -#ifdef INET6 -struct in6_ifreq in6_ridreq; -struct in6_aliasreq in6_addreq = - { { 0 }, - { 0 }, - { 0 }, - { 0 }, - 0, - { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; -#endif -struct sockaddr_in netmask; -struct netrange at_nr; /* AppleTalk net range */ +struct ifreq ifr; char name[IFNAMSIZ]; int flags; @@ -122,327 +88,78 @@ int doalias; int clearaddr; int newaddr = 1; -#ifdef INET6 -static int ip6lifetime; -#endif +int verbose; -struct afswtch; +int supmedia = 0; +int printname = 0; /* Print the name of the created interface. */ -int supmedia = 0; -int listcloners = 0; -int printname = 0; /* Print the name of the created interface. */ - -#ifdef INET6 -char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/ -#endif - -void Perror(const char *cmd); -void checkatrange(struct sockaddr_at *); -int ifconfig(int argc, char *const *argv, const struct afswtch *afp); -void notealias(const char *, int, int, const struct afswtch *afp); -void list_cloners(void); -void printb(const char *s, unsigned value, const char *bits); -void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); -void status(const struct afswtch *afp, int addrcount, +static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); +static void status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam); -void tunnel_status(int s); -void usage(void); -void ifmaybeload(char *name); +static void tunnel_status(int s); +static void usage(void); -#ifdef INET6 -void in6_fillscopeid(struct sockaddr_in6 *sin6); -int prefix(void *, int); -static char *sec2str(time_t); -int explicit_prefix = 0; -#endif +static struct afswtch *af_getbyname(const char *name); +static struct afswtch *af_getbyfamily(int af); +static void af_all_status(int, const struct rt_addrinfo *sdl); -typedef void c_func(const char *cmd, int arg, int s, const struct afswtch *afp); -typedef void c_func2(const char *arg, const char *arg2, int s, const struct afswtch *afp); -c_func setatphase, setatrange; -c_func setifaddr, setifbroadaddr, setifdstaddr, setifnetmask; -c_func2 settunnel; -c_func deletetunnel; -#ifdef INET6 -c_func setifprefixlen; -c_func setip6flags; -c_func setip6pltime; -c_func setip6vltime; -c_func2 setip6lifetime; -c_func setip6eui64; -#endif -c_func setifipdst; -c_func setifflags, setifmetric, setifmtu, setifcap; -c_func clone_destroy; -c_func setifname; - - -void clone_create(void); - - -#define NEXTARG 0xffffff -#define NEXTARG2 0xfffffe - -const -struct cmd { - const char *c_name; - int c_parameter; /* NEXTARG means next argv */ - void (*c_func)(const char *, int, int, const struct afswtch *afp); - void (*c_func2)(const char *, const char *, int, const struct afswtch *afp); -} cmds[] = { - { "up", IFF_UP, setifflags } , - { "down", -IFF_UP, setifflags }, - { "arp", -IFF_NOARP, setifflags }, - { "-arp", IFF_NOARP, setifflags }, - { "debug", IFF_DEBUG, setifflags }, - { "-debug", -IFF_DEBUG, setifflags }, - { "promisc", IFF_PPROMISC, setifflags }, - { "-promisc", -IFF_PPROMISC, setifflags }, - { "add", IFF_UP, notealias }, - { "alias", IFF_UP, notealias }, - { "-alias", -IFF_UP, notealias }, - { "delete", -IFF_UP, notealias }, - { "remove", -IFF_UP, notealias }, -#ifdef notdef -#define EN_SWABIPS 0x1000 - { "swabips", EN_SWABIPS, setifflags }, - { "-swabips", -EN_SWABIPS, setifflags }, -#endif - { "netmask", NEXTARG, setifnetmask }, -#ifdef INET6 - { "prefixlen", NEXTARG, setifprefixlen }, - { "anycast", IN6_IFF_ANYCAST, setip6flags }, - { "tentative", IN6_IFF_TENTATIVE, setip6flags }, - { "-tentative", -IN6_IFF_TENTATIVE, setip6flags }, - { "deprecated", IN6_IFF_DEPRECATED, setip6flags }, - { "-deprecated", -IN6_IFF_DEPRECATED, setip6flags }, - { "autoconf", IN6_IFF_AUTOCONF, setip6flags }, - { "-autoconf", -IN6_IFF_AUTOCONF, setip6flags }, - { "pltime", NEXTARG, setip6pltime }, - { "vltime", NEXTARG, setip6vltime }, - { "eui64", 0, setip6eui64 }, -#endif - { "range", NEXTARG, setatrange }, - { "phase", NEXTARG, setatphase }, - { "metric", NEXTARG, setifmetric }, - { "broadcast", NEXTARG, setifbroadaddr }, - { "ipdst", NEXTARG, setifipdst }, - { "tunnel", NEXTARG2, NULL, settunnel }, - { "deletetunnel", 0, deletetunnel }, - { "link0", IFF_LINK0, setifflags }, - { "-link0", -IFF_LINK0, setifflags }, - { "link1", IFF_LINK1, setifflags }, - { "-link1", -IFF_LINK1, setifflags }, - { "link2", IFF_LINK2, setifflags }, - { "-link2", -IFF_LINK2, setifflags }, - { "monitor", IFF_MONITOR, setifflags }, - { "-monitor", -IFF_MONITOR, setifflags }, - { "staticarp", IFF_STATICARP, setifflags }, - { "-staticarp", -IFF_STATICARP, setifflags }, -#ifdef USE_IF_MEDIA - { "media", NEXTARG, setmedia }, - { "mode", NEXTARG, setmediamode }, - { "mediaopt", NEXTARG, setmediaopt }, - { "-mediaopt", NEXTARG, unsetmediaopt }, -#endif -#ifdef USE_VLANS - { "vlan", NEXTARG, setvlantag }, - { "vlandev", NEXTARG, setvlandev }, - { "-vlandev", NEXTARG, unsetvlandev }, -#endif -#if 0 - /* XXX `create' special-cased below */ - {"create", 0, clone_create }, - {"plumb", 0, clone_create }, -#endif - {"destroy", 0, clone_destroy }, - {"unplumb", 0, clone_destroy }, -#ifdef USE_IEEE80211 - { "ssid", NEXTARG, set80211ssid }, - { "nwid", NEXTARG, set80211ssid }, - { "stationname", NEXTARG, set80211stationname }, - { "station", NEXTARG, set80211stationname }, /* BSD/OS */ - { "channel", NEXTARG, set80211channel }, - { "authmode", NEXTARG, set80211authmode }, - { "powersavemode", NEXTARG, set80211powersavemode }, - { "powersave", 1, set80211powersave }, - { "-powersave", 0, set80211powersave }, - { "powersavesleep", NEXTARG, set80211powersavesleep }, - { "wepmode", NEXTARG, set80211wepmode }, - { "wep", 1, set80211wep }, - { "-wep", 0, set80211wep }, - { "weptxkey", NEXTARG, set80211weptxkey }, - { "wepkey", NEXTARG, set80211wepkey }, - { "nwkey", NEXTARG, set80211nwkey }, /* NetBSD */ - { "-nwkey", 0, set80211wep }, /* NetBSD */ - { "rtsthreshold",NEXTARG, set80211rtsthreshold }, - { "protmode", NEXTARG, set80211protmode }, - { "txpower", NEXTARG, set80211txpower }, -#endif -#ifdef USE_MAC - { "maclabel", NEXTARG, setifmaclabel }, -#endif - { "rxcsum", IFCAP_RXCSUM, setifcap }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 9 17:27:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59FFF16A4D0; Thu, 9 Dec 2004 17:27:56 +0000 (GMT) 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 2C54216A4CE for ; Thu, 9 Dec 2004 17:27:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA3D943D2F for ; Thu, 9 Dec 2004 17:27:55 +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 iB9HRtcF075863 for ; Thu, 9 Dec 2004 17:27:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB9HRtoj075860 for perforce@freebsd.org; Thu, 9 Dec 2004 17:27:55 GMT (envelope-from sam@freebsd.org) Date: Thu, 9 Dec 2004 17:27:55 GMT Message-Id: <200412091727.iB9HRtoj075860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 17:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=66742 Change 66742 by sam@sam_ebb on 2004/12/09 17:27:07 IFC @ 66741 Affected files ... .. //depot/projects/wifi/UPDATING#4 integrate .. //depot/projects/wifi/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/wifi/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_atalk.c#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#30 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmac.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/wifi/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#8 integrate .. //depot/projects/wifi/share/man/man4/ath.4#3 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/wifi/share/man/man4/udav.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/wifi/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/wifi/share/man/man7/tuning.7#4 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/wifi/share/man/man9/mbuf.9#2 integrate .. //depot/projects/wifi/sys/conf/files#10 edit .. //depot/projects/wifi/sys/conf/files.i386#6 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#5 integrate .. //depot/projects/wifi/sys/conf/options#6 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 delete .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/opt_ah.h#3 delete .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/wifi/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/wifi/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#40 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#6 integrate .. //depot/projects/wifi/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/wifi/sys/dev/mii/mii.c#4 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#5 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/FILES#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/wifi/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#5 integrate .. //depot/projects/wifi/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/wifi/sys/i386/include/smp.h#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/wifi/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/wifi/sys/kern/kern_subr.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#4 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/wifi/sys/modules/Makefile#7 integrate .. //depot/projects/wifi/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/wifi/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#3 integrate .. //depot/projects/wifi/sys/net/if.c#6 integrate .. //depot/projects/wifi/sys/net/if_var.h#7 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#10 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#26 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#28 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#26 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#16 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#24 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/wifi/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/wifi/sys/sys/bus.h#2 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#5 integrate .. //depot/projects/wifi/sys/sys/uio.h#2 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_object.h#3 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/wifi/tools/regression/net80211/ccmp/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/ccmp/test_ccmp.c#2 integrate .. //depot/projects/wifi/tools/regression/net80211/tkip/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/tkip/test_tkip.c#2 integrate .. //depot/projects/wifi/tools/regression/net80211/wep/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/net80211/wep/test_wep.c#2 integrate .. //depot/projects/wifi/tools/tools/ath/80211debug.c#4 integrate .. //depot/projects/wifi/tools/tools/ath/80211stats.c#5 integrate .. //depot/projects/wifi/tools/tools/ath/Makefile#5 integrate .. //depot/projects/wifi/tools/tools/ath/athdebug.c#3 integrate .. //depot/projects/wifi/tools/tools/ath/athstats.c#6 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#4 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#5 integrate .. //depot/projects/wifi/usr.bin/make/cond.c#4 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#5 integrate .. //depot/projects/wifi/usr.bin/make/job.c#9 integrate .. //depot/projects/wifi/usr.bin/make/lst.h#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstClose.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#6 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#5 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsAtEnd.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstNext.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstOpen.c#5 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#5 integrate .. //depot/projects/wifi/usr.bin/make/main.c#9 integrate .. //depot/projects/wifi/usr.bin/make/make.c#6 integrate .. //depot/projects/wifi/usr.bin/make/make.h#3 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#4 integrate .. //depot/projects/wifi/usr.bin/make/str.c#4 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#5 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#5 integrate .. //depot/projects/wifi/usr.bin/make/var.c#5 integrate Differences ... ==== //depot/projects/wifi/UPDATING#4 (text+ko) ==== @@ -195,12 +195,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -423,8 +421,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +577,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1973,4 +1963,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ ==== //depot/projects/wifi/lib/libc/softfloat/bits32/softfloat.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $"); #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" @@ -77,7 +77,7 @@ Floating-point rounding mode and exception flags. ------------------------------------------------------------------------------- */ -fp_rnd float_rounding_mode = float_round_nearest_even; +fp_rnd_t float_rounding_mode = float_round_nearest_even; fp_except float_exception_flags = 0; /* ==== //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.17 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.18 2004/12/09 12:26:47 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -169,7 +169,7 @@ This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] ==== //depot/projects/wifi/sbin/ifconfig/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.26 2004/12/08 19:18:07 sam Exp $ PROG= ifconfig ==== //depot/projects/wifi/sbin/ifconfig/af_atalk.c#3 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_inet.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_inet6.c#5 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_ipx.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/af_link.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#5 (text+ko) ==== ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.86 2004/11/06 13:38:45 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.87 2004/12/08 19:18:07 sam Exp $ .\" .Dd Nov 2, 2004 .Dt IFCONFIG 8 ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.107 2004/09/01 18:22:14 brooks Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; #endif /* not lint */ #include ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.12 2004/03/30 22:59:22 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.13 2004/12/08 19:18:07 sam Exp $ */ #define __constructor __attribute__((constructor)) ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#30 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.10 2004/04/04 07:28:58 phk Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.11 2004/12/08 19:18:07 sam Exp $ */ /*- ==== //depot/projects/wifi/sbin/ifconfig/ifmac.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.2 2002/10/23 22:50:04 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.3 2004/12/08 19:18:07 sam Exp $ */ #include ==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ -/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.16 2004/01/15 15:19:19 sam Exp $ */ +/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.17 2004/12/08 19:18:07 sam Exp $ */ /* * Copyright (c) 1997 Jason R. Thorpe. ==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.5 2002/04/18 17:14:09 imp Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.6 2004/12/08 19:18:07 sam Exp $"; #endif static int __tag = 0; static int __have_tag = 0; ==== //depot/projects/wifi/sbin/mksnap_ffs/mksnap_ffs.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.7 2004/01/27 19:28:13 des Exp $ + * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.8 2004/12/08 11:54:50 phk Exp $ */ #include @@ -66,6 +66,7 @@ usage(); dir = argv[1]; + memset(&args, 0, sizeof args); args.fspec = argv[2]; /* @@ -103,7 +104,7 @@ */ if ((grp = getgrnam("operator")) == NULL) errx(1, "Cannot retrieve operator gid"); - if (mount("ffs", dir, MNT_UPDATE | MNT_SNAPSHOT | stfsbuf.f_flags, + if (mount("ufs", dir, MNT_UPDATE | MNT_SNAPSHOT | stfsbuf.f_flags, &args) < 0) err(1, "Cannot create %s", args.fspec); if ((fd = open(args.fspec, O_RDONLY)) < 0) ==== //depot/projects/wifi/share/man/man4/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.296 2004/11/30 16:16:34 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.297 2004/12/08 17:47:32 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -341,6 +341,11 @@ wi.4 \ witness.4 \ wlan.4 \ + wlan_acl.4 \ + wlan_ccmp.4 \ + wlan_tkip.4 \ + wlan_wep.4 \ + wlan_xauth.4 \ worm.4 \ xe.4 \ xl.4 \ ==== //depot/projects/wifi/share/man/man4/ath.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting +.\" Copyright (c) 2002-2004 Sam Leffler, Errno Consulting .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -29,17 +29,18 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.23 2004/11/07 13:40:27 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.25 2004/12/09 13:11:52 brueffer Exp $ .\"/ -.Dd August 26, 2004 +.Dd December 7, 2004 .Dt ATH 4 .Os .Sh NAME .Nm ath -.Nd "Atheros IEEE 802.11 driver" +.Nd "Atheros IEEE 802.11 wireless network driver" .Sh SYNOPSIS .Cd "device ath" .Cd "device ath_hal" +.Cd "device ath_rate_onoe" .Cd "device wlan" .Sh DESCRIPTION The @@ -67,14 +68,15 @@ AR5212-based devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds appropriate to each. All chips also support an Atheros Turbo Mode (TM) that operates in -the 802.11a frequency range with 2x the transmit speeds. -(This mode is, however, only interoperable with other Atheros-based devices.) +the 5Ghz frequency range with 2x the transmit speeds. +Some chips also support Turbo mode in the 2.4Ghz range with 802.11g. +(These modes are, however, only interoperable with other Atheros-based devices.) The actual transmit speed used is dependent on signal quality and the .Dq "rate control" algorithm employed by the driver. All chips support WEP encryption. -AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic -operations required for WPA but at this time the driver does not support them. +The AR5212 has hardware support for the AES-CCM, TKIP, and Michael cryptographic +operations required for WPA. To enable encryption, use .Xr ifconfig 8 as shown below. @@ -95,9 +97,9 @@ In this mode a host may function as an access point (base station). Access points are different than operating in IBSS mode. They operate in BSS mode. -They allow for easier roaming and bridge all ethernet traffic such +They allow for easier roaming and bridge all Ethernet traffic such that machines connected via an access point appear to be on the local -ethernet segment. +Ethernet segment. .Pp For more information on configuring this device, see .Xr ifconfig 8 . @@ -211,11 +213,11 @@ and receive descriptors. This usually indicates system memory is scarce and/or fragmented. .It "ath%d: unable to setup a data xmit queue!" -The request to the HAL to setup the transmit queue for normal +The request to the HAL to set up the transmit queue for normal data frames failed. This should not happen. .It "ath%d: unable to setup a beacon xmit queue!" -The request to the HAL to setup the transmit queue for 802.11 beacon frames +The request to the HAL to set up the transmit queue for 802.11 beacon frames frames failed. This should not happen. .It "ath%d: 802.11 address: %s" @@ -258,13 +260,6 @@ A problem occurred while querying the HAL to find the set of available channels for the device. This should not happen. -.It "ath%d: %s: %dM -> %dM (%d ok, %d err, %d retr)" -The driver's rate control algorithm changed the current rate for transmitting -frames. -This message is temporarily enabled for normal use to help in diagnosing -and improving the rate control algorithm. -The message indicates the new and old transmit rates and the statistics -it used to decide on this change. .It "ath%d: failed to enable memory mapping" The driver was unable to enable memory-mapped I/O to the PCI device registers. This should not happen. ==== //depot/projects/wifi/share/man/man4/mac_portacl.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.5 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.8 2004/12/09 13:48:33 trhodes Exp $ .\" -.Dd February 13, 2004 +.Dd December , 2004 .Dt MAC_PORTACL 4 .Os .Sh NAME @@ -203,6 +203,12 @@ protected ports, even if the port access control list does not explicitly allow this. (Default: 1). +.It Va security.mac.portacl.autoport_exempt +Allow applications to use automatic binding to port 0. +Applications use port 0 as a request for automatic port allocation when +binding an IP address to a socket. +This tunable will exempt port 0 allocation from rule checking. +(Default: 1) .El .Sh SEE ALSO .Xr mac 3 , ==== //depot/projects/wifi/share/man/man4/udav.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/udav.4,v 1.2 2004/07/08 12:40:42 ru Exp $ +.\" $FreeBSD: src/share/man/man4/udav.4,v 1.3 2004/12/09 13:27:44 brueffer Exp $ .\" -.Dd August 22, 2003 +.Dd December 9, 2004 .Dt UDAV 4 .Os .Sh NAME @@ -71,7 +71,7 @@ .Xr ifconfig 8 .Rs .%T "Davicom DM9601 data sheet" -.%O http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-F01-062202s.pdf +.%O http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf .Re .Sh HISTORY The ==== //depot/projects/wifi/share/man/man4/wlan.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.4 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.5 2004/12/08 17:47:32 sam Exp $ .\" -.Dd September 25, 2003 +.Dd December 7, 2004 .Dt WLAN 4 .Os .Sh NAME @@ -36,26 +36,64 @@ .Sh DESCRIPTION The .Nm -device provides generic code to support 802.11 -drivers, including host AP mode. -Currently it is required for the +module provides generic code to support 802.11 drivers. +Where a device does not directly support 802.11 functionality +this layer fills in. +The +.Nm +is required for the .Xr wi 4 , .Xr an 4 and .Xr ath 4 -drivers but will eventually be required by all 802.11 drivers. +drivers, with other drivers to follow. +.Pp +The +.Nm +module supports multi-mode devices capable of +operating in both 2.4GHz and 5GHz bands and supports numerous +802.11 protocols: 802.11a, 802.11b, and 802.11g. +The WPA, 802.11i, and 802.1x security protocols are supported +through a combination of in-kernel code and user-mode applications. +The WME and WMM multi-media protocols are supported entirely within +the +.Nm +module but require a suitably capable hardware device. .Pp +The +.Nm +module defines several mechanisms by which plugin modules may +be used to extend functionality. +Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented +as modules that are loaded on demand (if not statically configured +into a system). +Similarly there is an authenticator framework for defining 802.11 +authentication services and a framework for integrating access +control mechanisms specific to the 802.11 protocol. +.Sh DEBUGGING If the associated interface is marked for debugging with, for example, .Pp .Dl "ifconfig wi0 debug" .Pp then messages describing the operation of the 802.11 protocol will be sent to the console. -With the interface marked for debugging, doing: +Complete debugging controls are available using: +.Pp +.Dl "sysctl net.wlan.X.debug=mask" +.Pp +where X is the number of the +.Nm +instance and mask is a bit-or of control bits that determine which +debugging messages to enable. +For example, +.Dl "sysctl net.wlan.0.debug=0x00200000" .Pp -.Dl "sysctl debug.ieee80211=1" +enables debugging messages related to scanning for an access point, +adhoc neighbor, or an unoccupied channel when operation as an access point. +The +.Xr 80211debug +tool provides a more user-friendly mechanism for doing the same thing. .Pp -causes additional messages to be generated. Many drivers will also display the contents of each 802.11 frame sent and received when the interface is marked with both debugging and @@ -76,7 +114,12 @@ .Xr ath 4 , .Xr awi 4 , .Xr netintro 4 , -.Xr wi 4 +.Xr wi 4 , +.Xr wlan_wep 4 , +.Xr wlan_tkip 4 , +.Xr wlan_ccmp 4 , +.Xr wlan_xauth 4 , +.Xr wlan_acl 4 .Sh STANDARDS More information can be found in the IEEE 802.11 Standard. .Sh HISTORY @@ -85,13 +128,15 @@ driver first appeared in .Fx 5.0 . .Sh AUTHORS -Atsushi Onoe is the original author of this software. -The +Atsushi Onoe is the author of original .Nx -support was adapted to +software from which this work began. +.An -nosplit +.An Sam Leffler +brought the code into .Fx -by -.An -nosplit -.An Sam Leffler . +and then rewrote it to support multi-mode devices, +802.11g, WPA/802.11i, WME, and add the extensible frameworks +for cryptographic, authentication, and access control plugins. This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/wifi/share/man/man7/tuning.7#4 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.69 2004/11/16 21:22:09 jhb Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.70 2004/12/09 15:52:51 keramida Exp $ .\" .Dd June 25, 2002 .Dt TUNING 7 @@ -814,16 +814,15 @@ by a megabyte or more, leaving more memory available for applications. .Pp .Dv SCSI_DELAY -and -.Dv IDE_DELAY may be used to reduce system boot times. The defaults are fairly high and -can be responsible for 15+ seconds of delay in the boot process. +can be responsible for 5+ seconds of delay in the boot process. Reducing .Dv SCSI_DELAY -to 5 seconds usually works (especially with modern drives). +to something below 5 seconds could work (especially with modern drives). Reducing .Dv IDE_DELAY +(only available for PC98) also works but you have to be a little more careful. .Pp There are a number of ==== //depot/projects/wifi/share/man/man9/mbuf.9#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.52 2004/08/28 03:46:18 jmg Exp $ +.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.53 2004/12/08 17:47:49 sam Exp $ .\" .Dd August 27, 2004 .Dt MBUF 9 @@ -90,6 +90,8 @@ .Ss Mbuf utility functions .Ft void .Fn m_adj "struct mbuf *mbuf" "int len" +.Ft int +.Fn m_append "struct mbuf *mbuf" "int len" "c_caddr_t cp" .Ft struct mbuf * .Fn m_prepend "struct mbuf *mbuf" "int len" "int how" .Ft struct mbuf * @@ -581,6 +583,16 @@ .Fa len is positive, from the tail otherwise. .\" +.It Fn m_append mbuf len cp +Append +.Vt len +bytes of data +.Vt cp +to the +.Vt mbuf chain . +Extend the mbuf chain if the new data does not fit in +existing space. +.\" .It Fn m_prepend mbuf len how Allocate a new .Vt mbuf ==== //depot/projects/wifi/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.973 2004/12/06 00:43:36 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.975 2004/12/09 13:54:28 takawata Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -275,6 +275,7 @@ dev/acpi_support/acpi_asus.c optional acpi_asus acpi dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi dev/acpi_support/acpi_sony.c optional acpi_sony acpi +dev/acpi_support/acpi_ibm.c optional acpi_ibm acpi dev/acpi_support/acpi_toshiba.c optional acpi_toshiba acpi dev/acpica/acpi.c optional acpi dev/acpica/acpi_acad.c optional acpi @@ -366,6 +367,10 @@ dev/ath/if_ath_pci.c optional ath card 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/atheros/bsd.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ratectrl.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ar5212Phy.c optional ath_rate_atheros +dev/ath/ath_rate/atheros/ar5211Phy.c optional ath_rate_atheros dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi card ==== //depot/projects/wifi/sys/conf/files.i386#6 (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.509 2004/11/23 00:00:43 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.510 2004/12/08 18:20:52 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/wifi/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.174 2004/12/04 14:20:56 marius Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.176 2004/12/08 07:23:12 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -305,8 +305,7 @@ .if !target(${_src}) .if !exists(@) ${_src}: @ -.endif -.if exists(@) +.else ${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} @@ -315,18 +314,31 @@ .endfor # _ext .endfor # _srcsrc -.for _ext in c h -.if ${SRCS:Mvnode_if.${_ext}} != "" -CLEANFILES+= vnode_if.${_ext} +.if ${SRCS:Mvnode_if.c} != "" +CLEANFILES+= vnode_if.c .if !exists(@) -vnode_if.${_ext}: @ +vnode_if.c: @ +.else +vnode_if.c: @/tools/vnode_if.awk @/kern/vnode_if.src +.endif + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -c .endif -.if exists(@) -vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src + +.if ${SRCS:Mvnode_if.h} != "" +CLEANFILES+= vnode_if.h vnode_if_newproto.h vnode_if_typedef.h +.if !exists(@) +vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @ +.else +vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @/tools/vnode_if.awk \ + @/kern/vnode_if.src .endif - ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -${_ext} +vnode_if.h: vnode_if_newproto.h vnode_if_typedef.h + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -h +vnode_if_newproto.h: + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -p +vnode_if_typedef.h: + ${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -q .endif -.endfor .for _i in mii pccard usb .if ${SRCS:M${_i}devs.h} != "" @@ -337,8 +349,7 @@ .endif .if !exists(@) ${_i}devs.h: @ -.endif -.if exists(@) +.else ${_i}devs.h: @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs .endif ${AWK} -f @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs @@ -349,8 +360,7 @@ CLEANFILES+= acpi_quirks.h .if !exists(@) acpi_quirks.h: @ -.endif -.if exists(@) +.else acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks .endif ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks ==== //depot/projects/wifi/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.487 2004/11/12 19:44:30 peter Exp $ +# $FreeBSD: src/sys/conf/options,v 1.488 2004/12/08 18:20:53 sam Exp $ # # On the handling of kernel options # @@ -491,7 +491,6 @@ INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h -MBUF_GUARD opt_global.h MCLSHIFT opt_global.h MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h @@ -671,9 +670,9 @@ AH_SUPPORT_AR5210 opt_ah.h AH_SUPPORT_AR5211 opt_ah.h AH_SUPPORT_AR5212 opt_ah.h -AH_SUPPORT_AR5111 opt_ah.h -AH_SUPPORT_AR5112 opt_ah.h -AH_SUPPORT_AR2413 opt_ah.h +AH_SUPPORT_5111 opt_ah.h +AH_SUPPORT_5112 opt_ah.h +AH_SUPPORT_2413 opt_ah.h AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h ==== //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#3 (text+ko) ==== ==== //depot/projects/wifi/sys/contrib/dev/ath/README#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 9 23:18:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B06516A4D0; Thu, 9 Dec 2004 23:18:02 +0000 (GMT) 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 D4CC716A4CE for ; Thu, 9 Dec 2004 23:18:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC7FA43D58 for ; Thu, 9 Dec 2004 23:18:01 +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 iB9NI157095838 for ; Thu, 9 Dec 2004 23:18:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB9NI1Nv095835 for perforce@freebsd.org; Thu, 9 Dec 2004 23:18:01 GMT (envelope-from sam@freebsd.org) Date: Thu, 9 Dec 2004 23:18:01 GMT Message-Id: <200412092318.iB9NI1Nv095835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 23:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=66752 Change 66752 by sam@sam_ebb on 2004/12/09 23:17:37 Fix WME+WPA operation. Atheros parts mark IEEE80211_F_DATAPAD which forces 32-bit alignment of the crypto payload but the cipher encap support wasn't taking the pad bytes into account. This didn't matter until QoS data frames were encrypted and required padding. o add ieee80211_hdrspace and ieee80211_anyhdrspace that work like ieee80211_hdrsize and ieee80211_anyhdrsize but consider padding requirements o sprinkle use of the above in the tx cipher paths (not need currently on rx because the QoS and pad bits are stripped early in ieee80211_input; this is likely to change) Also: make some inline's be __inline for portability. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#19 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#3 (text+ko) ==== @@ -136,10 +136,12 @@ static int ccmp_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) { + struct ccmp_ctx *ctx = k->wk_private; + struct ieee80211com *ic = ctx->cc_ic; u_int8_t *ivp; int hdrlen; - hdrlen = ieee80211_hdrsize(mtod(m, void *)); + hdrlen = ieee80211_hdrspace(ic, mtod(m, void *)); /* * Copy down 802.11 header and add the IV, KeyID, and ExtIV. ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#4 (text+ko) ==== @@ -171,7 +171,7 @@ ic->ic_stats.is_crypto_tkipcm++; return 0; } - hdrlen = ieee80211_hdrsize(mtod(m, void *)); + hdrlen = ieee80211_hdrspace(ic, mtod(m, void *)); /* * Copy down 802.11 header and add the IV, KeyID, and ExtIV. @@ -215,10 +215,13 @@ if (k->wk_flags & IEEE80211_KEY_SWMIC) { struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); - int hdrlen = ieee80211_hdrsize(wh); + struct ieee80211com *ic = ctx->tc_ic; + int hdrlen; uint8_t mic[IEEE80211_WEP_MICLEN]; - ctx->tc_ic->ic_stats.is_crypto_tkipenmic++; + ic->ic_stats.is_crypto_tkipenmic++; + + hdrlen = ieee80211_hdrspace(ic, wh); michael_mic(ctx, k->wk_txmic, m, hdrlen, m->m_pkthdr.len - hdrlen, mic); ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#3 (text+ko) ==== @@ -120,11 +120,12 @@ wep_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) { struct wep_ctx *ctx = k->wk_private; + struct ieee80211com *ic = ctx->wc_ic; u_int32_t iv; u_int8_t *ivp; int hdrlen; - hdrlen = ieee80211_hdrsize(mtod(m, void *)); + hdrlen = ieee80211_hdrspace(ic, mtod(m, void *)); /* * Copy down 802.11 header and add the IV + KeyID. ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#10 (text+ko) ==== @@ -81,7 +81,7 @@ /* * Return the size of the 802.11 header for a management or data frame. */ -static inline int +static __inline int ieee80211_hdrsize(const void *data) { const struct ieee80211_frame *wh = data; @@ -98,9 +98,9 @@ } /* - * Return the size of the 802.11 header; handles any type of frame. + * Like ieee80211_hdrsize, but handles any type of frame. */ -static inline int +static __inline int ieee80211_anyhdrsize(const void *data) { const struct ieee80211_frame *wh = data; ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#19 (text+ko) ==== @@ -282,6 +282,36 @@ ic->ic_crypto.cs_key_update_end(ic); } +/* + * XXX these need to be here for IEEE80211_F_DATAPAD + */ + +/* + * Return the space occupied by the 802.11 header and any + * padding required by the driver. This works for a + * management or data frame. + */ +static __inline int +ieee80211_hdrspace(struct ieee80211com *ic, const void *data) +{ + int size = ieee80211_hdrsize(data); + if (ic->ic_flags & IEEE80211_F_DATAPAD) + size = roundup(size, sizeof(u_int32_t)); + return size; +} + +/* + * Like ieee80211_hdrspace, but handles any type of frame. + */ +static __inline int +ieee80211_anyhdrspace(struct ieee80211com *ic, const void *data) +{ + int size = ieee80211_anyhdrsize(data); + if (ic->ic_flags & IEEE80211_F_DATAPAD) + size = roundup(size, sizeof(u_int32_t)); + return size; +} + #define IEEE80211_MSG_DEBUG 0x40000000 /* IFF_DEBUG equivalent */ #define IEEE80211_MSG_DUMPPKTS 0x20000000 /* IFF_LINK2 equivalant */ #define IEEE80211_MSG_CRYPTO 0x10000000 /* crypto work */ From owner-p4-projects@FreeBSD.ORG Thu Dec 9 23:19:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B93C816A4D0; Thu, 9 Dec 2004 23:19:03 +0000 (GMT) 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 965B916A4CE for ; Thu, 9 Dec 2004 23:19:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D00343D4C for ; Thu, 9 Dec 2004 23:19:03 +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 iB9NJ3gD095865 for ; Thu, 9 Dec 2004 23:19:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB9NJ3Ir095862 for perforce@freebsd.org; Thu, 9 Dec 2004 23:19:03 GMT (envelope-from sam@freebsd.org) Date: Thu, 9 Dec 2004 23:19:03 GMT Message-Id: <200412092319.iB9NJ3Ir095862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 23:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=66753 Change 66753 by sam@sam_ebb on 2004/12/09 23:18:04 fix comment Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#41 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#41 (text+ko) ==== @@ -2919,8 +2919,8 @@ ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1); hdrlen = ieee80211_anyhdrsize(wh); /* - * Packet length must not include by any - * pad bytes; deduct it here. + * Packet length must not include any + * pad bytes; deduct them here. */ pktlen = m0->m_pkthdr.len - (hdrlen & 3); From owner-p4-projects@FreeBSD.ORG Thu Dec 9 23:19:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9341E16A4DA; Thu, 9 Dec 2004 23:19:04 +0000 (GMT) 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 361B016A504 for ; Thu, 9 Dec 2004 23:19:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D137743D4C for ; Thu, 9 Dec 2004 23:19:03 +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 iB9NJ3tL095872 for ; Thu, 9 Dec 2004 23:19:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB9NJ3d9095868 for perforce@freebsd.org; Thu, 9 Dec 2004 23:19:03 GMT (envelope-from sam@freebsd.org) Date: Thu, 9 Dec 2004 23:19:03 GMT Message-Id: <200412092319.iB9NJ3d9095868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2004 23:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=66754 Change 66754 by sam@sam_ebb on 2004/12/09 23:18:43 IFC Affected files ... .. //depot/projects/wifi/lib/libsdp/search.c#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_acl.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_ccmp.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_xauth.4#2 integrate .. //depot/projects/wifi/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#5 integrate Differences ... ==== //depot/projects/wifi/lib/libsdp/search.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $ - * $FreeBSD: src/lib/libsdp/search.c,v 1.6 2004/02/26 20:44:55 emax Exp $ + * $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $ */ #include @@ -55,7 +55,8 @@ sdp_session_p ss = (sdp_session_p) xss; uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL; - int32_t type, len; + int32_t t, len; + uint16_t lo, hi; if (ss == NULL) return (-1); @@ -66,11 +67,29 @@ return (-1); } - /* Calculate length of the request */ req = ss->req; + + /* Calculate ServiceSearchPattern length */ plen = plen * (sizeof(pp[0]) + 1); - alen = alen * (sizeof(ap[0]) + 1); + + /* Calculate AttributeIDList length */ + for (len = 0, t = 0; t < alen; t ++) { + lo = (uint16_t) (ap[t] >> 16); + hi = (uint16_t) (ap[t]); + + if (lo > hi) { + ss->error = EINVAL; + return (-1); + } + + if (lo != hi) + len += (sizeof(ap[t]) + 1); + else + len += (sizeof(lo) + 1); + } + alen = len; + /* Calculate length of the request */ len = plen + sizeof(uint8_t) + sizeof(uint16_t) + /* ServiceSearchPattern */ sizeof(uint16_t) + @@ -97,9 +116,21 @@ /* Put AttributeIDList */ SDP_PUT8(SDP_DATA_SEQ16, req); SDP_PUT16(alen, req); - for (; alen > 0; ap ++, alen -= (sizeof(ap[0]) + 1)) { - SDP_PUT8(SDP_DATA_UINT32, req); - SDP_PUT32(*ap, req); + for (; alen > 0; ap ++) { + lo = (uint16_t) (*ap >> 16); + hi = (uint16_t) (*ap); + + if (lo != hi) { + /* Put attribute range */ + SDP_PUT8(SDP_DATA_UINT32, req); + SDP_PUT32(*ap, req); + alen -= (sizeof(ap[0]) + 1); + } else { + /* Put attribute */ + SDP_PUT8(SDP_DATA_UINT16, req); + SDP_PUT16(lo, req); + alen -= (sizeof(lo) + 1); + } } /* Submit ServiceSearchAttributeRequest and wait for response */ @@ -241,8 +272,8 @@ rsp_tmp = ss->rsp; /* Skip the first SEQ */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -263,8 +294,8 @@ for (; rsp_tmp < rsp && vlen > 0; ) { /* Get set of attributes for the next record */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -286,8 +317,8 @@ /* Now rsp_tmp points to list of (attr,value) pairs */ for (; len > 0 && vlen > 0; vp ++, vlen --) { /* Attribute */ - SDP_GET8(type, rsp_tmp); - if (type != SDP_DATA_UINT16) { + SDP_GET8(t, rsp_tmp); + if (t != SDP_DATA_UINT16) { ss->error = ENOATTR; return (-1); } ==== //depot/projects/wifi/share/man/man4/wlan_acl.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan_acl.4,v 1.1 2004/12/08 17:47:32 sam Exp $ +.\" $FreeBSD: src/share/man/man4/wlan_acl.4,v 1.2 2004/12/09 13:57:12 brueffer Exp $ .\" .Dd December 7, 2004 .Dt WLAN_ACL 4 @@ -42,7 +42,7 @@ is an 802.11 access control plugin module for use with the .Xr wlan 4 module. -This module is automatically loaded if an applications configures +This module is automatically loaded if an application configures an access control policy for an 802.11 device operating as an access point. .Sh SEE ALSO ==== //depot/projects/wifi/share/man/man4/wlan_ccmp.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan_ccmp.4,v 1.1 2004/12/08 17:47:32 sam Exp $ +.\" $FreeBSD: src/share/man/man4/wlan_ccmp.4,v 1.2 2004/12/09 13:57:12 brueffer Exp $ .\" .Dd December 7, 2004 .Dt WLAN_CCMP 4 @@ -46,7 +46,7 @@ .Xr wlan 4 module. This module is automatically loaded if an AES-CCMP key is configured; -typically by a WPA supplicant program such as wpa_suplicant, +typically by a WPA supplicant program such as wpa_supplicant, or a WPA authenticator program such as hostapd. Should the underlying network device not be capable of doing the AES-CCMP calculations in hardware, the ==== //depot/projects/wifi/share/man/man4/wlan_tkip.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan_tkip.4,v 1.1 2004/12/08 17:47:32 sam Exp $ +.\" $FreeBSD: src/share/man/man4/wlan_tkip.4,v 1.2 2004/12/09 13:57:12 brueffer Exp $ .\" .Dd December 7, 2004 .Dt WLAN_TKIP 4 @@ -46,7 +46,7 @@ .Xr wlan 4 module. This module is automatically loaded if a TKIP key is configured; -typically by a WPA supplicant program such as wpa_suplicant, +typically by a WPA supplicant program such as wpa_supplicant, or a WPA authenticator program such as hostapd. Should the underlying network device not be capable of doing the TKIP and/or Michael calculations in hardware, the ==== //depot/projects/wifi/share/man/man4/wlan_xauth.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan_xauth.4,v 1.1 2004/12/08 17:47:32 sam Exp $ +.\" $FreeBSD: src/share/man/man4/wlan_xauth.4,v 1.2 2004/12/09 13:57:12 brueffer Exp $ .\" .Dd December 7, 2004 .Dt WLAN_XAUTH 4 @@ -49,7 +49,7 @@ is an 802.11 authenticator plugin module for use by the .Xr wlan 4 module. -This module is automatically loaded if an applications configures +This module is automatically loaded if an application configures an 802.11 device for operation as an AP with WPA or 802.1x authentication. .Sh SEE ALSO .Xr wlan 4 ==== //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#3 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.126 2004/10/29 10:15:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.127 2004/12/09 21:24:00 mckusick Exp $"); #include "opt_quota.h" @@ -1066,7 +1066,7 @@ if (indx % fs->fs_maxbpg == 0 || bap[indx - 1] == 0) { if (lbn < NDADDR + NINDIR(fs)) { cg = ino_to_cg(fs, ip->i_number); - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } /* * Find a cylinder with greater than average number of @@ -1082,12 +1082,12 @@ for (cg = startcg; cg < fs->fs_ncg; cg++) if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { fs->fs_cgrotor = cg; - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } for (cg = 0; cg <= startcg; cg++) if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { fs->fs_cgrotor = cg; - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } return (0); } @@ -1115,7 +1115,7 @@ if (indx % fs->fs_maxbpg == 0 || bap[indx - 1] == 0) { if (lbn < NDADDR + NINDIR(fs)) { cg = ino_to_cg(fs, ip->i_number); - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } /* * Find a cylinder with greater than average number of @@ -1131,12 +1131,12 @@ for (cg = startcg; cg < fs->fs_ncg; cg++) if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { fs->fs_cgrotor = cg; - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } for (cg = 0; cg <= startcg; cg++) if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { fs->fs_cgrotor = cg; - return (fs->fs_fpg * cg + fs->fs_frag); + return (cgbase(fs, cg) + fs->fs_frag); } return (0); } @@ -1376,7 +1376,7 @@ cgp->cg_frsum[allocsiz]--; if (frags != allocsiz) cgp->cg_frsum[allocsiz - frags]++; - blkno = cg * fs->fs_fpg + bno; + blkno = cgbase(fs, cg) + bno; if (DOINGSOFTDEP(ITOV(ip))) softdep_setup_blkmapdep(bp, fs, blkno); if (fs->fs_active != 0) @@ -1437,7 +1437,7 @@ fs->fs_cstotal.cs_nbfree--; fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--; fs->fs_fmod = 1; - blkno = cgp->cg_cgx * fs->fs_fpg + bno; + blkno = cgbase(fs, cgp->cg_cgx) + bno; if (DOINGSOFTDEP(ITOV(ip))) softdep_setup_blkmapdep(bp, fs, blkno); return (blkno); @@ -1541,7 +1541,7 @@ for (i = 1; i <= len; i++) if (!ffs_isblock(fs, blksfree, got - run + i)) panic("ffs_clusteralloc: map mismatch"); - bno = cg * fs->fs_fpg + blkstofrags(fs, got - run + 1); + bno = cgbase(fs, cg) + blkstofrags(fs, got - run + 1); if (dtog(fs, bno) != cg) panic("ffs_clusteralloc: allocated out of group"); len = blkstofrags(fs, len); ==== //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.90 2004/12/08 11:54:06 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.91 2004/12/09 21:24:00 mckusick Exp $"); #include #include @@ -743,7 +743,7 @@ nbp->b_flags |= B_VALIDSUSPWRT; numblks = howmany(fs->fs_size, fs->fs_frag); len = howmany(fs->fs_fpg, fs->fs_frag); - base = cg * fs->fs_fpg / fs->fs_frag; + base = cgbase(fs, cg) / fs->fs_frag; if (base + len >= numblks) len = numblks - base - 1; loc = 0; From owner-p4-projects@FreeBSD.ORG Fri Dec 10 22:26:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84C4A16A4D0; Fri, 10 Dec 2004 22:26:35 +0000 (GMT) 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 55CB116A4CE for ; Fri, 10 Dec 2004 22:26:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47A8843D66 for ; Fri, 10 Dec 2004 22:26:35 +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 iBAMQZ6d098417 for ; Fri, 10 Dec 2004 22:26:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBAMQY5N098414 for perforce@freebsd.org; Fri, 10 Dec 2004 22:26:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Dec 2004 22:26:34 GMT Message-Id: <200412102226.iBAMQY5N098414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Dec 2004 22:26:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=66791 Change 66791 by sam@sam_ebb on 2004/12/10 22:26:09 clear WEP bit in 802.11 header after crypto decap so tcpdump et. al. are not confused Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#27 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#27 (text+ko) ==== @@ -408,6 +408,7 @@ goto out; } wh = mtod(m, struct ieee80211_frame *); + wh->i_fc[1] &= ~IEEE80211_FC1_WEP; } else { key = NULL; } @@ -585,6 +586,7 @@ /* NB: stats+msgs handled in crypto_decap */ goto out; } + wh->i_fc[1] &= ~IEEE80211_FC1_WEP; } if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m); From owner-p4-projects@FreeBSD.ORG Fri Dec 10 22:30:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08FC216A4D0; Fri, 10 Dec 2004 22:30:42 +0000 (GMT) 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 D6DDF16A4CE for ; Fri, 10 Dec 2004 22:30:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2F7843D41 for ; Fri, 10 Dec 2004 22:30: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 iBAMUfrQ098674 for ; Fri, 10 Dec 2004 22:30:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBAMUf1I098671 for perforce@freebsd.org; Fri, 10 Dec 2004 22:30:41 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Dec 2004 22:30:41 GMT Message-Id: <200412102230.iBAMUf1I098671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Dec 2004 22:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=66793 Change 66793 by sam@sam_ebb on 2004/12/10 22:29:58 crypto decap may alter mbuf chain so recalculate wh before clearing wep bit in mgt frame case Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#28 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#28 (text+ko) ==== @@ -586,6 +586,7 @@ /* NB: stats+msgs handled in crypto_decap */ goto out; } + wh = mtod(m, struct ieee80211_frame *); wh->i_fc[1] &= ~IEEE80211_FC1_WEP; } if (ic->ic_rawbpf) From owner-p4-projects@FreeBSD.ORG Sat Dec 11 00:26:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D701716A4D0; Sat, 11 Dec 2004 00:26:01 +0000 (GMT) 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 93D1E16A4CE for ; Sat, 11 Dec 2004 00:26:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7685C43D2D for ; Sat, 11 Dec 2004 00:26:01 +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 iBB0Q1QO002445 for ; Sat, 11 Dec 2004 00:26:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBB0Q1QQ002442 for perforce@freebsd.org; Sat, 11 Dec 2004 00:26:01 GMT (envelope-from sam@freebsd.org) Date: Sat, 11 Dec 2004 00:26:01 GMT Message-Id: <200412110026.iBB0Q1QQ002442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2004 00:26:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=66796 Change 66796 by sam@sam_ebb on 2004/12/11 00:25:52 fixup inactivity timers: o ic_inact_auth is a bad name, it's the inactivity threshold for being associated but not authorized; use it that way o reset ni_inact when switching inactivity thresholds to minimize the race against the timer (don't want to lock for this stuff) o change the inactivity probe threshold from a one-shot to cover a range: when below this threshold but not expired send a probe each inactivity interval; should probably guard against the interval being turned way down as this could cause us to spam the net with probes also: o emit identical debug msg for station join in ap mode as printed for station associate in sta mode (i.e. show slot time, preamble, QoS, etc). Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#29 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#27 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#29 (text+ko) ==== @@ -878,7 +878,6 @@ return; } else (void) ieee80211_ref_node(ni); - ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, @@ -1070,7 +1069,6 @@ estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } - ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, "[%s] station authenticated (shared key)\n", ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#27 (text+ko) ==== @@ -198,6 +198,7 @@ ieee80211_node_authorize(struct ieee80211com *ic, struct ieee80211_node *ni) { ni->ni_flags |= IEEE80211_NODE_AUTH; + ni->ni_inact_reload = ic->ic_inact_run; } void @@ -907,7 +908,8 @@ ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ ieee80211_crypto_resetkey(ic, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); - ni->ni_inact = ni->ni_inact_reload = nt->nt_inact_init; + ni->ni_inact_reload = nt->nt_inact_init; + ni->ni_inact = ni->ni_inact_reload; IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); IEEE80211_NODE_LOCK(nt); @@ -1407,7 +1409,8 @@ * universally supported by drivers (need it * for ps-poll support so it should be...). */ - if (ni->ni_inact == ic->ic_inact_probe) { + if (0 < ni->ni_inact && + ni->ni_inact <= ic->ic_inact_probe) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, "[%s] probe station due to inactivity\n", ether_sprintf(ni->ni_macaddr)); @@ -1602,14 +1605,20 @@ newassoc = 0; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, - "[%s] station %s associated at aid %d\n", - ether_sprintf(ni->ni_macaddr), newassoc ? "newly" : "already", - IEEE80211_NODE_AID(ni)); + "[%s] station %sassociated at aid %d: %s preamble, %s slot time%s%s\n", + ether_sprintf(ni->ni_macaddr), newassoc ? "" : "re", + IEEE80211_NODE_AID(ni), + ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", + ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long", + ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "", + ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "" + ); /* give driver a chance to setup state like ni_txrate */ if (ic->ic_newassoc) ic->ic_newassoc(ic, ni, newassoc); - ni->ni_inact_reload = ic->ic_inact_run; + ni->ni_inact_reload = ic->ic_inact_auth; + ni->ni_inact = ni->ni_inact_reload; IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS); /* tell the authenticator about new station */ if (ic->ic_auth->ia_node_join != NULL) From owner-p4-projects@FreeBSD.ORG Sat Dec 11 00:28:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6700B16A4D0; Sat, 11 Dec 2004 00:28:05 +0000 (GMT) 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 3E6BE16A4CE for ; Sat, 11 Dec 2004 00:28:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCF7243D54 for ; Sat, 11 Dec 2004 00:28: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 iBB0S4mm002495 for ; Sat, 11 Dec 2004 00:28:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBB0S4Oh002491 for perforce@freebsd.org; Sat, 11 Dec 2004 00:28:04 GMT (envelope-from sam@freebsd.org) Date: Sat, 11 Dec 2004 00:28:04 GMT Message-Id: <200412110028.iBB0S4Oh002491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2004 00:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=66797 Change 66797 by sam@sam_ebb on 2004/12/11 00:27:15 IFC @ 66796 Affected files ... .. //depot/projects/wifi/etc/defaults/pccard.conf#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate .. //depot/projects/wifi/include/string.h#2 integrate .. //depot/projects/wifi/include/unistd.h#3 integrate .. //depot/projects/wifi/lib/libc/string/swab.3#2 integrate .. //depot/projects/wifi/lib/libc/string/swab.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#3 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/wifi/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#3 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#3 integrate .. //depot/projects/wifi/share/man/man4/xe.4#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac.c#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_ioctl.h#2 delete .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#29 integrate .. //depot/projects/wifi/sys/netinet/in_gif.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/wifi/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#6 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#6 integrate .. //depot/projects/wifi/usr.bin/make/var.c#6 integrate .. //depot/projects/wifi/usr.sbin/sendmail/Makefile#3 integrate Differences ... ==== //depot/projects/wifi/etc/defaults/pccard.conf#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.271 2004/12/09 22:27:11 rsm Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2247,7 +2247,14 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison) +# Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (Ethernet part) +card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter" + config 0x27 "xe" ? +# config auto "sio" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Intel EtherExpress PRO/100 Mobile Adapter (16-bit version) card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16" config auto "xe" ? insert /etc/pccard_ether $device start ==== //depot/projects/wifi/gnu/usr.bin/cvs/cvsbug/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.21 2004/09/28 21:19:31 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.22 2004/12/10 18:16:52 kensmith Exp $ MAINTAINER= peter@FreeBSD.org @@ -21,6 +21,7 @@ -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \ -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \ -e "s,@MKTEMP_FUNCTION@,," \ + -e "s,@MKTEMP_SH_FUNCTION@,," \ ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/wifi/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ + * $FreeBSD: src/include/string.h,v 1.21 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _STRING_H_ @@ -108,8 +108,19 @@ #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ ==== //depot/projects/wifi/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ + * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _UNISTD_H_ @@ -436,7 +436,12 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); ==== //depot/projects/wifi/lib/libc/string/swab.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd June 4, 1993 +.Dd December 10, 2004 .Dt SWAB 3 .Os .Sh NAME @@ -41,9 +41,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In unistd.h .Ft void -.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/wifi/lib/libc/string/swab.c#2 (text+ko) ==== @@ -38,12 +38,12 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $"); -#include +#include void -swab(const void * __restrict from, void * __restrict to, size_t len) +swab(const void * __restrict from, void * __restrict to, ssize_t len) { unsigned long temp; int n; ==== //depot/projects/wifi/lib/libc_r/uthread/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -10,6 +10,7 @@ uthread_acl_set_fd.c \ uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ + uthread_atfork.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ uthread_attr_getdetachstate.c \ ==== //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.84 2004/12/10 03:36:45 grog Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -451,6 +451,13 @@ void *routine_arg; }; +struct pthread_atfork { + TAILQ_ENTRY(pthread_atfork) qe; + void (*prepare)(void); + void (*parent)(void); + void (*child)(void); +}; + struct pthread_attr { int sched_policy; int sched_inherit; @@ -1025,6 +1032,9 @@ ; #endif +SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _atfork_list; +SCLASS pthread_mutex_t _atfork_mutex; + /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default #ifdef GLOBAL_PTHREAD_PRIVATE ==== //depot/projects/wifi/lib/libc_r/uthread/uthread_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $ */ #include #include @@ -48,6 +48,7 @@ _fork(void) { struct pthread *curthread = _get_curthread(); + struct pthread_atfork *af; int i, flags, use_deadlist = 0; pid_t ret; pthread_t pthread; @@ -59,9 +60,23 @@ */ _thread_kern_sig_defer(); + _pthread_mutex_lock(&_atfork_mutex); + + /* Run down atfork prepare handlers. */ + TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) { + if (af->prepare != NULL) + af->prepare(); + } + /* Fork a new process: */ if ((ret = __sys_fork()) != 0) { - /* Parent process or error. Nothing to do here. */ + /* Run down atfork parent handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->parent != NULL) + af->parent(); + } + _pthread_mutex_unlock(&_atfork_mutex); + } else { /* Close the pthread kernel pipe: */ __sys_close(_thread_kern_pipe[0]); @@ -207,8 +222,15 @@ } } } + /* Run down atfork child handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->child != NULL) + af->child(); + } + _mutex_reinit(&_atfork_mutex); } + /* * Undefer and handle pending signals, yielding if necessary: */ ==== //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.48 2004/12/10 03:36:45 grog Exp $ */ /* Allocate space for global thread variables here: */ @@ -437,6 +437,8 @@ TAILQ_INIT(&_thread_list); TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); + TAILQ_INIT(&_atfork_list); + _pthread_mutex_init(&_atfork_mutex, NULL); /* Initialise the global signal action structure: */ sigfillset(&act.sa_mask); ==== //depot/projects/wifi/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.159 2004/11/03 21:51:34 ceri Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.160 2004/12/10 02:38:21 csjp Exp $ .\" .Dd October 22, 2004 .Dt IPFW 8 @@ -973,14 +973,10 @@ A .Ar group may be specified by name or number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm jail Ar prisonID Matches all TCP or UDP packets sent by or received for the jail whos prison ID is .Ar prisonID . -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm icmptypes Ar types Matches ICMP packets whose ICMP type is in the list .Ar types . @@ -1305,8 +1301,6 @@ A .Ar user may be matched by name or identification number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm verrevpath For incoming packets, a routing table lookup is done on the packet's source address. @@ -2342,10 +2336,6 @@ .Xr sysctl 8 , .Xr syslogd 8 .Sh BUGS -Lock ordering issues could result in system hard locks if rules which -contain UID, GID or jail ID constraints and used with debug.mpsafenet -set to 1. -.Pp The syntax has grown over the years and sometimes it might be confusing. Unfortunately, backward compatibility prevents cleaning up mistakes made in the definition of the syntax. ==== //depot/projects/wifi/share/man/man4/mac_portacl.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.8 2004/12/09 13:48:33 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd December , 2004 +.Dd December 9, 2004 .Dt MAC_PORTACL 4 .Os .Sh NAME ==== //depot/projects/wifi/share/man/man4/xe.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/xe.4,v 1.7 2004/07/08 12:52:33 ru Exp $ +.\" $FreeBSD: src/share/man/man4/xe.4,v 1.8 2004/12/09 23:13:18 rsm Exp $ .\" .Dd July 4, 2004 .Dt XE 4 @@ -103,6 +103,8 @@ Compaq Netelligent 10/100 PC Card (CPQ-10/100) .It Intel EtherExpress Pro/100 PC Card Mobile Adapter 16 (Pro/100 M16A) +.It +Intel EtherExpress Pro/100 LAN/Modem PC Card Adapter (Pro/100 M16B) .El .Pp Other similar devices using the same hardware may also be supported. ==== //depot/projects/wifi/sys/arm/arm/bcopyinout.S#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.3 2004/11/09 16:47:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.4 2004/12/10 16:49:08 cognet Exp $"); #ifdef __XSCALE__ #include #else @@ -80,7 +80,7 @@ /* Quick exit if length is zero */ teq r2, #0 moveq r0, #0 - RETEQ + RETeq SAVE_REGS #ifdef MULTIPROCESSOR ==== //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.12 2004/09/14 03:12:01 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.13 2004/12/10 17:42:47 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -1529,7 +1529,9 @@ pfsync_sendout(sc) struct pfsync_softc *sc; { +#if NBPFILTER > 0 struct ifnet *ifp = &sc->sc_if; +#endif struct mbuf *m; #ifdef __FreeBSD__ ==== //depot/projects/wifi/sys/dev/aac/aac.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.104 2004/11/21 04:03:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.105 2004/12/09 22:20:25 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/wifi/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.17 2004/08/12 05:05:06 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.18 2004/12/09 22:20:25 scottl Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -60,7 +60,7 @@ #include #include -#include +#include #include struct aac_cam { ==== //depot/projects/wifi/sys/dev/aac/aac_debug.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.19 2004/06/13 17:57:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.20 2004/12/09 22:20:25 scottl Exp $"); /* * Debugging support. @@ -47,7 +47,7 @@ #include #include -#include +#include #include #ifdef AAC_DEBUG ==== //depot/projects/wifi/sys/dev/aac/aac_disk.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.41 2004/08/12 05:05:06 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.42 2004/12/09 22:20:25 scottl Exp $"); #include "opt_aac.h" @@ -50,7 +50,7 @@ #include #include -#include +#include #include /* ==== //depot/projects/wifi/sys/dev/aac/aac_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.49 2004/10/21 19:14:32 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.50 2004/12/09 22:20:25 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -55,7 +55,7 @@ #include #include -#include +#include #include static int aac_pci_probe(device_t dev); ==== //depot/projects/wifi/sys/dev/ctau/if_ct.c#3 (text+ko) ==== @@ -22,17 +22,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.17 2004/12/03 16:57:15 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.18 2004/12/10 05:54:45 rik Exp $"); #include - -#if __FreeBSD_version >= 500000 -# define NCTAU 1 -#else -# include "ctau.h" -#endif - -#if NCTAU > 0 #include #include #include @@ -55,13 +47,7 @@ #include #include #include -#if __FreeBSD_version < 500000 -# include -#endif #include -#if __FreeBSD_version <= 501000 -# include -#endif #include #include #include @@ -73,20 +59,12 @@ # include #else # include -# if __FreeBSD_version < 500000 -# include "sppp.h" -# if NSPPP <= 0 -# error The device ctau requires sppp or netgraph. -# endif -# endif # include # define PP_CISCO IFF_LINK2 -# if __FreeBSD_version < 500000 -# include -# endif # include -# define NBPFILTER NBPF #endif + +#define NCTAU 1 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */ #ifndef PP_FR @@ -116,10 +94,8 @@ unsigned long phys; void *virt; size_t size; -#if __FreeBSD_version >= 500000 bus_dma_tag_t dmat; bus_dmamap_t mapp; -#endif } ct_dma_mem_t; typedef struct _drv_t { @@ -459,7 +435,6 @@ extern struct cdevsw ct_cdevsw; -#if __FreeBSD_version >= 500000 static void ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -516,29 +491,7 @@ bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); bus_dma_tag_destroy (dmem->dmat); } -#else -static int -ct_bus_dma_mem_alloc (int bnum, int cnum, ct_dma_mem_t *dmem) -{ - dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, - 0x100000, 0x1000000, 16, 0); - if (dmem->virt == NULL) { - if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); - else printf ("ct%d: ", bnum); - printf ("couldn't allocate memory for dma memory\n", unit); - return 0; - } - dmem->phys = vtophys (dmem->virt); - return 1; -} -static void -ct_bus_dma_mem_free (ct_dma_mem_t *dmem) -{ - contigfree (dmem->virt, dmem->size, M_DEVBUF); -} -#endif - /* * The adapter is present, initialize the driver structures. */ @@ -700,21 +653,12 @@ ct_bus_dma_mem_free (&d->dmamem); continue; } -#if __FreeBSD_version >= 500000 NG_NODE_SET_PRIVATE (d->node, d); -#else - d->node->private = d; -#endif sprintf (d->nodename, "%s%d", NG_CT_NODE_TYPE, c->board->num*NCHAN + c->num); if (ng_name_node (d->node, d->nodename)) { printf ("%s: cannot name node\n", d->nodename); -#if __FreeBSD_version >= 500000 NG_NODE_UNREF (d->node); -#else - ng_rmnode (d->node); - ng_unref (d->node); -#endif channel [b->num*NCHAN + c->num] = 0; c->sys = 0; ct_bus_dma_mem_free (&d->dmamem); @@ -722,18 +666,11 @@ } d->queue.ifq_maxlen = IFQ_MAXLEN; d->hi_queue.ifq_maxlen = IFQ_MAXLEN; -#if __FreeBSD_version >= 500000 mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "ct_queue_hi", NULL, MTX_DEF); -#endif #else /*NETGRAPH*/ d->pp.pp_if.if_softc = d; -#if __FreeBSD_version > 501000 if_initname (&d->pp.pp_if, "ct", b->num * NCHAN + c->num); -#else - d->pp.pp_if.if_unit = b->num * NCHAN + c->num; - d->pp.pp_if.if_name = "ct"; -#endif d->pp.pp_if.if_mtu = PP_MTU; d->pp.pp_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST | IFF_NEEDSGIANT; @@ -805,7 +742,6 @@ continue; #ifdef NETGRAPH -#if __FreeBSD_version >= 500000 if (d->node) { ng_rmnode_self (d->node); NG_NODE_UNREF (d->node); @@ -814,14 +750,8 @@ mtx_destroy (&d->queue.ifq_mtx); mtx_destroy (&d->hi_queue.ifq_mtx); #else - ng_rmnode (d->node); - d->node = 0; -#endif -#else -#if __FreeBSD_version >= 410000 && NBPFILTER > 0 /* Detach from the packet filter list of interfaces. */ bpfdetach (&d->pp.pp_if); -#endif /* Detach from the sync PPP list. */ sppp_detach (&d->pp.pp_if); @@ -1001,11 +931,7 @@ return; #ifndef NETGRAPH if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_MTAP (&d->pp.pp_if, m); -#else - bpf_mtap (&d->pp.pp_if, m); -#endif #endif len = m->m_pkthdr.len; if (! m->m_next) @@ -1097,7 +1023,7 @@ { drv_t *d = c->sys; struct mbuf *m; -#if __FreeBSD_version >= 500000 && defined NETGRAPH +#ifdef NETGRAPH int error; #endif @@ -1116,22 +1042,14 @@ printmbuf (m); #ifdef NETGRAPH m->m_pkthdr.rcvif = 0; -#if __FreeBSD_version >= 500000 NG_SEND_DATA_ONLY (error, d->hook, m); #else - ng_queue_data (d->hook, m, 0); -#endif -#else ++d->pp.pp_if.if_ipackets; m->m_pkthdr.rcvif = &d->pp.pp_if; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_TAP (&d->pp.pp_if, data, len); -#else - bpf_tap (&d->pp.pp_if, data, len); -#endif sppp_input (&d->pp.pp_if, m); #endif } @@ -1188,11 +1106,7 @@ } } -#if __FreeBSD_version < 500000 -static int ct_open (dev_t dev, int oflags, int devtype, struct proc *p) -#else static int ct_open (struct cdev *dev, int oflags, int devtype, struct thread *td) -#endif { drv_t *d; @@ -1203,11 +1117,7 @@ return 0; } -#if __FreeBSD_version < 500000 -static int ct_close (dev_t dev, int fflag, int devtype, struct proc *p) -#else static int ct_close (struct cdev *dev, int fflag, int devtype, struct thread *td) -#endif { drv_t *d = channel [minor(dev)]; @@ -1240,11 +1150,7 @@ /* * Process an ioctl request on /dev/cronyx/ctauN. */ -#if __FreeBSD_version < 500000 -static int ct_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) -#else static int ct_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) -#endif { drv_t *d = channel [minor (dev)]; ct_chan_t *c; @@ -1275,11 +1181,7 @@ case SERIAL_SETPROTO: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (d->pp.pp_if.if_flags & IFF_RUNNING) @@ -1307,11 +1209,7 @@ case SERIAL_SETKEEPALIVE: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if ((d->pp.pp_flags & PP_FR) || @@ -1340,11 +1238,7 @@ case SERIAL_SETCFG: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_HDLC) @@ -1420,11 +1314,7 @@ case SERIAL_CLRSTAT: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; c->rintr = 0; @@ -1447,11 +1337,7 @@ case SERIAL_SETBAUD: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1465,11 +1351,7 @@ case SERIAL_SETLOOP: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1485,11 +1367,7 @@ case SERIAL_SETDPLL: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1507,11 +1385,7 @@ case SERIAL_SETNRZI: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1527,11 +1401,7 @@ case SERIAL_SETDEBUG: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; c->debug = *(int*)data; @@ -1551,11 +1421,7 @@ case SERIAL_SETHIGAIN: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1575,11 +1441,7 @@ if (c->mode != M_E1) return EINVAL; /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1600,11 +1462,7 @@ case SERIAL_SETCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1626,11 +1484,7 @@ case SERIAL_SETTIMESLOTS: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1646,11 +1500,7 @@ case SERIAL_SETSUBCHAN: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1674,11 +1524,7 @@ case SERIAL_SETINVCLK: case SERIAL_SETINVTCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1690,11 +1536,7 @@ case SERIAL_SETINVRCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 11 21:17:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C2E816A4D0; Sat, 11 Dec 2004 21:17:54 +0000 (GMT) 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 4492816A4CE for ; Sat, 11 Dec 2004 21:17:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0FD143D5A for ; Sat, 11 Dec 2004 21:17:53 +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 iBBLHrVH086475 for ; Sat, 11 Dec 2004 21:17:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBBLHqV5086472 for perforce@freebsd.org; Sat, 11 Dec 2004 21:17:52 GMT (envelope-from marcel@freebsd.org) Date: Sat, 11 Dec 2004 21:17:52 GMT Message-Id: <200412112117.iBBLHqV5086472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 66828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2004 21:17:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=66828 Change 66828 by marcel@marcel_nfs on 2004/12/11 21:16:54 IFC @66826 Affected files ... .. //depot/projects/ia64/etc/defaults/pccard.conf#30 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#6 integrate .. //depot/projects/ia64/include/string.h#15 integrate .. //depot/projects/ia64/include/unistd.h#26 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/ia64/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/ia64/lib/libc/string/swab.3#3 integrate .. //depot/projects/ia64/lib/libc/string/swab.c#5 integrate .. //depot/projects/ia64/lib/libc_r/uthread/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#21 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/ia64/lib/libc_r/uthread/uthread_fork.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#13 integrate .. //depot/projects/ia64/lib/libsdp/search.c#5 integrate .. //depot/projects/ia64/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/ia64/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/ia64/sbin/ifconfig/af_atalk.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/af_inet.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/af_inet6.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/af_ipx.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/af_link.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/ifclone.c#1 branch .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#27 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#23 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmac.c#2 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#8 integrate .. //depot/projects/ia64/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#40 integrate .. //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.c#4 integrate .. //depot/projects/ia64/share/man/man4/Makefile#79 integrate .. //depot/projects/ia64/share/man/man4/ath.4#20 integrate .. //depot/projects/ia64/share/man/man4/mac_portacl.4#5 integrate .. //depot/projects/ia64/share/man/man4/udav.4#3 integrate .. //depot/projects/ia64/share/man/man4/wlan.4#5 integrate .. //depot/projects/ia64/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/ia64/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/ia64/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/ia64/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/ia64/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/ia64/share/man/man4/xe.4#4 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#24 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#19 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#26 integrate .. //depot/projects/ia64/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/ia64/sys/conf/files#123 integrate .. //depot/projects/ia64/sys/conf/files.i386#59 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#39 integrate .. //depot/projects/ia64/sys/conf/options#81 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#7 delete .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/ia64/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#43 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#15 integrate .. //depot/projects/ia64/sys/dev/aac/aac_debug.c#11 integrate .. //depot/projects/ia64/sys/dev/aac/aac_disk.c#22 integrate .. //depot/projects/ia64/sys/dev/aac/aac_ioctl.h#4 delete .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#30 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/ia64/sys/dev/ata/ata-all.h#26 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#39 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#37 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#25 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#44 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/ia64/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/ia64/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/ia64/sys/dev/awi/awi.c#18 integrate .. //depot/projects/ia64/sys/dev/awi/awivar.h#6 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#16 integrate .. //depot/projects/ia64/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/FILES#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#55 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#19 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#19 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#24 integrate .. //depot/projects/ia64/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#60 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#42 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#23 integrate .. //depot/projects/ia64/sys/ia64/include/fpu.h#3 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#16 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#45 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/ia64/sys/modules/Makefile#79 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#24 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/ia64/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/ia64/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#9 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/ia64/sys/netgraph/ng_pppoe.c#18 integrate .. //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#15 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#28 integrate .. //depot/projects/ia64/sys/netinet/in_gif.c#12 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#41 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/ia64/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#31 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#38 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#10 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/ia64/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#39 integrate .. //depot/projects/ia64/tools/regression/net80211/ccmp/Makefile#1 branch .. //depot/projects/ia64/tools/regression/net80211/ccmp/test_ccmp.c#1 branch .. //depot/projects/ia64/tools/regression/net80211/tkip/Makefile#1 branch .. //depot/projects/ia64/tools/regression/net80211/tkip/test_tkip.c#1 branch .. //depot/projects/ia64/tools/regression/net80211/wep/Makefile#1 branch .. //depot/projects/ia64/tools/regression/net80211/wep/test_wep.c#1 branch .. //depot/projects/ia64/tools/tools/ath/80211debug.c#1 branch .. //depot/projects/ia64/tools/tools/ath/80211stats.c#3 integrate .. //depot/projects/ia64/tools/tools/ath/Makefile#5 integrate .. //depot/projects/ia64/tools/tools/ath/athdebug.c#1 branch .. //depot/projects/ia64/tools/tools/ath/athstats.c#5 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#15 integrate .. //depot/projects/ia64/usr.bin/make/arch.c#11 integrate .. //depot/projects/ia64/usr.bin/make/cond.c#13 integrate .. //depot/projects/ia64/usr.bin/make/dir.c#13 integrate .. //depot/projects/ia64/usr.bin/make/job.c#18 integrate .. //depot/projects/ia64/usr.bin/make/lst.h#7 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstAppend.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstClose.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstConcat.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDeQueue.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDestroy.c#6 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDupl.c#6 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstFindFrom.c#6 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInit.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInsert.c#5 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstIsAtEnd.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstNext.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstOpen.c#5 delete .. //depot/projects/ia64/usr.bin/make/lst.lib/lstRemove.c#5 integrate .. //depot/projects/ia64/usr.bin/make/main.c#27 integrate .. //depot/projects/ia64/usr.bin/make/make.c#10 integrate .. //depot/projects/ia64/usr.bin/make/make.h#10 integrate .. //depot/projects/ia64/usr.bin/make/nonints.h#13 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#20 integrate .. //depot/projects/ia64/usr.bin/make/str.c#12 integrate .. //depot/projects/ia64/usr.bin/make/suff.c#11 integrate .. //depot/projects/ia64/usr.bin/make/targ.c#11 integrate .. //depot/projects/ia64/usr.bin/make/var.c#19 integrate .. //depot/projects/ia64/usr.bin/whois/whois.1#7 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#13 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#12 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#13 integrate Differences ... ==== //depot/projects/ia64/etc/defaults/pccard.conf#30 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.271 2004/12/09 22:27:11 rsm Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2247,7 +2247,14 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison) +# Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (Ethernet part) +card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter" + config 0x27 "xe" ? +# config auto "sio" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Intel EtherExpress PRO/100 Mobile Adapter (16-bit version) card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16" config auto "xe" ? insert /etc/pccard_ether $device start ==== //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.21 2004/09/28 21:19:31 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.22 2004/12/10 18:16:52 kensmith Exp $ MAINTAINER= peter@FreeBSD.org @@ -21,6 +21,7 @@ -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \ -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \ -e "s,@MKTEMP_FUNCTION@,," \ + -e "s,@MKTEMP_SH_FUNCTION@,," \ ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/ia64/include/string.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ + * $FreeBSD: src/include/string.h,v 1.21 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _STRING_H_ @@ -108,8 +108,19 @@ #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ ==== //depot/projects/ia64/include/unistd.h#26 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ + * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _UNISTD_H_ @@ -436,7 +436,12 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); ==== //depot/projects/ia64/lib/libarchive/archive_entry.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.23 2004/08/08 07:39:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); #include #include @@ -609,7 +609,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev(m, minor(d)); + entry->ae_stat.st_rdev = makedev(major(m), minor(d)); } void @@ -618,7 +618,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev( major(d), m); + entry->ae_stat.st_rdev = makedev(major(d), minor(m)); } void ==== //depot/projects/ia64/lib/libc/softfloat/bits32/softfloat.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $"); #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" @@ -77,7 +77,7 @@ Floating-point rounding mode and exception flags. ------------------------------------------------------------------------------- */ -fp_rnd float_rounding_mode = float_round_nearest_even; +fp_rnd_t float_rounding_mode = float_round_nearest_even; fp_except float_exception_flags = 0; /* ==== //depot/projects/ia64/lib/libc/string/swab.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd June 4, 1993 +.Dd December 10, 2004 .Dt SWAB 3 .Os .Sh NAME @@ -41,9 +41,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In unistd.h .Ft void -.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/ia64/lib/libc/string/swab.c#5 (text+ko) ==== @@ -38,12 +38,12 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $"); -#include +#include void -swab(const void * __restrict from, void * __restrict to, size_t len) +swab(const void * __restrict from, void * __restrict to, ssize_t len) { unsigned long temp; int n; ==== //depot/projects/ia64/lib/libc_r/uthread/Makefile.inc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -10,6 +10,7 @@ uthread_acl_set_fd.c \ uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ + uthread_atfork.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ uthread_attr_getdetachstate.c \ ==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#21 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.84 2004/12/10 03:36:45 grog Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -451,6 +451,13 @@ void *routine_arg; }; +struct pthread_atfork { + TAILQ_ENTRY(pthread_atfork) qe; + void (*prepare)(void); + void (*parent)(void); + void (*child)(void); +}; + struct pthread_attr { int sched_policy; int sched_inherit; @@ -1025,6 +1032,9 @@ ; #endif +SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _atfork_list; +SCLASS pthread_mutex_t _atfork_mutex; + /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default #ifdef GLOBAL_PTHREAD_PRIVATE ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_fork.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $ */ #include #include @@ -48,6 +48,7 @@ _fork(void) { struct pthread *curthread = _get_curthread(); + struct pthread_atfork *af; int i, flags, use_deadlist = 0; pid_t ret; pthread_t pthread; @@ -59,9 +60,23 @@ */ _thread_kern_sig_defer(); + _pthread_mutex_lock(&_atfork_mutex); + + /* Run down atfork prepare handlers. */ + TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) { + if (af->prepare != NULL) + af->prepare(); + } + /* Fork a new process: */ if ((ret = __sys_fork()) != 0) { - /* Parent process or error. Nothing to do here. */ + /* Run down atfork parent handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->parent != NULL) + af->parent(); + } + _pthread_mutex_unlock(&_atfork_mutex); + } else { /* Close the pthread kernel pipe: */ __sys_close(_thread_kern_pipe[0]); @@ -207,8 +222,15 @@ } } } + /* Run down atfork child handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->child != NULL) + af->child(); + } + _mutex_reinit(&_atfork_mutex); } + /* * Undefer and handle pending signals, yielding if necessary: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.48 2004/12/10 03:36:45 grog Exp $ */ /* Allocate space for global thread variables here: */ @@ -437,6 +437,8 @@ TAILQ_INIT(&_thread_list); TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); + TAILQ_INIT(&_atfork_list); + _pthread_mutex_init(&_atfork_mutex, NULL); /* Initialise the global signal action structure: */ sigfillset(&act.sa_mask); ==== //depot/projects/ia64/lib/libsdp/search.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $ - * $FreeBSD: src/lib/libsdp/search.c,v 1.6 2004/02/26 20:44:55 emax Exp $ + * $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $ */ #include @@ -55,7 +55,8 @@ sdp_session_p ss = (sdp_session_p) xss; uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL; - int32_t type, len; + int32_t t, len; + uint16_t lo, hi; if (ss == NULL) return (-1); @@ -66,11 +67,29 @@ return (-1); } - /* Calculate length of the request */ req = ss->req; + + /* Calculate ServiceSearchPattern length */ plen = plen * (sizeof(pp[0]) + 1); - alen = alen * (sizeof(ap[0]) + 1); + + /* Calculate AttributeIDList length */ + for (len = 0, t = 0; t < alen; t ++) { + lo = (uint16_t) (ap[t] >> 16); + hi = (uint16_t) (ap[t]); + + if (lo > hi) { + ss->error = EINVAL; + return (-1); + } + + if (lo != hi) + len += (sizeof(ap[t]) + 1); + else + len += (sizeof(lo) + 1); + } + alen = len; + /* Calculate length of the request */ len = plen + sizeof(uint8_t) + sizeof(uint16_t) + /* ServiceSearchPattern */ sizeof(uint16_t) + @@ -97,9 +116,21 @@ /* Put AttributeIDList */ SDP_PUT8(SDP_DATA_SEQ16, req); SDP_PUT16(alen, req); - for (; alen > 0; ap ++, alen -= (sizeof(ap[0]) + 1)) { - SDP_PUT8(SDP_DATA_UINT32, req); - SDP_PUT32(*ap, req); + for (; alen > 0; ap ++) { + lo = (uint16_t) (*ap >> 16); + hi = (uint16_t) (*ap); + + if (lo != hi) { + /* Put attribute range */ + SDP_PUT8(SDP_DATA_UINT32, req); + SDP_PUT32(*ap, req); + alen -= (sizeof(ap[0]) + 1); + } else { + /* Put attribute */ + SDP_PUT8(SDP_DATA_UINT16, req); + SDP_PUT16(lo, req); + alen -= (sizeof(lo) + 1); + } } /* Submit ServiceSearchAttributeRequest and wait for response */ @@ -241,8 +272,8 @@ rsp_tmp = ss->rsp; /* Skip the first SEQ */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -263,8 +294,8 @@ for (; rsp_tmp < rsp && vlen > 0; ) { /* Get set of attributes for the next record */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -286,8 +317,8 @@ /* Now rsp_tmp points to list of (attr,value) pairs */ for (; len > 0 && vlen > 0; vp ++, vlen --) { /* Attribute */ - SDP_GET8(type, rsp_tmp); - if (type != SDP_DATA_UINT16) { + SDP_GET8(t, rsp_tmp); + if (t != SDP_DATA_UINT16) { ss->error = ENOATTR; return (-1); } ==== //depot/projects/ia64/sbin/geom/class/stripe/gstripe.8#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.17 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.18 2004/12/09 12:26:47 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -169,7 +169,7 @@ This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] ==== //depot/projects/ia64/sbin/ifconfig/Makefile#6 (text+ko) ==== @@ -1,36 +1,37 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.26 2004/12/08 19:18:07 sam Exp $ PROG= ifconfig -SRCS= ifconfig.c -#comment out to exclude SIOC[GS]IFMEDIA support -SRCS+= ifmedia.c -CFLAGS+=-DUSE_IF_MEDIA -CFLAGS+=-DINET6 +SRCS= ifconfig.c # base support -#comment out to exclude SIOC[GS]ETVLAN support -SRCS+= ifvlan.c -CFLAGS+=-DUSE_VLANS +# +# NB: The order here defines the order in which the constructors +# are called. This in turn defines the default order in which +# status is displayed. Probably should add a priority mechanism +# to the registration process so we don't depend on this aspect +# of the toolchain. +# +SRCS+= af_link.c # LLC support +SRCS+= af_inet.c # IPv4 support +SRCS+= af_inet6.c # IPv6 support +SRCS+= af_atalk.c # AppleTalk support -#comment out to exclude SIOC[GS]IEEE80211 support -SRCS+= ifieee80211.c -CFLAGS+=-DUSE_IEEE80211 +SRCS+= ifclone.c # clone device support +SRCS+= ifmac.c # MAC support +SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support +SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support -#comment out to exclude MAC support -SRCS+= ifmac.c -CFLAGS+=-DUSE_MAC - -MAN= ifconfig.8 - -.if defined(RELEASE_CRUNCH) -CFLAGS+=-DNO_IPX -.else +.if !defined(RELEASE_CRUNCH) +SRCS+= af_ipx.c # IPX support DPADD= ${LIBIPX} LDADD= -lipx .endif -CFLAGS+=-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ +MAN= ifconfig.8 + +CFLAGS+= -g -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ -Wnested-externs -I.. WARNS?= 0 ==== //depot/projects/ia64/sbin/ifconfig/ifconfig.8#27 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.86 2004/11/06 13:38:45 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.87 2004/12/08 19:18:07 sam Exp $ .\" -.Dd July 26, 2004 +.Dd Nov 2, 2004 .Dt IFCONFIG 8 .Os .Sh NAME @@ -55,6 +55,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Ar address_family .Nm .Fl l @@ -66,6 +67,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Fl C .Sh DESCRIPTION The @@ -596,64 +598,101 @@ It happens automatically when setting the first address on an interface. If the interface was reset when previously marked down, the hardware will be re-initialized. -.It Cm ssid Ar ssid -For IEEE 802.11 wireless interfaces, set the desired Service Set -Identifier (aka network name). -The SSID is a string up to 32 characters -in length and may be specified as either a normal string or in -hexadecimal when proceeded by -.Ql 0x . -Additionally, the SSID may be cleared by setting it to -.Ql - . -.It Cm nwid Ar ssid -Another name for the -.Cm ssid -parameter. -Included for -.Nx -compatibility. -.It Cm stationname Ar name -For IEEE 802.11 wireless interfaces, set the name of this station. -It appears that the station name is not really part of the IEEE 802.11 -protocol though all interfaces seem to support it. -As such it only -seems to be meaningful to identical or virtually identical equipment. -Setting the station name is identical in syntax to setting the SSID. -.It Cm station Ar name -Another name for the -.Cm stationname -parameter. -Included for -.Bsx -compatibility. -.It Cm channel Ar number -For IEEE 802.11 wireless interfaces, set the desired channel. -Channels range from 1 to 14, but the exact selection available -depends on the region your adaptor was manufactured for. -Setting -the channel to 0 will give you the default for your adaptor. -Many -adaptors ignore this setting unless you are in ad-hoc mode. +.El +.Pp +The following parameters are specific to IEEE 802.11 wireless interfaces: +.Bl -tag -width indent +.It Cm apbridge +When operating as an access point pass packets between +wireless clients directly (default). +To instead let them pass up through the +system and be forwarded using some other mechanism use +.Dq Li -apbridge. +Disabling the internal bridging +is useful when traffic is to be processed with +packet filtering. .It Cm authmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired authentication mode -in infrastructure mode. +Set the desired authentication mode in infrastructure mode. Not all adaptors support all modes. The set of valid modes is .Dq Li none , .Dq Li open , +.Dq Li shared (shared key), +.Dq Li 8021x (IEEE 802.1x), +or +.Dq Li wpa (IEEE WPA/WPA2/802.11i). +The +.Dq Li 8021x and -.Dq Li shared . +.Dq Li wpa +modes are only useful when used an authentication service +(a supplicant for client operation or an authenticator when +operating as an access point). Modes are case insensitive. +.It Cm bssid Ar address +Specify the MAC address of the access point to use when operating +as a station in a BSS network. +This overrides any automatic selection done by the system. +To disable a previously selected access point supply +.Dq Li any , +.Dq Li none , +or +.Dq Li - +for the address. +This option is useful when more than one access points have the same SSID. +Another name for the +.Cm bssid +parameter is +.Cm ap . +.It Cm chanlist Ar channels +Set the desired channels to use when scanning for access +points, neighbors in an IBSS network, or looking for unoccupied +channels when operating as an access point. +The set of channels is specified as a comma-separated list with +each element in the list either a single channel number of a range +of the form +.Dq Li a-b . +Channel numbers must be in the range 1 to 255 and be permissible +according to the operating characteristics of the device. +.It Cm channel Ar number +Set a single desired channel. +Channels range from 1 to 255, but the exact selection available +depends on the region your adaptor was manufactured for. +Setting +the channel to +.Dq Li 0 , +.Dq Li any , +or +.Dq Li - +will give you the default for your adaptor. +Many +adaptors ignore this setting unless you are in ad-hoc mode. +Alternatively the frequency, in megahertz, may be specified +instead of the channel number. +.It Cm hidessid +When operating as an access point do not broadcast the SSID +in beacon frames. +By default the SSID is included in beacon frames. +To re-enable the broadcast of the SSID use +.Fl hidessid . .It Cm powersave -For IEEE 802.11 wireless interfaces, enable powersave mode. -.It Fl powersave -For IEEE 802.11 wireless interfaces, disable powersave mode. +Enable powersave operation. +When operating as a client the station will conserve power by +periodically turning off the radio and listening for +messages from the access point telling it there are packets waiting. +The station must then retrieve the packets. +When operating as an access point the station must honor power +save operation of associated clients. +Not all devices support power save operation, either as a client +or as an access point. +Use +.Fl powersave +to disable powersave operation. .It Cm powersavesleep Ar sleep -For IEEE 802.11 wireless interfaces, set the desired max powersave sleep -time in milliseconds. +Set the desired max powersave sleep time in milliseconds. .It Cm protmode Ar technique -For IEEE 802.11 wireless interfaces operating in 11g, use the specified +For interfaces operating in 802.11g, use the specified .Ar technique for protecting OFDM frames in a mixed 11b/11g network. The set of valid techniques is @@ -664,8 +703,25 @@ .Dq Li rtscts (RTS/CTS). Technique names are case insensitive. +.It Cm roaming Ar mode +When operating as a station, control how the system will +behave when communication with the current access point +is broken. +.I Mode >>> TRUNCATED FOR MAIL (1000 lines) <<<