Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-14 12:30:40 +00:00
Code Issues Projects Releases Wiki Activity

small ipv6 doc changes; nslookup a tiny bit smaller

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-07 19:05:43 +00:00
parent 6476cc1089
commit 8528151658
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/ipv4_ipv6.txt
View File

@ -212,7 +212,8 @@ structure the code differently.
Here's the corresponding server C code for a dual-stack platform: Here's the corresponding server C code for a dual-stack platform:
int ServSock, csock; int ServSock, csock;
struct sockaddr addr, from; /* struct sockaddr is too small! */
struct sockaddr_storage addr, from;
... ...
ServSock = socket(AF_INET6, SOCK_STREAM, PF_INET6); ServSock = socket(AF_INET6, SOCK_STREAM, PF_INET6);
bind(ServSock, &addr, sizeof(addr)); bind(ServSock, &addr, sizeof(addr));

2
networking/nc.c
View File

@ -25,7 +25,6 @@ int nc_main(int argc, char **argv)
SKIP_NC_EXTRA (const int execparam = 0;) SKIP_NC_EXTRA (const int execparam = 0;)
USE_NC_EXTRA (char **execparam = NULL;) USE_NC_EXTRA (char **execparam = NULL;)
struct sockaddr_in address; struct sockaddr_in address;
struct hostent *hostinfo;
fd_set readfds, testfds; fd_set readfds, testfds;
int opt; /* must be signed (getopt returns -1) */ int opt; /* must be signed (getopt returns -1) */
@ -116,6 +115,7 @@ int nc_main(int argc, char **argv)
if (!execparam) close(sfd); if (!execparam) close(sfd);
} else { } else {
struct hostent *hostinfo;
hostinfo = xgethostbyname(argv[0]); hostinfo = xgethostbyname(argv[0]);
address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list; address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;

5
networking/nslookup.c
View File

@ -82,9 +82,10 @@ static int print_host(const char *hostname, const char *header)
while (cur) { while (cur) {
sockaddr_to_dotted(cur->ai_addr, str, sizeof(str)); sockaddr_to_dotted(cur->ai_addr, str, sizeof(str));
printf("%s %s\nAddress: %s", header, hostname, str); printf("%s %s\nAddress: %s", header, hostname, str);
if (getnameinfo(cur->ai_addr, cur->ai_addrlen, str, sizeof(str), NULL, 0, NI_NAMEREQD)) s[0] = ' ';
if (getnameinfo(cur->ai_addr, cur->ai_addrlen, str+1, sizeof(str)-1, NULL, 0, NI_NAMEREQD))
str[0] = '\0'; str[0] = '\0';
printf(" %s\n", str); puts(str);
cur = cur->ai_next; cur = cur->ai_next;
} }
} else { } else {