From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 3 22:10:05 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49A0416A420 for ; Tue, 3 Jan 2006 22:10:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF8843D5C for ; Tue, 3 Jan 2006 22:10:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k03MA4jn063859 for ; Tue, 3 Jan 2006 22:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k03MA4s9063854; Tue, 3 Jan 2006 22:10:04 GMT (envelope-from gnats) Resent-Date: Tue, 3 Jan 2006 22:10:04 GMT Resent-Message-Id: <200601032210.k03MA4s9063854@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, Torfinn Ingolfsen Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77FF316A41F for ; Tue, 3 Jan 2006 22:02:47 +0000 (GMT) (envelope-from tingo@start.no) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4DA743D49 for ; Tue, 3 Jan 2006 22:02:46 +0000 (GMT) (envelope-from tingo@start.no) Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0ISJ00FWIESTA190@osl1smout1.broadpark.no> for FreeBSD-gnats-submit@freebsd.org; Tue, 03 Jan 2006 23:07:41 +0100 (CET) Received: from kg-work.kg4.no ([80.203.92.30]) by osl1sminn1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0ISJ00G68EP0NEN0@osl1sminn1.broadpark.no> for FreeBSD-gnats-submit@freebsd.org; Tue, 03 Jan 2006 23:05:24 +0100 (CET) Message-Id: <1136325765.48123@kg-work.kg4.no> Date: Tue, 03 Jan 2006 23:02:45 +0100 From: Torfinn Ingolfsen To: FreeBSD gnats submit X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/91284: patch to improve port misc/callid - improves detection of calling / called numbers 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: Tue, 03 Jan 2006 22:10:05 -0000 >Number: 91284 >Category: ports >Synopsis: patch to improve port misc/callid - improves detection of calling / called numbers >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: Tue Jan 03 22:10:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Torfinn Ingolfsen >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD 5.4-STABLE #5: Sat Dec 31 16:54:14 CET 2005 root@kg-work.kg4.no:/usr/obj/usr/src/sys/SS51G root@kg-web2# portversion -v | grep callid callid-1.2 = up-to-date with port >Description: port callid-1.2 The script call-logd was mixing up the calling / called numbers very often. In addition, it was often confused about calls with no calling number (ie. secret number, presentation restricted / not allowed). >How-To-Repeat: Install the port misc/callid, and configure it. Try to call yourself (from your cellphone for example) both with and without presentation of number allowed. Look at the call log (web page). >Fix: This small patch seems to fix the problems for me. It would be wise that somebody else tested it as well, to verify that it doesn't introduce other problems. --- call-logd_1.2 Tue Jan 3 22:45:53 2006 +++ call-logd_new Tue Jan 3 22:51:33 2006 @@ -33,13 +33,14 @@ else{ @cpn = split(' ', $grepS); - if ($phonenr eq ''){ - $phonenr = "$cpn[3]"; - }#end if phonenr - - else{ - $msnnr = "$cpn[3]"; - }#end else + if ($cpn[0] eq "[calling") { + if ($cpn[3] ne "(type=national,") { + $phonenr = "$cpn[3]"; + } + } + if ($cpn[0] eq "[called") { + $msnnr = "$cpn[3]"; + } if ($msnnr eq ''){ >Release-Note: >Audit-Trail: >Unformatted: