faux.net: faux_net_recv/send functions

faux/net.h

@@ -45,6 +45,11 @@ void faux_net_sigmask_empty(faux_net_t *faux_net);
 void faux_net_sigmask_fill(faux_net_t *faux_net);
 void faux_net_sigmask_add(faux_net_t *faux_net, int signum);
 void faux_net_sigmask_del(faux_net_t *faux_net, int signum);
+ssize_t faux_net_send(faux_net_t *faux_net, const void *buf, size_t n);
+ssize_t faux_net_sendv(faux_net_t *faux_net,
+	const struct iovec *iov, int iovcnt);
+ssize_t faux_net_recv(faux_net_t *faux_net, void *buf, size_t n);
+ssize_t faux_net_recvv(faux_net_t *faux_net, struct iovec *iov, int iovcnt);
 
 C_DECL_END
 

faux/net/net.c

@@ -144,139 +144,33 @@ void faux_net_sigmask_del(faux_net_t *faux_net, int signum)
 	sigdelset(&faux_net->sigmask, signum);
 }
 
-#if 0
-ssize_t faux_net_send(faux_net_t *faux_net, int sock, int flags)
-{
-	unsigned int vec_entries_num = 0;
-	struct iovec *iov = NULL;
-	unsigned int i = 0;
-	faux_list_node_t *iter = NULL;
-	size_t ret = 0;
-
-	assert(faux_net);
-	assert(faux_net->hdr);
-	if (!faux_net || !faux_net->hdr)
-		return -1;
-
-	// Calculate number if struct iovec entries.
-	// n = (msg header) + ((param hdr) + (param data)) * (param_num)
-	vec_entries_num = 1 + (2 * faux_net_get_param_num(faux_net));
-	iov = faux_zmalloc(vec_entries_num * sizeof(*iov));
-
-	// Message header
-	iov[i].iov_base = faux_net->hdr;
-	iov[i].iov_len = sizeof(*faux_net->hdr);
-	i++;
-
-	// Parameter headers
-	for (iter = faux_net_init_param_iter(faux_net);
-		iter; iter = faux_list_next_node(iter)) {
-		crsp_phdr_t *phdr = NULL;
-		phdr = (crsp_phdr_t *)faux_list_data(iter);
-		iov[i].iov_base = phdr;
-		iov[i].iov_len = sizeof(*phdr);
-		i++;
-	}
-
-	// Parameter data
-	for (iter = faux_net_init_param_iter(faux_net);
-		iter; iter = faux_list_next_node(iter)) {
-		crsp_phdr_t *phdr = NULL;
-		void *data = NULL;
-		phdr = (crsp_phdr_t *)faux_list_data(iter);
-		data = (char *)phdr + sizeof(*phdr);
-		iov[i].iov_base = data;
-		iov[i].iov_len = ntohl(phdr->param_len);
-		i++;
-	}
-
-	ret = faux_sendv_block(sock, iov, vec_entries_num, flags);
-	faux_free(iov);
 
-	// Debug
-	if (faux_net && ret > 0) {
-		printf("(o) ");
-		faux_net_debug(faux_net);
-	}
+ssize_t faux_net_send(faux_net_t *faux_net, const void *buf, size_t n)
+{
 
-	return ret;
+	return faux_send_block(faux_net->fd, buf, n, faux_net->send_timeout,
+		&faux_net->sigmask, faux_net->isbreak_func);
 }
 
 
-faux_net_t *faux_net_recv(int sock, int flags)
+ssize_t faux_net_sendv(faux_net_t *faux_net,
+	const struct iovec *iov, int iovcnt)
 {
-	faux_net_t *faux_net = NULL;
-	size_t received = 0;
-	crsp_phdr_t *phdr = NULL;
-	unsigned int param_num = 0;
-	size_t phdr_whole_len = 0;
-	size_t max_data_len = 0;
-	size_t cur_data_len = 0;
-	unsigned int i = 0;
-	char *data = NULL;
+	return faux_sendv_block(faux_net->fd, iov, iovcnt, faux_net->send_timeout,
+		&faux_net->sigmask, faux_net->isbreak_func);
+}
 
-	faux_net = faux_net_allocate();
-	assert(faux_net);
-	if (!faux_net)
-		return NULL;
 
-	// Receive message header
-	received = faux_recv_block(sock, faux_net->hdr, sizeof(*faux_net->hdr),
-		flags);
-	if (received != sizeof(*faux_net->hdr)) {
-		faux_net_free(faux_net);
-		return NULL;
-	}
-	if (!faux_net_check_hdr(faux_net)) {
-		faux_net_free(faux_net);
-		return NULL;
-	}
+ssize_t faux_net_recv(faux_net_t *faux_net, void *buf, size_t n)
+{
 
-	// Receive parameter headers
-	param_num = faux_net_get_param_num(faux_net);
-	if (param_num != 0) {
-		phdr_whole_len = param_num * sizeof(*phdr);
-		phdr = faux_zmalloc(phdr_whole_len);
-		received = faux_recv_block(sock, phdr, phdr_whole_len, flags);
-		if (received != phdr_whole_len) {
-			faux_free(phdr);
-			faux_net_free(faux_net);
-			return NULL;
-		}
-		// Find out maximum data length
-		for (i = 0; i < param_num; i++) {
-			cur_data_len = ntohl(phdr[i].param_len);
-			if (cur_data_len > max_data_len)
-				max_data_len = cur_data_len;
-		}
-
-		// Receive parameter data
-		data = faux_zmalloc(max_data_len);
-		for (i = 0; i < param_num; i++) {
-			cur_data_len = ntohl(phdr[i].param_len);
-			if (0 == cur_data_len)
-				continue;
-			received = faux_recv_block(sock, data, cur_data_len, flags);
-			if (received != cur_data_len) {
-				faux_free(data);
-				faux_free(phdr);
-				faux_net_free(faux_net);
-				return NULL;
-			}
-			faux_net_add_param_internal(faux_net, phdr[i].param_type,
-				data, cur_data_len, BOOL_FALSE);
-		}
-
-		faux_free(data);
-		faux_free(phdr);
-	}
+	return faux_recv_block(faux_net->fd, buf, n, faux_net->recv_timeout,
+		&faux_net->sigmask, faux_net->isbreak_func);
+}
 
-	// Debug
-	if (faux_net) {
-		printf("(i) ");
-		faux_net_debug(faux_net);
-	}
 
-	return faux_net;
+ssize_t faux_net_recvv(faux_net_t *faux_net, struct iovec *iov, int iovcnt)
+{
+	return faux_recvv_block(faux_net->fd, iov, iovcnt, faux_net->recv_timeout,
+		&faux_net->sigmask, faux_net->isbreak_func);
 }
-#endif