Changeset cb569e6 in mainline for uspace/app/nettest2/nettest2.c
- Timestamp:
- 2010-11-18T21:58:27Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4e5c7ba
- Parents:
- 69e0d6d (diff), 45f04f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/nettest2/nettest2.c
r69e0d6d rcb569e6 223 223 int main(int argc, char *argv[]) 224 224 { 225 socklen_t max_length;226 uint8_t address_data[sizeof(struct sockaddr_in6)];227 225 struct sockaddr *address; 228 struct sockaddr_in *address_in;229 struct sockaddr_in6 *address_in6;226 struct sockaddr_in address_in; 227 struct sockaddr_in6 address_in6; 230 228 socklen_t addrlen; 231 229 uint8_t *address_start; … … 247 245 port = 7; 248 246 249 max_length = sizeof(address_data);250 address = (struct sockaddr *) address_data;251 address_in = (struct sockaddr_in *) address;252 address_in6 = (struct sockaddr_in6 *) address;253 254 247 /* 255 248 * Parse the command line arguments. … … 279 272 280 273 /* Prepare the address buffer */ 281 bzero(address_data, max_length);282 274 283 275 switch (family) { 284 276 case PF_INET: 285 address_in->sin_family = AF_INET; 286 address_in->sin_port = htons(port); 287 address_start = (uint8_t *) &address_in->sin_addr.s_addr; 288 addrlen = sizeof(struct sockaddr_in); 277 address_in.sin_family = AF_INET; 278 address_in.sin_port = htons(port); 279 address = (struct sockaddr *) &address_in; 280 addrlen = sizeof(address_in); 281 address_start = (uint8_t *) &address_in.sin_addr.s_addr; 289 282 break; 290 283 case PF_INET6: 291 address_in6->sin6_family = AF_INET6; 292 address_in6->sin6_port = htons(port); 293 address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr; 294 addrlen = sizeof(struct sockaddr_in6); 284 address_in6.sin6_family = AF_INET6; 285 address_in6.sin6_port = htons(port); 286 address = (struct sockaddr *) &address_in6; 287 addrlen = sizeof(address_in6); 288 address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr; 295 289 break; 296 290 default:
Note:
See TracChangeset
for help on using the changeset viewer.