X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Frnetclient.git;a=blobdiff_plain;f=rnet_encode.c;fp=rnet_encode.c;h=a0f371791cbddf96060a203b93ec951336e8a922;hp=b653199341f61e081b2e50c8a87ad4c096e8cb2f;hb=dcf28e8ddf45318e242546a0c70bd27339d70812;hpb=147fc799f60a5799bd569e6da5542c4b7df132b7

diff --git a/rnet_encode.c b/rnet_encode.c
index b653199..a0f3717 100644
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -56,6 +56,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 +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, "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);
@@ -127,8 +110,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;