From owner-freebsd-current@FreeBSD.ORG Wed Dec 5 13:24:09 2007 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACDA316A41B for ; Wed, 5 Dec 2007 13:24:09 +0000 (UTC) (envelope-from ianf@clue.co.za) Received: from munchkin.clue.co.za (munchkin.clue.co.za [66.219.59.160]) by mx1.freebsd.org (Postfix) with ESMTP id 70DEE13C442 for ; Wed, 5 Dec 2007 13:24:09 +0000 (UTC) (envelope-from ianf@clue.co.za) DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=20070313; d=clue.co.za; h=Received:Received:Received:X-Mailer:cc:From:Subject:In-Reply-To:X-Attribution:Mime-Version:Content-Type:Date:Message-Id; b=mndTQ/5bZWkXcwgSCrcZjEoaInHobao1d+MU2nO6bKp9QY9VLQFpZOU0tWlk/hq1/0/5n057srJE8iSw4OJtustNTW9sXqKm25wBuvzNWZinSiImQ0lGrNBF713JGC6lZR7LZkVOWSVIImnCoWsK5XFu7zNYH7T493Jz+NX2AWqkE9yePpUXAQxrlIztN9XulsrkJnkzrNT/MU8BMx+nO8feUJ7bFg+iB0hzTAKaM2/MoCk/JLoRz6CByJNvbC/E; Received: from uucp by munchkin.clue.co.za with local-rmail (Exim 4.67) (envelope-from ) id 1IzuES-0005Ab-ML for current@freebsd.org; Wed, 05 Dec 2007 13:24:08 +0000 Received: from ianf.clue.co.za ([10.0.0.6] helo=clue.co.za) by urchin.clue.co.za with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1IzuDc-0003hV-Dd for current@freebsd.org; Wed, 05 Dec 2007 13:23:16 +0000 Received: from localhost ([127.0.0.1] helo=clue.co.za) by clue.co.za with esmtp (Exim 4.68 (FreeBSD)) (envelope-from ) id 1IzuDb-000BbK-LQ for current@freebsd.org; Wed, 05 Dec 2007 15:23:15 +0200 X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.2 From: Ian FREISLICH In-Reply-To: Message from Ian FREISLICH of "Wed, 05 Dec 2007 14:51:58 +0200." X-Attribution: BOFH Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_1196860986_573910" Date: Wed, 05 Dec 2007 15:23:15 +0200 Message-Id: Cc: current@freebsd.org Subject: Re: Zaptel port X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Dec 2007 13:24:09 -0000 This is a multipart MIME message. --==_Exmh_1196860986_573910 Content-Type: text/plain; charset=us-ascii Ian FREISLICH wrote: > Folling my previous post about zaptel and asterisk, I've done a lot > of searching and the following patch from a very recent post to the > asterisk-bsd digium list solves the asterisk/zaptel lockup at least > for the 7.0 case. I'd suggest this patch making it into the > 7-RELEASE cycle otherwise the latest branch that Asterisk with zaptel > will work on is 6.x. > > The first chunk of this patch is already in the ports system. As usual, I post too quickly. The 3rd chunk is not needed. The correct patch is attached. -- Ian Freislich --==_Exmh_1196860986_573910 Content-Type: text/plain ; name="patch-zaptel::zaptel.c"; charset=us-ascii Content-Description: patch-zaptel::zaptel.c Content-Disposition: attachment; filename="patch-zaptel::zaptel.c" --- zaptel/zaptel.c.orig Sun Jun 25 14:21:49 2006 +++ zaptel/zaptel.c Fri Aug 11 11:56:20 2006 @@ -397,7 +397,7 @@ int schluffen(void *q) { - int rc = tsleep(q, PZERO | PCATCH, "schluffen", 0); + int rc = tsleep(q, PZERO | PCATCH, "schluffen", 10); switch(rc) { case EINTR: --- zaptel/zaptel.c.orig 2007-12-05 14:39:49.000000000 +0200 +++ zaptel/zaptel.c 2007-12-05 14:40:10.000000000 +0200 @@ -675,7 +675,7 @@ /* Free dev_info, if exist */ if(dev->si_drv2) free(dev->si_drv2, M_ZAP); dev->si_drv2 = NULL; - destroy_dev(dev); + destroy_dev_sched(dev); return res; } --==_Exmh_1196860986_573910--