From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 1 17:30:17 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F9781065674 for ; Mon, 1 Aug 2011 17:30:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F0A838FC18 for ; Mon, 1 Aug 2011 17:30:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p71HUGpI069735 for ; Mon, 1 Aug 2011 17:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p71HUGVn069732; Mon, 1 Aug 2011 17:30:16 GMT (envelope-from gnats) Resent-Date: Mon, 1 Aug 2011 17:30:16 GMT Resent-Message-Id: <201108011730.p71HUGVn069732@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kurt Lidl Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C800D106566C for ; Mon, 1 Aug 2011 17:22:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B7DBD8FC13 for ; Mon, 1 Aug 2011 17:22:30 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p71HMUNq093026 for ; Mon, 1 Aug 2011 17:22:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p71HMU1C093006; Mon, 1 Aug 2011 17:22:30 GMT (envelope-from nobody) Message-Id: <201108011722.p71HMU1C093006@red.freebsd.org> Date: Mon, 1 Aug 2011 17:22:30 GMT From: Kurt Lidl To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/159360: analog doesn't decode windows vista/windows 7 clients X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 17:30:17 -0000 >Number: 159360 >Category: ports >Synopsis: analog doesn't decode windows vista/windows 7 clients >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Aug 01 17:30:16 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Kurt Lidl >Release: FreeBSD 8.2-RELEASE (32bit x86) >Organization: Cello Software, LLC >Environment: FreeBSD webserver.fairview-park.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: In the "Operating System Report" section of Analog's output, it summarizes different client operating systems, as reported by the browser's User-Agent string. Analog doesn't know how to figure out what is Windows Vista or Windows 7. >How-To-Repeat: Run analog on a web report, notice the large number "Windows Unknown" entries that largely correspond to the windows vista/windows 7 clients. >Fix: Attached patch extends the files/patch-ab file to understand these two operating systems, along with what ought to be the version number for Windows 8, when it is released. Patch attached with submission follows: --- src/tree.c.orig 2004-12-19 08:51:31.000000000 -0500 +++ src/tree.c 2011-08-01 12:49:29.176805068 -0400 @@ -769,11 +769,13 @@ if (((*name = strstr(whole, "Mosaic")) != NULL && (len = 6)) || ((*name = strstr(whole, "mosaic")) != NULL && (len = 6)) || ((*name = strstr(whole, "Konqueror")) != NULL && (len = 9)) || + ((*name = strstr(whole, "Baiduspider")) != NULL && (len = 11)) || ((*name = strstr(whole, "Galeon")) != NULL && (len = 6)) || ((*name = strstr(whole, "Phoenix")) != NULL && (len = 7)) || ((*name = strstr(whole, "Firebird")) != NULL && (len = 8)) || ((*name = strstr(whole, "Firefox")) != NULL && (len = 7)) || ((*name = strstr(whole, "Chimera")) != NULL && (len = 7)) || + ((*name = strstr(whole, "Chrome")) != NULL && (len = 6)) || ((*name = strstr(whole, "Camino")) != NULL && (len = 6)) || ((*name = strstr(whole, "Safari")) != NULL && (len = 6)) || ((*name = strstr(whole, "WebTV")) != NULL && (len = 5)) || @@ -871,7 +873,17 @@ else *name = "Windows:Unknown Windows"; } - else if (*c >= '6' && *c <= '9') + else if (*c == '6') { + if (*(c + 1) == '.' && (*(c + 2) == '0')) + *name = "Windows:Windows Vista"; + else if (*(c + 1) == '.' && (*(c + 2) == '1')) + *name = "Windows:Windows 7"; + else if (*(c + 1) == '.' && (*(c + 2) == '2')) + *name = "Windows:Windows 8"; + else + *name = "Windows:Unknown Windows"; + } + else if (*c >= '7' && *c <= '9') *name = "Windows:Unknown Windows"; else *name = "Windows:Windows NT"; @@ -904,8 +916,16 @@ *name = "Macintosh"; else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL) *name = "Unix:Linux"; - else if (strstr(whole, "BSD") != NULL) - *name = "Unix:BSD"; + else if (strstr(whole, "FreeBSD") != NULL || strstr(whole, "freebsd") != NULL) + *name = "Unix:FreeBSD"; + else if (strstr(whole, "OpenBSD") != NULL || strstr(whole, "openbsd") != NULL) + *name = "Unix:OpenBSD"; + else if (strstr(whole, "NetBSD") != NULL || strstr(whole, "netbsd") != NULL) + *name = "Unix:NetBSD"; + else if (strstr(whole, "BSD/OS") != NULL || strstr(whole, "bsd/os") != NULL) + *name = "Unix:BSD/OS"; + else if (strstr(whole, "BSD") != NULL || strstr(whole, "bsd") != NULL) + *name = "Unix:Unknown BSD"; else if (strstr(whole, "SunOS") != NULL || strstr(whole, "sunos") != NULL) *name = "Unix:SunOS"; else if (strstr(whole, "HP-UX") != NULL || strstr(whole, "HPUX") != NULL || >Release-Note: >Audit-Trail: >Unformatted: