X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=0105ef6902114ae108da577186c1d58d8e52c0fb;hp=b05f74da69b62d3fd3a25a7ac58633f1628c1249;hb=17cba74507aad9a2cf5a8f113270e4bf6f8ade40;hpb=c839ef92e35d5604748aa4674b400156ff7baced

diff --git a/net.c b/net.c
index b05f74da..0105ef69 100644
--- a/net.c
+++ b/net.c
@@ -135,7 +135,7 @@ static int sendall(int fd, const char *buf, size_t *len)
  * @param buf the buffer to be encrypted and sent
  * @param len the length of \a buf
  *
- * Check if encrytion is available. If yes, encrypt the given buffer.  Send out
+ * Check if encrytpion is available. If yes, encrypt the given buffer.  Send out
  * the buffer, encrypted or not, and try to resend the remaing part in case of
  * short writes.
  *
@@ -201,7 +201,7 @@ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...)
  * @param buf the buffer to write the decrypted data to
  * @param size the size of @param buf
  *
- * Receive at most \a size bytes from filedescriptor fd. If encrytion is
+ * Receive at most \a size bytes from filedescriptor fd. If encryption is
  * available, decrypt the received buffer.
  *
  * @return the number of bytes received on success. On receive errors, -E_RECV
@@ -312,9 +312,9 @@ int para_connect(int fd, struct sockaddr_in *their_addr)
 /**
  * paraslash's wrapper around the accept system call
  *
- * @param fd the listening socket
- * @param addr structure which is filled in with the address of the peer socket
- * @param size should contain the size of the structure pointed to by \a addr
+ * \param fd the listening socket
+ * \param addr structure which is filled in with the address of the peer socket
+ * \param size should contain the size of the structure pointed to by \a addr
  *
  * \sa accept(2).
  */
@@ -322,8 +322,10 @@ int para_accept(int fd, void *addr, socklen_t size)
 {
 	int new_fd;
 
-	new_fd = accept(fd, (struct sockaddr *) addr, &size);
-	return new_fd == -1? -E_ACCEPT : new_fd;
+	do 
+		new_fd = accept(fd, (struct sockaddr *) addr, &size);
+	while (new_fd < 0 && errno == EINTR);
+	return new_fd < 0? -E_ACCEPT : new_fd;
 }
 
 static int setserversockopts(int socket_fd)
@@ -389,9 +391,6 @@ int create_pf_socket(const char *name, struct sockaddr_un *unix_addr, int mode)
 }
 
 #ifndef HAVE_UCRED
-	struct ucred {
-	uid_t uid, pid, gid;
-};
 ssize_t send_cred_buffer(int sock, char *buf)
 {
 	return send_buffer(sock, buf);