svn commit: r229766 - in head: lib/libc/net sbin/route
Author: ume
Date: Sat Jan 7 09:01:19 2012
New Revision: 229766
URL: http://svn.freebsd.org/changeset/base/229766
Log:
Handle the internal scope address representation of the KAME IPv6
stack for the node-local multicast address.
Spotted by: Rainer Bredehorn
MFC after:1 week
Modified:
head/lib/libc/net/getaddrinfo.c
head/sbin/route/route.c
Modified: head/lib/libc/net/getaddrinfo.c
==
--- head/lib/libc/net/getaddrinfo.c Sat Jan 7 04:13:25 2012
(r229765)
+++ head/lib/libc/net/getaddrinfo.c Sat Jan 7 09:01:19 2012
(r229766)
@@ -1576,7 +1576,8 @@ ip6_str2scopeid(char *scope, struct sock
if (*scope == '\0')
return -1;
- if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) {
+ if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
+ IN6_IS_ADDR_MC_NODELOCAL(a6)) {
/*
* We currently assume a one-to-one mapping between links
* and interfaces, so we simply use interface indices for
Modified: head/sbin/route/route.c
==
--- head/sbin/route/route.c Sat Jan 7 04:13:25 2012(r229765)
+++ head/sbin/route/route.c Sat Jan 7 09:01:19 2012(r229766)
@@ -375,7 +375,8 @@ routename(struct sockaddr *sa)
#ifdef __KAME__
if (sa->sa_len == sizeof(struct sockaddr_in6) &&
(IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
-IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr)) &&
+IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr) ||
+IN6_IS_ADDR_MC_NODELOCAL(&sin6.sin6_addr)) &&
sin6.sin6_scope_id == 0) {
sin6.sin6_scope_id =
ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
@@ -500,7 +501,8 @@ netname(struct sockaddr *sa)
#ifdef __KAME__
if (sa->sa_len == sizeof(struct sockaddr_in6) &&
(IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
-IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr)) &&
+IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr) ||
+IN6_IS_ADDR_MC_NODELOCAL(&sin6.sin6_addr)) &&
sin6.sin6_scope_id == 0) {
sin6.sin6_scope_id =
ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
@@ -1002,7 +1004,8 @@ getaddr(int which, char *str, struct hos
memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6));
#ifdef __KAME__
if ((IN6_IS_ADDR_LINKLOCAL(&su->sin6.sin6_addr) ||
-IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr)) &&
+IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr) ||
+IN6_IS_ADDR_MC_NODELOCAL(&su->sin6.sin6_addr)) &&
su->sin6.sin6_scope_id) {
*(u_int16_t *)&su->sin6.sin6_addr.s6_addr[2] =
htons(su->sin6.sin6_scope_id);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r228711 - head/sys/dev/usb/controller
Is this the change that is causing all the new usb-related messages when
shutting down? If so, can it be hidden behind verbose?
Doug
On 12/19/2011 07:35, Hans Petter Selasky wrote:
> Author: hselasky
> Date: Mon Dec 19 15:35:05 2011
> New Revision: 228711
> URL: http://svn.freebsd.org/changeset/base/228711
>
> Log:
> Add code to wait for USB shutdown to be executed at system shutdown.
> Add sysctl which can be used to skip this waiting.
>
> MFC after: 3 days
>
> Modified:
> head/sys/dev/usb/controller/usb_controller.c
>
> Modified: head/sys/dev/usb/controller/usb_controller.c
> ==
> --- head/sys/dev/usb/controller/usb_controller.c Mon Dec 19 14:55:14
> 2011(r228710)
> +++ head/sys/dev/usb/controller/usb_controller.c Mon Dec 19 15:35:05
> 2011(r228711)
> @@ -87,7 +87,12 @@ SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug
> static int usb_no_boot_wait = 0;
> TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait);
> SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN,
> &usb_no_boot_wait, 0,
> -"No device enumerate waiting at boot.");
> +"No USB device enumerate waiting at boot.");
> +
> +static int usb_no_shutdown_wait = 0;
> +TUNABLE_INT("hw.usb.no_shutdown_wait", &usb_no_shutdown_wait);
> +SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RDTUN,
> &usb_no_shutdown_wait, 0,
> +"No USB device waiting at system shutdown.");
>
> static devclass_t usb_devclass;
>
> @@ -277,11 +282,20 @@ usb_shutdown(device_t dev)
> return (0);
> }
>
> + device_printf(bus->bdev, "Controller shutdown\n");
> +
> USB_BUS_LOCK(bus);
> usb_proc_msignal(&bus->explore_proc,
> &bus->shutdown_msg[0], &bus->shutdown_msg[1]);
> + if (usb_no_shutdown_wait == 0) {
> + /* wait for shutdown callback to be executed */
> + usb_proc_mwait(&bus->explore_proc,
> + &bus->shutdown_msg[0], &bus->shutdown_msg[1]);
> + }
> USB_BUS_UNLOCK(bus);
>
> + device_printf(bus->bdev, "Controller shutdown complete\n");
> +
> return (0);
> }
>
>
--
You can observe a lot just by watching. -- Yogi Berra
Breadth of IT experience, and depth of knowledge in the DNS.
Yours for the right price. :) http://SupersetSolutions.com/
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
RE: svn commit: r228711 - head/sys/dev/usb/controller
Hi, Yes, that is correct. I was thinking to add something like if (bootverbose), please feel free to do so. I'm very busy this weekend. Some messages are produced by new bus, and I'm not sure how easy those are to hide. The idea behind the messages, is that if anything hangs at shutdown, that it will easily be traced down. --HPS -Original message- To:Hans Petter Selasky ; CC:src-committ...@freebsd.org; svn-src-...@freebsd.org; svn-src-head@freebsd.org; From:Doug Barton Sent:Sat 07-01-2012 10:18 Subject:Re: svn commit: r228711 - head/sys/dev/usb/controller Is this the change that is causing all the new usb-related messages when shutting down? If so, can it be hidden behind verbose? Doug ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229767 - in head/sys/dev: an bfe bm bxe e1000 ep ex firewire ie if_ndis ixgb ixgbe lge msk my nfe nve qlxgb rt sis sk sn snc stge tl tsec usb/net vx vxge wb xen/netback xen/netfront
Author: kevlo Date: Sat Jan 7 09:41:57 2012 New Revision: 229767 URL: http://svn.freebsd.org/changeset/base/229767 Log: ether_ifattach() sets if_mtu to ETHERMTU, don't bother set it again Reviewed by: yongari Modified: head/sys/dev/an/if_an.c head/sys/dev/bfe/if_bfe.c head/sys/dev/bm/if_bm.c head/sys/dev/bxe/if_bxe.c head/sys/dev/e1000/if_em.c head/sys/dev/e1000/if_igb.c head/sys/dev/e1000/if_lem.c head/sys/dev/ep/if_ep.c head/sys/dev/ex/if_ex.c head/sys/dev/firewire/if_fwe.c head/sys/dev/ie/if_ie.c head/sys/dev/if_ndis/if_ndis.c head/sys/dev/ixgb/if_ixgb.c head/sys/dev/ixgbe/ixgbe.c head/sys/dev/ixgbe/ixv.c head/sys/dev/lge/if_lge.c head/sys/dev/msk/if_msk.c head/sys/dev/my/if_my.c head/sys/dev/nfe/if_nfe.c head/sys/dev/nve/if_nve.c head/sys/dev/qlxgb/qla_os.c head/sys/dev/rt/if_rt.c head/sys/dev/sis/if_sis.c head/sys/dev/sk/if_sk.c head/sys/dev/sn/if_sn.c head/sys/dev/snc/dp83932.c head/sys/dev/stge/if_stge.c head/sys/dev/tl/if_tl.c head/sys/dev/tsec/if_tsec.c head/sys/dev/usb/net/usb_ethernet.c head/sys/dev/vx/if_vx.c head/sys/dev/vxge/vxge.c head/sys/dev/wb/if_wb.c head/sys/dev/xen/netback/netback.c head/sys/dev/xen/netfront/netfront.c Modified: head/sys/dev/an/if_an.c == --- head/sys/dev/an/if_an.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/an/if_an.c Sat Jan 7 09:41:57 2012(r229767) @@ -761,7 +761,6 @@ an_attach(struct an_softc *sc, int flags ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->an_dev), device_get_unit(sc->an_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = an_ioctl; ifp->if_start = an_start; Modified: head/sys/dev/bfe/if_bfe.c == --- head/sys/dev/bfe/if_bfe.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/bfe/if_bfe.c Sat Jan 7 09:41:57 2012(r229767) @@ -489,7 +489,6 @@ bfe_attach(device_t dev) ifp->if_ioctl = bfe_ioctl; ifp->if_start = bfe_start; ifp->if_init = bfe_init; - ifp->if_mtu = ETHERMTU; IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; IFQ_SET_READY(&ifp->if_snd); Modified: head/sys/dev/bm/if_bm.c == --- head/sys/dev/bm/if_bm.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/bm/if_bm.c Sat Jan 7 09:41:57 2012(r229767) @@ -468,7 +468,6 @@ bm_attach(device_t dev) if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = bm_start; ifp->if_ioctl = bm_ioctl; Modified: head/sys/dev/bxe/if_bxe.c == --- head/sys/dev/bxe/if_bxe.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/bxe/if_bxe.c Sat Jan 7 09:41:57 2012(r229767) @@ -2136,7 +2136,6 @@ bxe_attach(device_t dev) #endif ifp->if_init = bxe_init; - ifp->if_mtu = ETHERMTU; ifp->if_hwassist = BXE_IF_HWASSIST; ifp->if_capabilities = BXE_IF_CAPABILITIES; /* TPA not enabled by default. */ Modified: head/sys/dev/e1000/if_em.c == --- head/sys/dev/e1000/if_em.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/e1000/if_em.c Sat Jan 7 09:41:57 2012(r229767) @@ -2898,7 +2898,6 @@ em_setup_interface(device_t dev, struct return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_init = em_init; ifp->if_softc = adapter; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; Modified: head/sys/dev/e1000/if_igb.c == --- head/sys/dev/e1000/if_igb.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/e1000/if_igb.c Sat Jan 7 09:41:57 2012(r229767) @@ -2899,7 +2899,6 @@ igb_setup_interface(device_t dev, struct return (-1); } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_init = igb_init; ifp->if_softc = adapter; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; Modified: head/sys/dev/e1000/if_lem.c == --- head/sys/dev/e1000/if_lem.c Sat Jan 7 09:01:19 2012(r229766) +++ head/sys/dev/e1000/if_lem.c Sat Jan 7 09:41:57 2012
svn commit: r229768 - in head: include lib/libc/gen libexec/rtld-elf
Author: kib
Date: Sat Jan 7 10:33:01 2012
New Revision: 229768
URL: http://svn.freebsd.org/changeset/base/229768
Log:
Implement fdlopen(3), an rtld interface to load shared object by file
descriptor.
Requested and tested by: des (previous version)
Reviewed by: des, kan (previous version)
MFC after:2 weeks
Modified:
head/include/dlfcn.h
head/lib/libc/gen/Makefile.inc
head/lib/libc/gen/Symbol.map
head/lib/libc/gen/dlfcn.c
head/lib/libc/gen/dlopen.3
head/libexec/rtld-elf/Symbol.map
head/libexec/rtld-elf/rtld.c
Modified: head/include/dlfcn.h
==
--- head/include/dlfcn.hSat Jan 7 09:41:57 2012(r229767)
+++ head/include/dlfcn.hSat Jan 7 10:33:01 2012(r229768)
@@ -118,6 +118,7 @@ void*dlopen(const char *, int);
void *dlsym(void * __restrict, const char * __restrict);
#if __BSD_VISIBLE
+void *fdlopen(int, int);
int dladdr(const void * __restrict, Dl_info * __restrict);
dlfunc_t dlfunc(void * __restrict, const char * __restrict);
int dlinfo(void * __restrict, int, void * __restrict);
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Sat Jan 7 09:41:57 2012
(r229767)
+++ head/lib/libc/gen/Makefile.inc Sat Jan 7 10:33:01 2012
(r229768)
@@ -95,8 +95,8 @@ MLINKS+=directory.3 closedir.3 directory
directory.3 fdopendir.3 \
directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \
directory.3 seekdir.3 directory.3 telldir.3
-MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \
- dlopen.3 dlsym.3
+MLINKS+=dlopen.3 fdlopen.3 dlopen.3 dlclose.3 dlopen.3 dlerror.3 \
+ dlopen.3 dlfunc.3 dlopen.3 dlsym.3
MLINKS+=err.3 err_set_exit.3 err.3 err_set_file.3 err.3 errc.3 err.3 errx.3 \
err.3 verr.3 err.3 verrc.3 err.3 verrx.3 err.3 vwarn.3 err.3 vwarnc.3 \
err.3 vwarnx.3 err.3 warnc.3 err.3 warn.3 err.3 warnx.3
Modified: head/lib/libc/gen/Symbol.map
==
--- head/lib/libc/gen/Symbol.mapSat Jan 7 09:41:57 2012
(r229767)
+++ head/lib/libc/gen/Symbol.mapSat Jan 7 10:33:01 2012
(r229768)
@@ -382,6 +382,7 @@ FBSD_1.2 {
};
FBSD_1.3 {
+fdlopen;
__FreeBSD_libc_enter_restricted_mode;
};
Modified: head/lib/libc/gen/dlfcn.c
==
--- head/lib/libc/gen/dlfcn.c Sat Jan 7 09:41:57 2012(r229767)
+++ head/lib/libc/gen/dlfcn.c Sat Jan 7 10:33:01 2012(r229768)
@@ -147,6 +147,15 @@ dl_iterate_phdr(int (*callback)(struct d
return 0;
}
+#pragma weak fdlopen
+void *
+fdlopen(int fd, int mode)
+{
+
+ _rtld_error(sorry);
+ return NULL;
+}
+
#pragma weak _rtld_atfork_pre
void
_rtld_atfork_pre(int *locks)
Modified: head/lib/libc/gen/dlopen.3
==
--- head/lib/libc/gen/dlopen.3 Sat Jan 7 09:41:57 2012(r229767)
+++ head/lib/libc/gen/dlopen.3 Sat Jan 7 10:33:01 2012(r229768)
@@ -32,11 +32,12 @@
.\" @(#) dlopen.3 1.6 90/01/31 SMI
.\" $FreeBSD$
.\"
-.Dd July 7, 2009
+.Dd December 21, 2011
.Dt DLOPEN 3
.Os
.Sh NAME
.Nm dlopen ,
+.Nm fdlopen ,
.Nm dlsym ,
.Nm dlfunc ,
.Nm dlerror ,
@@ -49,6 +50,8 @@
.Ft void *
.Fn dlopen "const char *path" "int mode"
.Ft void *
+.Fn fdlopen "int fd" "int mode"
+.Ft void *
.Fn dlsym "void * restrict handle" "const char * restrict symbol"
.Ft dlfunc_t
.Fn dlfunc "void * restrict handle" "const char * restrict symbol"
@@ -164,6 +167,36 @@ be interrogated with
.Fn dlerror .
.Pp
The
+.Fn fdlopen
+function is similar to
+.Fn dlopen ,
+but it takes the file descriptor argument
+.Fa fd ,
+which is used for the file operations needed to load an object
+into the address space.
+The file descriptor
+.Fa fd
+is not closed by the function regardless a result of execution,
+but a duplicate of the file descriptor is.
+This may be important if a
+.Xr lockf 3
+lock is held on the passed descriptor.
+The
+.Fa fd
+argument -1 is interpreted as a reference to the main
+executable of the process, similar to
+.Va NULL
+value for the
+.Fa name
+argument to
+.Fn dlopen .
+The
+.Fn fdlopen
+function can be used by the code that needs to perform
+additional checks on the loaded objects, to prevent races with
+symlinking or renames.
+.Pp
+The
.Fn dlsym
function
returns the address binding of the symbol described in the null-terminated
@@ -354,6 +387,7 @@ option to the C language compiler.
.Sh ERRORS
The
.Fn dlopen ,
+.Fn fdlopen ,
.Fn dlsym ,
and
.Fn dlfunc
Modified: head/libexec/rtld-elf/Symbol.map
==
--- head/libexec/rtld-elf/S
svn commit: r229771 - head/sys/boot/common
Author: kib Date: Sat Jan 7 11:16:23 2012 New Revision: 229771 URL: http://svn.freebsd.org/changeset/base/229771 Log: Document comconsole_port and comconsole_pcidev loader variables. MFC after:2 weeks Modified: head/sys/boot/common/loader.8 Modified: head/sys/boot/common/loader.8 == --- head/sys/boot/common/loader.8 Sat Jan 7 11:01:35 2012 (r229770) +++ head/sys/boot/common/loader.8 Sat Jan 7 11:16:23 2012 (r229771) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 27, 2011 +.Dd January 7, 2012 .Dt LOADER 8 .Os .Sh NAME @@ -419,6 +419,43 @@ was compiled. Changes to the .Va comconsole_speed variable take effect immediately. +.It Va comconsole_port +Defines the base i/o port used to access console UART +(i386 and amd64 only). +If the variable is not set, its assumed value is 0x3F8, which +corresponds to PC port COM1, unless overriden by +.Va BOOT_COMCONSOLE_PORT +variable during the compilation of +.Nm . +Setting the +.Va comconsole_port +variable automatically set +.Va hw.uart.console +environment variable to provide a hint to kernel for location of the console. +Loader console is changed immediately after variable +.Va comconsole_port +is set. +.It Va comconsole_pcidev +Defines the location of a PCI device of the 'simple communication' +class to be used as the serial console UART (i386 and amd64 only). +The syntax of the variable is +.Li 'bus:device:function[:bar]' , +where all members must be numeric, with possible +.Li 0x +prefix to indicate a hexadecimal value. +The +.Va bar +member is optional and assumed to be 0x10 if omitted. +The bar must decode i/o space. +Setting the variable +.Va comconsole_pcidev +automatically sets the variable +.Va comconsole_port +to the base of the selected bar, and hint +.Va hw.uart.console . +Loader console is changed immediately after variable +.Va comconsole_pcidev +is set. .It Va console Defines the current console or consoles. Multiple consoles may be specified. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229773 - head/sys/contrib/pf/net
Author: glebius Date: Sat Jan 7 12:40:45 2012 New Revision: 229773 URL: http://svn.freebsd.org/changeset/base/229773 Log: Fix indentation. Modified: head/sys/contrib/pf/net/if_pfsync.c Modified: head/sys/contrib/pf/net/if_pfsync.c == --- head/sys/contrib/pf/net/if_pfsync.c Sat Jan 7 12:32:50 2012 (r229772) +++ head/sys/contrib/pf/net/if_pfsync.c Sat Jan 7 12:40:45 2012 (r229773) @@ -3028,11 +3028,10 @@ pfsync_bulk_start(void) #else sc->sc_bulk_next = TAILQ_FIRST(&state_list); #endif - sc->sc_bulk_last = sc->sc_bulk_next; + sc->sc_bulk_last = sc->sc_bulk_next; - pfsync_bulk_status(PFSYNC_BUS_START); - callout_reset(&sc->sc_bulk_tmo, 1, - pfsync_bulk_update, sc); + pfsync_bulk_status(PFSYNC_BUS_START); + callout_reset(&sc->sc_bulk_tmo, 1, pfsync_bulk_update, sc); } #ifdef __FreeBSD__ PF_UNLOCK(); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229774 - head/sys/netinet
Author: tuexen
Date: Sat Jan 7 13:03:33 2012
New Revision: 229774
URL: http://svn.freebsd.org/changeset/base/229774
Log:
Improve the handling of received INITs. Send an ABORT when
not accepting the connection. Also fix a crash, which
could happen when the user closed the socket.
MFC after: 1 month.
Modified:
head/sys/netinet/sctp_input.c
Modified: head/sys/netinet/sctp_input.c
==
--- head/sys/netinet/sctp_input.c Sat Jan 7 12:40:45 2012
(r229773)
+++ head/sys/netinet/sctp_input.c Sat Jan 7 13:03:33 2012
(r229774)
@@ -88,43 +88,14 @@ sctp_handle_init(struct mbuf *m, int iph
{
struct sctp_init *init;
struct mbuf *op_err;
- uint32_t init_limit;
SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_init: handling INIT tcb:%p\n",
stcb);
if (stcb == NULL) {
SCTP_INP_RLOCK(inp);
- if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) {
- goto outnow;
- }
- }
- op_err = NULL;
- init = &cp->init;
- /* First are we accepting? */
- if ((inp->sctp_socket->so_qlimit == 0) && (stcb == NULL)) {
- SCTPDBG(SCTP_DEBUG_INPUT2,
- "sctp_handle_init: Abort, so_qlimit:%d\n",
- inp->sctp_socket->so_qlimit);
- /*
-* FIX ME ?? What about TCP model and we have a
-* match/restart case? Actually no fix is needed. the lookup
-* will always find the existing assoc so stcb would not be
-* NULL. It may be questionable to do this since we COULD
-* just send back the INIT-ACK and hope that the app did
-* accept()'s by the time the COOKIE was sent. But there is
-* a price to pay for COOKIE generation and I don't want to
-* pay it on the chance that the app will actually do some
-* accepts(). The App just looses and should NOT be in this
-* state :-)
-*/
- sctp_abort_association(inp, stcb, m, iphlen, sh, op_err,
- vrf_id, port);
- if (stcb)
- *abort_no_unlock = 1;
- goto outnow;
}
+ /* validate length */
if (ntohs(cp->ch.chunk_length) < sizeof(struct sctp_init_chunk)) {
- /* Invalid length */
op_err = sctp_generate_invmanparam(SCTP_CAUSE_INVALID_PARAM);
sctp_abort_association(inp, stcb, m, iphlen, sh, op_err,
vrf_id, port);
@@ -133,6 +104,7 @@ sctp_handle_init(struct mbuf *m, int iph
goto outnow;
}
/* validate parameters */
+ init = &cp->init;
if (init->initiate_tag == 0) {
/* protocol error... send abort */
op_err = sctp_generate_invmanparam(SCTP_CAUSE_INVALID_PARAM);
@@ -169,19 +141,49 @@ sctp_handle_init(struct mbuf *m, int iph
*abort_no_unlock = 1;
goto outnow;
}
- init_limit = offset + ntohs(cp->ch.chunk_length);
if (sctp_validate_init_auth_params(m, offset + sizeof(*cp),
- init_limit)) {
+ offset + ntohs(cp->ch.chunk_length))) {
/* auth parameter(s) error... send abort */
sctp_abort_association(inp, stcb, m, iphlen, sh, NULL, vrf_id,
port);
if (stcb)
*abort_no_unlock = 1;
goto outnow;
}
- /* send an INIT-ACK w/cookie */
- SCTPDBG(SCTP_DEBUG_INPUT3, "sctp_handle_init: sending INIT-ACK\n");
- sctp_send_initiate_ack(inp, stcb, m, iphlen, offset, sh, cp, vrf_id,
port,
- ((stcb == NULL) ? SCTP_HOLDS_LOCK : SCTP_NOT_LOCKED));
+ /*
+* We are only accepting if we have a socket with positive
+* so_qlimit.
+*/
+ if ((stcb == NULL) &&
+ ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
+ (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) ||
+ (inp->sctp_socket == NULL) ||
+ (inp->sctp_socket->so_qlimit == 0))) {
+ /*
+* FIX ME ?? What about TCP model and we have a
+* match/restart case? Actually no fix is needed. the lookup
+* will always find the existing assoc so stcb would not be
+* NULL. It may be questionable to do this since we COULD
+* just send back the INIT-ACK and hope that the app did
+* accept()'s by the time the COOKIE was sent. But there is
+* a price to pay for COOKIE generation and I don't want to
+* pay it on the chance that the app will actually do some
+* accepts(). The App just looses and should NOT be in this
+* state :-)
+*/
+
svn commit: r229775 - head/sys/netinet
Author: tuexen
Date: Sat Jan 7 14:04:00 2012
New Revision: 229775
URL: http://svn.freebsd.org/changeset/base/229775
Log:
Retire the SCTP sysctl "strict_init". We always perform the validation
and there is no reason to make is configuarable.
Discussed with rrs@.
Modified:
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_sysctl.c
head/sys/netinet/sctp_sysctl.h
Modified: head/sys/netinet/sctp_input.c
==
--- head/sys/netinet/sctp_input.c Sat Jan 7 13:03:33 2012
(r229774)
+++ head/sys/netinet/sctp_input.c Sat Jan 7 14:04:00 2012
(r229775)
@@ -4617,7 +4617,7 @@ process_control_chunks:
SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_INIT\n");
/* The INIT chunk must be the only chunk. */
if ((num_chunks > 1) ||
- (SCTP_BASE_SYSCTL(sctp_strict_init) && (length -
*offset > (int)SCTP_SIZE32(chk_length {
+ (length - *offset > (int)SCTP_SIZE32(chk_length))) {
sctp_abort_association(inp, stcb, m,
iphlen, sh, NULL, vrf_id, port);
*offset = length;
@@ -4673,9 +4673,9 @@ process_control_chunks:
return (NULL);
}
}
- /* The INIT-CK chunk must be the only chunk. */
+ /* The INIT-ACK chunk must be the only chunk. */
if ((num_chunks > 1) ||
- (SCTP_BASE_SYSCTL(sctp_strict_init) && (length -
*offset > (int)SCTP_SIZE32(chk_length {
+ (length - *offset > (int)SCTP_SIZE32(chk_length))) {
*offset = length;
if (locked_tcb) {
SCTP_TCB_UNLOCK(locked_tcb);
Modified: head/sys/netinet/sctp_sysctl.c
==
--- head/sys/netinet/sctp_sysctl.c Sat Jan 7 13:03:33 2012
(r229774)
+++ head/sys/netinet/sctp_sysctl.c Sat Jan 7 14:04:00 2012
(r229775)
@@ -58,7 +58,6 @@ sctp_init_sysctls()
#if !defined(SCTP_WITH_NO_CSUM)
SCTP_BASE_SYSCTL(sctp_no_csum_on_loopback) =
SCTPCTL_LOOPBACK_NOCSUM_DEFAULT;
#endif
- SCTP_BASE_SYSCTL(sctp_strict_init) = SCTPCTL_STRICT_INIT_DEFAULT;
SCTP_BASE_SYSCTL(sctp_peer_chunk_oh) = SCTPCTL_PEER_CHKOH_DEFAULT;
SCTP_BASE_SYSCTL(sctp_max_burst_default) = SCTPCTL_MAXBURST_DEFAULT;
SCTP_BASE_SYSCTL(sctp_fr_max_burst_default) =
SCTPCTL_FRMAXBURST_DEFAULT;
@@ -607,7 +606,6 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
#if !defined(SCTP_WITH_NO_CSUM)
RANGECHK(SCTP_BASE_SYSCTL(sctp_no_csum_on_loopback),
SCTPCTL_LOOPBACK_NOCSUM_MIN, SCTPCTL_LOOPBACK_NOCSUM_MAX);
#endif
- RANGECHK(SCTP_BASE_SYSCTL(sctp_strict_init),
SCTPCTL_STRICT_INIT_MIN, SCTPCTL_STRICT_INIT_MAX);
RANGECHK(SCTP_BASE_SYSCTL(sctp_peer_chunk_oh),
SCTPCTL_PEER_CHKOH_MIN, SCTPCTL_PEER_CHKOH_MAX);
RANGECHK(SCTP_BASE_SYSCTL(sctp_max_burst_default),
SCTPCTL_MAXBURST_MIN, SCTPCTL_MAXBURST_MAX);
RANGECHK(SCTP_BASE_SYSCTL(sctp_fr_max_burst_default),
SCTPCTL_FRMAXBURST_MIN, SCTPCTL_FRMAXBURST_MAX);
@@ -876,10 +874,6 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT
SCTPCTL_LOOPBACK_NOCSUM_DESC);
#endif
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, strict_init, CTLTYPE_UINT |
CTLFLAG_RW,
-&SCTP_BASE_SYSCTL(sctp_strict_init), 0, sysctl_sctp_check, "IU",
-SCTPCTL_STRICT_INIT_DESC);
-
SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, peer_chkoh, CTLTYPE_UINT |
CTLFLAG_RW,
&SCTP_BASE_SYSCTL(sctp_peer_chunk_oh), 0, sysctl_sctp_check, "IU",
SCTPCTL_PEER_CHKOH_DESC);
Modified: head/sys/netinet/sctp_sysctl.h
==
--- head/sys/netinet/sctp_sysctl.h Sat Jan 7 13:03:33 2012
(r229774)
+++ head/sys/netinet/sctp_sysctl.h Sat Jan 7 14:04:00 2012
(r229775)
@@ -50,7 +50,6 @@ struct sctp_sysctl {
#if !defined(SCTP_WITH_NO_CSUM)
uint32_t sctp_no_csum_on_loopback;
#endif
- uint32_t sctp_strict_init;
uint32_t sctp_peer_chunk_oh;
uint32_t sctp_max_burst_default;
uint32_t sctp_max_chunks_on_queue;
@@ -168,12 +167,6 @@ struct sctp_sysctl {
#define SCTPCTL_LOOPBACK_NOCSUM_MAX1
#define SCTPCTL_LOOPBACK_NOCSUM_DEFAULT1
-/* strict_init: Enable strict INIT/INIT-ACK singleton enforcement */
-#define SCTPCTL_STRICT_INIT_DESC "Enable strict INIT/INIT-ACK singleton
enforcement"
-#define SCTPCTL_STRICT_INIT_MIN0
-#define SCTPCTL_STRICT_INIT_MAX1
-#define SCTPCTL_STRICT_INIT_DEFAULT1
-
/* peer_chkoh: Amount to debit peers rwnd p
svn commit: r229777 - head/sys/contrib/pf/net
Author: glebius
Date: Sat Jan 7 14:39:45 2012
New Revision: 229777
URL: http://svn.freebsd.org/changeset/base/229777
Log:
Merge from OpenBSD:
revision 1.170
date: 2011/10/30 23:04:38; author: mikeb; state: Exp; lines: +6 -7
Allow setting big MTU values on the pfsync interface but not larger
than the syncdev MTU. Prompted by the discussion with and tested
by Maxim Bourmistrov; ok dlg, mpf
Consistently use sc_ifp->if_mtu in the MTU check throughout the
module. This backs out r228813.
Modified:
head/sys/contrib/pf/net/if_pfsync.c
Modified: head/sys/contrib/pf/net/if_pfsync.c
==
--- head/sys/contrib/pf/net/if_pfsync.c Sat Jan 7 14:35:37 2012
(r229776)
+++ head/sys/contrib/pf/net/if_pfsync.c Sat Jan 7 14:39:45 2012
(r229777)
@@ -47,6 +47,7 @@
* 1.118, 1.124, 1.148, 1.149, 1.151, 1.171 - fixes to bulk updates
* 1.120, 1.175 - use monotonic time_uptime
* 1.122 - reduce number of updates for non-TCP sessions
+ * 1.170 - SIOCSIFMTU checks
*/
#ifdef __FreeBSD__
@@ -492,13 +493,12 @@ pfsync_clone_create(struct if_clone *ifc
ifp->if_type = IFT_PFSYNC;
ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_hdrlen = sizeof(struct pfsync_header);
- ifp->if_mtu = 1500; /* XXX */
+ ifp->if_mtu = ETHERMTU;
#ifdef __FreeBSD__
callout_init(&sc->sc_tmo, CALLOUT_MPSAFE);
callout_init_mtx(&sc->sc_bulk_tmo, &pf_task_mtx, 0);
callout_init(&sc->sc_bulkfail_tmo, CALLOUT_MPSAFE);
#else
- ifp->if_hardmtu = MCLBYTES; /* XXX */
timeout_set(&sc->sc_tmo, pfsync_timeout, sc);
timeout_set(&sc->sc_bulk_tmo, pfsync_bulk_update, sc);
timeout_set(&sc->sc_bulkfail_tmo, pfsync_bulk_fail, sc);
@@ -1614,7 +1614,7 @@ pfsync_in_bus(struct pfsync_pkt *pkt, st
#ifdef __FreeBSD__
callout_reset(&sc->sc_bulkfail_tmo, 4 * hz +
V_pf_pool_limits[PF_LIMIT_STATES].limit /
- ((sc->sc_sync_if->if_mtu - PFSYNC_MINPKT) /
+ ((sc->sc_ifp->if_mtu - PFSYNC_MINPKT) /
sizeof(struct pfsync_state)),
pfsync_bulk_fail, V_pfsyncif);
#else
@@ -1821,10 +1821,10 @@ pfsyncioctl(struct ifnet *ifp, u_long cm
#endif
break;
case SIOCSIFMTU:
- if (ifr->ifr_mtu <= PFSYNC_MINPKT)
+ if (!sc->sc_sync_if ||
+ ifr->ifr_mtu <= PFSYNC_MINPKT ||
+ ifr->ifr_mtu > sc->sc_sync_if->if_mtu)
return (EINVAL);
- if (ifr->ifr_mtu > MCLBYTES) /* XXX could be bigger */
- ifr->ifr_mtu = MCLBYTES;
if (ifr->ifr_mtu < ifp->if_mtu) {
s = splnet();
#ifdef __FreeBSD__
@@ -2667,7 +2667,7 @@ pfsync_request_update(u_int32_t creatori
nlen += sizeof(struct pfsync_subheader);
#ifdef __FreeBSD__
- if (sc->sc_len + nlen > sc->sc_sync_if->if_mtu) {
+ if (sc->sc_len + nlen > sc->sc_ifp->if_mtu) {
#else
if (sc->sc_len + nlen > sc->sc_if.if_mtu) {
#endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229778 - in head/sbin: bsdlabel camcontrol devfs dhclient fsck_ffs hastctl hastd ifconfig ipfw mdmfs mount_nfs ping6 reboot routed
Author: uqs
Date: Sat Jan 7 16:09:33 2012
New Revision: 229778
URL: http://svn.freebsd.org/changeset/base/229778
Log:
Spelling fixes for sbin/
Modified:
head/sbin/bsdlabel/bsdlabel.c
head/sbin/camcontrol/camcontrol.c
head/sbin/devfs/rule.c
head/sbin/dhclient/dhclient-script.8
head/sbin/dhclient/options.c
head/sbin/fsck_ffs/fsck.h
head/sbin/fsck_ffs/fsutil.c
head/sbin/hastctl/hastctl.8
head/sbin/hastd/activemap.c
head/sbin/hastd/hast_compression.c
head/sbin/hastd/hastd.c
head/sbin/hastd/lzf.h
head/sbin/hastd/primary.c
head/sbin/hastd/proto.c
head/sbin/ifconfig/ifieee80211.c
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/main.c
head/sbin/mdmfs/mdmfs.c
head/sbin/mount_nfs/mount_nfs.c
head/sbin/ping6/ping6.c
head/sbin/reboot/nextboot.8
head/sbin/routed/main.c
head/sbin/routed/radix.c
head/sbin/routed/table.c
Modified: head/sbin/bsdlabel/bsdlabel.c
==
--- head/sbin/bsdlabel/bsdlabel.c Sat Jan 7 14:39:45 2012
(r229777)
+++ head/sbin/bsdlabel/bsdlabel.c Sat Jan 7 16:09:33 2012
(r229778)
@@ -189,8 +189,8 @@ main(int argc, char *argv[])
break;
case 'r':
/*
-* We accept and ignode -r for compatibility
with
-* historically disklabel usage.
+* We accept and ignore -r for compatibility
with
+* historical disklabel usage.
*/
break;
case 'w':
@@ -386,7 +386,7 @@ writelabel(void)
struct disklabel *lp = &lab;
if (disable_write) {
- warnx("write to disk label supressed - label was as follows:");
+ warnx("write to disk label suppressed - label was as follows:");
display(stdout, NULL);
return (0);
}
@@ -1512,8 +1512,8 @@ getvirginlabel(void)
loclab.d_secperunit = mediasize / secsize;
/*
-* Nobody in these enligthened days uses the CHS geometry for
-* anything, but nontheless try to get it right. If we fail
+* Nobody in these enlightened days uses the CHS geometry for
+* anything, but nonetheless try to get it right. If we fail
* to get any good ideas from the device, construct something
* which is IBM-PC friendly.
*/
Modified: head/sbin/camcontrol/camcontrol.c
==
--- head/sbin/camcontrol/camcontrol.c Sat Jan 7 14:39:45 2012
(r229777)
+++ head/sbin/camcontrol/camcontrol.c Sat Jan 7 16:09:33 2012
(r229778)
@@ -5732,7 +5732,7 @@ usage(int verbose)
"defects arguments:\n"
"-f format specify defect list format (block, bfi or phys)\n"
"-Gget the grown defect list\n"
-"-Pget the permanant defect list\n"
+"-Pget the permanent defect list\n"
"inquiry arguments:\n"
"-Dget the standard inquiry data\n"
"-Sget the serial number\n"
Modified: head/sbin/devfs/rule.c
==
--- head/sbin/devfs/rule.c Sat Jan 7 14:39:45 2012(r229777)
+++ head/sbin/devfs/rule.c Sat Jan 7 16:09:33 2012(r229778)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include "extern.h"
-static void rulespec_infp(FILE *fp, unsigned long reqest, devfs_rsnum rsnum);
+static void rulespec_infp(FILE *fp, unsigned long request, devfs_rsnum rsnum);
static void rulespec_instr(struct devfs_rule *dr, const char *str,
devfs_rsnum rsnum);
static void rulespec_intok(struct devfs_rule *dr, int ac, char **av,
Modified: head/sbin/dhclient/dhclient-script.8
==
--- head/sbin/dhclient/dhclient-script.8Sat Jan 7 14:39:45 2012
(r229777)
+++ head/sbin/dhclient/dhclient-script.8Sat Jan 7 16:09:33 2012
(r229778)
@@ -232,7 +232,7 @@ will check for the existence of
.Pa /etc/dhclient-exit-hooks .
If found, it will be sourced
.Pq see Xr sh 1 .
-These hooks scripts can be used to dynamically modify the enviornment at
+These hooks scripts can be used to dynamically modify the environment at
appropriate times during the DHCP negotiations.
For example, if the administrator wishes to disable alias IP numbers on
the DHCP interface, they might want to put the following in
Modified: head/sbin/dhclient/options.c
==
--- head/sbin/dhclient/options.cSat Jan 7 14:39:45 2012
(r229777)
+++ head/sbin/dhclient/options.cSat Jan 7 16:09:33 2012
(r229778)
@@ -284,8 +284,8 @@ find_search_dom
svn commit: r229779 - in head/release: doc/en_US.ISO8859-1/relnotes picobsd/tinyware/passwd picobsd/tinyware/simple_httpd
Author: uqs
Date: Sat Jan 7 16:09:43 2012
New Revision: 229779
URL: http://svn.freebsd.org/changeset/base/229779
Log:
Spelling fixes for release/
Modified:
head/release/doc/en_US.ISO8859-1/relnotes/article.sgml
head/release/picobsd/tinyware/passwd/local_passwd.c
head/release/picobsd/tinyware/passwd/pw_copy.c
head/release/picobsd/tinyware/simple_httpd/README
Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sat Jan 7
16:09:33 2012(r229778)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sat Jan 7
16:09:43 2012(r229779)
@@ -339,7 +339,7 @@
with the same semantics as (for example)
&man.chmod.1;.
-For compatiblity with other implementations, &man.cp.1; now
+For compatibility with other implementations, &man.cp.1; now
supports a -a flag, which is equivalent to
specifying the -RrP flags.
Modified: head/release/picobsd/tinyware/passwd/local_passwd.c
==
--- head/release/picobsd/tinyware/passwd/local_passwd.c Sat Jan 7 16:09:33
2012(r229778)
+++ head/release/picobsd/tinyware/passwd/local_passwd.c Sat Jan 7 16:09:43
2012(r229779)
@@ -172,7 +172,7 @@ getnewpasswd(pw, nis)
to64(&salt[5], random(), 4);
salt[9] = '\0';
#else
- /* Make a good size salt for algoritms that can use it. */
+ /* Make a good size salt for algorithms that can use it. */
gettimeofday(&tv,0);
#ifdef LOGIN_CAP
if (login_setcryptfmt(lc, "md5", NULL) == NULL)
Modified: head/release/picobsd/tinyware/passwd/pw_copy.c
==
--- head/release/picobsd/tinyware/passwd/pw_copy.c Sat Jan 7 16:09:33
2012(r229778)
+++ head/release/picobsd/tinyware/passwd/pw_copy.c Sat Jan 7 16:09:43
2012(r229779)
@@ -193,7 +193,7 @@ err:pw_error(NULL, 1, 1);
* by default, warning for IDs greater than USHRT_MAX.
*
* If pw_big_ids_warning is anything other than -1 on entry to pw_scan()
- * it will be set based on the existance of PW_SCAN_BIG_IDS in the
+ * it will be set based on the existence of PW_SCAN_BIG_IDS in the
* environment.
*/
int pw_big_ids_warning = -1;
Modified: head/release/picobsd/tinyware/simple_httpd/README
==
--- head/release/picobsd/tinyware/simple_httpd/README Sat Jan 7 16:09:33
2012(r229778)
+++ head/release/picobsd/tinyware/simple_httpd/README Sat Jan 7 16:09:43
2012(r229779)
@@ -21,14 +21,14 @@ of html,gif,cgi whatever. Your traditio
The "fetch" mode supports file transfer over httpd. This
is best thought of as mate for fetch(1). This feature can be
-usefull to transfer a file from one host to another.
+useful to transfer a file from one host to another.
Simple_httpd has the ability to run CGI scripts. All CGI
scripts must be located in ${DOCUMENT_ROOT}/cgi-bin. The
-server currently only sets 3 enviroment variables before calling
+server currently only sets 3 environment variables before calling
the script.
-CGI Enviroment variables are below:
+CGI Environment variables are below:
SERVER_SOFTWARE = FreeBSD/PicoBSD
REMOTE_HOST = client.canada_lower_taxes.com
@@ -61,7 +61,7 @@ daemonize without fear of output on stdo
-D
Do not daemonize. The server will not run in the background. It will
-stay attached to the tty. This is usefull for debugging. In this
+stay attached to the tty. This is useful for debugging. In this
mode no log file is created. Logging info is to stdout.
This option is automatically selected if fetch option is selected.
@@ -139,7 +139,7 @@ receiver# fetch http://sender.com:53/Ind
To Do
=
-Simple authentication would be very usefull[understatment].
+Simple authentication would be very useful [understatment].
/etc/passwd or PAM would be nice.
I think a netmask option would be good. Most internet appliances
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229780 - in head/libexec: bootpd bootpd/bootpgw bootpd/tools/bootptest ftpd getty lukemftpd rbootd revnetgroup rshd rtld-aout rtld-elf rtld-elf/mips rtld-elf/sparc64 tftpd
Author: uqs
Date: Sat Jan 7 16:09:54 2012
New Revision: 229780
URL: http://svn.freebsd.org/changeset/base/229780
Log:
Spelling fixes for libexec/
Modified:
head/libexec/bootpd/bootpd.c
head/libexec/bootpd/bootpgw/bootpgw.c
head/libexec/bootpd/hash.h
head/libexec/bootpd/tools/bootptest/bootptest.c
head/libexec/bootpd/tools/bootptest/print-bootp.c
head/libexec/ftpd/ftpcmd.y
head/libexec/getty/init.c
head/libexec/lukemftpd/nbsd_pidfile.h
head/libexec/rbootd/parseconf.c
head/libexec/rbootd/rbootd.c
head/libexec/rbootd/rmpproto.c
head/libexec/revnetgroup/parse_netgroup.c
head/libexec/rshd/rshd.8
head/libexec/rtld-aout/shlib.c
head/libexec/rtld-elf/mips/reloc.c
head/libexec/rtld-elf/rtld.h
head/libexec/rtld-elf/sparc64/reloc.c
head/libexec/tftpd/tftp-io.c
head/libexec/tftpd/tftp-utils.h
Modified: head/libexec/bootpd/bootpd.c
==
--- head/libexec/bootpd/bootpd.cSat Jan 7 16:09:43 2012
(r229779)
+++ head/libexec/bootpd/bootpd.cSat Jan 7 16:09:54 2012
(r229780)
@@ -663,7 +663,7 @@ ignoring request for server %s from clie
bp->bp_op = BOOTREPLY;
if (bp->bp_ciaddr.s_addr == 0) {
/*
-* client doesnt know his IP address,
+* client doesn't know his IP address,
* search by hardware address.
*/
if (debug > 1) {
@@ -1119,7 +1119,7 @@ sendreply(forward, dst_override)
/*
* This call checks read access to a file. It returns 0 if the file given
- * by "path" exists and is publically readable. A value of -1 is returned if
+ * by "path" exists and is publicly readable. A value of -1 is returned if
* access is not permitted or an error occurs. Successful calls also
* return the file size in bytes using the long pointer "filesize".
*
Modified: head/libexec/bootpd/bootpgw/bootpgw.c
==
--- head/libexec/bootpd/bootpgw/bootpgw.c Sat Jan 7 16:09:43 2012
(r229779)
+++ head/libexec/bootpd/bootpgw/bootpgw.c Sat Jan 7 16:09:54 2012
(r229780)
@@ -534,7 +534,7 @@ handle_request()
/* Has this packet hopped too many times? */
hops = bp->bp_hops;
if (++hops > maxhops) {
- report(LOG_NOTICE, "reqest from %s reached hop limit",
+ report(LOG_NOTICE, "request from %s reached hop limit",
inet_ntoa(recv_addr.sin_addr));
return;
}
Modified: head/libexec/bootpd/hash.h
==
--- head/libexec/bootpd/hash.h Sat Jan 7 16:09:43 2012(r229779)
+++ head/libexec/bootpd/hash.h Sat Jan 7 16:09:54 2012(r229780)
@@ -81,7 +81,7 @@ SOFTWARE.
*
* A generalized hash function, hash_HashFunction(), is included
* with this package to make things a little easier. It is not
- * guarenteed to use the best hash algorithm in existence. . . .
+ * guaranteed to use the best hash algorithm in existence. . . .
*/
Modified: head/libexec/bootpd/tools/bootptest/bootptest.c
==
--- head/libexec/bootpd/tools/bootptest/bootptest.c Sat Jan 7 16:09:43
2012(r229779)
+++ head/libexec/bootpd/tools/bootptest/bootptest.c Sat Jan 7 16:09:54
2012(r229780)
@@ -186,7 +186,7 @@ main(argc, argv)
break;
switch (argv[0][1]) {
- case 'f': /* File name to reqest.
*/
+ case 'f': /* File name to
request. */
if (argc < 2)
goto error;
argc--; argv++;
Modified: head/libexec/bootpd/tools/bootptest/print-bootp.c
==
--- head/libexec/bootpd/tools/bootptest/print-bootp.c Sat Jan 7 16:09:43
2012(r229779)
+++ head/libexec/bootpd/tools/bootptest/print-bootp.c Sat Jan 7 16:09:54
2012(r229780)
@@ -187,7 +187,7 @@ bootp_print(bp, length, sport, dport)
/*
* Option description data follows.
- * These are decribed in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
+ * These are described in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
*
* The first char of each option string encodes the data format:
* ?: unknown
Modified: head/libexec/ftpd/ftpcmd.y
==
--- head/libexec/ftpd/ftpcmd.y Sat Jan 7 16:09:43 2012(r229779)
+++ head/libexec/ftpd/ftpcmd.y Sat Jan 7 16:09:54 2012(r229780)
@@ -1718,7 +1718,7 @@ exptilde(char *s)
* Avoid expanding to a pathname including '\r' or '\n' in order to
* not disrupt
svn commit: r229782 - head/bin/ps
Author: uqs
Date: Sat Jan 7 16:10:23 2012
New Revision: 229782
URL: http://svn.freebsd.org/changeset/base/229782
Log:
Spelling fixes for bin/
Modified:
head/bin/ps/ps.c
Modified: head/bin/ps/ps.c
==
--- head/bin/ps/ps.cSat Jan 7 16:10:15 2012(r229781)
+++ head/bin/ps/ps.cSat Jan 7 16:10:23 2012(r229782)
@@ -625,7 +625,7 @@ main(int argc, char *argv[])
ks = STAILQ_FIRST(&kinfo[i].ki_ks);
STAILQ_REMOVE_HEAD(&kinfo[i].ki_ks, ks_next);
- /* Truncate rightmost column if neccessary. */
+ /* Truncate rightmost column if necessary. */
if (STAILQ_NEXT(vent, next_ve) == NULL &&
termwidth != UNLIMITED && ks->ks_str != NULL) {
left = termwidth - linelen;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229781 - in head/include: . arpa gssapi rpc rpcsvc
Author: uqs
Date: Sat Jan 7 16:10:15 2012
New Revision: 229781
URL: http://svn.freebsd.org/changeset/base/229781
Log:
Spelling fixes for include/
Modified:
head/include/arpa/nameser_compat.h
head/include/gssapi/gssapi.h
head/include/resolv.h
head/include/rpc/svc.h
head/include/rpcsvc/mount.x
head/include/rpcsvc/nfs_prot.x
head/include/rpcsvc/nis.x
Modified: head/include/arpa/nameser_compat.h
==
--- head/include/arpa/nameser_compat.h Sat Jan 7 16:09:54 2012
(r229780)
+++ head/include/arpa/nameser_compat.h Sat Jan 7 16:10:15 2012
(r229781)
@@ -63,7 +63,7 @@ typedef struct {
/* fields in third byte */
unsignedqr: 1; /*%< response flag */
unsignedopcode: 4; /*%< purpose of message */
- unsignedaa: 1; /*%< authoritive answer */
+ unsignedaa: 1; /*%< authoritative answer */
unsignedtc: 1; /*%< truncated message */
unsignedrd: 1; /*%< recursion desired */
/* fields in fourth byte */
@@ -77,7 +77,7 @@ typedef struct {
/* fields in third byte */
unsignedrd :1; /*%< recursion desired */
unsignedtc :1; /*%< truncated message */
- unsignedaa :1; /*%< authoritive answer */
+ unsignedaa :1; /*%< authoritative answer */
unsignedopcode :4; /*%< purpose of message */
unsignedqr :1; /*%< response flag */
/* fields in fourth byte */
Modified: head/include/gssapi/gssapi.h
==
--- head/include/gssapi/gssapi.hSat Jan 7 16:09:54 2012
(r229780)
+++ head/include/gssapi/gssapi.hSat Jan 7 16:10:15 2012
(r229781)
@@ -756,11 +756,11 @@ OM_uint32 gss_release_oid
OM_uint32 gss_decapsulate_token
(const gss_buffer_t, /* mechanism independent token */
gss_OID, /* desired mechanism */
- gss_buffer_t /* decapsulated mechanism dependant token */
+ gss_buffer_t /* decapsulated mechanism dependent token */
);
OM_uint32 gss_encapsulate_token
- (const gss_buffer_t, /* mechanism dependant token */
+ (const gss_buffer_t, /* mechanism dependent token */
gss_OID, /* desired mechanism */
gss_buffer_t /* encapsulated mechanism independent token */
);
Modified: head/include/resolv.h
==
--- head/include/resolv.h Sat Jan 7 16:09:54 2012(r229780)
+++ head/include/resolv.h Sat Jan 7 16:10:15 2012(r229781)
@@ -184,7 +184,7 @@ struct __res_state {
u_int16_t nscount;
u_int16_t nstimes[MAXNS]; /*%< ms. */
int nssocks[MAXNS];
- struct __res_state_ext *ext;/*%< extention for IPv6
*/
+ struct __res_state_ext *ext;/*%< extension for IPv6
*/
} _ext;
} _u;
};
Modified: head/include/rpc/svc.h
==
--- head/include/rpc/svc.h Sat Jan 7 16:09:54 2012(r229780)
+++ head/include/rpc/svc.h Sat Jan 7 16:10:15 2012(r229781)
@@ -314,7 +314,7 @@ __END_DECLS
* Somebody has to wait for incoming requests and then call the correct
* service routine. The routine svc_run does infinite waiting; i.e.,
* svc_run never returns.
- * Since another (co-existant) package may wish to selectively wait for
+ * Since another (co-existent) package may wish to selectively wait for
* incoming calls or other events outside of the rpc architecture, the
* routine svc_getreq is provided. It must be passed readfds, the
* "in-place" results of a select system call (see select, section 2).
Modified: head/include/rpcsvc/mount.x
==
--- head/include/rpcsvc/mount.x Sat Jan 7 16:09:54 2012(r229780)
+++ head/include/rpcsvc/mount.x Sat Jan 7 16:10:15 2012(r229781)
@@ -150,7 +150,7 @@ program MOUNTPROG {
version MOUNTVERS {
/*
* Does no work. It is made available in all RPC services
-* to allow server reponse testing and timing
+* to allow server response testing and timing
*/
void
MOUNTPROC_NULL(void) = 0;
@@ -205,7 +205,7 @@ program MOUNTPROG {
version MOUNTVERS3 {
/*
* Does n
svn commit: r229783 - in head/etc: . namedb rc.d
Author: uqs
Date: Sat Jan 7 16:10:32 2012
New Revision: 229783
URL: http://svn.freebsd.org/changeset/base/229783
Log:
Spelling fixes for etc/
Modified:
head/etc/mac.conf
head/etc/namedb/named.conf
head/etc/network.subr
head/etc/rc.d/bgfsck
head/etc/rc.firewall
head/etc/rc.initdiskless
head/etc/rc.subr
head/etc/services
Modified: head/etc/mac.conf
==
--- head/etc/mac.conf Sat Jan 7 16:10:23 2012(r229782)
+++ head/etc/mac.conf Sat Jan 7 16:10:32 2012(r229783)
@@ -3,7 +3,7 @@
#
# TrustedBSD MAC userland policy configuration file. Kernel modules
# export label information, and mac.conf indicates to userland
-# applications what defaults they should use in the absense of any
+# applications what defaults they should use in the absence of any
# other user-provided information.
#
Modified: head/etc/namedb/named.conf
==
--- head/etc/namedb/named.conf Sat Jan 7 16:10:23 2012(r229782)
+++ head/etc/namedb/named.conf Sat Jan 7 16:10:32 2012(r229783)
@@ -94,7 +94,7 @@ zone "." { type hint; file "/etc/namedb/
As documented at http://dns.icann.org/services/axfr/ these zones:
"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET
- are availble for AXFR from these servers on IPv4 and IPv6:
+ are available for AXFR from these servers on IPv4 and IPv6:
xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
*/
/*
Modified: head/etc/network.subr
==
--- head/etc/network.subr Sat Jan 7 16:10:23 2012(r229782)
+++ head/etc/network.subr Sat Jan 7 16:10:32 2012(r229783)
@@ -139,7 +139,7 @@ ifconfig_up()
_cfg=0
fi
- # backward compatiblity: $ipv6_ifconfig_IF
+ # backward compatibility: $ipv6_ifconfig_IF
ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF`
if [ -n "${ifconfig_args}" ]; then
warn "\$ipv6_ifconfig_$1 is obsolete." \
Modified: head/etc/rc.d/bgfsck
==
--- head/etc/rc.d/bgfsckSat Jan 7 16:10:23 2012(r229782)
+++ head/etc/rc.d/bgfsckSat Jan 7 16:10:32 2012(r229783)
@@ -22,7 +22,7 @@ bgfsck_start ()
background_fsck_delay=0
fi
if [ ${background_fsck_delay} -lt 0 ]; then
- echo "Background file system checks delayed indefinitly"
+ echo "Background file system checks delayed indefinitely"
return 0
fi
Modified: head/etc/rc.firewall
==
--- head/etc/rc.firewallSat Jan 7 16:10:23 2012(r229782)
+++ head/etc/rc.firewallSat Jan 7 16:10:32 2012(r229783)
@@ -46,7 +46,7 @@ fi
# client - will try to protect just this machine
# simple - will try to protect a whole network
# closed - totally disables IP services except via lo0 interface
-# workstation - will try to protect just this machine using statefull
+# workstation - will try to protect just this machine using stateful
#firewalling. See below for rc.conf variables used
# UNKNOWN - disables the loading of firewall rules.
# filename- will load the rules in the given filename (full path
required)
@@ -105,7 +105,7 @@ setup_ipv6_mandatory () {
${fwcmd} add pass ipv6-icmp from fe80::/10 to fe80::/10
${fwcmd} add pass ipv6-icmp from fe80::/10 to ff02::/16
- # Allow ICMPv6 destination unreach
+ # Allow ICMPv6 destination unreachable
${fwcmd} add pass ipv6-icmp from any to any icmp6types 1
# Allow NS/NA/toobig (don't filter it out)
@@ -437,7 +437,7 @@ case ${firewall_type} in
#default denied packets should be
#logged (in /var/log/security).
# firewall_nologports: List of TCP/UDP ports for which
- #denied incomming packets are not
+ #denied incoming packets are not
#logged.
# Allow packets for which a state has been built.
@@ -505,7 +505,7 @@ case ${firewall_type} in
${fwcmd} add deny { tcp or udp } from any to any $i in
done
- # Broadcasts and muticasts
+ # Broadcasts and multicasts
${fwcmd} add deny ip from any to 255.255.255.255
${fwcmd} add deny ip from any to 224.0.0.0/24 in # XXX
@@ -513,7 +513,7 @@ case ${firewall_type} in
${fwcmd} add deny udp from any to any 520 in
# Noise from webbrowsing.
-
svn commit: r229784 - in head/lib: libgssapi libutil libvgl msun/src
Author: uqs Date: Sat Jan 7 16:13:56 2012 New Revision: 229784 URL: http://svn.freebsd.org/changeset/base/229784 Log: Convert files to UTF-8 and add some copyright markers where missing. Modified: head/lib/libgssapi/gss_display_status.c head/lib/libgssapi/gss_pseudo_random.c head/lib/libgssapi/gss_release_oid.c head/lib/libutil/flopen.3 head/lib/libutil/kld.3 head/lib/libvgl/bitmap.c head/lib/libvgl/keyboard.c head/lib/libvgl/main.c head/lib/libvgl/mouse.c head/lib/libvgl/simple.c head/lib/libvgl/text.c head/lib/libvgl/vgl.3 head/lib/libvgl/vgl.h head/lib/msun/src/s_fabsl.c Modified: head/lib/libgssapi/gss_display_status.c == --- head/lib/libgssapi/gss_display_status.c Sat Jan 7 16:10:32 2012 (r229783) +++ head/lib/libgssapi/gss_display_status.c Sat Jan 7 16:13:56 2012 (r229784) @@ -26,7 +26,7 @@ * $FreeBSD$ */ /* - * Copyright (c) 1998 - 2005 Kungliga Tekniska H�gskolan + * Copyright (c) 1998 - 2005 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -58,7 +58,7 @@ * SUCH DAMAGE. */ /* - * Copyright (c) 1998 - 2005 Kungliga Tekniska H�gskolan + * Copyright (c) 1998 - 2005 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * Modified: head/lib/libgssapi/gss_pseudo_random.c == --- head/lib/libgssapi/gss_pseudo_random.c Sat Jan 7 16:10:32 2012 (r229783) +++ head/lib/libgssapi/gss_pseudo_random.c Sat Jan 7 16:13:56 2012 (r229784) @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2007 Kungliga Tekniska H�gskolan +/*- + * Copyright (c) 2007 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * Modified: head/lib/libgssapi/gss_release_oid.c == --- head/lib/libgssapi/gss_release_oid.cSat Jan 7 16:10:32 2012 (r229783) +++ head/lib/libgssapi/gss_release_oid.cSat Jan 7 16:13:56 2012 (r229784) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Kungliga Tekniska H�gskolan + * Copyright (c) 2006 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * Modified: head/lib/libutil/flopen.3 == --- head/lib/libutil/flopen.3 Sat Jan 7 16:10:32 2012(r229783) +++ head/lib/libutil/flopen.3 Sat Jan 7 16:13:56 2012(r229784) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Dag-Erling Co�dan Sm�rgrav +.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without Modified: head/lib/libutil/kld.3 == --- head/lib/libutil/kld.3 Sat Jan 7 16:10:32 2012(r229783) +++ head/lib/libutil/kld.3 Sat Jan 7 16:13:56 2012(r229784) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2006 Dag-Erling Co�dan Sm�rgrav +.\" Copyright (c) 2006 Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without Modified: head/lib/libvgl/bitmap.c == --- head/lib/libvgl/bitmap.cSat Jan 7 16:10:32 2012(r229783) +++ head/lib/libvgl/bitmap.cSat Jan 7 16:13:56 2012(r229784) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1991-1997 S�ren Schmidt + * Copyright (c) 1991-1997 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/lib/libvgl/keyboard.c == --- head/lib/libvgl/keyboard.c Sat Jan 7 16:10:32 2012(r229783) +++ head/lib/libvgl/keyboard.c Sat Jan 7 16:13:56 2012(r229784) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1997 S�ren Schmidt + * Copyright (c) 1997 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/lib/libvgl/main.c == --- head/lib/libvgl/main.c Sat Jan 7 16:10:32 2012(r229783) +++ head/lib/libvgl/main.c Sat Jan 7 16:13:56 2012(r229784) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1991-1997 S�ren Schmidt + * Copyright (c) 1991-1997 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/lib/libvgl/mouse.c == --- head/lib/libvgl/mouse.c Sat Jan 7 16:
svn commit: r229789 - head/sys/i386/conf
Author: adrian Date: Sat Jan 7 19:38:26 2012 New Revision: 229789 URL: http://svn.freebsd.org/changeset/base/229789 Log: Fix the broken module build I introduced earlier. Modified: head/sys/i386/conf/XEN Modified: head/sys/i386/conf/XEN == --- head/sys/i386/conf/XEN Sat Jan 7 18:53:14 2012(r229788) +++ head/sys/i386/conf/XEN Sat Jan 7 19:38:26 2012(r229789) @@ -83,6 +83,10 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +# Wireless cards +optionsIEEE80211_SUPPORT_MESH +optionsAH_SUPPORT_AR5416 + # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r228985 - head/sys/boot/forth
On 2011-12-30 07:24, Sergey Kandaurov wrote: Author: pluknet Date: Fri Dec 30 06:24:59 2011 New Revision: 228985 URL: http://svn.freebsd.org/changeset/base/228985 Log: Unset the environment variables associated with individual menu items before invoking the kernel. When I did a single-user mode boot to install a new world, I saw the following warning on the (serial) console during boot: /boot.config: -D -S115200 Consoles: internal video/keyboard serial port BIOS drive A: is disk0 BIOS drive C: is disk1 BIOS 638kB/3143616kB available memory FreeBSD/x86 bootstrap loader, Revision 1.1 (d...@vm-freebsd10-amd64.home.andric.com, Sat Jan 7 01:05:07 CET 2012) Loading /boot/defaults/loader.conf /boot/kernel/kernel data=0xb73530 data=0x11dbe0+0x2b4db8 syms=[0x8+0xfd620+0x8+0xec6b6] - Hit [Enter] to boot immediately, or any other key for command prompt. Type '?' for a list of commands, 'help' for more detailed help. OK boot -s menu-unset not found <<-- what's this? GDB: no debug ports present KDB: debugger backends: ddb KDB: current backend: ddb [...kernel boots...] E.g, it always gives a 'menu-unset not found' warning (or maybe it's an error, it's not clear). This was not the case before r228985. I have almost no knowledge about forth, but it looks like this might be caused by the new try-menu-unset subroutine. My loader.conf is just this: beastie_disable="YES" comconsole_speed="115200" console="comconsole vidconsole" kern.hz="100" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229790 - head/sys/dev/ath/ath_hal
Author: adrian Date: Sat Jan 7 20:13:55 2012 New Revision: 229790 URL: http://svn.freebsd.org/changeset/base/229790 Log: Commit a temporary workaround for people who are building kernels where they've disabled all the wireless devices/framework. This is just a build workaround. If you're actively using wireless, you must still define AH_SUPPORT_AR5416 as I'm not sure what else will break! The real solution is to make the module build depend if AH_SUPPORT_AR5416 is defined, as well as make the 11n code in if_ath_tx.c and if_ath_tx_ht.c completely optional (maybe depend upon ATH_SUPPORT_11N.) Modified: head/sys/dev/ath/ath_hal/ah_desc.h Modified: head/sys/dev/ath/ath_hal/ah_desc.h == --- head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 19:38:26 2012 (r229789) +++ head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 20:13:55 2012 (r229790) @@ -23,6 +23,17 @@ #include "opt_ah.h"/* NB: required for AH_SUPPORT_AR5416 */ /* + * For now, define this for the structure definitions. + * Because of how the HAL / driver module currently builds, + * it's not very feasible to build the module without + * this defined. The rest of the code (eg in the driver + * body) can work fine with these fields being uninitialised; + * they'll be initialised to 0 anyway. + */ + +#defineAH_SUPPORT_AR5416 1 + +/* * Transmit descriptor status. This structure is filled * in only after the tx descriptor process method finds a * ``done'' descriptor; at which point it returns something ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229791 - head/sys/dev/ath/ath_hal
Author: adrian Date: Sat Jan 7 20:23:05 2012 New Revision: 229791 URL: http://svn.freebsd.org/changeset/base/229791 Log: .. the AR5416 HAL code touches the MIMO parts in HAL_CHANNEL, so this is also needed. Pointed out by: bz Modified: head/sys/dev/ath/ath_hal/ah_desc.h head/sys/dev/ath/ath_hal/ah_internal.h Modified: head/sys/dev/ath/ath_hal/ah_desc.h == --- head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 20:13:55 2012 (r229790) +++ head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 20:23:05 2012 (r229791) @@ -31,7 +31,9 @@ * they'll be initialised to 0 anyway. */ +#ifndefAH_SUPPORT_AR5416 #defineAH_SUPPORT_AR5416 1 +#endif /* * Transmit descriptor status. This structure is filled Modified: head/sys/dev/ath/ath_hal/ah_internal.h == --- head/sys/dev/ath/ath_hal/ah_internal.h Sat Jan 7 20:13:55 2012 (r229790) +++ head/sys/dev/ath/ath_hal/ah_internal.h Sat Jan 7 20:23:05 2012 (r229791) @@ -30,6 +30,10 @@ #include #include "opt_ah.h"/* needed for AH_SUPPORT_AR5416 */ +#ifndefAH_SUPPORT_AR5416 +#defineAH_SUPPORT_AR5416 1 +#endif + #ifndef NBBY #defineNBBY8 /* number of bits/byte */ #endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r229783 - in head/etc: . namedb rc.d
On 01/07/2012 08:10, Ulrich Spoerlein wrote: > Modified: head/etc/namedb/named.conf Good catch, thanks. :) -- You can observe a lot just by watching. -- Yogi Berra Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229794 - head/usr.bin/hexdump
Author: eadler (ports committer)
Date: Sat Jan 7 23:15:21 2012
New Revision: 229794
URL: http://svn.freebsd.org/changeset/base/229794
Log:
- Fix how hexdump parses escape strings
From the NetBSD bug:
The way how hexdump(1) parses escape sequences has some bugs.
It shows up when an escape sequence is used as the non-last character
of a format string.
PR: bin/144722
Submitted by: gcooper
Approved by: rpaulo
Obtained from:NetBSD
MFC after:1 week
Modified:
head/usr.bin/hexdump/parse.c
Modified: head/usr.bin/hexdump/parse.c
==
--- head/usr.bin/hexdump/parse.cSat Jan 7 22:29:46 2012
(r229793)
+++ head/usr.bin/hexdump/parse.cSat Jan 7 23:15:21 2012
(r229794)
@@ -255,7 +255,9 @@ rewrite(FS *fs)
sokay = NOTOKAY;
}
- p2 = p1 + 1;/* Set end pointer. */
+ p2 = *p1 ? p1 + 1 : p1; /* Set end pointer -- make sure
+* that it's non-NUL/-NULL first
+* though. */
cs[0] = *p1;/* Set conversion string. */
cs[1] = '\0';
@@ -449,13 +451,21 @@ escape(char *p1)
char *p2;
/* alphabetic escape sequences have to be done in place */
- for (p2 = p1;; ++p1, ++p2) {
- if (!*p1) {
- *p2 = *p1;
- break;
- }
- if (*p1 == '\\')
- switch(*++p1) {
+ for (p2 = p1; *p1; p1++, p2++) {
+ /*
+* Let's take a peak at the next item and see whether or not
+* we need to escape the value...
+*/
+ if (*p1 == '\\') {
+
+ p1++;
+
+ switch(*p1) {
+ /* A standalone `\' */
+ case '\0':
+ *p2 = '\\';
+ *++p2 = '\0';
+ break;
case 'a':
/* *p2 = '\a'; */
*p2 = '\007';
@@ -482,7 +492,12 @@ escape(char *p1)
*p2 = *p1;
break;
}
+
+ } else
+ *p2 = *p1;
+
}
+
}
void
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229795 - head/sys/net80211
Author: bz Date: Sat Jan 7 23:41:38 2012 New Revision: 229795 URL: http://svn.freebsd.org/changeset/base/229795 Log: Correct comment for the IPv6 case to say "traffic class" not "TOS" as pointed out back in 2009. MFC after:3 days Modified: head/sys/net80211/ieee80211_output.c Modified: head/sys/net80211/ieee80211_output.c == --- head/sys/net80211/ieee80211_output.cSat Jan 7 23:15:21 2012 (r229794) +++ head/sys/net80211/ieee80211_output.cSat Jan 7 23:41:38 2012 (r229795) @@ -834,7 +834,7 @@ ieee80211_classify(struct ieee80211_node uint32_t flow; uint8_t tos; /* -* IPv6 frame, map the DSCP bits from the TOS field. +* IPv6 frame, map the DSCP bits from the traffic class field. */ m_copydata(m, sizeof(struct ether_header) + offsetof(struct ip6_hdr, ip6_flow), sizeof(flow), ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229798 - head/sys/mips/mips
Author: gonzo
Date: Sun Jan 8 00:34:39 2012
New Revision: 229798
URL: http://svn.freebsd.org/changeset/base/229798
Log:
Fix DDB x/i addr[,count] command for count > 1 case
Modified:
head/sys/mips/mips/db_disasm.c
Modified: head/sys/mips/mips/db_disasm.c
==
--- head/sys/mips/mips/db_disasm.c Sun Jan 8 00:14:45 2012
(r229797)
+++ head/sys/mips/mips/db_disasm.c Sun Jan 8 00:34:39 2012
(r229798)
@@ -388,5 +388,6 @@ md_printins(int ins, int mdbdot)
reg_name[i.IType.rt], reg_name[i.IType.rs],
(short)i.IType.imm);
}
+ db_printf("\n");
return (delay);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229800 - head/sys/conf
Author: adrian
Date: Sun Jan 8 00:55:22 2012
New Revision: 229800
URL: http://svn.freebsd.org/changeset/base/229800
Log:
Make these two files conditionally build on UFS_ACL, as it doesn't
seem to be used elsewhere.
Since UFS_ACL is enabled by default for GENERIC kernels, this shouldn't
break anything - but please beat me to fix things if it does.
This reduces the footprint of the kernel on small embedded systems
(think <1MB flash for the compressed kernel image) just enough to
actually fit.
Modified:
head/sys/conf/files
Modified: head/sys/conf/files
==
--- head/sys/conf/files Sun Jan 8 00:42:07 2012(r229799)
+++ head/sys/conf/files Sun Jan 8 00:55:22 2012(r229800)
@@ -2409,8 +2409,9 @@ kern/sched_ule.c optional sched_ule
kern/serdev_if.m standard
kern/stack_protector.c standard \
compile-with "${NORMAL_C:N-fstack-protector*}"
-kern/subr_acl_nfs4.c standard
-kern/subr_acl_posix1e.cstandard
+# XXX subr_acl_nfs4.c is also used by ZFS
+kern/subr_acl_nfs4.c optional ufs_acl
+kern/subr_acl_posix1e.coptional ufs_acl
kern/subr_autoconf.c standard
kern/subr_blist.c standard
kern/subr_bus.cstandard
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229802 - in head/sys/fs: nfs nfsclient
Author: rmacklem
Date: Sun Jan 8 01:54:46 2012
New Revision: 229802
URL: http://svn.freebsd.org/changeset/base/229802
Log:
opt_inet6.h was missing from some files in the new NFS subsystem.
The effect of this was, for clients mounted via inet6 addresses,
that the DRC cache would never have a hit in the server. It also
broke NFSv4 callbacks when an inet6 address was the only one available
in the client. This patch fixes the above, plus deletes opt_inet6.h
from a couple of files it is not needed for.
MFC after:2 weeks
Modified:
head/sys/fs/nfs/nfs_commonkrpc.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfsclient/nfs_clkrpc.c
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==
--- head/sys/fs/nfs/nfs_commonkrpc.cSun Jan 8 01:09:00 2012
(r229801)
+++ head/sys/fs/nfs/nfs_commonkrpc.cSun Jan 8 01:54:46 2012
(r229802)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
* Socket operations for use by nfs
*/
-#include "opt_inet6.h"
#include "opt_kdtrace.h"
#include "opt_kgssapi.h"
#include "opt_nfs.h"
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==
--- head/sys/fs/nfs/nfs_commonsubs.cSun Jan 8 01:09:00 2012
(r229801)
+++ head/sys/fs/nfs/nfs_commonsubs.cSun Jan 8 01:54:46 2012
(r229802)
@@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$");
* copy data between mbuf chains and uio lists.
*/
#ifndef APPLEKEXT
+#include "opt_inet6.h"
+
#include
/*
Modified: head/sys/fs/nfsclient/nfs_clkrpc.c
==
--- head/sys/fs/nfsclient/nfs_clkrpc.c Sun Jan 8 01:09:00 2012
(r229801)
+++ head/sys/fs/nfsclient/nfs_clkrpc.c Sun Jan 8 01:54:46 2012
(r229802)
@@ -34,7 +34,6 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_inet6.h"
#include "opt_kgssapi.h"
#include
Modified: head/sys/fs/nfsclient/nfs_clport.c
==
--- head/sys/fs/nfsclient/nfs_clport.c Sun Jan 8 01:09:00 2012
(r229801)
+++ head/sys/fs/nfsclient/nfs_clport.c Sun Jan 8 01:54:46 2012
(r229802)
@@ -34,6 +34,7 @@
#include
__FBSDID("$FreeBSD$");
+#include "opt_inet6.h"
#include "opt_kdtrace.h"
#include
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==
--- head/sys/fs/nfsclient/nfs_clrpcops.cSun Jan 8 01:09:00 2012
(r229801)
+++ head/sys/fs/nfsclient/nfs_clrpcops.cSun Jan 8 01:54:46 2012
(r229802)
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
*/
#ifndef APPLEKEXT
+#include "opt_inet6.h"
+
#include
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229803 - head/sys/mips/mips
Author: gonzo
Date: Sun Jan 8 05:44:19 2012
New Revision: 229803
URL: http://svn.freebsd.org/changeset/base/229803
Log:
Fix relocations for MIPS64:
- Use Elf32_Addr as default, the only field that is
64 bitw wide is R_MIPS_64
- Add R_MIPS_HIGHER and R_MIPS_HGHEST handlers
- Handle R_MIPS_HI16 and R_MIPS_LO16 for both .rel and
.rela sections
Modified:
head/sys/mips/mips/elf_machdep.c
Modified: head/sys/mips/mips/elf_machdep.c
==
--- head/sys/mips/mips/elf_machdep.cSun Jan 8 01:54:46 2012
(r229802)
+++ head/sys/mips/mips/elf_machdep.cSun Jan 8 05:44:19 2012
(r229803)
@@ -168,25 +168,41 @@ static int
elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
int type, int local, elf_lookup_fn lookup)
{
- Elf_Addr *where = (Elf_Addr *)NULL;
+ Elf32_Addr *where = (Elf32_Addr *)NULL;
Elf_Addr addr;
Elf_Addr addend = (Elf_Addr)0;
Elf_Word rtype = (Elf_Word)0, symidx;
- const Elf_Rel *rel;
+ const Elf_Rel *rel = NULL;
+ const Elf_Rela *rela = NULL;
/*
* Stash R_MIPS_HI16 info so we can use it when processing R_MIPS_LO16
*/
static Elf_Addr ahl;
- static Elf_Addr *where_hi16;
+ static Elf32_Addr *where_hi16;
switch (type) {
case ELF_RELOC_REL:
rel = (const Elf_Rel *)data;
- where = (Elf_Addr *) (relocbase + rel->r_offset);
- addend = *where;
+ where = (Elf32_Addr *) (relocbase + rel->r_offset);
rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info);
+ switch (rtype) {
+ case R_MIPS_64:
+ addend = *(Elf64_Addr *)where;
+ break;
+ default:
+ addend = *where;
+ break;
+ }
+
+ break;
+ case ELF_RELOC_RELA:
+ rela = (const Elf_Rela *)data;
+ where = (Elf32_Addr *) (relocbase + rela->r_offset);
+ addend = rela->r_addend;
+ rtype = ELF_R_TYPE(rela->r_info);
+ symidx = ELF_R_SYM(rela->r_info);
break;
default:
panic("unknown reloc type %d\n", type);
@@ -202,7 +218,7 @@ elf_reloc_internal(linker_file_t lf, Elf
return (-1);
addr += addend;
if (*where != addr)
- *where = addr;
+ *where = (Elf32_Addr)addr;
break;
case R_MIPS_26: /* ((A << 2) | (P & 0xf000) + S) >> 2 */
@@ -220,25 +236,73 @@ elf_reloc_internal(linker_file_t lf, Elf
*where |= addr & 0x03ff;
break;
+ case R_MIPS_64: /* S + A */
+ addr = lookup(lf, symidx, 1);
+ if (addr == 0)
+ return (-1);
+ addr += addend;
+ if (*(Elf64_Addr*)where != addr)
+ *(Elf64_Addr*)where = addr;
+ break;
+
case R_MIPS_HI16: /* ((AHL + S) - ((short)(AHL + S)) >> 16 */
- ahl = addend << 16;
- where_hi16 = where;
+ if (rela != NULL) {
+ addr = lookup(lf, symidx, 1);
+ if (addr == 0)
+ return (-1);
+ addr += addend;
+ *where &= 0x;
+ *where |= long long) addr + 0x8000LL) >> 16) &
0x);
+ }
+ else {
+ ahl = addend << 16;
+ where_hi16 = where;
+ }
break;
case R_MIPS_LO16: /* AHL + S */
- ahl += (int16_t)addend;
+ if (rela != NULL) {
+ addr = lookup(lf, symidx, 1);
+ if (addr == 0)
+ return (-1);
+ addr += addend;
+ *where &= 0x;
+ *where |= addr & 0x;
+ }
+ else {
+ ahl += (int16_t)addend;
+ addr = lookup(lf, symidx, 1);
+ if (addr == 0)
+ return (-1);
+
+ addend &= 0x;
+ addend |= (uint16_t)(ahl + addr);
+ *where = addend;
+
+ addend = *where_hi16;
+ addend &= 0x;
+ addend |= ((ahl + addr) - (int16_t)(ahl + addr)) >> 16;
+ *where_hi16 = addend;
+ }
+
+ break;
+
+ case R_MIPS_HIGHER: /* %higher(A+S) */
