Release 2015.1

[cascardo/rnetclient.git] / rnet_encode.c

diff --git a/rnet_encode.c b/rnet_encode.c
index 2bf705a..b653199 100644 (file)
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2013  Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ *  Copyright (C) 2013-2014  Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ *  Copyright (C) 2014  Alexandre Oliva <lxoliva@fsfla.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
@@ -26,14 +27,9 @@
 #include "rnet_message.h"
 #include "decfile.h"
 
-#define RNET_HEADER_START_2013 111
-#define RNET_HEADER_END_2013 (RNET_HEADER_SIZE_2013 - 15)
-#define RNET_HEADER_START_2014 111
-#define RNET_HEADER_END_2014 (RNET_HEADER_SIZE_2014 - 15)
-
 int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 {
-       int r;
+       int r = -EIO;
 
        uint32_t tp_arq;
        uint32_t id_dec;
@@ -48,7 +44,7 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        char *header;
        uint8_t ret;
 
-       size_t header_start, header_end;
+       size_t header_size, header_head, header_tail;
 
        *msg = rnet_message_new();
        if (*msg == NULL) {
@@ -58,7 +54,7 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        file_len = rnet_decfile_get_file(decfile)->len;
        hash = rnet_decfile_get_file_hash(decfile);
        if (!hash)
-               return -1;
+               goto out;
        header = rnet_decfile_get_header(decfile);
 
        codigo_recnet = rnet_decfile_get_header_field(decfile, "codigo_recnet");
@@ -71,16 +67,27 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        versao_pgd = strtoul(rnet_decfile_get_header_field(decfile, "nr_versao"), NULL, 10);
        ret = strtoul(rnet_decfile_get_header_field(decfile, "in_ret"), NULL, 10);
 
-       if (!strcmp(exerc, "2014")) {
-               header_start = RNET_HEADER_START_2014;
-               header_end = RNET_HEADER_END_2014;
+       if (!strcmp(exerc, "2015")) {
+               header_size = RNET_HEADER_SIZE_2015;
+               header_head = RNET_HEADER_HEAD_2015;
+               header_tail = RNET_HEADER_TAIL_2015;
+       } else if (!strcmp(exerc, "2014")) {
+               header_size = RNET_HEADER_SIZE_2014;
+               header_head = RNET_HEADER_HEAD_2014;
+               header_tail = RNET_HEADER_TAIL_2014;
        } else if (!strcmp(exerc, "2013")) {
-               header_start = RNET_HEADER_START_2013;
-               header_end = RNET_HEADER_END_2013;
+               header_size = RNET_HEADER_SIZE_2013;
+               header_head = RNET_HEADER_HEAD_2013;
+               header_tail = RNET_HEADER_TAIL_2013;
        } else {
-               return -EINVAL;
+               r = -EINVAL;
+               goto out2;
        }
 
+       /* This was already checked at parse time.  */
+       if (strlen (header) != header_size)
+               abort ();
+
        (*msg)->buffer[0] = 0x40;
        (*msg)->len = 1;
        r = rnet_message_add_u32(msg, "a_comp", 0);
@@ -107,7 +114,9 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        r = rnet_message_add_ascii(msg, "origem", "JA2R");
        r = rnet_message_add_ascii(msg, "so", "GNU");
        r = rnet_message_add_ascii(msg, "cliente", "201105");
-       r = rnet_message_add_buffer(msg, "dados_val", header + header_start, header_end - header_start);
+       r = rnet_message_add_buffer(msg, "dados_val",
+                                   header + header_head,
+                                   header_size - header_tail - header_head);
        r = rnet_message_add_u32(msg, "tam_dados_val", 0);
        r = rnet_message_add_u32(msg, "tam_dados_val_chave", 0);
        r = rnet_message_add_u32(msg, "arquivos_restantes", 0);
@@ -115,6 +124,12 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        free(hash);
 
        if (r < 0)
-               return r;
+               goto out;
        return 0;
+
+out2:
+       free(hash);
+out:
+       rnet_message_del(*msg);
+       return r;
 }