X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flibreceita.git;a=blobdiff_plain;f=rnetclient.c;h=e1a30387120c2172cc0d63aacdba9823c086dddc;hp=4e3f4696a28c0a26051f9d1f244f2f0f7660e371;hb=52012f62f845abd12b3e9fddb8aefc95e4b015ed;hpb=5d5cb6b57c38bad07851464bcb3ea6a2ace464c3

diff --git a/rnetclient.c b/rnetclient.c
index 4e3f469..e1a3038 100644
--- a/rnetclient.c
+++ b/rnetclient.c
@@ -94,7 +94,7 @@ static int inflateRecord(char *buffer, size_t len, char **out, size_t *olen)
 	zstrm.opaque = Z_NULL;
 	if ((r = inflateInit(&zstrm)) != Z_OK)
 		return -1;
-	*olen = (buffer[3] << 8 & buffer[4]);
+	*olen = (buffer[3] << 8 | buffer[4]);
 	*out = malloc(*olen);
 	if (!out) {
 		inflateEnd(&zstrm);
@@ -174,16 +174,48 @@ static void usage(void)
 	exit(1);
 }
 
+static int rnet_send(gnutls_session_t session, char *buffer, size_t len)
+{
+	char *out;
+	size_t olen;
+	deflateRecord(buffer, len, &out, &olen);
+	gnutls_record_send(session, out, olen);
+	free(out);
+	return 0;
+}
+
+static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
+{
+	char *out;
+	size_t olen;
+	int r;
+	char *buffer;
+	size_t len;
+	rnet_message_expand(message, 6);
+	buffer = (*message)->buffer;
+	r = gnutls_record_recv(session, buffer, 6);
+	len = (buffer[1] << 8 | buffer[2]);
+	rnet_message_expand(message, len);
+	buffer = (*message)->buffer + 6;
+	r = gnutls_record_recv(session, buffer, len);
+	inflateRecord(buffer - 6, len + 6, &out, &olen);
+	rnet_message_del(*message);
+	*message = NULL;
+	rnet_message_expand(message, olen);
+	memcpy((*message)->buffer, out, olen);
+	(*message)->len = olen;
+	free(out);
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
 	int c;
 	int r;
-	char buffer[2048];
-	char *out;
-	size_t olen;
 	struct rnet_decfile *decfile;
 	struct rnet_message *message = NULL;
 	gnutls_session_t session;
+	int finish = 0;
 	
 	if (argc < 2) {
 		usage();
@@ -214,16 +246,59 @@ int main(int argc, char **argv)
 				gnutls_strerror(r));
 
 	rnet_encode(decfile, &message);
-	deflateRecord(message->buffer, message->len, &out, &olen);
-	gnutls_record_send(session, out, olen);
-	free(out);
+	rnet_send(session, message->buffer, message->len);
+	rnet_message_del(message);
 
-	while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0)
-		write(1, buffer, r);
-	close(c);
+	message = NULL;
+	r = rnet_recv(session, &message);
+	if (r || !message || message->len == 0) {
+		fprintf(stderr, "error when receiving response\n");
+		goto out;
+	}
+	write(1, message->buffer, message->len);
+	switch (message->buffer[0]) {
+	case 1: /* go ahead */
+		break;
+	case 3: /* error */
+		finish = 1;
+		break;
+	case 2:
+	case 4:
+	case 5:
+		finish = 1;
+		break;
+	}
+	rnet_message_del(message);
 
-	rnet_decfile_close(decfile);
+	if (finish)
+		goto out;
+
+	message = rnet_decfile_get_file(decfile);
+	rnet_send(session, message->buffer, message->len);
 
+	message = NULL;
+	r = rnet_recv(session, &message);
+	if (r || !message || message->len == 0) {
+		fprintf(stderr, "error when receiving response\n");
+		goto out;
+	}
+	write(1, message->buffer, message->len);
+	switch (message->buffer[0]) {
+	case 3: /* error */
+		finish = 1;
+		break;
+	case 2:
+	case 4:
+	case 5:
+	case 1:
+		finish = 1;
+		break;
+	}
+	
+out:
+	gnutls_bye(session, GNUTLS_SHUT_RDWR);
+	close(c);
+	rnet_decfile_close(decfile);
 	gnutls_global_deinit();
 
 	return 0;