PERFORCE change 38542 for review
Peter Wemm
peter at FreeBSD.org
Wed Sep 24 14:50:26 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38542
Change 38542 by peter at peter_daintree on 2003/09/24 14:49:39
IFC @38532
Affected files ...
.. //depot/projects/hammer/UPDATING#17 integrate
.. //depot/projects/hammer/crypto/openssh/auth-chall.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#5 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config#5 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config#5 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/hammer/crypto/openssh/version.h#6 integrate
.. //depot/projects/hammer/etc/sendmail/Makefile#5 integrate
.. //depot/projects/hammer/lib/libalias/Makefile#5 integrate
.. //depot/projects/hammer/lib/libalias/alias.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias.h#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_db.c#4 integrate
.. //depot/projects/hammer/lib/libalias/alias_local.h#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_skinny.c#1 branch
.. //depot/projects/hammer/lib/libalias/libalias.3#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#21 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#10 integrate
.. //depot/projects/hammer/sbin/natd/natd.8#6 integrate
.. //depot/projects/hammer/sbin/natd/natd.c#5 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#13 integrate
.. //depot/projects/hammer/share/man/man4/ugen.4#3 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#14 integrate
.. //depot/projects/hammer/share/man/man9/BUS_CONFIG_INTR.9#1 branch
.. //depot/projects/hammer/share/man/man9/Makefile#16 integrate
.. //depot/projects/hammer/sys/alpha/include/bus.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/vmparam.h#14 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#11 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/hammer/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_pccard.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#19 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#18 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#18 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#17 integrate
.. //depot/projects/hammer/sys/i386/include/bus_at386.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/bus_pc98.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#4 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#11 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#10 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#8 integrate
.. //depot/projects/hammer/sys/modules/bridge/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ipfilter/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/bridge.c#7 integrate
.. //depot/projects/hammer/sys/net/pfil.c#3 integrate
.. //depot/projects/hammer/sys/net/pfil.h#2 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#15 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#16 integrate
.. //depot/projects/hammer/sys/netinet/ip_var.h#9 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_forward.c#3 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#6 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/hammer/sys/netinet6/ip6protosw.h#2 integrate
.. //depot/projects/hammer/sys/pc98/i386/busiosubr.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/param.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus.h#14 integrate
.. //depot/projects/hammer/sys/sys/param.h#19 integrate
.. //depot/projects/hammer/sys/sys/protosw.h#4 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#19 integrate
.. //depot/projects/hammer/usr.bin/Makefile#20 integrate
.. //depot/projects/hammer/usr.bin/fstat/msdosfs.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/command.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ppp/nat_cmd.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/nat_cmd.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#6 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#14 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#17 (text+ko) ====
@@ -17,6 +17,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20030923:
+ Fix a bug in arplookup(), whereby a hostile party on a locally
+ attached network could exhaust kernel memory, and cause a system
+ panic, by sending a flood of spoofed ARP requests. See
+ FreeBSD-SA-03:14.arp.
+
20030915:
A change to /etc/defaults/rc.conf now causes inetd to be started
with `-C 60' if it is not overridden in /etc/rc.conf. This
@@ -1362,4 +1368,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.266 2003/09/15 17:20:05 nectar Exp $
+$FreeBSD: src/UPDATING,v 1.267 2003/09/23 16:39:30 bms Exp $
==== //depot/projects/hammer/crypto/openssh/auth-chall.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth-chall.c,v 1.8 2001/05/18 14:13:28 markus Exp $");
-RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.6 2003/03/31 13:45:36 des Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.7 2003/09/24 18:24:27 des Exp $");
#include "auth.h"
#include "log.h"
@@ -93,7 +93,7 @@
xfree(info);
}
/* if we received more prompts, we're screwed */
- res = (numprompts != 0);
+ res = (res == 0 && numprompts == 0) ? 0 : -1;
}
device->free_ctx(authctxt->kbdintctxt);
authctxt->kbdintctxt = NULL;
==== //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include "includes.h"
-RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.13 2003/09/24 19:11:52 des Exp $");
#ifdef USE_PAM
#include <security/pam_appl.h>
@@ -134,8 +134,8 @@
*resp = xmalloc(n * sizeof **resp);
buffer_init(&buffer);
for (i = 0; i < n; ++i) {
- resp[i]->resp_retcode = 0;
- resp[i]->resp = NULL;
+ (*resp)[i].resp_retcode = 0;
+ (*resp)[i].resp = NULL;
switch (msg[i]->msg_style) {
case PAM_PROMPT_ECHO_OFF:
buffer_put_cstring(&buffer, msg[i]->msg);
@@ -143,7 +143,7 @@
ssh_msg_recv(ctxt->pam_csock, &buffer);
if (buffer_get_char(&buffer) != PAM_AUTHTOK)
goto fail;
- resp[i]->resp = buffer_get_string(&buffer, NULL);
+ (*resp)[i].resp = buffer_get_string(&buffer, NULL);
break;
case PAM_PROMPT_ECHO_ON:
buffer_put_cstring(&buffer, msg[i]->msg);
@@ -151,7 +151,7 @@
ssh_msg_recv(ctxt->pam_csock, &buffer);
if (buffer_get_char(&buffer) != PAM_AUTHTOK)
goto fail;
- resp[i]->resp = buffer_get_string(&buffer, NULL);
+ (*resp)[i].resp = buffer_get_string(&buffer, NULL);
break;
case PAM_ERROR_MSG:
buffer_put_cstring(&buffer, msg[i]->msg);
@@ -169,8 +169,6 @@
buffer_free(&buffer);
return (PAM_SUCCESS);
fail:
- while (i)
- xfree(resp[--i]);
xfree(*resp);
*resp = NULL;
buffer_free(&buffer);
@@ -550,20 +548,20 @@
for (i = 0; i < n; ++i) {
switch (msg[i]->msg_style) {
case PAM_PROMPT_ECHO_OFF:
- resp[i]->resp =
+ (*resp)[i].resp =
read_passphrase(msg[i]->msg, RP_ALLOW_STDIN);
- resp[i]->resp_retcode = PAM_SUCCESS;
+ (*resp)[i].resp_retcode = PAM_SUCCESS;
break;
case PAM_PROMPT_ECHO_ON:
fputs(msg[i]->msg, stderr);
fgets(input, sizeof input, stdin);
- resp[i]->resp = xstrdup(input);
- resp[i]->resp_retcode = PAM_SUCCESS;
+ (*resp)[i].resp = xstrdup(input);
+ (*resp)[i].resp_retcode = PAM_SUCCESS;
break;
case PAM_ERROR_MSG:
case PAM_TEXT_INFO:
fputs(msg[i]->msg, stderr);
- resp[i]->resp_retcode = PAM_SUCCESS;
+ (*resp)[i].resp_retcode = PAM_SUCCESS;
break;
default:
goto fail;
@@ -571,8 +569,6 @@
}
return (PAM_SUCCESS);
fail:
- while (i)
- xfree(resp[--i]);
xfree(*resp);
*resp = NULL;
return (PAM_CONV_ERR);
==== //depot/projects/hammer/crypto/openssh/ssh_config#5 (text+ko) ====
@@ -1,5 +1,5 @@
# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
-# $FreeBSD: src/crypto/openssh/ssh_config,v 1.21 2003/04/23 17:10:53 des Exp $
+# $FreeBSD: src/crypto/openssh/ssh_config,v 1.22 2003/09/24 19:20:23 des Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
@@ -35,4 +35,4 @@
# Cipher 3des
# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
# EscapeChar ~
-# VersionAddendum FreeBSD-20030423
+# VersionAddendum FreeBSD-20030924
==== //depot/projects/hammer/crypto/openssh/ssh_config.5#5 (text+ko) ====
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh_config.5,v 1.7 2003/03/28 10:11:43 jmc Exp $
-.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.9 2003/04/23 17:10:53 des Exp $
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.10 2003/09/24 19:20:23 des Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -623,7 +623,7 @@
Specifies a string to append to the regular version string to identify
OS- or site-specific modifications.
The default is
-.Dq FreeBSD-20030423 .
+.Dq FreeBSD-20030924 .
.It Cm XAuthLocation
Specifies the full pathname of the
.Xr xauth 1
==== //depot/projects/hammer/crypto/openssh/sshd_config#5 (text+ko) ====
@@ -1,5 +1,5 @@
# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
-# $FreeBSD: src/crypto/openssh/sshd_config,v 1.32 2003/04/23 17:10:53 des Exp $
+# $FreeBSD: src/crypto/openssh/sshd_config,v 1.33 2003/09/24 19:20:23 des Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
@@ -14,7 +14,7 @@
# Note that some of FreeBSD's defaults differ from OpenBSD's, and
# FreeBSD has a few additional options.
-#VersionAddendum FreeBSD-20030423
+#VersionAddendum FreeBSD-20030924
#Port 22
#Protocol 2,1
==== //depot/projects/hammer/crypto/openssh/sshd_config.5#5 (text+ko) ====
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd_config.5,v 1.15 2003/03/28 10:11:43 jmc Exp $
-.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.11 2003/04/23 17:10:53 des Exp $
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.12 2003/09/24 19:20:23 des Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -650,7 +650,7 @@
Specifies a string to append to the regular version string to identify
OS- or site-specific modifications.
The default is
-.Dq FreeBSD-20030423 .
+.Dq FreeBSD-20030924 .
.It Cm X11DisplayOffset
Specifies the first display number available for
.Nm sshd Ns 's
==== //depot/projects/hammer/crypto/openssh/version.h#6 (text+ko) ====
@@ -1,11 +1,11 @@
/* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */
-/* $FreeBSD: src/crypto/openssh/version.h,v 1.22 2003/09/17 14:36:14 nectar Exp $ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.23 2003/09/24 19:20:23 des Exp $ */
#ifndef SSH_VERSION
#define SSH_VERSION (ssh_version_get())
#define SSH_VERSION_BASE "OpenSSH_3.6.1p1"
-#define SSH_VERSION_ADDENDUM "FreeBSD-20030917"
+#define SSH_VERSION_ADDENDUM "FreeBSD-20030924"
const char *ssh_version_get(void);
void ssh_version_set_addendum(const char *add);
==== //depot/projects/hammer/etc/sendmail/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.19 (Berkeley) 1/14/97
-# $FreeBSD: src/etc/sendmail/Makefile,v 1.28 2003/09/01 03:40:33 gshapiro Exp $
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.29 2003/09/24 04:19:26 gshapiro Exp $
M4= m4
CHMOD= chmod
@@ -8,17 +8,17 @@
SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
-CFDIR= ${SENDMAIL_DIR}/cf
+SENDMAIL_CF_DIR?=${SENDMAIL_DIR}/cf
# this is overkill, but....
-M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
+M4FILES!= find ${SENDMAIL_CF_DIR} -type f -name '*.m4' -print
.SUFFIXES: .mc .cf
.mc.cf: ${M4FILES}
${RM} ${.TARGET}
- ${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
- ${CFDIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
+ ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
+ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
${CHMOD} ${ROMODE} ${.TARGET}
DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf
@@ -61,10 +61,10 @@
all: ${ALL}
# Build the installed submit.cf from the sendmail distributed submit.mc.
-freebsd.submit.cf: ${CFDIR}/cf/submit.mc
+freebsd.submit.cf: ${SENDMAIL_CF_DIR}/cf/submit.mc
${RM} ${.TARGET}
- ${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
- ${CFDIR}/m4/cf.m4 ${.ALLSRC} > ${.TARGET}
+ ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
+ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.ALLSRC} > ${.TARGET}
${CHMOD} ${ROMODE} ${.TARGET}
install distribution:
@@ -76,7 +76,8 @@
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${CFDIR}/cf/submit.mc ${DESTDIR}/etc/mail/freebsd.submit.mc
+ ${SENDMAIL_CF_DIR}/cf/submit.mc \
+ ${DESTDIR}/etc/mail/freebsd.submit.mc
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
freebsd.submit.cf ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
==== //depot/projects/hammer/lib/libalias/Makefile#5 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/lib/libalias/Makefile,v 1.22 2003/08/18 15:25:38 obrien Exp $
+# $FreeBSD: src/lib/libalias/Makefile,v 1.23 2003/09/23 07:41:53 marcus Exp $
LIB= alias
SHLIBDIR?= /lib
SHLIB_MAJOR= 4
MAN= libalias.3
SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
- alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
+ alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \
alias_util.c
INCS= alias.h
==== //depot/projects/hammer/lib/libalias/alias.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.37 2003/06/13 21:54:01 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.38 2003/09/23 07:41:53 marcus Exp $");
/*
Alias.c provides supervisory control for the functions of the
@@ -917,6 +917,9 @@
if (ntohs(tc->th_dport) == PPTP_CONTROL_PORT_NUMBER
|| ntohs(tc->th_sport) == PPTP_CONTROL_PORT_NUMBER)
AliasHandlePptpIn(pip, link);
+ else if (skinnyPort != 0 && (ntohs(tc->th_dport) == skinnyPort
+ || ntohs(tc->th_sport) == skinnyPort))
+ AliasHandleSkinny(pip, link);
alias_address = GetAliasAddress(link);
original_address = GetOriginalAddress(link);
@@ -1098,6 +1101,9 @@
else if (ntohs(tc->th_dport) == PPTP_CONTROL_PORT_NUMBER
|| ntohs(tc->th_sport) == PPTP_CONTROL_PORT_NUMBER)
AliasHandlePptpOut(pip, link);
+ else if (skinnyPort != 0 && (ntohs(tc->th_sport) == skinnyPort
+ || ntohs(tc->th_dport) == skinnyPort))
+ AliasHandleSkinny(pip, link);
/* Adjust TCP checksum since source port is being aliased */
/* and source address is being altered */
==== //depot/projects/hammer/lib/libalias/alias.h#3 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libalias/alias.h,v 1.24 2003/06/01 23:15:00 ru Exp $
+ * $FreeBSD: src/lib/libalias/alias.h,v 1.25 2003/09/23 07:41:53 marcus Exp $
*/
/*-
@@ -45,6 +45,7 @@
void PacketAliasInit(void);
void PacketAliasSetAddress(struct in_addr _addr);
void PacketAliasSetFWBase(unsigned int _base, unsigned int _num);
+void PacketAliasSetSkinnyPort(unsigned int _port);
unsigned int
PacketAliasSetMode(unsigned int _flags, unsigned int _mask);
void PacketAliasUninit(void);
==== //depot/projects/hammer/lib/libalias/alias_db.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.54 2003/09/09 23:50:57 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.55 2003/09/23 07:41:53 marcus Exp $");
/*
Alias_db.c encapsulates all data structures used for storing
@@ -398,6 +398,9 @@
/* flag. */
#endif
+unsigned int skinnyPort = 0; /* TCP port used by the Skinny */
+ /* protocol. */
+
@@ -2948,3 +2951,8 @@
fireWallNumNums = num;
#endif
}
+
+void
+PacketAliasSetSkinnyPort(unsigned int port) {
+ skinnyPort = port;
+}
==== //depot/projects/hammer/lib/libalias/alias_local.h#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/lib/libalias/alias_local.h,v 1.23 2002/07/01 11:19:40 brian Exp $
+ * $FreeBSD: src/lib/libalias/alias_local.h,v 1.24 2003/09/23 07:41:53 marcus Exp $
*/
/*
@@ -74,6 +74,7 @@
/* Globals */
extern int packetAliasMode;
+extern unsigned int skinnyPort;
/* Prototypes */
@@ -212,6 +213,9 @@
void AliasHandleCUSeeMeOut(struct ip *_pip, struct alias_link *_link);
void AliasHandleCUSeeMeIn(struct ip *_pip, struct in_addr _original_addr);
+/* Skinny routines */
+void AliasHandleSkinny(struct ip *_pip, struct alias_link *_link);
+
/* Transparent proxy routines */
int ProxyCheck(struct ip *_pip, struct in_addr *_proxy_server_addr,
u_short *_proxy_server_port);
==== //depot/projects/hammer/lib/libalias/libalias.3#5 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.48 2003/09/08 19:57:13 ru Exp $
+.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.49 2003/09/23 07:41:53 marcus Exp $
.\"
.Dd April 13, 2000
.Dt LIBALIAS 3
@@ -265,6 +265,16 @@
flag).
The range will be cleared for all rules on initialization.
.Ed
+.Pp
+.Ft void
+.Fn PacketAliasSkinnyPort "unsigned int port"
+.Bd -ragged -offset indent
+Set the TCP port used by the Skinny Station protocol.
+Skinny is used by Cisco IP phones to communicate with
+Cisco Call Managers to set up voice over IP calls.
+If this is not set, Skinny aliasing will not be done.
+The typical port used by Skinny is 2000.
+.Ed
.Sh PACKET HANDLING
The packet handling functions are used to modify incoming (remote to local)
and outgoing (local to remote) packets.
==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#21 (text+ko) ====
@@ -33,7 +33,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.96 2003/09/19 23:28:13 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.97 2003/09/23 04:02:23 davidxu Exp $");
#include <sys/types.h>
#include <sys/kse.h>
@@ -2352,6 +2352,10 @@
kse_critical_t crit;
DBG_MSG("Freeing thread %p\n", thread);
+ if (thread->name) {
+ free(thread->name);
+ thread->name = NULL;
+ }
if ((curthread == NULL) || (free_thread_count >= MAX_CACHED_THREADS)) {
thr_destroy(thread);
} else {
==== //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#10 (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/libpthread/thread/thr_mutex.c,v 1.41 2003/09/04 14:06:42 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.42 2003/09/24 12:52:57 davidxu Exp $
*/
#include <stdlib.h>
#include <errno.h>
@@ -346,6 +346,7 @@
(*mutex)->m_prio = curthread->active_priority;
(*mutex)->m_saved_prio =
curthread->inherited_priority;
+ curthread->inherited_priority = (*mutex)->m_prio;
THR_SCHED_UNLOCK(curthread, curthread);
/* Add to the list of owned mutexes: */
@@ -540,10 +541,10 @@
/* Schedule the next thread: */
_thr_sched_switch(curthread);
+ curthread->data.mutex = NULL;
if (THR_IN_MUTEXQ(curthread)) {
THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock);
mutex_queue_remove(*m, curthread);
- curthread->data.mutex = NULL;
THR_LOCK_RELEASE(curthread, &(*m)->m_lock);
}
}
@@ -619,10 +620,10 @@
/* Schedule the next thread: */
_thr_sched_switch(curthread);
+ curthread->data.mutex = NULL;
if (THR_IN_MUTEXQ(curthread)) {
THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock);
mutex_queue_remove(*m, curthread);
- curthread->data.mutex = NULL;
THR_LOCK_RELEASE(curthread, &(*m)->m_lock);
}
}
@@ -708,10 +709,10 @@
/* Schedule the next thread: */
_thr_sched_switch(curthread);
+ curthread->data.mutex = NULL;
if (THR_IN_MUTEXQ(curthread)) {
THR_LOCK_ACQUIRE(curthread, &(*m)->m_lock);
mutex_queue_remove(*m, curthread);
- curthread->data.mutex = NULL;
THR_LOCK_RELEASE(curthread, &(*m)->m_lock);
}
@@ -1590,9 +1591,6 @@
TAILQ_REMOVE(&mutex->m_queue, pthread, sqe);
pthread->sflags &= ~THR_FLAGS_IN_SYNCQ;
- /* This thread is no longer waiting for this mutex. */
- pthread->data.mutex = NULL;
-
/*
* Only exit the loop if the thread hasn't been
* cancelled.
==== //depot/projects/hammer/sbin/natd/natd.8#6 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/natd/natd.8,v 1.60 2003/08/13 15:13:33 ru Exp $
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.61 2003/09/23 07:41:55 marcus Exp $
.Dd February 28, 2003
.Dt NATD 8
.Os
@@ -31,6 +31,7 @@
.Op Fl log_denied
.Op Fl log_facility Ar facility_name
.Op Fl punch_fw Ar firewall_range
+.Op Fl skinny_port Ar port
.Op Fl log_ipfw_denied
.Op Fl pid_file | P Ar pidfile
.Ek
@@ -483,6 +484,13 @@
.Ar basenumber
will be used for punching firewall holes.
The range will be cleared for all rules on startup.
+.It Fl skinny_port Ar port
+This option allows you to specify the TCP port used for
+the Skinny Station protocol.
+Skinny is used by Cisco IP phones to communicate with
+Cisco Call Managers to set up voice over IP calls.
+By default, Skinny aliasing is not performed.
+The typical port value for Skinny is 2000.
.It Fl log_ipfw_denied
Log when a packet cannot be re-injected because an
.Xr ipfw 8
==== //depot/projects/hammer/sbin/natd/natd.c#5 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.43 2003/08/13 13:16:19 ru Exp $");
+__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.44 2003/09/23 07:41:55 marcus Exp $");
#define SYSLOG_NAMES
@@ -99,6 +99,7 @@
static int StrToAddrAndPortRange (const char* str, struct in_addr* addr, char* proto, port_range *portRange);
static void ParseArgs (int argc, char** argv);
static void SetupPunchFW(const char *strValue);
+static void SetupSkinnyPort(const char *strValue);
/*
* Globals.
@@ -838,6 +839,7 @@
LogDenied,
LogFacility,
PunchFW,
+ SkinnyPort,
LogIpfwDenied,
PidFile
};
@@ -1059,6 +1061,14 @@
"punch_fw",
NULL },
+ { SkinnyPort,
+ 0,
+ String,
+ "port",
+ "set the TCP port for use with the Skinny Station protocol",
+ "skinny_port",
+ NULL },
+
{ LogIpfwDenied,
0,
YesNo,
@@ -1258,6 +1268,10 @@
SetupPunchFW(strValue);
break;
+ case SkinnyPort:
+ SetupSkinnyPort(strValue);
+ break;
+
case LogIpfwDenied:
logIpfwDenied = yesNoValue;;
break;
@@ -1705,3 +1719,14 @@
PacketAliasSetFWBase(base, num);
(void)PacketAliasSetMode(PKT_ALIAS_PUNCH_FW, PKT_ALIAS_PUNCH_FW);
}
+
+static void
+SetupSkinnyPort(const char *strValue)
+{
+ unsigned int port;
+
+ if (sscanf(strValue, "%u", &port) != 1)
+ errx(1, "skinny_port: port parameter required");
+
+ PacketAliasSetSkinnyPort(port);
+}
==== //depot/projects/hammer/share/examples/etc/make.conf#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/etc/make.conf,v 1.217 2003/07/06 19:01:41 gshapiro Exp $
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.218 2003/09/24 04:19:26 gshapiro Exp $
#
# NOTE: Please would any committer updating this file also update the
# make.conf(5) manual page, if necessary, which is located in
@@ -263,6 +263,11 @@
#
#SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
#
+# The following overrides the default location for the m4 configuration
+# files used to build a .cf file from a .mc file.
+#
+#SENDMAIL_CF_DIR=/usr/local/share/sendmail/cf
+#
# Setting the following variable modifies the flags passed to m4 when
# building a .cf file from a .mc file. It can be used to enable
# features disabled by default.
==== //depot/projects/hammer/share/man/man4/ugen.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" 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/ugen.4,v 1.3 2003/02/28 19:28:29 jhay Exp $
+.\" $FreeBSD: src/share/man/man4/ugen.4,v 1.5 2003/09/24 05:55:59 jb Exp $
.\"
.Dd July 12, 1998
.Dt UGEN 4
@@ -145,27 +145,27 @@
Get the alternative setting number for the interface with the given
index.
The
-.Va config_index
+.Va uai_config_index
is ignored in this call.
.Bd -literal
struct usb_alt_interface {
- int config_index;
- int interface_index;
- int alt_no;
+ int uai_config_index;
+ int uai_interface_index;
+ int uai_alt_no;
};
.Ed
.It Dv USB_SET_ALTINTERFACE Pq Vt "struct usb_alt_interface"
Set the alternative setting to the given number in the interface with the
given index.
The
-.Va config_index
+.Va uai_config_index
is ignored in this call.
.Pp
This operation can only be performed when no endpoints for the interface
are open.
.It Dv USB_GET_NO_ALT Pq Vt "struct usb_alt_interface"
Return the number of different alternate settings in the
-.Va alt_no
+.Va uai_alt_no
field.
.It Dv USB_GET_DEVICE_DESC Pq Vt usb_device_descriptor_t
Return the device descriptor.
@@ -175,8 +175,8 @@
.Dv USB_CURRENT_CONFIG_INDEX .
.Bd -literal
struct usb_config_desc {
- int config_index;
- usb_config_descriptor_t desc;
+ int ucd_config_index;
+ usb_config_descriptor_t ucd_desc;
};
.Ed
.It Dv USB_GET_INTERFACE_DESC Pq Vt "struct usb_interface_desc"
@@ -186,10 +186,10 @@
.Dv USB_CURRENT_ALT_INDEX .
.Bd -literal
struct usb_interface_desc {
- int config_index;
- int interface_index;
- int alt_index;
- usb_interface_descriptor_t desc;
+ int uid_config_index;
+ int uid_interface_index;
+ int uid_alt_index;
+ usb_interface_descriptor_t uid_desc;
};
.Ed
.It Dv USB_GET_ENDPOINT_DESC Pq Vt "struct usb_endpoint_desc"
@@ -198,26 +198,26 @@
endpoint index.
.Bd -literal
struct usb_endpoint_desc {
- int config_index;
- int interface_index;
- int alt_index;
- int endpoint_index;
- usb_endpoint_descriptor_t desc;
+ int ued_config_index;
+ int ued_interface_index;
+ int ued_alt_index;
+ int ued_endpoint_index;
+ usb_endpoint_descriptor_t ued_desc;
};
.Ed
.It Dv USB_GET_FULL_DESC Pq Vt "struct usb_full_desc"
Return all the descriptors for the given configuration.
.Bd -literal
struct usb_full_desc {
- int config_index;
- u_int size;
- u_char *data;
+ int ufd_config_index;
+ u_int ufd_size;
+ u_char *ufd_data;
};
.Ed
The
-.Va data
+.Va ufd_data
field should point to a memory area of the size given in the
-.Va size
+.Va ufd_size
field.
The proper size can be determined by first issuing a
.Dv USB_GET_CONFIG_DESC
@@ -229,34 +229,34 @@
string index.
.Bd -literal
struct usb_string_desc {
- int string_index;
- int language_id;
- usb_string_descriptor_t desc;
+ int usd_string_index;
+ int usd_language_id;
+ usb_string_descriptor_t usd_desc;
};
.Ed
.It Dv USB_DO_REQUEST Pq Vt "struct usb_ctl_request"
Send a USB request to the device on the control endpoint.
Any data sent to/from the device is located at
-.Va data .
+.Va ucr_data .
The size of the transferred data is determined from the
-.Va request .
+.Va ucr_request .
The
-.Va addr
+.Va ucr_addr
field is ignored in this call.
The
-.Va flags
+.Va ucr_flags
field can be used to flag that the request is allowed to
be shorter than the requested size, and the
-.Va actlen
+.Va ucr_actlen
will contain the actual size on completion.
.Bd -literal
struct usb_ctl_request {
- int addr;
- usb_device_request_t request;
- void *data;
- int flags;
+ int ucr_addr;
+ usb_device_request_t ucr_request;
+ void *ucr_data;
+ int ucr_flags;
#define USBD_SHORT_XFER_OK 0x04 /* allow short reads */
- int actlen; /* actual length transferred */
+ int ucr_actlen; /* actual length transferred */
};
.Ed
This is a dangerous operation in that it can perform arbitrary operations
==== //depot/projects/hammer/share/man/man5/make.conf.5#14 (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/man5/make.conf.5,v 1.79 2003/09/15 16:11:41 sheldonh Exp $
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.80 2003/09/24 04:19:26 gshapiro Exp $
.\"
.Dd November 3, 2000
.Dt MAKE.CONF 5
@@ -635,6 +635,13 @@
file(s), e.g.,
.Pa /etc/mail/foo.mc
.Pa /etc/mail/bar.mc .
+.It Va SENDMAIL_CF_DIR
+.Pq Vt str
+Override the default location for the m4 configuration files used to build a
+.Pa .cf
+file from a
+.Pa .mc
+file.
.It Va SENDMAIL_M4_FLAGS
.Pq Vt str
Flags passed to m4 when building a
==== //depot/projects/hammer/share/man/man9/Makefile#16 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.199 2003/07/21 14:20:58 harti Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.200 2003/09/24 05:18:41 marcel Exp $
MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \
- BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \
- BUS_SETUP_INTR.9 \
+ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_CONFIG_INTR.9 BUS_PRINT_CHILD.9 \
+ BUS_READ_IVAR.9 BUS_SETUP_INTR.9 \
DECLARE_MODULE.9 DELAY.9 DEVICE_ATTACH.9 DEVICE_DETACH.9 \
DEVICE_IDENTIFY.9 DEVICE_PROBE.9 DEVICE_SHUTDOWN.9 \
DEV_MODULE.9 DRIVER_MODULE.9 \
==== //depot/projects/hammer/sys/alpha/include/bus.h#11 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.23 2003/07/27 13:52:09 mux Exp $ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.24 2003/09/23 08:22:33 nyan Exp $ */
#ifndef _ALPHA_BUS_H_
#define _ALPHA_BUS_H_
@@ -91,6 +91,24 @@
#define BUS_SPACE_UNRESTRICTED (~0UL)
/*
+ * Map a region of device bus space into CPU virtual address space.
+ */
+
+static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ bus_size_t size, int flags,
+ bus_space_handle_t *bshp);
+
+static __inline int
+bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr,
+ bus_size_t size __unused, int flags __unused,
+ bus_space_handle_t *bshp)
+{
+
+ *bshp = addr;
+ return (0);
+}
+
+/*
* Unmap a region of device bus space.
*/
==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#5 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.25 2003/05/23 05:04:54 peter Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.26 2003/09/23 08:22:33 nyan Exp $ */
#ifndef _AMD64_BUS_AMD64_H_
#define _AMD64_BUS_AMD64_H_
@@ -114,11 +114,19 @@
* Map a region of device bus space into CPU virtual address space.
*/
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
+static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ bus_size_t size, int flags,
+ bus_space_handle_t *bshp);
+
+static __inline int
+bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr,
+ bus_size_t size __unused, int flags __unused,
+ bus_space_handle_t *bshp)
+{
-int bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size,
- int flags, bus_space_handle_t *bshp);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list