Release 2017.1

[cascardo/rnetclient.git] / rnet_encode.c

diff --git a/rnet_encode.c b/rnet_encode.c
index b653199..fefee79 100644 (file)
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2013-2014  Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ *  Copyright (C) 2013-2017  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
@@ -27,7 +27,7 @@
 #include "rnet_message.h"
 #include "decfile.h"
 
-int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
+int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg, char *client)
 {
        int r = -EIO;
 
@@ -46,6 +46,9 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 
        size_t header_size, header_head, header_tail;
 
+       if (client == NULL)
+               client = RNET_DEFAULT_VERSION;
+
        *msg = rnet_message_new();
        if (*msg == NULL) {
                return -ENOMEM;
@@ -56,6 +59,10 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        if (!hash)
                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,27 +74,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, "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_size = RNET_HEADER_SIZE_2013;
-               header_head = RNET_HEADER_HEAD_2013;
-               header_tail = RNET_HEADER_TAIL_2013;
-       } else {
-               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);
@@ -113,7 +99,7 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
        r = rnet_message_add_ascii(msg, "versao_java", "1.5.0-gij;Free Software rnetclient pretending to be GNU Interpreter for Java");
        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_ascii(msg, "cliente", client);
        r = rnet_message_add_buffer(msg, "dados_val",
                                    header + header_head,
                                    header_size - header_tail - header_head);
@@ -127,8 +113,6 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
                goto out;
        return 0;
 
-out2:
-       free(hash);
 out:
        rnet_message_del(*msg);
        return r;