PERFORCE change 121396 for review
Paolo Pisati
piso at FreeBSD.org
Mon Jun 11 07:18:18 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=121396
Change 121396 by piso at piso_skytech on 2007/06/11 07:18:02
IFC at 121395
Affected files ...
.. //depot/projects/soc2005/libalias/UPDATING#20 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11_radio.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/print-802_11.c#3 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/ftpd#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/gdm#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/imap#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/kde#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/login#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/other#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/pop3#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/rsh#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/sshd#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/telnetd#2 integrate
.. //depot/projects/soc2005/libalias/etc/pam.d/xdm#2 integrate
.. //depot/projects/soc2005/libalias/include/histedit.h#2 integrate
.. //depot/projects/soc2005/libalias/include/paths.h#2 integrate
.. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ustar.c#7 integrate
.. //depot/projects/soc2005/libalias/lib/libarchive/test/test_tar_filenames.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/regex/regcomp.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/regex/regerror.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/regex/regexec.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/regex/regfree.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libedit/editline.3#3 integrate
.. //depot/projects/soc2005/libalias/lib/libedit/el.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libedit/el.h#2 integrate
.. //depot/projects/soc2005/libalias/lib/libedit/term.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libedit/term.h#3 integrate
.. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate
.. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.h#4 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#9 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/ifmedia.c#5 integrate
.. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/trap.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_syscall.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/conf/NOTES#24 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files#29 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.amd64#13 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.i386#12 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.pc98#10 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.sparc64#7 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.sun4v#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#11 integrate
.. //depot/projects/soc2005/libalias/sys/dev/awi/awi.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/awi/awivar.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/dcons/dcons_os.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwireg.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwivar.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mii/icsphy.c#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/mii/icsphyreg.h#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#10 integrate
.. //depot/projects/soc2005/libalias/sys/dev/msk/if_msk.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/if_ral_pci.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560reg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560var.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661reg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661var.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/isa/ad1816.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/isa/ess.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/isa/mss.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/isa/sb16.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/isa/sb8.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/als4000.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/atiixp.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/aureal.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/cmi.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/cs4281.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/csapcm.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ds1.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10k1.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/es137x.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/fm801.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ich.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/maestro3.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/neomagic.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/solo.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/t4dwave.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/via8233.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/via82c686.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/vibes.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/channel.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/channel.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/vchan.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/usb/uaudio_pcm.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_cue.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_cuereg.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_kue.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_kuereg.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_rumreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_ural.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_uralreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/if_uralvar.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/uark.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/ufm.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/usb_port.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/usbdivar.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/wi/if_wi.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/wi/if_wivar.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/i386/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2005/libalias/sys/i386/i386/trap.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/include/vmparam.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_fork.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/modules/Makefile#17 integrate
.. //depot/projects/soc2005/libalias/sys/modules/mii/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/sys/modules/wlan_scan_ap/Makefile#1 branch
.. //depot/projects/soc2005/libalias/sys/modules/wlan_scan_sta/Makefile#1 branch
.. //depot/projects/soc2005/libalias/sys/net/if_media.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/_ieee80211.h#7 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_none.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_tkip.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_wep.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_freebsd.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_freebsd.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ht.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ht.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_power.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_power.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_radiotap.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_regdomain.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_regdomain.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan_ap.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan_sta.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#8 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2005/libalias/sys/sparc64/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2005/libalias/sys/sys/param.h#17 integrate
.. //depot/projects/soc2005/libalias/sys/sys/vmmeter.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vm_contig.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vm_pageout.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vm_pageq.c#6 integrate
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wlandebug/wlandebug.c#4 integrate
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate
Differences ...
==== //depot/projects/soc2005/libalias/UPDATING#20 (text+ko) ====
@@ -21,6 +21,37 @@
developers choose to disable these features on build machines
to maximize performance.
+20070610:
+ The net80211 layer has changed significantly and all wireless
+ drivers that depend on it need to be recompiled. Further these
+ changes require that any program that interacts with the wireless
+ support in the kernel be recompiled; this includes: ifconfig,
+ wpa_supplicant, hostapd, and wlanstats. Users must also, for
+ the moment, kldload the wlan_scan_sta and/or wlan_scan_ap modules
+ if they use modules for wireless support. These modules implement
+ scanning support for station and ap modes, respectively. Failure
+ to load the appropriate module before marking a wireless interface
+ up will result in a message to the console and the device not
+ operating properly.
+
+20070610:
+ The pam_nologin(8) module ceases to provide an authentication
+ function and starts providing an account management function.
+ Consequent changes to /etc/pam.d should be brought in using
+ mergemaster(8). Third-party files in /usr/local/etc/pam.d may
+ need manual editing as follows. Locate this line (or similar):
+
+ auth required pam_nologin.so no_warn
+
+ and change it according to this example:
+
+ account required pam_nologin.so no_warn
+
+ That is, the first word needs to be changed from "auth" to
+ "account". The new line can be moved to the account section
+ within the file for clarity. Not updating pam.conf(5) files
+ will result in nologin(5) ignored by the respective services.
+
20070529:
The ether_ioctl() function has been synchronized with ioctl(2)
and ifnet.if_ioctl. Due to that, the size of one of its arguments
@@ -801,4 +832,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $
+$FreeBSD: src/UPDATING,v 1.494 2007/06/11 04:06:50 sam Exp $
==== //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11.h#2 (text+ko) ====
@@ -1,3 +1,4 @@
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11.h,v 1.2 2007/06/11 04:04:30 sam Exp $ */
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.9 2003/07/22 17:36:57 guy Exp $ (LBL) */
/*
* Copyright (c) 2001
@@ -30,6 +31,7 @@
#define IEEE802_11_RA_LEN 6
#define IEEE802_11_TA_LEN 6
#define IEEE802_11_SEQ_LEN 2
+#define IEEE802_11_CTL_LEN 2
#define IEEE802_11_IV_LEN 3
#define IEEE802_11_KID_LEN 1
@@ -72,6 +74,7 @@
/* RESERVED 0xF */
+#define CTRL_BAR 0x8
#define CTRL_PS_POLL 0xA
#define CTRL_RTS 0xB
#define CTRL_CTS 0xC
@@ -280,6 +283,20 @@
#define CTRL_END_ACK_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
+struct ctrl_bar_t {
+ u_int16_t fc;
+ u_int16_t dur;
+ u_int8_t ra[6];
+ u_int8_t ta[6];
+ u_int16_t ctl;
+ u_int16_t seq;
+ u_int8_t fcs[4];
+};
+
+#define CTRL_BAR_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
+ IEEE802_11_RA_LEN+IEEE802_11_TA_LEN+\
+ IEEE802_11_CTL_LEN+IEEE802_11_SEQ_LEN)
+
#define IV_IV(iv) ((iv) & 0xFFFFFF)
#define IV_PAD(iv) (((iv) >> 24) & 0x3F)
#define IV_KEYID(iv) (((iv) >> 30) & 0x03)
==== //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11_radio.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.1.1.1 2005/05/29 18:16:31 sam Exp $ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.2 2007/06/11 04:04:30 sam Exp $ */
/* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1 2004/09/23 21:33:10 dyoung Exp $ */
@@ -53,7 +53,11 @@
#endif
#endif /* _KERNEL */
-/* The radio capture header precedes the 802.11 header. */
+/*
+ * The radio capture header precedes the 802.11 header.
+ *
+ * Note well: all radiotap fields are little-endian.
+ */
struct ieee80211_radiotap_header {
u_int8_t it_version; /* Version 0. Only increases
* for drastic changes,
@@ -87,15 +91,19 @@
* IEEE80211_RADIOTAP_CHANNEL 2 x u_int16_t MHz, bitmap
*
* Tx/Rx frequency in MHz, followed by flags (see below).
+ * Note that IEEE80211_RADIOTAP_XCHANNEL must be used to
+ * represent an HT channel as there is not enough room in
+ * the flags word.
*
* IEEE80211_RADIOTAP_FHSS u_int16_t see below
*
* For frequency-hopping radios, the hop set (first byte)
* and pattern (second byte).
*
- * IEEE80211_RADIOTAP_RATE u_int8_t 500kb/s
+ * IEEE80211_RADIOTAP_RATE u_int8_t 500kb/s or index
*
- * Tx/Rx data rate
+ * Tx/Rx data rate. If bit 0x80 is set then it represents an
+ * an MCS index and not an IEEE rate.
*
* IEEE80211_RADIOTAP_DBM_ANTSIGNAL int8_t decibels from
* one milliwatt (dBm)
@@ -154,6 +162,17 @@
*
* Unitless indication of the Rx/Tx antenna for this packet.
* The first antenna is antenna 0.
+ *
+ * IEEE80211_RADIOTAP_XCHANNEL u_int32_t bitmap
+ * u_int16_t MHz
+ * u_int8_t channel number
+ * u_int8_t .5 dBm
+ *
+ * Extended channel specification: flags (see below) followed by
+ * frequency in MHz, the corresponding IEEE channel number, and
+ * finally the maximum regulatory transmit power cap in .5 dBm
+ * units. This property supersedes IEEE80211_RADIOTAP_CHANNEL
+ * and only one of the two should be present.
*/
enum ieee80211_radiotap_type {
IEEE80211_RADIOTAP_TSFT = 0,
@@ -170,17 +189,27 @@
IEEE80211_RADIOTAP_ANTENNA = 11,
IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
+ IEEE80211_RADIOTAP_XCHANNEL = 14,
IEEE80211_RADIOTAP_EXT = 31
};
#ifndef _KERNEL
-/* Channel flags. */
-#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */
-#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */
-#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */
-#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */
-#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */
-#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */
+/* Channel flags; some are used only with XCHANNEL */
+#define IEEE80211_CHAN_TURBO 0x00010 /* Turbo channel */
+#define IEEE80211_CHAN_CCK 0x00020 /* CCK channel */
+#define IEEE80211_CHAN_OFDM 0x00040 /* OFDM channel */
+#define IEEE80211_CHAN_2GHZ 0x00080 /* 2 GHz spectrum channel. */
+#define IEEE80211_CHAN_5GHZ 0x00100 /* 5 GHz spectrum channel */
+#define IEEE80211_CHAN_PASSIVE 0x00200 /* Only passive scan allowed */
+#define IEEE80211_CHAN_DYN 0x00400 /* Dynamic CCK-OFDM channel */
+#define IEEE80211_CHAN_GFSK 0x00800 /* GFSK channel (FHSS PHY) */
+#define IEEE80211_CHAN_GSM 0x01000 /* 900 MHz spectrum channel */
+#define IEEE80211_CHAN_STURBO 0x02000 /* 11a static turbo channel only */
+#define IEEE80211_CHAN_HALF 0x04000 /* Half rate channel */
+#define IEEE80211_CHAN_QUARTER 0x08000 /* Quarter rate channel */
+#define IEEE80211_CHAN_HT20 0x10000 /* HT 20 channel */
+#define IEEE80211_CHAN_HT40U 0x20000 /* HT 40 channel w/ ext above */
+#define IEEE80211_CHAN_HT40D 0x40000 /* HT 40 channel w/ ext below */
#endif /* !_KERNEL */
/* For IEEE80211_RADIOTAP_FLAGS */
@@ -197,5 +226,11 @@
#define IEEE80211_RADIOTAP_F_FRAG 0x08 /* sent/received
* with fragmentation
*/
+#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */
+#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between
+ * 802.11 header and payload
+ * (to 32-bit boundary)
+ */
+#define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */
#endif /* _NET_IF_IEEE80211RADIOTAP_H_ */
==== //depot/projects/soc2005/libalias/contrib/tcpdump/print-802_11.c#3 (text+ko) ====
@@ -1,3 +1,4 @@
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.2 2007/06/11 04:04:30 sam Exp $ */
/*
* Copyright (c) 2001
* Fortress Technologies, Inc. All rights reserved.
@@ -61,6 +62,27 @@
printf(" Mbit]"); \
} while (0)
+static const int ieee80211_htrates[16] = {
+ 13, /* IFM_IEEE80211_MCS0 */
+ 26, /* IFM_IEEE80211_MCS1 */
+ 39, /* IFM_IEEE80211_MCS2 */
+ 52, /* IFM_IEEE80211_MCS3 */
+ 78, /* IFM_IEEE80211_MCS4 */
+ 104, /* IFM_IEEE80211_MCS5 */
+ 117, /* IFM_IEEE80211_MCS6 */
+ 130, /* IFM_IEEE80211_MCS7 */
+ 26, /* IFM_IEEE80211_MCS8 */
+ 52, /* IFM_IEEE80211_MCS9 */
+ 78, /* IFM_IEEE80211_MCS10 */
+ 104, /* IFM_IEEE80211_MCS11 */
+ 156, /* IFM_IEEE80211_MCS12 */
+ 208, /* IFM_IEEE80211_MCS13 */
+ 234, /* IFM_IEEE80211_MCS14 */
+ 260, /* IFM_IEEE80211_MCS15 */
+};
+#define PRINT_HT_RATE(_sep, _r, _suf) \
+ printf("%s%.1f%s", _sep, (.5 * ieee80211_htrates[(_r) & 0xf]), _suf)
+
static const char *auth_alg_text[]={"Open System","Shared Key","EAP"};
#define NUM_AUTH_ALGS (sizeof auth_alg_text / sizeof auth_alg_text[0])
@@ -553,6 +575,17 @@
ctrl_body_print(u_int16_t fc, const u_char *p)
{
switch (FC_SUBTYPE(fc)) {
+ case CTRL_BAR:
+ printf("BAR");
+ if (!TTEST2(*p, CTRL_BAR_HDRLEN))
+ return 0;
+ if (!eflag)
+ printf(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
+ etheraddr_string(((const struct ctrl_bar_t *)p)->ra),
+ etheraddr_string(((const struct ctrl_bar_t *)p)->ta),
+ EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->ctl)),
+ EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->seq)));
+ break;
case CTRL_PS_POLL:
printf("Power Save-Poll");
if (!TTEST2(*p, CTRL_PS_POLL_HDRLEN))
@@ -725,6 +758,13 @@
return;
switch (FC_SUBTYPE(fc)) {
+ case CTRL_BAR:
+ printf(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
+ etheraddr_string(((const struct ctrl_bar_t *)p)->ra),
+ etheraddr_string(((const struct ctrl_bar_t *)p)->ta),
+ EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->ctl)),
+ EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->seq)));
+ break;
case CTRL_PS_POLL:
printf("BSSID:%s TA:%s ",
etheraddr_string(((const struct ctrl_ps_poll_t *)p)->bssid),
@@ -767,6 +807,8 @@
return MGMT_HDRLEN;
case T_CTRL:
switch (FC_SUBTYPE(fc)) {
+ case CTRL_BAR:
+ return CTRL_BAR_HDRLEN;
case CTRL_PS_POLL:
return CTRL_PS_POLL_HDRLEN;
case CTRL_RTS:
@@ -925,6 +967,64 @@
return ieee802_11_print(p, h->len, h->caplen);
}
+#define IEEE80211_CHAN_FHSS \
+ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
+#define IEEE80211_CHAN_A \
+ (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)
+#define IEEE80211_CHAN_B \
+ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
+#define IEEE80211_CHAN_PUREG \
+ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM)
+#define IEEE80211_CHAN_G \
+ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
+
+#define IS_CHAN_FHSS(flags) \
+ ((flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
+#define IS_CHAN_A(flags) \
+ ((flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
+#define IS_CHAN_B(flags) \
+ ((flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
+#define IS_CHAN_PUREG(flags) \
+ ((flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
+#define IS_CHAN_G(flags) \
+ ((flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
+#define IS_CHAN_ANYG(flags) \
+ (IS_CHAN_PUREG(flags) || IS_CHAN_G(flags))
+
+static void
+print_chaninfo(int freq, int flags)
+{
+ printf("%u MHz", freq);
+ if (IS_CHAN_FHSS(flags))
+ printf(" FHSS");
+ if (IS_CHAN_A(flags)) {
+ if (flags & IEEE80211_CHAN_HALF)
+ printf(" 11a/10Mhz");
+ else if (flags & IEEE80211_CHAN_QUARTER)
+ printf(" 11a/5Mhz");
+ else
+ printf(" 11a");
+ }
+ if (IS_CHAN_ANYG(flags)) {
+ if (flags & IEEE80211_CHAN_HALF)
+ printf(" 11g/10Mhz");
+ else if (flags & IEEE80211_CHAN_QUARTER)
+ printf(" 11g/5Mhz");
+ else
+ printf(" 11g");
+ } else if (IS_CHAN_B(flags))
+ printf(" 11b");
+ if (flags & IEEE80211_CHAN_TURBO)
+ printf(" Turbo");
+ if (flags & IEEE80211_CHAN_HT20)
+ printf(" ht/20");
+ else if (flags & IEEE80211_CHAN_HT40D)
+ printf(" ht/40-");
+ else if (flags & IEEE80211_CHAN_HT40U)
+ printf(" ht/40+");
+ printf(" ");
+}
+
static int
print_radiotap_field(struct cpack_state *s, u_int32_t bit)
{
@@ -935,7 +1035,7 @@
u_int16_t u16;
u_int32_t u32;
u_int64_t u64;
- } u, u2;
+ } u, u2, u3, u4;
int rc;
switch (bit) {
@@ -970,6 +1070,18 @@
case IEEE80211_RADIOTAP_TSFT:
rc = cpack_uint64(s, &u.u64);
break;
+ case IEEE80211_RADIOTAP_XCHANNEL:
+ rc = cpack_uint32(s, &u.u32);
+ if (rc != 0)
+ break;
+ rc = cpack_uint16(s, &u2.u16);
+ if (rc != 0)
+ break;
+ rc = cpack_uint8(s, &u3.u8);
+ if (rc != 0)
+ break;
+ rc = cpack_uint8(s, &u4.u8);
+ break;
default:
/* this bit indicates a field whose
* size we do not know, so we cannot
@@ -986,15 +1098,16 @@
switch (bit) {
case IEEE80211_RADIOTAP_CHANNEL:
- printf("%u MHz ", u.u16);
- if (u2.u16 != 0)
- printf("(0x%04x) ", u2.u16);
+ print_chaninfo(u.u16, u2.u16);
break;
case IEEE80211_RADIOTAP_FHSS:
printf("fhset %d fhpat %d ", u.u16 & 0xff, (u.u16 >> 8) & 0xff);
break;
case IEEE80211_RADIOTAP_RATE:
- PRINT_RATE("", u.u8, " Mb/s ");
+ if (u.u8 & 0x80)
+ PRINT_RATE("", u.u8, " Mb/s ");
+ else
+ PRINT_HT_RATE("", u.u8, " Mb/s ");
break;
case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
printf("%ddB signal ", u.i8);
@@ -1029,6 +1142,14 @@
printf("wep ");
if (u.u8 & IEEE80211_RADIOTAP_F_FRAG)
printf("fragmented ");
+#if 0
+ if (u.u8 & IEEE80211_RADIOTAP_F_FCS)
+ printf("fcs ");
+ if (u.u8 & IEEE80211_RADIOTAP_F_DATAPAD)
+ printf("datapad ");
+#endif
+ if (u.u8 & IEEE80211_RADIOTAP_F_BADFCS)
+ printf("badfcs ");
break;
case IEEE80211_RADIOTAP_ANTENNA:
printf("antenna %d ", u.u8);
@@ -1036,6 +1157,9 @@
case IEEE80211_RADIOTAP_TSFT:
printf("%" PRIu64 "us tsft ", u.u64);
break;
+ case IEEE80211_RADIOTAP_XCHANNEL:
+ print_chaninfo(u2.u16, u.u32);
+ break;
}
return 0;
}
==== //depot/projects/soc2005/libalias/etc/pam.d/ftpd#2 (text+ko) ====
@@ -1,11 +1,10 @@
#
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "ftpd" service
#
# auth
-auth required pam_nologin.so no_warn
auth sufficient pam_opie.so no_warn no_fake_prompts
auth requisite pam_opieaccess.so no_warn allow_local
#auth sufficient pam_krb5.so no_warn
@@ -13,6 +12,7 @@
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/gdm#2 (text+ko) ====
@@ -1,16 +1,16 @@
#
-# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "gdm" service
#
# auth
-auth required pam_nologin.so no_warn
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/imap#2 (text+ko) ====
@@ -1,11 +1,13 @@
#
-# $FreeBSD: src/etc/pam.d/imap,v 1.5 2003/03/08 09:50:11 markm Exp $
+# $FreeBSD: src/etc/pam.d/imap,v 1.6 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "imap" service
#
# auth
-#auth required pam_nologin.so no_warn
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
+
+# account
+#account required pam_nologin.so
==== //depot/projects/soc2005/libalias/etc/pam.d/kde#2 (text+ko) ====
@@ -1,16 +1,16 @@
#
-# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "kde" service
#
# auth
-auth required pam_nologin.so no_warn
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/login#2 (text+ko) ====
@@ -1,16 +1,16 @@
#
-# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $
+# $FreeBSD: src/etc/pam.d/login,v 1.17 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "login" service
#
# auth
-auth required pam_nologin.so no_warn
auth sufficient pam_self.so no_warn
auth include system
# account
account requisite pam_securetty.so
+account required pam_nologin.so
account include system
# session
==== //depot/projects/soc2005/libalias/etc/pam.d/other#2 (text+ko) ====
@@ -1,11 +1,10 @@
#
-# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "other" service
#
# auth
-auth required pam_nologin.so no_warn
auth sufficient pam_opie.so no_warn no_fake_prompts
auth requisite pam_opieaccess.so no_warn allow_local
#auth sufficient pam_krb5.so no_warn try_first_pass
@@ -13,6 +12,7 @@
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/pop3#2 (text+ko) ====
@@ -1,11 +1,13 @@
#
-# $FreeBSD: src/etc/pam.d/pop3,v 1.5 2003/03/08 09:50:11 markm Exp $
+# $FreeBSD: src/etc/pam.d/pop3,v 1.6 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "pop3" service
#
# auth
-#auth required pam_nologin.so no_warn
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
+
+# account
+#account required pam_nologin.so
==== //depot/projects/soc2005/libalias/etc/pam.d/rsh#2 (text+ko) ====
@@ -1,14 +1,14 @@
#
-# $FreeBSD: src/etc/pam.d/rsh,v 1.5 2003/02/10 00:50:03 des Exp $
+# $FreeBSD: src/etc/pam.d/rsh,v 1.6 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "rsh" service
#
# auth
-auth required pam_nologin.so no_warn
auth required pam_rhosts.so no_warn
# account
+account required pam_nologin.so
account required pam_unix.so
# session
==== //depot/projects/soc2005/libalias/etc/pam.d/sshd#2 (text+ko) ====
@@ -1,11 +1,10 @@
#
-# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "sshd" service
#
# auth
-auth required pam_nologin.so no_warn
auth sufficient pam_opie.so no_warn no_fake_prompts
auth requisite pam_opieaccess.so no_warn allow_local
#auth sufficient pam_krb5.so no_warn try_first_pass
@@ -13,6 +12,7 @@
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/telnetd#2 (text+ko) ====
@@ -1,11 +1,10 @@
#
-# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "telnetd" service
#
# auth
-auth required pam_nologin.so no_warn
auth sufficient pam_opie.so no_warn no_fake_prompts
auth requisite pam_opieaccess.so no_warn allow_local
#auth sufficient pam_krb5.so no_warn try_first_pass
@@ -13,6 +12,7 @@
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/etc/pam.d/xdm#2 (text+ko) ====
@@ -1,16 +1,16 @@
#
-# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "xdm" service
#
# auth
-auth required pam_nologin.so no_warn
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
auth required pam_unix.so no_warn try_first_pass
# account
+account required pam_nologin.so
#account required pam_krb5.so
account required pam_unix.so
==== //depot/projects/soc2005/libalias/include/histedit.h#2 (text+ko) ====
@@ -30,8 +30,8 @@
* SUCH DAMAGE.
*
* @(#)histedit.h 8.2 (Berkeley) 1/3/94
- * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $
- * $FreeBSD: src/include/histedit.h,v 1.10 2005/08/07 20:51:52 stefanf Exp $
+ * $NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $
+ * $FreeBSD: src/include/histedit.h,v 1.12 2007/06/11 06:25:19 stefanf Exp $
*/
/*
@@ -104,7 +104,7 @@
* Low level editline access functions
*/
int el_set(EditLine *, int, ...);
-int el_get(EditLine *, int, void *);
+int el_get(EditLine *, int, ...);
#if 0
unsigned char _el_fn_complete(EditLine *, int);
#endif
@@ -130,8 +130,11 @@
#define EL_CLIENTDATA 14 /* , void *); */
#define EL_UNBUFFERED 15 /* , int); */
#define EL_PREP_TERM 16 /* , int); */
+#define EL_GETTC 17 /* , const char *, ..., NULL); */
+#define EL_GETFP 18 /* , int, FILE **) */
+#define EL_SETFP 19 /* , int, FILE *) */
-#define EL_BUILTIN_GETCFN (NULL)
+#define EL_BUILTIN_GETCFN (NULL)
/*
* Source named file or $PWD/.editrc or $HOME/.editrc
@@ -181,7 +184,7 @@
#define H_FUNC 0 /* , UTSL */
#define H_SETSIZE 1 /* , const int); */
-#define H_EVENT 1 /* , const int); */
+#define H_EVENT 1 /* , const int); */
#define H_GETSIZE 2 /* , void); */
#define H_FIRST 3 /* , void); */
#define H_LAST 4 /* , void); */
==== //depot/projects/soc2005/libalias/include/paths.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)paths.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/paths.h,v 1.25 2004/01/04 17:17:46 iedowse Exp $
+ * $FreeBSD: src/include/paths.h,v 1.26 2007/06/11 02:21:18 simokawa Exp $
*/
#ifndef _PATHS_H_
@@ -61,6 +61,7 @@
#define _PATH_DRUM "/dev/drum"
#define _PATH_ETC "/etc"
#define _PATH_FTPUSERS "/etc/ftpusers"
+#define _PATH_FWMEM "/dev/fwmem"
#define _PATH_HALT "/sbin/halt"
#define _PATH_IFCONFIG "/sbin/ifconfig"
#define _PATH_KMEM "/dev/kmem"
==== //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ustar.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.23 2007/05/29 01:00:19 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.24 2007/06/11 05:17:30 kientzle Exp $");
#ifdef HAVE_ERRNO_H
@@ -279,6 +279,16 @@
/* Store in two pieces, splitting at a '/'. */
p = strchr(pp + strlen(pp) - USTAR_name_size - 1, '/');
/*
+ * If the separator we found is the first '/', find
+ * the next one. (This is a pathological case that
+ * occurs for paths of exactly 101 bytes that start with
+ * '/'; it occurs because the separating '/' is not
+ * stored explicitly and the reconstruction assumes that
+ * an empty prefix means there is no '/' separator.)
+ */
+ if (p == pp)
+ p = strchr(p + 1, '/');
+ /*
* If there is no path separator, or the prefix or
* remaining name are too large, return an error.
*/
==== //depot/projects/soc2005/libalias/lib/libarchive/test/test_tar_filenames.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.4 2007/06/11 05:17:30 kientzle Exp $");
/*
* Exercise various lengths of filenames in tar archives,
@@ -31,8 +31,8 @@
* filenames into prefix/suffix.
*/
-static void
-test_filename(int dlen, int flen)
+static
+test_filename(const char *prefix, int dlen, int flen)
{
char buff[8192];
char filename[400];
@@ -40,12 +40,17 @@
struct archive_entry *ae;
struct archive *a;
size_t used;
- int i;
+ size_t prefix_length = 0;
+ int i = 0;
- for (i = 0; i < dlen; i++)
+ if (prefix) {
+ strcpy(filename, prefix);
+ i = prefix_length = strlen(prefix);
+ }
+ for (; i < prefix_length + dlen; i++)
filename[i] = 'a';
filename[i++] = '/';
- for (; i < dlen + flen + 1; i++)
+ for (; i < prefix_length + dlen + flen + 1; i++)
filename[i] = 'b';
filename[i++] = '\0';
@@ -111,7 +116,7 @@
assertA(0 == archive_read_next_header(a, &ae));
failure("Pathname %d/%d: %s", dlen, flen, archive_entry_pathname(ae));
assertEqualString(filename, archive_entry_pathname(ae));
- assert((S_IFREG | 0755) == archive_entry_mode(ae));
+ assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae));
/*
* Read the two dirs and check the names.
@@ -147,13 +152,15 @@
/* Repeat the following for a variety of dir/file lengths. */
for (dlen = 40; dlen < 60; dlen++) {
for (flen = 40; flen < 60; flen++) {
- test_filename(dlen, flen);
+ test_filename(NULL, dlen, flen);
+ test_filename("/", dlen, flen);
}
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list