| Submitter | Michael Roth |
|---|---|
| Date | Nov. 16, 2010, 1:16 a.m. |
| Message ID | <1289870175-14880-11-git-send-email-mdroth@linux.vnet.ibm.com> |
| Download | mbox | patch |
| Permalink | /patch/71329/ |
| State | New |
| Headers | show |
Comments
On 11/16/10 02:16, Michael Roth wrote: > + if (pkt->type == VP_PKT_CLIENT) { > + TRACE("recieved client packet, client fd: %d, server fd: %d", > + pkt->payload.proxied.client_fd, pkt->payload.proxied.server_fd); > + fd = pkt->payload.proxied.server_fd; > + } else if (pkt->type == VP_PKT_SERVER) { > + TRACE("recieved server packet, client fd: %d, server fd: %d", > + pkt->payload.proxied.client_fd, pkt->payload.proxied.server_fd); > + fd = pkt->payload.proxied.client_fd; > + } else { > + TRACE("unknown packet type"); > + return -1; > + } -1 isn't a very friendly error value to pass up the stack. > + /* TODO: proxied in non-blocking mode can causes us to spin here > + * for slow servers/clients. need to use write()'s and maintain > + * a per-conn write queue that we clear out before sending any > + * more data to the fd > + */ > + ret = vp_send_all(fd, (void *)pkt->payload.proxied.data, > + pkt->payload.proxied.bytes); > + if (ret == -1) { > + LOG("error sending data over channel"); > + return -1; > + } else if (ret != pkt->payload.proxied.bytes) { > + TRACE("buffer full?"); > + return -1; > + } Again here, please pass the error codes up the stack so we can later handle them appropriately. Cheers, Jes
Patch
diff --git a/virtproxy.c b/virtproxy.c index f189e2c..a0bbe7f 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -268,6 +268,48 @@ static void vp_channel_accept(void *opaque) vp_set_fd_handler(drv->listen_fd, NULL, NULL, NULL); } +/* handle data packets + * + * process VPPackets containing data and send them to the corresponding + * FDs + */ +static int vp_handle_data_packet(void *drv, const VPPacket *pkt) +{ + int fd, ret; + + TRACE("called with drv: %p", drv); + + if (pkt->type == VP_PKT_CLIENT) { + TRACE("recieved client packet, client fd: %d, server fd: %d", + pkt->payload.proxied.client_fd, pkt->payload.proxied.server_fd); + fd = pkt->payload.proxied.server_fd; + } else if (pkt->type == VP_PKT_SERVER) { + TRACE("recieved server packet, client fd: %d, server fd: %d", + pkt->payload.proxied.client_fd, pkt->payload.proxied.server_fd); + fd = pkt->payload.proxied.client_fd; + } else { + TRACE("unknown packet type"); + return -1; + } + + /* TODO: proxied in non-blocking mode can causes us to spin here + * for slow servers/clients. need to use write()'s and maintain + * a per-conn write queue that we clear out before sending any + * more data to the fd + */ + ret = vp_send_all(fd, (void *)pkt->payload.proxied.data, + pkt->payload.proxied.bytes); + if (ret == -1) { + LOG("error sending data over channel"); + return -1; + } else if (ret != pkt->payload.proxied.bytes) { + TRACE("buffer full?"); + return -1; + } + + return 0; +} + /* process a stream of packets coming in from the channel */ int vp_handle_packet_buf(VPDriver *drv, const void *buf, int count) {
Process VPPackets coming in from channel and send them to the appropriate server/client connections. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- virtproxy.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-)