Check for responses and send second message.

[cascardo/libreceita.git] / rnetclient.c

diff --git a/rnetclient.c b/rnetclient.c
index f93f386..e1a3038 100644 (file)
--- a/rnetclient.c
+++ b/rnetclient.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012  Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ *  Copyright (C) 2012-2013  Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
 #include <netdb.h>
 #include <gnutls/gnutls.h>
 #include <zlib.h>
+#include "decfile.h"
+#include "rnet_message.h"
+#include "rnet_encode.h"
 
 static void * get_creds(char *certfile)
 {
@@ -91,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);
@@ -165,15 +168,67 @@ static int handshake(int c)
        return 0;
 }
 
+static void usage(void)
+{
+       fprintf(stderr, "rnetclient [filename]\n");
+       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();
+       }
+
+       decfile = rnet_decfile_open(argv[1]);
+       if (!decfile) {
+               fprintf(stderr, "could not parse %s: %s\n", argv[1], strerror(errno));
+               exit(1);
+       }
+
        gnutls_global_init();
+
        session_new(&session);
        r = connect_rnet(&c);
        if (r) {
@@ -189,15 +244,62 @@ int main(int argc, char **argv)
        if ((r = gnutls_handshake(session)) < 0)
                fprintf(stderr, "error in handshake: %s\n",
                                gnutls_strerror(r));
-       else
-               fprintf(stderr, "handshake ok\n");
-       r = read(0, buffer, sizeof(buffer));
-       deflateRecord(buffer, r, &out, &olen);
-       gnutls_record_send(session, out, olen);
-       free(out);
-       while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0)
-               write(1, buffer, r);
+
+       rnet_encode(decfile, &message);
+       rnet_send(session, message->buffer, message->len);
+       rnet_message_del(message);
+
+       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);
+
+       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;
 }