Automated import from //branches/donutburger/...@140825,140825

1 files changed, 6 insertions, 1 deletions

diff --git a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
index de01295..f79c019 100755
--- a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
+++ b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
@@ -3084,7 +3084,12 @@ static void osNetworkSystem_setSocketOptionImpl(JNIEnv* env, jclass clazz,
             if ((anOption >> 16) & BROKEN_MULTICAST_IF) {
                 return;
             }
-            result = setsockopt(handle, IPPROTO_IP, IP_MULTICAST_IF, &sockVal, sockSize);
+            struct ip_mreqn mcast_req;
+            memset(&mcast_req, 0, sizeof(mcast_req));
+            memcpy(&(mcast_req.imr_address), &(sockVal.sin_addr),
+                   sizeof(struct in_addr));
+            result = setsockopt(handle, IPPROTO_IP, IP_MULTICAST_IF,
+                                &mcast_req, sizeof(mcast_req));
             if (0 != result) {
                 throwSocketException(env, convertError(errno));
                 return;