bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sockutil: Make sockaddr_address_string conform to its comment

Browse Source
This commit is contained in:
nick
2013-03-19 14:47:50 +00:00
parent e994b80756
commit 2bb8434128
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sockutil.c
View File

@@ -42,7 +42,9 @@ const char* sockaddr_address_string( const struct sockaddr* sa, char* dest, size
ret = inet_ntop( AF_INET, &in->sin_addr, dest, len );
} else if ( sa->sa_family == AF_INET6 ) {
ret = inet_ntop( AF_INET6, &in6->sin6_addr, dest, len );
} else {
}
if ( ret == NULL ) {
strncpy( dest, "???", len );
}

4
tests/unit/check_sockutil.c
View File

@@ -76,10 +76,10 @@ START_TEST( test_sockaddr_address_string_doesnt_overflow_short_buffer )
v4->sin_port = htons( 4777 );
ck_assert_int_eq( 1, inet_pton( AF_INET, "192.168.0.1", &v4->sin_addr ));
result = sockaddr_address_string( &sa, &testbuf[0], 4 );
result = sockaddr_address_string( &sa, &testbuf[0], 2 );
ck_assert( result == NULL );
ck_assert_str_eq( "", testbuf );
ck_assert_str_eq( "??", testbuf );
}
END_TEST