projects
/
cascardo
/
rnetclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update cliente version to that of ReceitaNet 2014.
[cascardo/rnetclient.git]
/
rnetclient.c
diff --git
a/rnetclient.c
b/rnetclient.c
index
2b98cc4
..
a58b62b
100644
(file)
--- a/
rnetclient.c
+++ b/
rnetclient.c
@@
-31,6
+31,10
@@
#include "rnet_message.h"
#include "rnet_encode.h"
#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;
static void * get_creds(char *certfile)
{
static gnutls_certificate_credentials_t cred;
@@
-94,7
+98,7
@@
static int inflateRecord(char *buffer, size_t len, char **out, size_t *olen)
zstrm.opaque = Z_NULL;
if ((r = inflateInit(&zstrm)) != Z_OK)
return -1;
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);
*out = malloc(*olen);
if (!out) {
inflateEnd(&zstrm);
@@
-195,7
+199,7
@@
static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
buffer = (*message)->buffer;
r = gnutls_record_recv(session, buffer, 6);
if (buffer[0] == 0x01) {
buffer = (*message)->buffer;
r = gnutls_record_recv(session, buffer, 6);
if (buffer[0] == 0x01) {
- len =
(buffer[1] << 8 | buffer[2]
);
+ len =
chars2len(buffer+1
);
rnet_message_expand(message, len);
buffer = (*message)->buffer + 6;
r = gnutls_record_recv(session, buffer, len);
rnet_message_expand(message, len);
buffer = (*message)->buffer + 6;
r = gnutls_record_recv(session, buffer, len);
@@
-207,7
+211,7
@@
static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
(*message)->len = olen;
free(out);
} else {
(*message)->len = olen;
free(out);
} else {
- len =
(buffer[1] << 8 | buffer[2]
);
+ len =
chars2len(buffer+1
);
rnet_message_expand(message, len - 1);
buffer = (*message)->buffer + 6;
r = gnutls_record_recv(session, buffer, len - 1);
rnet_message_expand(message, len - 1);
buffer = (*message)->buffer + 6;
r = gnutls_record_recv(session, buffer, len - 1);
@@
-311,7
+315,7
@@
int main(int argc, char **argv)
r == EAI_SYSTEM ? strerror(errno) : gai_strerror(r));
exit(1);
}
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);
r = handshake(c);
if (r < 0) {
exit(1);