X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=rnet_encode.c;h=d37f06bdd6b3eae4ea9e2fae4cf6a9308667b700;hb=df21e3f7fa59a9f2c1d0e95be33c8f99adbac314;hp=5945ace8efb650146e4fb9435d4e32616c743f45;hpb=e5fff2cb284ed4f7b9aac302b6adbb39777d39c9;p=cascardo%2Frnetclient.git

diff --git a/rnet_encode.c b/rnet_encode.c
index 5945ace..d37f06b 100644
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -37,12 +37,22 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	char *ano;
 	char *exerc;
 	char *uf;
+	uint16_t versao_pgd;
+	uint64_t file_len;
+	char *hash;
+	char *header;
 
 	*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;
+	header = rnet_decfile_get_header(decfile);
+
 	codigo_recnet = rnet_decfile_get_header_field(decfile, "codigo_recnet");
 	tp_arq = strtoul(codigo_recnet, NULL, 10);
 	id_dec = strtoul(rnet_decfile_get_header_field(decfile, "hash"), NULL, 10);
@@ -50,21 +60,40 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	ano = rnet_decfile_get_header_field(decfile, "ano");
 	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);
 
 	(*msg)->buffer[0] = 0x40;
 	(*msg)->len = 1;
-	r = rnet_message_add_u32(*msg, "a_comp", 0);
-	r = rnet_message_add_u32(*msg, "tp_arq", tp_arq);
-	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_ascii(*msg, "ni", cpf);
-	r = rnet_message_add_ascii(*msg, "tipo_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_ascii(*msg, "uf", uf);
-	r = rnet_message_add_u8(*msg, "vrs_des_pa", 0);
+	r = rnet_message_add_u32(msg, "a_comp", 0);
+	r = rnet_message_add_u32(msg, "tp_arq", tp_arq);
+	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, "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_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);
+	r = rnet_message_add_ascii(msg, "uf", uf);
+	r = rnet_message_add_u8(msg, "vrs_des_pa", 0);
+	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, "origem", "JA2R");
+	r = rnet_message_add_ascii(msg, "so", "GNU");
+	r = rnet_message_add_ascii(msg, "cliente", "201104");
+	r = rnet_message_add_buffer(msg, "dados_val", header + 111, 750 - 111);
+	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);
+
+	free(hash);
 
 	if (r < 0)
 		return r;