summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/native/jni/java-net
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2007-08-04 10:53:49 +0000
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2007-08-04 10:53:49 +0000
commitbfd03af53013b43663c88995c6d5943815e8d75b (patch)
tree871b70a606d87369d5aa9d6f621baedc13b49eba /libjava/classpath/native/jni/java-net
parentbefb0bace8afefe156fe5718f9d1f202d28560c7 (diff)
downloadppe42-gcc-bfd03af53013b43663c88995c6d5943815e8d75b.tar.gz
ppe42-gcc-bfd03af53013b43663c88995c6d5943815e8d75b.zip
libjava/
2007-08-04 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20070727). * Regenerate class and header files. * Regenerate auto* files. * include/jvm.h: * jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type. * jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise. * jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA, _Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA, _Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA, _Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify jvalue parameter. * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise. * java/lang/VMFloat.java (toString, parseFloat): New. * gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported, isModalExclusionTypeSupported): New (stub only). * gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise. * gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages, updateFocusableWindowState, setModalBlocked, getBoundsPrivate, setAlwaysOnTop): Likewise. * gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature. * scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer, ignore javax.sound.sampled.spi.MixerProvider, ignore .in files. * HACKING: Mention --enable-gstreamer-peer, removal of generated files. libjava/classpath/ 2007-08-04 Matthias Klose <doko@ubuntu.com> * java/util/EnumMap.java (clone): Add cast. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127204 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/native/jni/java-net')
-rw-r--r--libjava/classpath/native/jni/java-net/Makefile.in15
-rw-r--r--libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c21
-rw-r--r--libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c30
-rw-r--r--libjava/classpath/native/jni/java-net/javanet.c2
4 files changed, 41 insertions, 27 deletions
diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in
index b2f7efced6e..3fdf64d3d2c 100644
--- a/libjava/classpath/native/jni/java-net/Makefile.in
+++ b/libjava/classpath/native/jni/java-net/Makefile.in
@@ -137,6 +137,8 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
+CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
@@ -175,8 +177,6 @@ EXEEXT = @EXEEXT@
FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@
-FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
-FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
@@ -200,6 +200,15 @@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
+GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
+GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_FILE_READER = @GSTREAMER_FILE_READER@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GSTREAMER_MIXER_PROVIDER = @GSTREAMER_MIXER_PROVIDER@
+GSTREAMER_PLUGINS_BASE_CFLAGS = @GSTREAMER_PLUGINS_BASE_CFLAGS@
+GSTREAMER_PLUGINS_BASE_LIBS = @GSTREAMER_PLUGINS_BASE_LIBS@
+GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
@@ -272,8 +281,6 @@ USER_CLASSLIB = @USER_CLASSLIB@
USER_JAVAH = @USER_JAVAH@
USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
-USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
-USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
diff --git a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c b/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
index cdfbe739789..a59604c04af 100644
--- a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
+++ b/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
@@ -69,6 +69,7 @@ exception statement from your version. */
#include "gnu_java_net_VMPlainSocketImpl.h"
#define THROW_NO_NETWORK(env) JCL_ThrowException (env, "java/lang/InternalError", "this platform not configured for network support")
+#define THROW_NO_IPV6(env) JCL_ThrowException (env, "java/lang/InternalError", "IPv6 support not available")
/*
* Class: gnu_java_net_VMPlainSocketImpl
@@ -120,7 +121,7 @@ Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env,
jclass c __attribute__((unused)),
jint fd, jbyteArray addr, jint port)
{
- /* FIXME! Add check if we have IPv6! */
+#ifdef HAVE_INET6
struct sockaddr_in6 sockaddr;
jbyte *elems;
int ret;
@@ -141,6 +142,9 @@ Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env,
if (-1 == ret)
JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+#else
+ THROW_NO_IPV6(env);
+#endif
}
@@ -442,8 +446,7 @@ Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface6 (JNIEnv *env,
#endif /* HAVE_INET6 */
#else
(void) fd;
- JCL_ThrowException (env, "java/lang/InternalError",
- "socket options not supported");
+ THROW_NO_IPV6(env);
#endif /* HAVE_SETSOCKOPT */
}
@@ -582,8 +585,7 @@ Java_gnu_java_net_VMPlainSocketImpl_join6 (JNIEnv *env,
#else
(void) fd;
(void) addr;
- JCL_ThrowException (env, "java/lang/InternalError",
- "IPv6 support not available");
+ THROW_NO_IPV6(env);
#endif /* HAVE_INET6 */
#else
(void) fd;
@@ -657,8 +659,7 @@ Java_gnu_java_net_VMPlainSocketImpl_leave6 (JNIEnv *env,
#else
(void) fd;
(void) addr;
- JCL_ThrowException (env, "java/lang/InternalError",
- "IPv6 support not available");
+ THROW_NO_IPV6(env);
#endif /* HAVE_INET6 */
#else
(void) fd;
@@ -763,8 +764,7 @@ Java_gnu_java_net_VMPlainSocketImpl_joinGroup6 (JNIEnv *env,
#else
(void) fd;
(void) addr;
- JCL_ThrowException (env, "java/lang/InternalError",
- "IPv6 support not available");
+ THROW_NO_IPV6(env);
#endif /* HAVE_INET6 */
#else
(void) fd;
@@ -865,8 +865,7 @@ Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6 (JNIEnv *env,
#else
(void) fd;
(void) addr;
- JCL_ThrowException (env, "java/lang/InternalError",
- "IPv6 support not available");
+ THROW_NO_IPV6(env);
#endif /* HAVE_INET6 */
#else
(void) fd;
diff --git a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
index fc921ecef1f..43f2d9146dd 100644
--- a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
+++ b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
@@ -163,10 +163,12 @@ Java_java_net_VMInetAddress_getHostByAddr (JNIEnv * env,
addr = cpnet_newIPV4Address(env);
cpnet_bytesToIPV4Address (addr, octets);
break;
+#ifdef HAVE_INET6
case 16:
addr = cpnet_newIPV6Address(env);
cpnet_bytesToIPV6Address (addr, octets);
break;
+#endif
default:
JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address");
return (jstring) NULL;
@@ -245,9 +247,9 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
/* Now loop and copy in each address */
for (i = 0; i < addresses_count; i++)
{
- if (cpnet_isIPV6Address (addresses[i]))
+ if (cpnet_isIPV4Address (addresses[i]))
{
- ret_octets = (*env)->NewByteArray (env, 16);
+ ret_octets = (*env)->NewByteArray (env, 4);
if (!ret_octets)
{
@@ -258,15 +260,16 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
- cpnet_IPV6AddressToBytes (addresses[i], octets);
+ cpnet_IPV4AddressToBytes (addresses[i], octets);
(*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
(*env)->SetObjectArrayElement (env, addrs, i, ret_octets);
}
- else if (cpnet_isIPV4Address (addresses[i]))
+#ifdef HAVE_INET6
+ else if (cpnet_isIPV6Address (addresses[i]))
{
- ret_octets = (*env)->NewByteArray (env, 4);
+ ret_octets = (*env)->NewByteArray (env, 16);
if (!ret_octets)
{
@@ -277,12 +280,13 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
- cpnet_IPV4AddressToBytes (addresses[i], octets);
+ cpnet_IPV6AddressToBytes (addresses[i], octets);
(*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
(*env)->SetObjectArrayElement (env, addrs, i, ret_octets);
}
+#endif
else
{
JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
@@ -336,9 +340,9 @@ Java_java_net_VMInetAddress_aton (JNIEnv *env,
if (!address)
return (jbyteArray) NULL;
- if (cpnet_isIPV6Address (address))
+ if (cpnet_isIPV4Address (address))
{
- ret_octets = (jbyteArray) (*env)->NewByteArray (env, 16);
+ ret_octets = (jbyteArray) (*env)->NewByteArray (env, 4);
if (!ret_octets)
{
@@ -349,13 +353,14 @@ Java_java_net_VMInetAddress_aton (JNIEnv *env,
octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
- cpnet_IPV6AddressToBytes (address, octets);
+ cpnet_IPV4AddressToBytes (address, octets);
(*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
}
- else if (cpnet_isIPV4Address (address))
+#ifdef HAVE_INET6
+ else if (cpnet_isIPV6Address (address))
{
- ret_octets = (jbyteArray) (*env)->NewByteArray (env, 4);
+ ret_octets = (jbyteArray) (*env)->NewByteArray (env, 16);
if (!ret_octets)
{
@@ -366,10 +371,11 @@ Java_java_net_VMInetAddress_aton (JNIEnv *env,
octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
- cpnet_IPV4AddressToBytes (address, octets);
+ cpnet_IPV6AddressToBytes (address, octets);
(*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
}
+#endif
else
{
JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
diff --git a/libjava/classpath/native/jni/java-net/javanet.c b/libjava/classpath/native/jni/java-net/javanet.c
index 1d2f7202a17..1f093f4aa72 100644
--- a/libjava/classpath/native/jni/java-net/javanet.c
+++ b/libjava/classpath/native/jni/java-net/javanet.c
@@ -395,10 +395,12 @@ _javanet_get_ip_netaddr (JNIEnv * env, jobject addr)
netaddr = cpnet_newIPV4Address(env);
cpnet_bytesToIPV4Address(netaddr, octets);
break;
+#ifdef HAVE_INET6
case 16:
netaddr = cpnet_newIPV6Address(env);
cpnet_bytesToIPV6Address(netaddr, octets);
break;
+#endif
default:
/* This should not happen as we have checked before.
* But that way we shut the compiler warnings */
OpenPOWER on IntegriCloud