Merge pull request #114 from hfmanson/master

fixed porting errors

Author: vanrein

lib/libtlspool.c

@@ -590,7 +590,13 @@ int tlspool_starttls (int cryptfd, starttls_t *tlsdata,
 // printf ("\n");
 
 	/* Send the request */
-	os_sendmsg_command(poolfd, &cmd, renegotiate ? -1 : cryptfd);
+	if (os_sendmsg_command(poolfd, &cmd, renegotiate ? -1 : cryptfd) == -1) {
+		// Let SIGPIPE be reported as EPIPE
+		close (cryptfd);
+		registry_update (&entry_reqid, NULL);
+		// errno inherited from os_sendmsg_command()
+		return -1;
+	}
 	sentfd = cryptfd;  /* Close anytime after response and before fn end */
 
 	/* Handle responses until success or error */
@@ -629,7 +635,16 @@ int tlspool_starttls (int cryptfd, starttls_t *tlsdata,
 			/* We may now have a value to send in plainfd */
 			/* Now supply plainfd in the callback response */
 			sentfd = plainfd;
-			os_sendmsg_command(poolfd, &cmd, plainfd);
+			if (os_sendmsg_command(poolfd, &cmd, plainfd) == -1) {
+				// Let SIGPIPE be reported as EPIPE
+				if (sentfd >= 0) {
+					closesocket(sentfd);
+					sentfd = -1;
+				}
+				registry_update (&entry_reqid, NULL);
+				// errno inherited from np_send_command()
+				return -1;
+			}
 			break;	// Loop around and try again
 		case PIOC_STARTTLS_V2:
 			/* Wheee!!! we're done */

lib/libtlspool_posix.c

@@ -5,8 +5,8 @@ int os_sendmsg_command(pool_handle_t poolfd, struct tlspool_command *cmd, int fd
 	struct iovec iov;
 	struct cmsghdr *cmsg;
 	struct msghdr mh = { 0 };
-	iov.iov_base = &cmd;
-	iov.iov_len = sizeof(cmd);
+	iov.iov_base = cmd;
+	iov.iov_len = sizeof(struct tlspool_command);
 	mh.msg_iov = &iov;
 	mh.msg_iovlen = 1;
 	if (fd >= 0) {
@@ -19,6 +19,7 @@ int os_sendmsg_command(pool_handle_t poolfd, struct tlspool_command *cmd, int fd
 		*(int *)CMSG_DATA(cmsg) = fd;
 		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
 	}
+	return sendmsg (poolfd, &mh, MSG_NOSIGNAL);
 }
 
 
@@ -123,6 +124,6 @@ pool_handle_t open_pool (void *path) {
 			newpoolfd = INVALID_POOL_HANDLE;
 		}
 	}
-// printf ("DEBUG: Trying new poolfd %d for path %s\n", poolfd, sun.sun_path);
+// printf ("DEBUG: Trying new poolfd %d for path %s\n", newpoolfd, sun.sun_path);
 	return newpoolfd;
 }