summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-03-13 11:30:47 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-03-13 11:45:51 +0100
commit4253eaffd2d17a8ae1026e3068985fb8d39feab0 (patch)
treeebea41b497b67ddad1b3c1a8a0aa494693bfe9fc
parent07196ab8ea16d4fd39f54f11088a854543cf27ac (diff)
downloadecon-4253eaffd2d17a8ae1026e3068985fb8d39feab0.zip
econ-4253eaffd2d17a8ae1026e3068985fb8d39feab0.tar.gz
econ-4253eaffd2d17a8ae1026e3068985fb8d39feab0.tar.bz2
econpacket: Have to use different read strategies for udp and tcp
UDP needs to read the complete packet in one read, so the read size >= packet_size. TCP reads more that one packet if size > packet_size, which we dont want. So do parital reads for tcp, and real it all at once for udp sockets.
-rw-r--r--econpacket.c64
-rw-r--r--econpacket.h6
2 files changed, 63 insertions, 7 deletions
diff --git a/econpacket.c b/econpacket.c
index 7160980..0eac748 100644
--- a/econpacket.c
+++ b/econpacket.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <unistd.h>
+#include <sys/socket.h>
#include <sys/uio.h>
#include "econpacket.h"
@@ -79,15 +80,53 @@ epkt_send(int fd, struct econ_packet *pkt)
return writev(fd, pkt->iov, i);
}
+static int
+iov_max_read(struct iovec *iov, int *iovcnt, size_t size)
+{
+ int i;
+
+ for (i = 0; i < *iovcnt; ++i) {
+ if (iov[i].iov_len > size) {
+ iov[i].iov_len = size;
+ *iovcnt = i+1;
+ return 0;
+ }
+ size -= iov[i].iov_len;
+ }
+
+ if (size > 0)
+ return -1;
+
+ return 0;
+}
+
int
epkt_read(int fd, struct econ_packet *pkt)
{
- union { ssize_t s; size_t u; } len;
+ union { ssize_t s; size_t u; } len, len2;
+ int type;
+ socklen_t length = sizeof(int);
+ int iovcnt;
init_iov(pkt);
pkt->long_data_size = 0;
- len.s = readv(fd, pkt->iov, 4);
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &length) < 0)
+ return -1;
+
+ /* FIXME Do we get the diffs between udp and tcp handled a bit nicer? */
+ switch (type) {
+ case SOCK_STREAM:
+ iovcnt = 1;
+ break;
+ case SOCK_DGRAM:
+ iovcnt = 4;
+ break;
+ default:
+ return -1;
+ }
+
+ len.s = readv(fd, pkt->iov, iovcnt);
if (len.s < 0)
return -1;
@@ -96,13 +135,30 @@ epkt_read(int fd, struct econ_packet *pkt)
return -1;
}
+ fprintf(stderr, "epkt_read: len.u: %zd, cmd: %d, datasize: %d\n",
+ len.u, pkt->hdr.commandID, pkt->hdr.datasize);
+
if (pkt->hdr.datasize == 0) {
if (len.u > sizeof(struct econ_header))
return -1;
return 0;
}
- fprintf(stderr, "epkt_read: len.u: %zd, cmd: %d, datasize: %d\n",
- len.u, pkt->hdr.commandID, pkt->hdr.datasize);
+
+ if (pkt->hdr.datasize > 1024)
+ return -1;
+
+ if (type == SOCK_STREAM) {
+ iovcnt = 3;
+ if (iov_max_read(&pkt->iov[1], &iovcnt, pkt->hdr.datasize) < 0)
+ return -1;
+
+ /* Yes, this may write up to long_data[1024]. */
+ len2.s = readv(fd, &pkt->iov[1], iovcnt);
+ if (len2.s < 0 || len2.u != pkt->hdr.datasize)
+ return -1;
+
+ len.u += len2.u;
+ }
if (len.u != sizeof(struct econ_header) + pkt->hdr.datasize) {
fprintf(stderr, "packet has invalid datasize\n");
diff --git a/econpacket.h b/econpacket.h
index eccb453..fc4aea4 100644
--- a/econpacket.h
+++ b/econpacket.h
@@ -26,14 +26,14 @@ struct econ_packet {
struct econ_command cmd;
struct econ_record rec;
- /* Holding the previous elements */
- struct iovec iov[4];
-
/* Storage for irregular long commands.
* This is just the remaining part, the first
* bytes are stored in cmd and rec. */
char long_data[1024];
size_t long_data_size;
+
+ /* Holding the previous elements */
+ struct iovec iov[4];
};
void