Skip to content

Commit

Permalink
- Adding coverity badge
Browse files Browse the repository at this point in the history
- Small fixes in tcp stack management
- Fixed mtcp's issue# 67 pertaining to epwget*.
  • Loading branch information
ajamshed committed Apr 20, 2017
1 parent f2d6222 commit d882377
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/ndsl-kaist/mOS-networking-stack.svg?branch=master)](https://travis-ci.org/ndsl-kaist/mOS-networking-stack)
[![Build Status](https://scan.coverity.com/projects/11918/badge.svg)](https://scan.coverity.com/projects/mos-networking-stack)

# mOS-networking-stack

Expand Down
5 changes: 4 additions & 1 deletion core/src/tcp_in.c
Original file line number Diff line number Diff line change
Expand Up @@ -1305,8 +1305,11 @@ UpdateRecvTCPContext(mtcp_manager_t mtcp, struct tcp_stream *cur_stream,
/* SYN retransmit implies our SYN/ACK was lost. Resend */
if (tcph->syn && pctx->p.seq == cur_stream->rcvvar->irs)
Handle_TCP_ST_LISTEN(mtcp, cur_stream, pctx);
else
else {
Handle_TCP_ST_SYN_RCVD(mtcp, cur_stream, pctx);
if (pctx->p.payloadlen > 0 && cur_stream->state == TCP_ST_ESTABLISHED)
Handle_TCP_ST_ESTABLISHED(mtcp, cur_stream, pctx);
}
break;

case TCP_ST_ESTABLISHED:
Expand Down
12 changes: 7 additions & 5 deletions core/src/tcp_out.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,13 @@ SendTCPPacket(struct mtcp_manager *mtcp, tcp_stream *cur_stream,
struct tcp_stream *recvside_stream = cur_stream->pair_stream;
struct tcp_stream *sendside_stream = cur_stream;

if (recvside_stream->rcvvar && recvside_stream->rcvvar->rcvbuf)
pctx.p.offset = (uint64_t)seq2loff(recvside_stream->rcvvar->rcvbuf,
pctx.p.seq, recvside_stream->rcvvar->irs + 1);

UpdateMonitor(mtcp, sendside_stream, recvside_stream, &pctx, false);
if (recvside_stream) {
if (recvside_stream->rcvvar && recvside_stream->rcvvar->rcvbuf)
pctx.p.offset = (uint64_t)seq2loff(recvside_stream->rcvvar->rcvbuf,
pctx.p.seq, recvside_stream->rcvvar->irs + 1);

UpdateMonitor(mtcp, sendside_stream, recvside_stream, &pctx, false);
}
}

#ifdef PKTDUMP
Expand Down
2 changes: 1 addition & 1 deletion samples/epwget/epwget-mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ HandleReadEvent(thread_context_t ctx, int sockid, struct wget_vars *wv)
wv->file_len, wv->file_len / 1024 / 1024);
wv->headerset = TRUE;
wv->recv += (rd - (wv->resp_len - wv->header_len));
rd = (wv->resp_len - wv->header_len);

pbuf += (rd - (wv->resp_len - wv->header_len));
rd = (wv->resp_len - wv->header_len);

} else {
/* failed to parse response header */
Expand Down
2 changes: 1 addition & 1 deletion samples/epwget/epwget.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ HandleReadEvent(thread_context_t ctx, int sockid, struct wget_vars *wv)
wv->file_len, wv->file_len / 1024 / 1024);
wv->headerset = TRUE;
wv->recv += (rd - (wv->resp_len - wv->header_len));
rd = (wv->resp_len - wv->header_len);

pbuf += (rd - (wv->resp_len - wv->header_len));
rd = (wv->resp_len - wv->header_len);

} else {
/* failed to parse response header */
Expand Down

0 comments on commit d882377

Please sign in to comment.