src/java.base/windows/native/libnio/ch/DatagramDispatcher.c

rev 57653 : [mq]: Truncate

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 21,45 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
- /*
-  */
- 
  #include <windows.h>
  #include <winsock2.h>
  #include <ctype.h>
  #include "jni.h"
  #include "jni_util.h"
  #include "jvm.h"
  #include "jlong.h"
- #include "sun_nio_ch_DatagramDispatcher.h"
- 
  #include "nio.h"
  #include "nio_util.h"
  
  
  /**************************************************************
   * DatagramDispatcher.c
   */
  
--- 21,43 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #include <windows.h>
  #include <winsock2.h>
  #include <ctype.h>
+ 
  #include "jni.h"
  #include "jni_util.h"
  #include "jvm.h"
  #include "jlong.h"
  #include "nio.h"
  #include "nio_util.h"
  
+ #include "sun_nio_ch_DatagramDispatcher.h"
+ 
  
  /**************************************************************
   * DatagramDispatcher.c
   */
  
*** 67,87 ****
              0,              /* no overlapped sockets */
              0);             /* no completion routine */
  
      if (i == SOCKET_ERROR) {
          int theErr = (jint)WSAGetLastError();
          if (theErr == WSAEWOULDBLOCK) {
              return IOS_UNAVAILABLE;
          }
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "Write failed");
          return IOS_THROWN;
      }
  
      return convertReturnVal(env, (jint)read, JNI_TRUE);
  }
  
  JNIEXPORT jlong JNICALL
--- 65,87 ----
              0,              /* no overlapped sockets */
              0);             /* no completion routine */
  
      if (i == SOCKET_ERROR) {
          int theErr = (jint)WSAGetLastError();
+         if (theErr != WSAEMSGSIZE) {
              if (theErr == WSAEWOULDBLOCK) {
                  return IOS_UNAVAILABLE;
              }
              if (theErr == WSAECONNRESET) {
                  purgeOutstandingICMP(env, clazz, fd);
                  JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
                  return IOS_THROWN;
              }
!             JNU_ThrowIOExceptionWithLastError(env, "WSARecv failed");
              return IOS_THROWN;
          }
+     }
  
      return convertReturnVal(env, (jint)read, JNI_TRUE);
  }
  
  JNIEXPORT jlong JNICALL
*** 118,138 ****
      /* clean up */
      free(bufs);
  
      if (i != 0) {
          int theErr = (jint)WSAGetLastError();
          if (theErr == WSAEWOULDBLOCK) {
              return IOS_UNAVAILABLE;
          }
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "Write failed");
          return IOS_THROWN;
      }
  
      return convertLongReturnVal(env, (jlong)read, JNI_TRUE);
  }
  
  
--- 118,140 ----
      /* clean up */
      free(bufs);
  
      if (i != 0) {
          int theErr = (jint)WSAGetLastError();
+         if (theErr != WSAEMSGSIZE) {
              if (theErr == WSAEWOULDBLOCK) {
                  return IOS_UNAVAILABLE;
              }
              if (theErr == WSAECONNRESET) {
                  purgeOutstandingICMP(env, clazz, fd);
                  JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
                  return IOS_THROWN;
              }
!             JNU_ThrowIOExceptionWithLastError(env, "WSARecv failed");
              return IOS_THROWN;
          }
+     }
  
      return convertLongReturnVal(env, (jlong)read, JNI_TRUE);
  }
  
  
*** 167,177 ****
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "Write failed");
          return IOS_THROWN;
      }
  
      return convertReturnVal(env, (jint)written, JNI_FALSE);
  }
--- 169,179 ----
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "WSASend failed");
          return IOS_THROWN;
      }
  
      return convertReturnVal(env, (jint)written, JNI_FALSE);
  }
*** 217,227 ****
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "Write failed");
          return IOS_THROWN;
      }
  
      return convertLongReturnVal(env, (jlong)written, JNI_FALSE);
  }
--- 219,229 ----
          if (theErr == WSAECONNRESET) {
              purgeOutstandingICMP(env, clazz, fd);
              JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException", 0);
              return IOS_THROWN;
          }
!         JNU_ThrowIOExceptionWithLastError(env, "WSASend failed");
          return IOS_THROWN;
      }
  
      return convertLongReturnVal(env, (jlong)written, JNI_FALSE);
  }