ports/78574: [MAINTAINER] comms/echolinux: [SUMMARIZE CHANGES]

[Diane Bruce]

On Wed, Mar 09, 2005 at 09:48:24AM +0100, Volker Stolz wrote:
> On Tue, Mar 08, 2005 at 12:27:43PM -0500, Diane Bruce wrote:
> > On Tue, Mar 08, 2005 at 02:23:13PM +0000, Volker Stolz wrote:
...
>
> Same problem. Can you please check that your ports-tree you're diffing against
> is up to date? Maybe you're diffing against a stale local file?

Nope. I just did another cvsup this morning my original copy matched cvsup copy.
I also tested my manual generated diff yesterday on a copy of my local
ports tree. Everything was fine. I'm simply going to drop a shar file
of files/patch-echolinux_control.c into this e-mail, but I'd be curious
to see what is going on. i.e. what the rejects are, what the diffs between
your patch-echolinux_control.c are with this shar version.


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch-echolinux_control.c
#
echo x - patch-echolinux_control.c
sed 's/^X//' >patch-echolinux_control.c << 'END-of-patch-echolinux_control.c'
X--- echolinux/control.c.orig	Mon Feb  2 22:29:46 2004
X+++ echolinux/control.c	Mon Mar  7 15:52:46 2005
X@@ -13,7 +13,7 @@
X #include <stdio.h>
X #include <stdlib.h>
X #include <sys/ioctl.h>
X-#include <linux/soundcard.h>
X+#include <sys/soundcard.h>
X #include <sys/types.h>
X #include <sys/stat.h>
X #include <sys/ioctl.h>
X@@ -24,7 +24,8 @@
X #include <arpa/inet.h>
X #include <netdb.h>
X #include <errno.h>
X-#include <wait.h>
X+#include <sys/types.h>
X+#include <sys/wait.h>
X #include <signal.h>
X #include <string.h>
X #include <sys/time.h>
X@@ -354,7 +355,7 @@
X     timeout.tv_sec = 10;
X     timeout.tv_usec = 0;
X     }
X-
X+
X     if((i == 0) && (audioPid > 0)){  // timeout & connected
X       connectTimeout++;
X       if(connectTimeout == CONNECT_TRY){
X@@ -388,28 +389,32 @@
X 	  disconnect(FALSE);
X       }
X       if(isRTCPSdespacket(inBuffer, length)){
X-	if((audioPid > 0) &&
X-	   (inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr)){
X-	  sdesItems.nitems = 1;
X-	  sdesItems.item[0].r_item = RTCP_SDES_NAME;
X-	  sdesItems.item[0].r_text = NULL;
X-	  remoteName[0] = 0;
X-	  parseSDES(inBuffer, &sdesItems);
X-	  if(sdesItems.item[0].r_text != NULL){
X-	    copySDESitem(sdesItems.item[0].r_text, &remoteName[2]);
X-	  }
X-	  remoteName[0] = CONNECT;
X-	  remoteName[1] = ' ';
X-	  puts(remoteName);
X-	  if(atemptingConnect){
X-	    atemptingConnect = 0;
X-	    fputs("P connect.wav\n", audioOutFd);
X-	    fputs("I\n", audioOutFd);
X-	  }
X-	  connectTimeout = 0;  // reset the counter
X-	}
X-	else {
X-	  if(audioPid<=0){
X+	if (audioPid > 0) {
X+	  sendto(outControlSocket,
X+		 *sdesPacket,
X+		 sdesLength,
X+		 0,
X+		 (struct sockaddr *)&destAddr,
X+		 sizeof destAddr);
X+	  if(inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr){
X+	    sdesItems.nitems = 1;
X+	    sdesItems.item[0].r_item = RTCP_SDES_NAME;
X+	    sdesItems.item[0].r_text = NULL;
X+	    remoteName[0] = 0;
X+	    parseSDES(inBuffer, &sdesItems);
X+	    if(sdesItems.item[0].r_text != NULL){
X+	      copySDESitem(sdesItems.item[0].r_text, &remoteName[2]);
X+	    }
X+	    remoteName[0] = CONNECT;
X+	    remoteName[1] = ' ';
X+	    puts(remoteName);
X+	    if(atemptingConnect){
X+	      atemptingConnect = 0;
X+	      fputs("P connect.wav\n", audioOutFd);
X+	      fputs("I\n", audioOutFd);
X+	    }
X+	    connectTimeout = 0;  // reset the counter
X+	  } else { /* audioPid <= 0 */
X 	    sdesItems.nitems = 1;
X 	    sdesItems.item[0].r_item = RTCP_SDES_NAME;
X 	    sdesItems.item[0].r_text = NULL;
X@@ -424,8 +429,6 @@
X 	    makeConnection(inet_ntoa(inAddr.sin_addr));
X 	    fputs("P connect.wav\n", audioOutFd);
X 	    fputs("I\n", audioOutFd);
X-	  }
X-	  else {
X 	  }
X 	}
X       }
END-of-patch-echolinux_control.c
exit

Let me know whats up please.

- Diane