X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Frnetclient.git;a=blobdiff_plain;f=rnet_encode.c;h=fefee79be7cc123dd53bd5180920fc905542d2ef;hp=9800ec6740cc0bf8d5318c290f8d02f7c397ce7b;hb=HEAD;hpb=9cc129999c4236370e638dc9ef69c25f1793fd78

diff --git a/rnet_encode.c b/rnet_encode.c
index 9800ec6..fefee79 100644
--- 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-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
@@ -26,9 +27,9 @@
 #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;
@@ -39,6 +40,14 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	char *uf;
 	uint16_t versao_pgd;
 	uint64_t file_len;
+	char *hash;
+	char *header;
+	uint8_t ret;
+
+	size_t header_size, header_head, header_tail;
+
+	if (client == NULL)
+		client = RNET_DEFAULT_VERSION;
 
 	*msg = rnet_message_new();
 	if (*msg == NULL) {
@@ -46,6 +55,14 @@ 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)
+		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);
@@ -55,6 +72,7 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	exerc = rnet_decfile_get_header_field(decfile, "exerc");
 	uf = rnet_decfile_get_header_field(decfile, "uf");
 	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);
 
 	(*msg)->buffer[0] = 0x40;
 	(*msg)->len = 1;
@@ -63,11 +81,13 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	r = rnet_message_add_u32(msg, "id_dec", id_dec);
 	r = rnet_message_add_ascii(msg, "exercicio", ano);
 	r = rnet_message_add_ascii(msg, "exercicio_pgd", exerc);
+	r = rnet_message_add_buffer(msg, "hash_arq", hash, 16);
+	r = rnet_message_add_buffer(msg, "hash_trans", hash, 16);
 	r = rnet_message_add_ascii(msg, "ni", cpf);
-	r = rnet_message_add_ascii(msg, "tipo_ni", "CPF");
+	r = rnet_message_add_ascii(msg, "tp_ni", "CPF");
 	r = rnet_message_add_u8(msg, "num_ass", 0);
 	r = rnet_message_add_u32(msg, "p_comp", 0);
-	r = rnet_message_add_u8(msg, "ret", 0);
+	r = rnet_message_add_u8(msg, "ret", ret);
 	r = rnet_message_add_u64(msg, "tam_arq", file_len);
 	r = rnet_message_add_u64(msg, "tam_assinado", file_len);
 	r = rnet_message_add_u64(msg, "tam_trans", file_len);
@@ -76,15 +96,24 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	r = rnet_message_add_u16(msg, "versao_pgd", versao_pgd);
 	r = rnet_message_add_u8(msg, "critica_validador", 0x06);
 	r = rnet_message_add_ascii(msg, "ip_loc", "127.0.0.1");
-	r = rnet_message_add_ascii(msg, "versao_java", "1.7.0_03-icedtea;OpenJDK Runtime Environment");
+	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", "201104");
+	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);
 	r = rnet_message_add_u32(msg, "tam_dados_val", 0);
-	r = rnet_message_add_u64(msg, "tam_dados_val_chave", 0);
+	r = rnet_message_add_u32(msg, "tam_dados_val_chave", 0);
 	r = rnet_message_add_u32(msg, "arquivos_restantes", 0);
 
+	free(hash);
+
 	if (r < 0)
-		return r;
+		goto out;
 	return 0;
+
+out:
+	rnet_message_del(*msg);
+	return r;
 }