Skip to content

Remove symbols with prefix INKUDP from plugin API #11171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ywkaras merged 1 commit into from
Mar 25, 2024
Merged

Remove symbols with prefix INKUDP from plugin API #11171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions doc/release-notes/whats-new.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,8 @@ C++ Plugin API Deprecated
^^^^^^^^^^^^^^^^^^^^^^^^^

It is deprecated in this release. It will be deleted in ATS 11.

Symbols With INKUDP Prefix
^^^^^^^^^^^^^^^^^^^^^^^^^^

In the plugin API, all types and functions starting with the prefix INKUDP are removed.
18 changes: 9 additions & 9 deletions include/iocore/eventsystem/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
#define QPACK_EVENT_EVENTS_START 2700
#define NT_ASYNC_CONNECT_EVENT_EVENTS_START 3000
#define NT_ASYNC_IO_EVENT_EVENTS_START 3100
#define RAFT_EVENT_EVENTS_START 3200
#define SIMPLE_EVENT_EVENTS_START 3300
#define UPDATE_EVENT_EVENTS_START 3500
#define AIO_EVENT_EVENTS_START 3900
#define BLOCK_CACHE_EVENT_EVENTS_START 4000
#define UTILS_EVENT_EVENTS_START 5000
#define INK_API_EVENT_EVENTS_START 60000
#define SRV_EVENT_EVENTS_START 62000
#define REMAP_EVENT_EVENTS_START 63000
// #define RAFT_EVENT_EVENTS_START 3200 Not currently used
#define SIMPLE_EVENT_EVENTS_START 3300
#define UPDATE_EVENT_EVENTS_START 3500
#define AIO_EVENT_EVENTS_START 3900
#define BLOCK_CACHE_EVENT_EVENTS_START 4000
#define UTILS_EVENT_EVENTS_START 5000
#define INK_API_EVENT_EVENTS_START 60000
#define SRV_EVENT_EVENTS_START 62000
#define REMAP_EVENT_EVENTS_START 63000

// define misc events here
#define ONE_WAY_TUNNEL_EVENT_PEER_CLOSE (SIMPLE_EVENT_EVENTS_START + 1)
Expand Down
61 changes: 0 additions & 61 deletions include/ts/InkAPIPrivateIOCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,64 +129,3 @@ int TSMutexCheck(TSMutex mutex);
/* IOBuffer */
int64_t TSIOBufferBlockDataSizeGet(TSIOBufferBlock blockp);
void TSIOBufferBlockDestroy(TSIOBufferBlock blockp);
using INKUDPPacket = void *;
using INKUDPacketQueue = void *;
using INKUDPConn = void *;
/* ===== UDP Connections ===== */
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
TSAction INKUDPBind(TSCont contp, unsigned int ip, int port);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
TSAction INKUDPSendTo(TSCont contp, INKUDPConn udp, unsigned int ip, int port, char *buf, int len);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
TSAction INKUDPRecvFrom(TSCont contp, INKUDPConn udp);

/****************************************************************************
* Return file descriptor.
* contact: OXYGEN
****************************************************************************/
int INKUDPConnFdGet(INKUDPConn udp);

/* ===== UDP Packet ===== */
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
INKUDPPacket INKUDPPacketCreate();

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
TSIOBufferBlock INKUDPPacketBufferBlockGet(INKUDPPacket packet);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
unsigned int INKUDPPacketFromAddressGet(INKUDPPacket packet);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
int INKUDPPacketFromPortGet(INKUDPPacket packet);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
INKUDPConn INKUDPPacketConnGet(INKUDPPacket packet);

/****************************************************************************
* contact: OXYGEN
****************************************************************************/
void INKUDPPacketDestroy(INKUDPPacket packet);

/* ===== Packet Queue ===== */
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
INKUDPPacket INKUDPPacketGet(INKUDPacketQueue queuep);
132 changes: 0 additions & 132 deletions src/api/InkIOCoreAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,138 +422,6 @@ INKBasedTimeGet()
return ink_get_hrtime();
}

/* UDP Connection Interface */

TSAction
INKUDPBind(TSCont contp, unsigned int ip, int port)
{
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);

FORCE_PLUGIN_SCOPED_MUTEX(contp);

struct sockaddr_in addr;
ats_ip4_set(&addr, ip, htons(port));

return reinterpret_cast<TSAction>(
udpNet.UDPBind((Continuation *)contp, ats_ip_sa_cast(&addr), -1, INK_ETHERNET_MTU_SIZE, INK_ETHERNET_MTU_SIZE));
}

TSAction
INKUDPSendTo(TSCont contp, INKUDPConn udp, unsigned int ip, int port, char *data, int64_t len)
{
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);

FORCE_PLUGIN_SCOPED_MUTEX(contp);
UDPPacket *packet = UDPPacket::new_UDPPacket();
UDPConnection *conn = (UDPConnection *)udp;

ats_ip4_set(&packet->to, ip, htons(port));

IOBufferBlock *blockp = new_IOBufferBlock();
blockp->alloc(BUFFER_SIZE_INDEX_32K);

if (len > index_to_buffer_size(BUFFER_SIZE_INDEX_32K)) {
len = index_to_buffer_size(BUFFER_SIZE_INDEX_32K) - 1;
}

memcpy(blockp->start(), data, len);
blockp->fill(len);

packet->append_block((IOBufferBlock *)blockp);
/* (Jinsheng 11/27/00) set connection twice which causes:
FATAL: ../../../proxy/iocore/UDPPacket.h:136:
failed assert `!m_conn` */

/* packet->setConnection ((UDPConnection *)udp); */
return reinterpret_cast<TSAction>(conn->send((Continuation *)contp, packet));
}

TSAction
INKUDPRecvFrom(TSCont contp, INKUDPConn udp)
{
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);

FORCE_PLUGIN_SCOPED_MUTEX(contp);
UDPConnection *conn = (UDPConnection *)udp;
return reinterpret_cast<TSAction>(conn->recv((Continuation *)contp));
}

int
INKUDPConnFdGet(INKUDPConn udp)
{
UDPConnection *conn = (UDPConnection *)udp;
return conn->getFd();
}

/* UDP Packet */
INKUDPPacket
INKUDPPacketCreate()
{
UDPPacket *packet = UDPPacket::new_UDPPacket();
return ((INKUDPPacket)packet);
}

TSIOBufferBlock
INKUDPPacketBufferBlockGet(INKUDPPacket packet)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)packet) == TS_SUCCESS);

UDPPacket *p = (UDPPacket *)packet;
return ((TSIOBufferBlock)p->getIOBlockChain());
}

unsigned int
INKUDPPacketFromAddressGet(INKUDPPacket packet)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)packet) == TS_SUCCESS);

UDPPacket *p = (UDPPacket *)packet;
return ats_ip4_addr_cast(&p->from);
}

int
INKUDPPacketFromPortGet(INKUDPPacket packet)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)packet) == TS_SUCCESS);

UDPPacket *p = (UDPPacket *)packet;
return ats_ip_port_host_order(&p->from);
}

INKUDPConn
INKUDPPacketConnGet(INKUDPPacket packet)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)packet) == TS_SUCCESS);

UDPPacket *p = (UDPPacket *)packet;
return ((INKUDPConn)p->getConnection());
}

void
INKUDPPacketDestroy(INKUDPPacket packet)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)packet) == TS_SUCCESS);

UDPPacket *p = (UDPPacket *)packet;
p->free();
}

/* Packet Queue */

INKUDPPacket
INKUDPPacketGet(INKUDPacketQueue queuep)
{
if (queuep != nullptr) {
UDPPacket *packet;
Queue<UDPPacket> *qp = (Queue<UDPPacket> *)queuep;

packet = qp->pop();
return (packet);
}

return nullptr;
}

/* Buffers */

TSIOBuffer
Expand Down