X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_recv.c;h=8d2add19091f4894814c1aeeaeeefee5d5c8c19e;hb=2934ee80367ee9d50b99ed8d7f672d1a397b4ce0;hp=59e9696b47e082f09bf6c58ccf49eadb3c3153e9;hpb=e3a7e12639c34fd86d48a072beb48add8c498d09;p=paraslash.git

diff --git a/http_recv.c b/http_recv.c
index 59e9696b..8d2add19 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -105,7 +105,7 @@ static int http_recv_post_monitor(struct sched *s, void *context)
 		return 0;
 	}
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
-		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+		ret = read_and_compare(rn->fd, HTTP_OK_MSG);
 		if (ret < 0) {
 			PARA_ERROR_LOG("did not receive HTTP OK message\n");
 			goto out;
@@ -150,7 +150,7 @@ static int http_recv_open(struct receiver_node *rn)
 	struct lls_parse_result *lpr = rn->lpr;
 	const char *r_i = RECV_CMD_OPT_STRING_VAL(HTTP, HOST, lpr);
 	uint32_t r_p = RECV_CMD_OPT_UINT32_VAL(HTTP, PORT, lpr);
-	int fd, ret = para_connect_simple(IPPROTO_TCP, r_i, r_p);
+	int fd, ret = para_connect(IPPROTO_TCP, r_i, r_p);
 
 	if (ret < 0)
 		return ret;
@@ -160,7 +160,7 @@ static int http_recv_open(struct receiver_node *rn)
 		close(fd);
 		return ret;
 	}
-	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+	rn->private_data = phd = zalloc(sizeof(struct private_http_recv_data));
 	rn->fd = fd;
 	phd->status = HTTP_CONNECTED;
 	rn->btrp = btr_pool_new("http_recv", 320 * 1024);