pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

getlocaladdrs

pull/5/head
yuqing 2016-01-18 10:17:45 +08:00
parent 05e01ce113
commit a786f36d65
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sockopt.c
View File

@ -1619,7 +1619,7 @@ int getlocaladdrs(char ip_addrs[][IP_ADDRESS_SIZE], \
int result; int result;
*count = 0; *count = 0;
s = socket(AF_INET, SOCK_STREAM, 0); s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) if (s < 0)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, " \
@ -1656,7 +1656,6 @@ int getlocaladdrs(char ip_addrs[][IP_ADDRESS_SIZE], \
return ENOSPC; return ENOSPC;
} }
s_in = (struct sockaddr_in *) &ifrp->ifr_addr; s_in = (struct sockaddr_in *) &ifrp->ifr_addr;
if (sa->sa_family == AF_INET) if (sa->sa_family == AF_INET)
{ {
@ -1674,8 +1673,11 @@ int getlocaladdrs(char ip_addrs[][IP_ADDRESS_SIZE], \
(*count)++; (*count)++;
} }
#ifdef OS_FREEBSD
ifrp = (struct ifreq*)((caddr_t)&ifrp->ifr_addr + sa->sa_len); ifrp = (struct ifreq*)((caddr_t)&ifrp->ifr_addr + sa->sa_len);
#else
ifrp++;
#endif
} }
close(s); close(s);

2
src/tests/test_mblock.c
View File

@ -93,7 +93,7 @@ print_local_host_ip_addrs();
{ {
FastProcessInfo *processes; FastProcessInfo *processes;
get_processes(&processes, &count); get_processes(&processes, &count);
printf("count: %d\n", count); printf("process count: %d\n", count);
for (i=0; i<count; i++) for (i=0; i<count; i++)
{ {
printf("%d %d %c %s\n", processes[i].field_count, processes[i].pid, processes[i].state, processes[i].comm); printf("%d %d %c %s\n", processes[i].field_count, processes[i].pid, processes[i].state, processes[i].comm);