Add more fields to the first message.

[cascardo/rnetclient.git] / rnetclient.c

diff --git a/rnetclient.c b/rnetclient.c
index e4c7638..4e3f469 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)
 {
@@ -149,6 +152,28 @@ static int connect_rnet(int *c)
        return 0;
 }
 
+static int handshake(int c)
+{
+       char buffer[16];
+       int r;
+       buffer[0] = 1;
+       write(c, buffer, 1);
+       write(c, "00000000000000", 14);
+       r = read(c, buffer, 1);
+       if (r != 1 && buffer[0] != 'E')
+               return -1;
+       r = read(c, buffer, 14);
+       if (r != 14)
+               return -1;
+       return 0;
+}
+
+static void usage(void)
+{
+       fprintf(stderr, "rnetclient [filename]\n");
+       exit(1);
+}
+
 int main(int argc, char **argv)
 {
        int c;
@@ -156,8 +181,22 @@ int main(int argc, char **argv)
        char buffer[2048];
        char *out;
        size_t olen;
+       struct rnet_decfile *decfile;
+       struct rnet_message *message = NULL;
        gnutls_session_t session;
+       
+       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) {
@@ -166,27 +205,26 @@ int main(int argc, char **argv)
                exit(1);
        }
        gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) c);
-       buffer[0] = 1;
-       write(c, buffer, 1);
-       write(c, "00000000000000", 14);
-       r = read(c, buffer, 1);
-       if (r != 1 && buffer[0] != 'E')
-               exit(1);
-       r = read(c, buffer, 14);
-       if (r != 14)
+       r = handshake(c);
+       if (r < 0) {
                exit(1);
+       }
        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);
+
+       rnet_encode(decfile, &message);
+       deflateRecord(message->buffer, message->len, &out, &olen);
        gnutls_record_send(session, out, olen);
        free(out);
+
        while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0)
                write(1, buffer, r);
        close(c);
+
+       rnet_decfile_close(decfile);
+
        gnutls_global_deinit();
+
        return 0;
 }