X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0c515f17c44344813e8949fbb684b357ad70cfdf..740819ef7b3b96451e16b2fa3891d46cfc73ec64:/connection.c

diff --git a/connection.c b/connection.c
index fc7c6667..ec726075 100644
--- a/connection.c
+++ b/connection.c
@@ -19,59 +19,6 @@
 /* support the max connections option */
 #include "rsync.h"
 
-int yield_connection(char *fname, int max_connections)
-{
-	int fd, i;
-	pid_t mypid=getpid(), pid=0;
-
-	if (max_connections <= 0)
-		return 1;
-
-	fd = open(fname,O_RDWR);
-	if (fd == -1) {
-		rprintf(FERROR,"Couldn't open lock file %s (%s)\n",fname,strerror(errno));
-		return 0;
-	}
-
-	if (!lock_file(fd)) {
-		rprintf(FERROR,"failed to lock %s\n", fname);
-		close(fd);
-		return 0;
-	}
-
-	/* find the right spot */
-	for (i=0;i<max_connections;i++) {
-		if (read(fd, &pid, sizeof(pid)) != sizeof(pid)) {
-			unlock_file(fd);
-			close(fd);
-			return 0;
-		}
-		if (pid == mypid) break;
-	}
-
-	if (i == max_connections) {
-		rprintf(FERROR,"Entry not found in lock file %s\n",fname);
-		unlock_file(fd);
-		close(fd);
-		return 0;
-	}
-
-	pid = 0;
-  
-	/* remove our mark */
-	if (lseek(fd,i*sizeof(pid),SEEK_SET) != i*sizeof(pid) ||
-	    write(fd, &pid,sizeof(pid)) != sizeof(pid)) {
-		rprintf(FERROR,"Couldn't update lock file %s (%s)\n",fname,strerror(errno));
-		unlock_file(fd);
-		close(fd);
-		return 0;
-	}
-
-	unlock_file(fd);
-	close(fd);
-	return 1;
-}
-
 
 /****************************************************************************
 simple routine to do connection counting
@@ -79,45 +26,24 @@ simple routine to do connection counting
 int claim_connection(char *fname,int max_connections)
 {
 	int fd, i;
-	pid_t pid;
 
 	if (max_connections <= 0)
 		return 1;
-	
+
 	fd = open(fname,O_RDWR|O_CREAT, 0600);
 
 	if (fd == -1) {
 		return 0;
 	}
 
-	if (!lock_file(fd)) {
-		rprintf(FERROR,"failed to lock %s\n", fname);
-		close(fd);
-		return 0;
-	}
-
 	/* find a free spot */
 	for (i=0;i<max_connections;i++) {
-		if (read(fd,&pid,sizeof(pid)) != sizeof(pid)) break;
-		if (pid == 0 || !process_exists(pid)) break;
+		if (lock_range(fd, i*4, 4)) return 1;
 	}		
 
-	if (i == max_connections) {
-		unlock_file(fd);
-		close(fd);
-		return 0;
-	}
-
-	pid = getpid();
-
-	if (lseek(fd,i*sizeof(pid),SEEK_SET) != i*sizeof(pid) ||
-	    write(fd, &pid,sizeof(pid)) != sizeof(pid)) {
-		unlock_file(fd);
-		close(fd);
-		return 0;
-	}
+	/* only interested in open failures */
+	errno = 0;
 
-	unlock_file(fd);
 	close(fd);
-	return 1;
+	return 0;
 }