From ad0ad8711465667e312781efde2f0de78dfcfc1e Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:50:08 +0300 Subject: [PATCH] raw: Fill sin_family member of sw_sockaddr structure. --- src/raw/test/test_sw_bind.c | 6 ++++++ src/raw/test/test_sw_close.c | 1 + 2 files changed, 7 insertions(+) diff --git a/src/raw/test/test_sw_bind.c b/src/raw/test/test_sw_bind.c index 795a851..5cb866d 100644 --- a/src/raw/test/test_sw_bind.c +++ b/src/raw/test/test_sw_bind.c @@ -80,6 +80,7 @@ static void bind_invalid_ip_address(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; inet_pton(AF_INET, "254.254.254.254", &addr.sin_addr.s_addr); rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); @@ -101,6 +102,7 @@ static void bind_ok(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); @@ -117,12 +119,14 @@ static void bind_address_in_use(void) sockfd1 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr1, 0, sizeof(addr1)); + addr1.sin_family = AF_INET; addr1.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd1, (struct sockaddr *) &addr1, sizeof(addr1)); dprintf("after first sw_bind rc = %d\n", rc); sockfd2 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr2, 0, sizeof(addr2)); + addr2.sin_family = AF_INET; addr2.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd2, (struct sockaddr *) &addr2, sizeof(addr2)); dprintf("after second sw_bind rc = %d\n", rc); @@ -141,10 +145,12 @@ static void bind_socket_already_bound(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr1, 0, sizeof(addr1)); + addr1.sin_family = AF_INET; addr1.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd, (struct sockaddr *) &addr1, sizeof(addr1)); memset(&addr2, 0, sizeof(addr2)); + addr2.sin_family = AF_INET; addr2.sin_addr.s_addr = INADDR_ANY; addr2.sw_hash.h_array[0] = 0xFF; /* chage hash ("port") */ rc = sw_bind(sockfd, (struct sockaddr *) &addr2, sizeof(addr2)); diff --git a/src/raw/test/test_sw_close.c b/src/raw/test/test_sw_close.c index bae346e..21a86e6 100644 --- a/src/raw/test/test_sw_close.c +++ b/src/raw/test/test_sw_close.c @@ -92,6 +92,7 @@ static void close_ok_descriptor_is_bound(void) DIE(s < 0, "sw_socket"); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(s, (struct sockaddr *) &addr, sizeof(addr)); DIE(rc < 0, "sw_bind"); -- 2.20.1