#include "rnet_message.h"
#include "rnet_encode.h"
+static size_t chars2len (unsigned char buf[2]) {
+ return (buf[0] << 8 | buf[1]);
+}
+
static void * get_creds(char *certfile)
{
static gnutls_certificate_credentials_t cred;
gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, cred);
}
-static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen)
+static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen, int header)
{
z_stream zstrm;
int r;
free(*out);
return -1;
}
- *olen = zstrm.avail_out + 6;
+ *olen = zstrm.total_out + 6;
(*out)[0] = 0x1;
- (*out)[1] = (zstrm.avail_out >> 8);
- (*out)[2] = (zstrm.avail_out & 0xff);
+ (*out)[1] = (zstrm.total_out >> 8);
+ (*out)[2] = (zstrm.total_out & 0xff);
(*out)[3] = (len >> 8);
(*out)[4] = (len & 0xff);
- (*out)[5] = 0x1;
+ (*out)[5] = header ? 0x01 : 0x0;
deflateEnd(&zstrm);
return 0;
}
zstrm.opaque = Z_NULL;
if ((r = inflateInit(&zstrm)) != Z_OK)
return -1;
- *olen = (buffer[3] << 8 | buffer[4]);
+ *olen = chars2len(buffer+3);
*out = malloc(*olen);
if (!out) {
inflateEnd(&zstrm);
char buffer[16];
int r;
buffer[0] = 1;
- write(c, buffer, 1);
- write(c, "00000000000000", 14);
+ r = write(c, buffer, 1);
+ if (r < 1)
+ return -1;
+ r = write(c, "00000000000000", 14);
+ if (r < 14)
+ return -1;
r = read(c, buffer, 1);
if (r != 1 && buffer[0] != 'E')
return -1;
exit(1);
}
-static int rnet_send(gnutls_session_t session, char *buffer, size_t len)
+static int rnet_send(gnutls_session_t session, char *buffer, size_t len, int header)
{
- char *out;
- size_t olen;
- deflateRecord(buffer, len, &out, &olen);
- gnutls_record_send(session, out, olen);
- free(out);
- return 0;
+ int r = 0;
+ /* Large files have to be uploaded as multiple
+ separately-deflated chunks, because the compressed and
+ uncompressed lengths in each record are encoded in unsigned
+ 16-bit integers each.
+
+ The header can't be split into multiple chunks, and it
+ should never have to, since it won't ever get even close to
+ 64KiB.
+
+ The uploaded file may be larger: to upload such large
+ files, it suffices to send multiple records till the entire
+ file is transferred, without waiting for a response. Since
+ we've alread informed the server of the file size in the
+ header, it knows exactly how much data to expect before
+ sending a response. It will only send an error message
+ before that if it times us out.
+
+ Odds are that any reasonably large size will do, but it
+ can't be too close to 64KiB, otherwise there won't be room
+ for the compressed length should it not compress well,
+ which should never happen for capital-ASCII-only
+ declaration files, but who knows?
+
+ This chunk size worked at the first try, uploading a
+ ~100KiB file, so let's stick with it. */
+ const int maxc = 64472;
+ if (header && len > maxc)
+ return -1;
+
+ do {
+ char *out = NULL;
+ size_t olen;
+ size_t clen = len < maxc ? len : maxc;
+ r = deflateRecord(buffer, clen, &out, &olen, header);
+ if (!r) {
+ size_t n = gnutls_record_send(session, out, olen);
+ if (n != olen)
+ r = -1;
+ }
+ free(out);
+ buffer += clen;
+ len -= clen;
+ } while (len && !r);
+ return r;
}
static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
rnet_message_expand(message, 6);
buffer = (*message)->buffer;
r = gnutls_record_recv(session, buffer, 6);
- len = (buffer[1] << 8 | buffer[2]);
- rnet_message_expand(message, len);
- buffer = (*message)->buffer + 6;
- r = gnutls_record_recv(session, buffer, len);
- inflateRecord(buffer - 6, len + 6, &out, &olen);
- rnet_message_del(*message);
- *message = NULL;
- rnet_message_expand(message, olen);
- memcpy((*message)->buffer, out, olen);
- (*message)->len = olen;
- free(out);
+ if (buffer[0] == 0x01) {
+ len = chars2len(buffer+1);
+ rnet_message_expand(message, len);
+ buffer = (*message)->buffer + 6;
+ r = gnutls_record_recv(session, buffer, len);
+ inflateRecord(buffer - 6, len + 6, &out, &olen);
+ rnet_message_del(*message);
+ *message = NULL;
+ rnet_message_expand(message, olen);
+ memcpy((*message)->buffer, out, olen);
+ (*message)->len = olen;
+ free(out);
+ } else {
+ len = chars2len(buffer+1);
+ rnet_message_expand(message, len - 1);
+ buffer = (*message)->buffer + 6;
+ r = gnutls_record_recv(session, buffer, len - 1);
+ (*message)->len = len + 4;
+ rnet_message_strip(*message, 4);
+ }
return 0;
}
umask(mask);
}
-static void handle_response_already_found(char *cpf, struct rnet_message *message)
+static void handle_response_text_and_file(char *cpf, struct rnet_message *message)
{
char *value;
int vlen;
save_rec_file(cpf, value, vlen);
}
+static void handle_response_already_found(char *cpf, struct rnet_message *message)
+{
+ handle_response_text_and_file(cpf, message);
+}
+
+static void handle_response_error(struct rnet_message *message)
+{
+ char *value;
+ int vlen;
+ if (!rnet_message_parse(message, "texto", &value, &vlen))
+ fprintf(stderr, "%.*s\n", vlen, value);
+ fprintf(stderr, "Error transmiting DEC file.\n");
+}
+
int main(int argc, char **argv)
{
int c;
r == EAI_SYSTEM ? strerror(errno) : gai_strerror(r));
exit(1);
}
- gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) c);
+ gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)(intptr_t) c);
r = handshake(c);
if (r < 0) {
exit(1);
gnutls_strerror(r));
rnet_encode(decfile, &message);
- rnet_send(session, message->buffer, message->len);
+ rnet_send(session, message->buffer, message->len, 1);
rnet_message_del(message);
message = NULL;
}
switch (message->buffer[0]) {
case 1: /* go ahead */
+ handle_response_text_and_file(cpf, message);
break;
case 3: /* error */
+ handle_response_error(message);
finish = 1;
break;
case 4:
break;
case 2:
case 5:
+ handle_response_text_and_file(cpf, message);
finish = 1;
break;
}
goto out;
message = rnet_decfile_get_file(decfile);
- rnet_send(session, message->buffer, message->len);
+ rnet_send(session, message->buffer, message->len, 0);
message = NULL;
r = rnet_recv(session, &message);
}
switch (message->buffer[0]) {
case 3: /* error */
- finish = 1;
+ handle_response_error(message);
break;
case 2:
case 4:
case 5:
case 1:
- finish = 1;
+ handle_response_text_and_file(cpf, message);
break;
}