MINOR : vzsock_send() & vzsock_recv_str() functions were added

libvzsock.h

@@ -53,7 +53,7 @@ struct vzsock_ctx {
 #define VZS_ERR_BAD_PARAM	3
 #define VZS_ERR_TIMEOUT		4
 #define VZS_ERR_CONN_BROKEN	5
-
+#define VZS_ERR_TOOLONG		6
 #ifdef __cplusplus
 extern "C" {
 #endif 
@@ -72,7 +72,18 @@ int vzsock_create_conn(struct vzsock_ctx *ctx,
 int vzsock_close_conn(struct vzsock_ctx *ctx, void *conn);
 int vzsock_set_conn(struct vzsock_ctx *ctx, void *conn, 
 		int type, void *data, size_t size);
-
+int vzsock_send(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		const char * data, 
+		size_t size);
+/* read string, separated by <separator>. Will write '\0' on end of string */
+int vzsock_recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size);
 #ifdef __cplusplus
 }
 #endif 

sock.c

@@ -31,6 +31,12 @@ static int _send(
 		void *conn, 
 		const char * data, 
 		size_t size);
+static int recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size);
 
 
 int _vzs_sock_init(struct vzsock_ctx *ctx, struct vzs_handlers *handlers)
@@ -55,6 +61,7 @@ int _vzs_sock_init(struct vzsock_ctx *ctx, struct vzs_handlers *handlers)
 	handlers->close_conn = close_conn;
 	handlers->set_conn = set_conn;
 	handlers->send = _send;
+	handlers->recv_str = recv_str;
 
 	return 0;
 }
@@ -171,3 +178,20 @@ static int _send(
 
 	return _vzs_writefd(ctx, cn->sock, data, size);
 }
+
+/* 
+  read from nonblocking descriptor <fd> string, separated by <separator>.
+  will write '\0' on the end of string
+*/
+static int recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size)
+{
+	struct sock_conn *cn = (struct sock_conn *)conn;
+
+	return _vzs_recv_str(ctx, cn->sock, separator, data, size);
+}
+

ssh.c

@@ -38,6 +38,12 @@ static int send(
 		void *conn, 
 		const char * data, 
 		size_t size);
+static int recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size);
 
 
 int _vzs_ssh_init(struct vzsock_ctx *ctx, struct vzs_handlers *handlers)
@@ -58,6 +64,7 @@ int _vzs_ssh_init(struct vzsock_ctx *ctx, struct vzs_handlers *handlers)
 	handlers->close_conn = close_conn;
 	handlers->set_conn = set_conn;
 	handlers->send = send;
+	handlers->recv_str = recv_str;
 
 	return 0;
 }
@@ -488,3 +495,20 @@ static int send(
 
 	return _vzs_writefd(ctx, cn->out, data, size);
 }
+
+/* 
+  read from nonblocking descriptor <fd> string, separated by <separator>.
+  will write '\0' on the end of string
+*/
+static int recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size)
+{
+	struct ssh_conn *cn = (struct ssh_conn *)conn;
+
+	return _vzs_recv_str(ctx, cn->in, separator, data, size);
+}
+

util.c

@@ -379,4 +379,66 @@ int _vzs_writefd(struct vzsock_ctx *ctx, int fd, const char * data, size_t size)
 	return VZS_ERR_CONN_BROKEN;
 }
 
+/* 
+  read from nonblocking descriptor <fd> string, separated by <separator>.
+  will write '\0' on the end of string
+*/
+int _vzs_recv_str(
+		struct vzsock_ctx *ctx, 
+		int fd, 
+		char separator, 
+		char *data, 
+		size_t size)
+{
+	int rc;
+	char * p;
+	fd_set fds;
+	struct timeval tv;
+
+	p = data;
+	*p = '\0';
+	while (1) {
+		/* read data */
+		while (1) {
+			errno = 0;
+			rc = read(fd, p, 1);
+			if (rc > 0) {
+				if (*p == separator) {
+					*p = '\0';
+					return 0;
+				}
+				p++;
+				if (p >= data + size)
+					return VZS_ERR_TOOLONG;
+				continue;
+			} else if (rc == 0) {
+				/* end of file */
+				*p = '\0';
+				return 0;
+			}
+			if (errno == EAGAIN)
+				/* wait next data */
+				break;
+			else
+				return VZS_ERR_CONN_BROKEN;
+		}
+
+		/* wait next data in socket */
+		do {
+			FD_ZERO(&fds);
+			FD_SET(fd, &fds);
+			tv.tv_sec = ctx->tmo;
+			tv.tv_usec = 0;
+			rc = select(fd + 1, &fds, NULL, NULL, &tv);
+			if (rc == 0)
+				return VZS_ERR_TIMEOUT;
+			else if (rc <= 0)
+				return VZS_ERR_CONN_BROKEN;
+		} while (!FD_ISSET(fd, &fds));
+	}
+
+	/* but we never should be here */
+	return VZS_ERR_CONN_BROKEN;
+}
+
 

util.h

@@ -101,6 +101,16 @@ int _vzs_rmdir(struct vzsock_ctx *ctx, const char *dirname);
 
 /* Write <size> bytes of <data> in non-blocking descriptor <fd>. */
 int _vzs_writefd(struct vzsock_ctx *ctx, int fd, const char * data, size_t size);
+/* 
+  read from nonblocking descriptor <fd> string, separated by <separator>.
+  will write '\0' on the end of string
+*/
+int _vzs_recv_str(
+		struct vzsock_ctx *ctx, 
+		int fd, 
+		char separator, 
+		char *data, 
+		size_t size);
 
 #ifdef __cplusplus
 }

vzsock.c

@@ -177,4 +177,27 @@ int vzsock_set_conn(struct vzsock_ctx *ctx, void *conn,
 	return handlers->set_conn(ctx, conn, type, data, size);
 }
 
+int vzsock_send(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		const char * data, 
+		size_t size)
+{
+	struct vzs_handlers *handlers = (struct vzs_handlers *)ctx->handlers;
+
+	return handlers->send(ctx, conn, data, size);
+}
+
+int vzsock_recv_str(
+		struct vzsock_ctx *ctx, 
+		void *conn, 
+		char separator, 
+		char *data, 
+		size_t size)
+{
+	struct vzs_handlers *handlers = (struct vzs_handlers *)ctx->handlers;
+
+	return handlers->recv_str(ctx, conn, separator, data, size);
+}
+
 

vzsock.h

@@ -25,13 +25,18 @@ struct vzs_handlers {
 	int (*set_conn)(struct vzsock_ctx *ctx, void *conn, 
 			int type, void *data, size_t size);
 	int (*send)(
-		struct vzsock_ctx *ctx, 
-		void *conn, 
-		const char * data, 
-		size_t size);
+			struct vzsock_ctx *ctx, 
+			void *conn, 
+			const char * data, 
+			size_t size);
+	int (*recv_str)(
+			struct vzsock_ctx *ctx, 
+			void *conn, 
+			char separator, 
+			char *data, 
+			size_t size);
+
 /*
-        int (*recv_str)(void *conn,
-                char separator, char *data, size_t size);
         int (*is_connected)(void *conn);
 */
 };