From 575cfc364e8d56d98a4e97bbfe0aa3ec995712d1 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Sat, 13 Mar 2021 21:22:44 -0800
Subject: [PATCH] Remove non-standard API function accept4()

---
 include/ZeroTierSockets.h | 13 -------------
 src/Sockets.cpp           | 23 -----------------------
 src/bindings/python/zt.i  |  1 -
 3 files changed, 37 deletions(-)

diff --git a/include/ZeroTierSockets.h b/include/ZeroTierSockets.h
index 0b25342..f99af1f 100644
--- a/include/ZeroTierSockets.h
+++ b/include/ZeroTierSockets.h
@@ -1463,19 +1463,6 @@ ZTS_API int ZTCALL zts_listen(int fd, int backlog);
  */
 ZTS_API int ZTCALL zts_accept(int fd, struct zts_sockaddr *addr, zts_socklen_t *addrlen);
 
-/**
- * @brief Accept an incoming connection (sets zts_errno)
- *
- * @param fd Socket file descriptor
- * @param addr Address of remote host for accepted connection
- * @param addrlen Length of address
- * @param flags
- * @return New socket file descriptor on success. ZTS_ERR_SOCKET, ZTS_ERR_SERVICE, ZTS_ERR_ARG on failure.
- */
-#if defined(__linux__)
-	int zts_accept4(int fd, struct zts_sockaddr *addr, zts_socklen_t *addrlen, int flags);
-#endif
-
 // Socket level option number
 #define ZTS_SOL_SOCKET      0x0fff
 // Socket options
diff --git a/src/Sockets.cpp b/src/Sockets.cpp
index c4afe63..e38ca5d 100644
--- a/src/Sockets.cpp
+++ b/src/Sockets.cpp
@@ -153,29 +153,6 @@ JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_accept(
 }
 #endif
 
-#if defined(__linux__)
-int zts_accept4(int fd, struct zts_sockaddr *addr, zts_socklen_t *addrlen, int flags)
-{
-	if (!(_serviceStateFlags & ZTS_STATE_NET_SERVICE_RUNNING)) {
-		return ZTS_ERR_SERVICE;
-	}
-	return ZTS_ERR_SERVICE; // TODO
-}
-#endif
-#ifdef ZTS_ENABLE_JAVA
-#if defined(__linux__)
- JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_accept4(
-	JNIEnv *env, jobject thisObj, jint fd, jobject addr, jint port, jint flags)
- {
-	struct zts_sockaddr_storage ss;
-	zts_socklen_t addrlen = sizeof(struct zts_sockaddr_storage);
-	int retval = zts_accept4(fd, (struct zts_sockaddr *)&ss, &addrlen, flags);
-	ss2zta(env, &ss, addr);
-	return retval > -1 ? retval : -(zts_errno);
-}
-#endif
-#endif
-
 int zts_setsockopt(int fd, int level, int optname, const void *optval,zts_socklen_t optlen)
 {
 	if (!(_serviceStateFlags & ZTS_STATE_NET_SERVICE_RUNNING)) {
diff --git a/src/bindings/python/zt.i b/src/bindings/python/zt.i
index 8ddefe5..390924f 100644
--- a/src/bindings/python/zt.i
+++ b/src/bindings/python/zt.i
@@ -25,7 +25,6 @@
 %ignore zts_sockaddr_in6;
 
 %ignore zts_linger;
-%ignore zts_accept4;
 %ignore zts_ip_mreq;
 %ignore zts_in_pktinfo;
 %ignore zts_ipv6_mreq;