/*
- * Copyright (C) 2013 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
* it under the terms of the GNU General Public License as published by
#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;
+ int r = -EIO;
uint32_t tp_arq;
uint32_t id_dec;
size_t header_size, header_head, header_tail;
+ if (client == NULL)
+ client = RNET_DEFAULT_VERSION;
+
*msg = rnet_message_new();
if (*msg == NULL) {
return -ENOMEM;
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);
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);
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);
free(hash);
if (r < 0)
- return r;
+ goto out;
return 0;
+
+out:
+ rnet_message_del(*msg);
+ return r;
}