Github user jpeach commented on a diff in the pull request:
https://github.com/apache/trafficserver/pull/1294#discussion_r94717094
--- Diff: iocore/net/BIO_fastopen.cc ---
@@ -116,39 +115,21 @@ static long
fastopen_ctrl(BIO *bio, int cmd, long larg, void *ptr)
{
switch (cmd) {
- case BIO_C_SET_FD:
- ink_assert(larg == BIO_CLOSE || larg == BIO_NOCLOSE);
- ink_assert(bio->num == NO_FD);
-
- bio->init = 1;
- bio->shutdown = larg;
- bio->num = *reinterpret_cast<int *>(ptr);
- return 0;
-
case BIO_C_SET_CONNECT:
// We only support BIO_set_conn_address(), which sets a sockaddr.
ink_assert(larg == 2);
- bio->ptr = ptr;
+ BIO_set_data(bio, ptr);
return 0;
- // We are unbuffered so unconditionally succeed on BIO_flush().
- case BIO_CTRL_FLUSH:
- return 1;
-
- case BIO_CTRL_PUSH:
- case BIO_CTRL_POP:
- return 0;
-
- default:
-#if DEBUG
- ink_abort("unsupported BIO control cmd=%d larg=%ld ptr=%p", cmd, larg,
ptr);
-#endif
-
- return 0;
+ case BIO_C_SET_FD:
+ ink_assert(larg == BIO_CLOSE || larg == BIO_NOCLOSE);
+ ink_assert(BIO_get_fd(bio, nullptr) == NO_FD);
--- End diff --
I don't think you need to worry about keeping this any more.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
