From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 8 05:50:03 2005 Return-Path: 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 5436C16A4CE for ; Tue, 8 Mar 2005 05:50:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E13CE43D58 for ; Tue, 8 Mar 2005 05:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j285o2bl030315 for ; Tue, 8 Mar 2005 05:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j285o26R030314; Tue, 8 Mar 2005 05:50:02 GMT (envelope-from gnats) Resent-Date: Tue, 8 Mar 2005 05:50:02 GMT Resent-Message-Id: <200503080550.j285o26R030314@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, Diane Bruce Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6760416A4CE for ; Tue, 8 Mar 2005 05:47:50 +0000 (GMT) Received: from heceta.db.net (heceta.db.net [142.46.199.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id F005143D53 for ; Tue, 8 Mar 2005 05:47:49 +0000 (GMT) (envelope-from db@db.net) Received: from heceta.db.net ([142.46.199.182] helo=localhost ident=mailnull) by heceta.db.net with esmtp (Exim 4.24; FreeBSD 4.8) id 1D8Xdx-000Of6-MH for freebsd-gnats-submit@freebsd.org; Tue, 08 Mar 2005 00:52:33 -0500 Received: from localhost.dbn ([127.0.0.1] helo=night.dbn) by night.db.net with esmtp (Exim 4.43 (FreeBSD)) id 1D8Xa4-000HhC-Eg for FreeBSD-gnats-submit@freebsd.org; Tue, 08 Mar 2005 00:48:32 -0500 Received: (from db@localhost) by night.dbn (8.13.1/8.13.1/Submit) id j285mWxN068025; Tue, 8 Mar 2005 00:48:32 -0500 (EST) (envelope-from db) Message-Id: <200503080548.j285mWxN068025@night.dbn> Date: Tue, 8 Mar 2005 00:48:32 -0500 (EST) From: Diane Bruce To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/78574: [MAINTAINER] comms/echolinux: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2005 05:50:03 -0000 >Number: 78574 >Category: ports >Synopsis: [MAINTAINER] comms/echolinux: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 08 05:50:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD night.dbn 5.3-STABLE FreeBSD 5.3-STABLE #5: Sat Nov 20 15:12:34 EST 2004 >Description: [DESCRIBE CHANGES] Generated with FreeBSD Port Tools 0.63 Bug in code meant it would timeout as it would not reply to a "heartbeat" check. There is no way the original linux version would work properly without this code. Original programmer will be contacted, meanwhile, this gets the FreeBSD version working.. >How-To-Repeat: >Fix: --- echolinux-0.16a_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/echolinux/Makefile /usr/ports/comms/fixed_echolinux/echolinux/Makefile --- /usr/ports/comms/echolinux/Makefile Mon Nov 15 18:17:54 2004 +++ /usr/ports/comms/fixed_echolinux/echolinux/Makefile Sun Mar 6 00:52:34 2005 @@ -7,7 +7,7 @@ PORTNAME= echolinux PORTVERSION= 0.16a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cqinet diff -ruN --exclude=CVS /usr/ports/comms/echolinux/files/patch-echolinux_control.c /usr/ports/comms/fixed_echolinux/echolinux/files/patch-echolinux_control.c --- /usr/ports/comms/echolinux/files/patch-echolinux_control.c Sun Jul 4 19:28:32 2004 +++ /usr/ports/comms/fixed_echolinux/echolinux/files/patch-echolinux_control.c Mon Mar 7 15:53:15 2005 @@ -1,5 +1,14 @@ --- echolinux/control.c.orig Mon Feb 2 22:29:46 2004 -+++ echolinux/control.c Fri Jul 2 00:58:38 2004 ++++ echolinux/control.c Mon Mar 7 15:52:46 2005 +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include @@ -24,7 +24,8 @@ #include #include @@ -10,3 +19,76 @@ #include #include #include +@@ -354,7 +355,7 @@ + timeout.tv_sec = 10; + timeout.tv_usec = 0; + } +- ++ + if((i == 0) && (audioPid > 0)){ // timeout & connected + connectTimeout++; + if(connectTimeout == CONNECT_TRY){ +@@ -388,28 +389,32 @@ + disconnect(FALSE); + } + if(isRTCPSdespacket(inBuffer, length)){ +- if((audioPid > 0) && +- (inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr)){ +- sdesItems.nitems = 1; +- sdesItems.item[0].r_item = RTCP_SDES_NAME; +- sdesItems.item[0].r_text = NULL; +- remoteName[0] = 0; +- parseSDES(inBuffer, &sdesItems); +- if(sdesItems.item[0].r_text != NULL){ +- copySDESitem(sdesItems.item[0].r_text, &remoteName[2]); +- } +- remoteName[0] = CONNECT; +- remoteName[1] = ' '; +- puts(remoteName); +- if(atemptingConnect){ +- atemptingConnect = 0; +- fputs("P connect.wav\n", audioOutFd); +- fputs("I\n", audioOutFd); +- } +- connectTimeout = 0; // reset the counter +- } +- else { +- if(audioPid<=0){ ++ if (audioPid > 0) { ++ sendto(outControlSocket, ++ *sdesPacket, ++ sdesLength, ++ 0, ++ (struct sockaddr *)&destAddr, ++ sizeof destAddr); ++ if(inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr){ ++ sdesItems.nitems = 1; ++ sdesItems.item[0].r_item = RTCP_SDES_NAME; ++ sdesItems.item[0].r_text = NULL; ++ remoteName[0] = 0; ++ parseSDES(inBuffer, &sdesItems); ++ if(sdesItems.item[0].r_text != NULL){ ++ copySDESitem(sdesItems.item[0].r_text, &remoteName[2]); ++ } ++ remoteName[0] = CONNECT; ++ remoteName[1] = ' '; ++ puts(remoteName); ++ if(atemptingConnect){ ++ atemptingConnect = 0; ++ fputs("P connect.wav\n", audioOutFd); ++ fputs("I\n", audioOutFd); ++ } ++ connectTimeout = 0; // reset the counter ++ } else { /* audioPid <= 0 */ + sdesItems.nitems = 1; + sdesItems.item[0].r_item = RTCP_SDES_NAME; + sdesItems.item[0].r_text = NULL; +@@ -424,8 +429,6 @@ + makeConnection(inet_ntoa(inAddr.sin_addr)); + fputs("P connect.wav\n", audioOutFd); + fputs("I\n", audioOutFd); +- } +- else { + } + } + } --- echolinux-0.16a_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: