Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1483?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Change stream_buf_read_setup_dowork parameter to struct
steam_buf
......................................................................
Change stream_buf_read_setup_dowork parameter to struct steam_buf
This methods only ever access sock->stream_buf so make the method
simpler by just having a parameter sb.
Change-Id: I3deb7cd75db3cb280fa8d9c637cd3bde3881d6e3
---
M src/openvpn/socket.c
M src/openvpn/socket.h
2 files changed, 21 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/83/1483/4
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 58ccda9..c463041 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -2111,22 +2111,22 @@
}
bool
-stream_buf_read_setup_dowork(struct link_socket *sock)
+stream_buf_read_setup_dowork(struct stream_buf *sb)
{
- if (sock->stream_buf.residual.len &&
!sock->stream_buf.residual_fully_formed)
+ if (sb->residual.len && !sb->residual_fully_formed)
{
- ASSERT(buf_copy(&sock->stream_buf.buf, &sock->stream_buf.residual));
- ASSERT(buf_init(&sock->stream_buf.residual, 0));
- sock->stream_buf.residual_fully_formed =
stream_buf_added(&sock->stream_buf, 0);
+ ASSERT(buf_copy(&sb->buf, &sb->residual));
+ ASSERT(buf_init(&sb->residual, 0));
+ sb->residual_fully_formed = stream_buf_added(sb, 0);
dmsg(D_STREAM_DEBUG, "STREAM: RESIDUAL FULLY FORMED [%s], len=%d",
- sock->stream_buf.residual_fully_formed ? "YES" : "NO",
sock->stream_buf.residual.len);
+ sb->residual_fully_formed ? "YES" : "NO", sb->residual.len);
}
- if (!sock->stream_buf.residual_fully_formed)
+ if (!sb->residual_fully_formed)
{
- stream_buf_set_next(&sock->stream_buf);
+ stream_buf_set_next(sb);
}
- return !sock->stream_buf.residual_fully_formed;
+ return !sb->residual_fully_formed;
}
static bool
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 850064d..3f46dc6 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -528,14 +528,24 @@
}
}
-bool stream_buf_read_setup_dowork(struct link_socket *sock);
+/**
+ * Will try to check if the buffers in stream form a
+ * full packet. Will return true if further reads are
+ * required and false otherwise. (full packet is ready)
+ *
+ * With UDP we always return true as there is no reassembly.
+ *
+ * @param sb the stream buffer that should be worked on
+ * @return true if more reads are required.
+ */
+bool stream_buf_read_setup_dowork(struct stream_buf *sb);
static inline bool
stream_buf_read_setup(struct link_socket *sock)
{
if (link_socket_connection_oriented(sock))
{
- return stream_buf_read_setup_dowork(sock);
+ return stream_buf_read_setup_dowork(&sock->stream_buf);
}
else
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1483?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3deb7cd75db3cb280fa8d9c637cd3bde3881d6e3
Gerrit-Change-Number: 1483
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
