Re: odd code in traceroute.c
I've tweaked freebsd's fix so that it really ...
... leaks memory! The following diff maybe has a higher probability
of being right...
Index: traceroute.c
===
RCS file: /cvs/src/usr.sbin/traceroute/traceroute.c,v
retrieving revision 1.67
diff -u -r1.67 traceroute.c
--- traceroute.c5 Jun 2009 00:10:01 - 1.67
+++ traceroute.c3 Jul 2009 10:40:45 -
@@ -608,10 +608,6 @@
send_probe(++seq, ttl, incflag, to);
while ((cc = wait_for_reply(s, from, t1))) {
(void) gettimeofday(t2, NULL);
- if (t2.tv_sec - t1.tv_sec waittime) {
- cc = 0;
- break;
- }
i = packet_ok(packet, cc, from, seq, incflag);
/* Skip short packet */
if (i == 0)
@@ -740,10 +736,9 @@
wait.tv_usec += 100;
wait.tv_sec--;
}
- if (wait.tv_sec 0)
- wait.tv_sec = wait.tv_usec = 0;
- if (select(sock+1, fdsp, (fd_set *)0, (fd_set *)0, wait) 0)
+ if (wait.tv_sec = 0
+ select(sock+1, fdsp, (fd_set *)0, (fd_set *)0, wait) 0)
cc = recvfrom(s, (char *)packet, sizeof(packet), 0,
(struct sockaddr *)from, fromlen);
ViewSonic LCD 19 VA1903wmb (1440X900 - Parlantes 1.5w), disponibles en NEW TREE Comp.
Si no puede ver correctamente este correo,accedalo aqum [IMAGE] Los dmas Jueves entregamos Gratis en la ciudad de La Plata pedidos cuyo monto superen los U$S 300. Para montos inferiores a U$S 300, se deberan abonar $ 25. Los dmas Martes y Viernes entregamos Gratis en Galerma Jardmn [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] Descargar Lista de Precios Completa en Formato EXCEL PARA DESCARGARSE LA SOLICITUD DE ALTA CREDITICIA haga click aqum [IMAGE] Departamento Comercial Buenos Aires 5171-4000 Lineas rotativas Paul Bloj Gerente Comercial pa...@newtree.com.ar [IMAGE] 106014018 Nextel ID: 54*546*1479 Ejecutivos de Cuenta Marcelo Martmn marce...@newtree.com.ar [image]marce...@newtree.com.ar Directo 5171-4033 Patricia Gonzalez patric...@newtree.com.ar [image]patric...@newtree.com.ar Directo 5171-4034 [IMAGE] [IMAGE] Envmos ASEGURADOS a TODO el pais a traves de OCA [IMAGE] [IMAGE] Mariana Ieraci maria...@newtree.com.ar [image]maria...@newtree.com.ar [IMAGE] 248762299 Directo 5171-4015 Yamila Ramos yam...@newtree.com.ar [image]yam...@newtree.com.ar Directo 5171-4017 Ivonne Santander ivo...@newtree.com.ar [image]ivonnesantander...@hotmail.com Directo 5171-4018 Alejo Diaz Santillo ale...@newtree.com.ar [image]ale...@newtree.com.ar [IMAGE] 86635256 Directo 5171-4014 Damian Infer PM Kodak - Creative - Avermedia - Brother Ventas Retail damia...@newtree.com.ar [image]dam...@newtree.com.ar Directo 5171-4050 Cinthia Abibo cint...@newtree.com.ar [image]cinthianewt...@hotmail.com Directo 5171-4011 Marma Bertucci mar...@newtree.com.ar [image]mar...@newtree.com.ar [IMAGE] 91695881 Directo 5171-4013 Depto. Atencisn al Cliente Gabriela Milano gabrie...@newtree.com.ar Directo 5171-4036 Logmstica y Expedicisn Roberto Moreno Directo 5171-4030 rober...@newtree.com.ar [image]roberto_newt...@newtree.com.ar Nextel ID: 54*546*1477 Servicio Ticnico - RMA Nestor Laddeda serv...@newtree.com.ar Directo 5171-4005 Sucursal Mendoza Entre Rios 431 - Mendoza. - TE. 0261 4619600 - FAX: 0261-4202470 Mail: ventas...@newtree.com.ar Nextel ID: 54*546*3913 // 54*546*9941 Marcelo Resa Gerente de Sucursal marce...@newtree.com.ar [image]newtree...@hotmail.com Leonardo Muqoz Jefe de Ventas Sucursal leonar...@newtree.com.ar [image]leonewtreemend...@hotmail.com [IMAGE] 334064927 Javier Bonanno Ejecutivo de Cuentas javi...@newtree.com.ar [IMAGE] javiernewtree...@hotmail.com Sergio Izquierdo Servicio Ticnico serg...@newtree.com.ar [IMAGE] rmanewtree-...@hotmail.com [IMAGE] Informacisn Bancaria Cuentas $ (PESOS) Cuentas en U$S (DOLARES) [IMAGE] Banco Galicia Orden: G y P New Tree S.A. Cta. Cte. $: 470-5-303-8 Suc. 303 CBU: 007-030392-000470-580 [IMAGE] Banco Galicia Orden: G y P New Tree S.A. Cta. Esp. U$S: 9750025-4-303-0 Suc. 303 CBU: 007-030393-10097500-25400 [IMAGE] Banco Francis Orden: G y P New Tree S.A. Cta. Cte. $: 07/008161/3 Suc. 07 CBU: 01700077 2000816139 [IMAGE] Banco Credicoop Orden: G y P New Tree S.A. Cta. Cte. $: 241-11/7 Suc. Almagro CBU: 191024105502411178 [IMAGE] Banco Macro Bansud Orden: G y P New Tree S.A. Cta. Cte. $: 3-502-0016001806-0 CBU: 191024105502411178 [IMAGE] Banco Macro Bansud Orden: G y P New Tree S.A. Cta. Cte. U$S: 2-502-0016001806-0 CBU: 191024105502411178 Sslo Cuentas en $ (PESOS) [IMAGE] Banco Provincia Orden: G y P New Tree S.A. Cta. Cte. $: 10187/3 Suc. 4009 CBU: 01400090-01400901018730 [IMAGE] Banco Ciudad Orden: G y P New Tree S.A. Cta. Cte. $: 384/9 Suc. 38 CBU: 02900384-038496 [IMAGE] Banco Nacisn Orden: G y P New Tree S.A. Cta. Cte. $: 62700068/61 Suc. 0012 CBU: 01106271-20062700068610 OBSERVACIONES * Los precios y ofertas publicados en el presente Newsletter son exclusivos para CLIENTES del CANAL (Resellers, Integradores, VARs, Ensambladores), registrados como clientes de G y P New Tree S.A. * Los precios estan expresados en Dslares Estadounidenses (USD), E INCLUYEN IVA (10,5% o 21%, segun corresponda) y pueden variar sin previo aviso. * El presupuesto esta realizado en base a Pago Contado Efectivo (Respetando clausula Dslar). * Consulte por otras opciones de pago (Cheque al dia, CPD, transferencia electrsnica de fondos, etc.). * Cierre de Cotizacion: Dslar Tipo Vendedor Mercado Libre al cierre anterior de la fecha de recepcion del pago. * Los precios cotizados en la presente estan expresados considerando todos los aranceles, impuestos y gastos de importacisn vigentes al dma de la fecha. * Dichos precios se veran modificados en funcisn a la variacisn de algunos de los componentes que intervienen en la constitucisn de los costos de importacisn de los mismos y /o modificacisn de precios u obsolencia del producto por parte del fabricante. Asimismo los mencionados precios son de contado, salvo indicacisn en contrario. En dicho caso la forma de pago a convenir estara sujeta a la situacisn crediticia del
wdc patch to get SSD with native SATA working on HP2133 netbook
As detailed in the following link I have to disable pciide and set my
BIOS to use SATA drives in 'compatible' mode in order to use my HP2133
netbook with the cheap 4GB SSD it came with:
http://www.nabble.com/Re%3A-Interrupt-problems-with-recent-snapshot-p20160942.html
I looked into the problem and discovered that my drive only supports
Ultra-DMA mode 4. The pciide/wdc code forces various PIO/DMA settings
(including UDMA5) when it detects a SATA drive in 'native' mode and
dispenses with any autodetection. The following patch just removes
the forced settings and lets the autodetection run. My drive is
detected properly with my BIOS set to use native SATA and runs at a
more acceptable speed. Presumably someone added that code because
some drives don't work with autodetection so I doubt this patch can be
applied to 4.6-beta without more widespread testing.
Daniel
Index: wdc.c
===
RCS file: /cvs/src/sys/dev/ic/wdc.c,v
retrieving revision 1.102
diff -u wdc.c
--- wdc.c 7 Feb 2009 08:07:28 - 1.102
+++ wdc.c 4 Jul 2009 00:41:43 -
@@ -1245,21 +1245,6 @@
int i, valid_mode_found;
int cf_flags = drvp-cf_flags;
- if ((wdc-cap WDC_CAPABILITY_SATA) != 0
- (params-atap_sata_caps != 0x
- params-atap_sata_caps != 0x)) {
- WDCDEBUG_PRINT((%s: atap_sata_caps=0x%x\n, __func__,
- params-atap_sata_caps), DEBUG_PROBE);
-
- /* Skip ATA modes detection for native SATA drives */
- drvp-PIO_mode = drvp-PIO_cap = 4;
- drvp-DMA_mode = drvp-DMA_cap = 2;
- drvp-UDMA_mode = drvp-UDMA_cap = 5;
- drvp-drive_flags |= DRIVE_SATA | DRIVE_MODE | DRIVE_UDMA;
- drvp-ata_vers = 4;
- return;
- }
-
if ((wdc-cap (WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32)) ==
(WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32)) {
struct ataparams params2;
diff of dmesg before patch (with SATA in compatible mode) and after
(with SATA in native mode):
--- dmesg.beforeFri Jul 3 17:16:14 2009
+++ dmesg.after Fri Jul 3 17:19:11 2009
@@ -1,112 +1,106 @@
-OpenBSD 4.6-beta (GENERIC) #37: Tue Jun 30 11:13:06 MDT 2009
-dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
+OpenBSD 4.6 (build) #1: Fri Jul 3 17:05:05 PDT 2009
+u...@host.example.com:/home/user/work/wdc/build
cpu0: VIA C7-M Processor 1000MHz (CentaurHauls 686-class) 1 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,CMOV,PAT,CFLUSH,ACPI,MMX,FXSR,SSE,SSE2,TM,SBF,SSE3,EST,TM2,xTPR
real mem = 1877241856 (1790MB)
avail mem = 1805881344 (1722MB)
-User Kernel Config
-UKC disable pciide
-105 pciide* disabled
-106 pciide* disabled
-UKC quit
-Continuing...
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 11/11/08, BIOS32 rev. 0 @
0xf0010, SMBIOS rev. 2.5 @ 0xfc590 (19 entries)
bios0: vendor Hewlett-Packard version 68VGU Ver. F.06 date 11/11/2008
bios0: Hewlett-Packard HP 2133
acpi0 at bios0: rev 2
acpi0: tables DSDT FACP APIC MCFG SLIC WDRT OEMB HPET SSDT
acpi0: wakeup devices BLAN(S0) SLPB(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: RNG AES AES-CTR SHA1 SHA256 RSA
cpu0: apic clock running at 99MHz
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 3, 24 pins
ioapic1 at mainbus0: apid 2 pa 0xfecc, version 3, 24 pins
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (P0P1)
acpiprt2 at acpi0: bus 2 (NBPG)
acpiprt3 at acpi0: bus 0 (P0P9)
acpiprt4 at acpi0: bus 7 (P0PA)
acpiprt5 at acpi0: bus 5 (NBP0)
acpiprt6 at acpi0: bus 128 (PCI1)
acpiec0 at acpi0
acpicpu0 at acpi0: C3, C2, PSS
acpipwrres0 at acpi0: APMF
acpitz0 at acpi0: critical temperature 105 degC
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT1 model Primary serial 10 type LiOn oem
Hewlett-Packard
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
acpibtn2 at acpi0: PWRB
acpivideo0 at acpi0: VGA_
acpivout0 at acpivideo0: LCD_
acpivout1 at acpivideo0: CRT_
bios0: ROM list: 0xc/0xcc00
cpu0: Enhanced SpeedStep 998 MHz: speeds: 1000, 800, 600, 400 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 VIA P4M900 Host rev 0x00
viaagp0 at pchb0: v3
agp0 at viaagp0: aperture at 0xf000, size 0x1000
pchb1 at pci0 dev 0 function 1 VIA P4M900 Host rev 0x00
pchb2 at pci0 dev 0 function 2 VIA P4M900 Host rev 0x00
pchb3 at pci0 dev 0 function 3 VIA P4M900 Host rev 0x00
pchb4 at pci0 dev 0 function 4 VIA P4M900 Host rev 0x00
VIA P4M900 IOAPIC rev 0x00 at pci0 dev 0 function 5 not configured
pchb5 at pci0 dev 0 function 6 VIA P4M900 Security rev 0x00
pchb6 at pci0 dev 0 function 7 VIA P4M900 Host rev 0x00
ppb0 at pci0 dev 1 function 0 VIA VT8377 AGP rev 0x00
pci1 at ppb0
