Support header for 2016.

[cascardo/rnetclient.git] / rnet_encode.c

diff --git a/rnet_encode.c b/rnet_encode.c
index fb86942..a0f3717 100644 (file)
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -29,7 +29,7 @@
 
 int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 {
-       int r;
+       int r = -EIO;
 
        uint32_t tp_arq;
        uint32_t id_dec;
@@ -54,8 +54,12 @@ 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);
+       header_head = RNET_HEADER_HEAD_COMMON;
+       header_tail = RNET_HEADER_TAIL_COMMON;
+       /* This was already checked at parse time. */
+       header_size = strlen(header);
 
        codigo_recnet = rnet_decfile_get_header_field(decfile, "codigo_recnet");
        tp_arq = strtoul(codigo_recnet, NULL, 10);
@@ -67,22 +71,6 @@ 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_size = RNET_HEADER_SIZE_2014;
-               header_head = RNET_HEADER_HEAD_2014;
-               header_tail = RNET_HEADER_TAIL_2014;
-       } else if (!strcmp(exerc, "2013")) {
-               header_size = RNET_HEADER_SIZE_2013;
-               header_head = RNET_HEADER_HEAD_2013;
-               header_tail = RNET_HEADER_TAIL_2013;
-       } else {
-               return -EINVAL;
-       }
-
-       /* 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);
@@ -119,6 +107,10 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        free(hash);
 
        if (r < 0)
-               return r;
+               goto out;
        return 0;
+
+out:
+       rnet_message_del(*msg);
+       return r;
 }