From 126f2ace5d36c72a8fced27218a66e0b6f920f85 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Fri, 13 Oct 2023 08:53:43 +0000 Subject: [PATCH] 8318006: remove unused net related coding Reviewed-by: alanb, lucy --- src/java.base/share/native/libnet/net_util.h | 6 -- .../unix/native/libnet/net_util_md.c | 66 ------------------ .../windows/native/libnet/net_util_md.c | 69 ------------------- 3 files changed, 141 deletions(-) diff --git a/src/java.base/share/native/libnet/net_util.h b/src/java.base/share/native/libnet/net_util.h index 771ce3c2bbf..06cf448a01d 100644 --- a/src/java.base/share/native/libnet/net_util.h +++ b/src/java.base/share/native/libnet/net_util.h @@ -170,12 +170,6 @@ NET_SetSockOpt(int fd, int level, int opt, const void *arg, int len); JNIEXPORT int JNICALL NET_Bind(int fd, SOCKETADDRESS *sa, int len); -JNIEXPORT int JNICALL -NET_MapSocketOption(jint cmd, int *level, int *optname); - -JNIEXPORT int JNICALL -NET_MapSocketOptionV6(jint cmd, int *level, int *optname); - JNIEXPORT jint JNICALL NET_EnableFastTcpLoopback(int fd); diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c index 67194075c75..8a6249f504f 100644 --- a/src/java.base/unix/native/libnet/net_util_md.c +++ b/src/java.base/unix/native/libnet/net_util_md.c @@ -314,72 +314,6 @@ int NET_IsZeroAddr(jbyte* caddr) { return 1; } -/* - * Map the Java level socket option to the platform specific - * level and option name. - */ -int -NET_MapSocketOption(jint cmd, int *level, int *optname) { - static struct { - jint cmd; - int level; - int optname; - } const opts[] = { - { java_net_SocketOptions_TCP_NODELAY, IPPROTO_TCP, TCP_NODELAY }, - { java_net_SocketOptions_SO_OOBINLINE, SOL_SOCKET, SO_OOBINLINE }, - { java_net_SocketOptions_SO_LINGER, SOL_SOCKET, SO_LINGER }, - { java_net_SocketOptions_SO_SNDBUF, SOL_SOCKET, SO_SNDBUF }, - { java_net_SocketOptions_SO_RCVBUF, SOL_SOCKET, SO_RCVBUF }, - { java_net_SocketOptions_SO_KEEPALIVE, SOL_SOCKET, SO_KEEPALIVE }, - { java_net_SocketOptions_SO_REUSEADDR, SOL_SOCKET, SO_REUSEADDR }, - { java_net_SocketOptions_SO_REUSEPORT, SOL_SOCKET, SO_REUSEPORT }, - { java_net_SocketOptions_SO_BROADCAST, SOL_SOCKET, SO_BROADCAST }, - { java_net_SocketOptions_IP_TOS, IPPROTO_IP, IP_TOS }, - { java_net_SocketOptions_IP_MULTICAST_IF, IPPROTO_IP, IP_MULTICAST_IF }, - { java_net_SocketOptions_IP_MULTICAST_IF2, IPPROTO_IP, IP_MULTICAST_IF }, - { java_net_SocketOptions_IP_MULTICAST_LOOP, IPPROTO_IP, IP_MULTICAST_LOOP }, - }; - - int i; - - if (ipv6_available()) { - switch (cmd) { - // Different multicast options if IPv6 is enabled - case java_net_SocketOptions_IP_MULTICAST_IF: - case java_net_SocketOptions_IP_MULTICAST_IF2: - *level = IPPROTO_IPV6; - *optname = IPV6_MULTICAST_IF; - return 0; - - case java_net_SocketOptions_IP_MULTICAST_LOOP: - *level = IPPROTO_IPV6; - *optname = IPV6_MULTICAST_LOOP; - return 0; -#if defined(MACOSX) - // Map IP_TOS request to IPV6_TCLASS - case java_net_SocketOptions_IP_TOS: - *level = IPPROTO_IPV6; - *optname = IPV6_TCLASS; - return 0; -#endif - } - } - - /* - * Map the Java level option to the native level - */ - for (i=0; i<(int)(sizeof(opts) / sizeof(opts[0])); i++) { - if (cmd == opts[i].cmd) { - *level = opts[i].level; - *optname = opts[i].optname; - return 0; - } - } - - /* not found */ - return -1; -} - /* * Wrapper for getsockopt system routine - does any necessary * pre/post processing to deal with OS specific oddities :- diff --git a/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c index 4ccc4c6631a..5305a02f1c2 100644 --- a/src/java.base/windows/native/libnet/net_util_md.c +++ b/src/java.base/windows/native/libnet/net_util_md.c @@ -225,75 +225,6 @@ jint reuseport_supported(int ipv6_available) return JNI_FALSE; } -/* call NET_MapSocketOptionV6 for the IPv6 fd only - * and NET_MapSocketOption for the IPv4 fd - */ -JNIEXPORT int JNICALL -NET_MapSocketOptionV6(jint cmd, int *level, int *optname) { - - switch (cmd) { - case java_net_SocketOptions_IP_MULTICAST_IF: - case java_net_SocketOptions_IP_MULTICAST_IF2: - *level = IPPROTO_IPV6; - *optname = IPV6_MULTICAST_IF; - return 0; - - case java_net_SocketOptions_IP_MULTICAST_LOOP: - *level = IPPROTO_IPV6; - *optname = IPV6_MULTICAST_LOOP; - return 0; - } - return NET_MapSocketOption (cmd, level, optname); -} - -/* - * Map the Java level socket option to the platform specific - * level and option name. - */ - -JNIEXPORT int JNICALL -NET_MapSocketOption(jint cmd, int *level, int *optname) { - - typedef struct { - jint cmd; - int level; - int optname; - } sockopts; - - static sockopts opts[] = { - { java_net_SocketOptions_TCP_NODELAY, IPPROTO_TCP, TCP_NODELAY }, - { java_net_SocketOptions_SO_OOBINLINE, SOL_SOCKET, SO_OOBINLINE }, - { java_net_SocketOptions_SO_LINGER, SOL_SOCKET, SO_LINGER }, - { java_net_SocketOptions_SO_SNDBUF, SOL_SOCKET, SO_SNDBUF }, - { java_net_SocketOptions_SO_RCVBUF, SOL_SOCKET, SO_RCVBUF }, - { java_net_SocketOptions_SO_KEEPALIVE, SOL_SOCKET, SO_KEEPALIVE }, - { java_net_SocketOptions_SO_REUSEADDR, SOL_SOCKET, SO_REUSEADDR }, - { java_net_SocketOptions_SO_BROADCAST, SOL_SOCKET, SO_BROADCAST }, - { java_net_SocketOptions_IP_MULTICAST_IF, IPPROTO_IP, IP_MULTICAST_IF }, - { java_net_SocketOptions_IP_MULTICAST_LOOP, IPPROTO_IP, IP_MULTICAST_LOOP }, - { java_net_SocketOptions_IP_TOS, IPPROTO_IP, IP_TOS }, - - }; - - - int i; - - /* - * Map the Java level option to the native level - */ - for (i=0; i<(int)(sizeof(opts) / sizeof(opts[0])); i++) { - if (cmd == opts[i].cmd) { - *level = opts[i].level; - *optname = opts[i].optname; - return 0; - } - } - - /* not found */ - return -1; -} - - /* * Wrapper for setsockopt dealing with Windows specific issues :- *