1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
|
--- getifaddrs.c 2010-07-03 20:31:27.000000000 +0800
+++ getifaddrs.c89 2010-08-04 10:49:52.000000000 +0800
@@ -507,7 +507,9 @@
/* loop to handle interfaces coming online causing a buffer overflow
* between first call to list buffer length and second call to enumerate.
*/
- for (unsigned i = MAX_TRIES; i; i--)
+ {
+ unsigned i;
+ for (i = MAX_TRIES; i; i--)
{
pgm_debug ("IP_ADAPTER_INFO buffer length %lu bytes.", ulOutBufLen);
pAdapterInfo = (IP_ADAPTER_INFO*)_pgm_heap_alloc (ulOutBufLen);
@@ -519,6 +521,7 @@
break;
}
}
+ }
switch (dwRet) {
case ERROR_SUCCESS: /* NO_ERROR */
@@ -543,12 +546,15 @@
}
/* count valid adapters */
+ {
int n = 0, k = 0;
for (pAdapter = pAdapterInfo;
pAdapter;
pAdapter = pAdapter->Next)
{
- for (IP_ADDR_STRING *pIPAddr = &pAdapter->IpAddressList;
+ {
+ IP_ADDR_STRING *pIPAddr;
+ for (pIPAddr = &pAdapter->IpAddressList;
pIPAddr;
pIPAddr = pIPAddr->Next)
{
@@ -557,11 +563,13 @@
continue;
++n;
}
+ }
}
pgm_debug ("GetAdaptersInfo() discovered %d interfaces.", n);
/* contiguous block for adapter list */
+ {
struct _pgm_ifaddrs_t* ifa = pgm_new0 (struct _pgm_ifaddrs_t, n);
struct _pgm_ifaddrs_t* ift = ifa;
@@ -570,7 +578,9 @@
pAdapter;
pAdapter = pAdapter->Next)
{
- for (IP_ADDR_STRING *pIPAddr = &pAdapter->IpAddressList;
+ {
+ IP_ADDR_STRING *pIPAddr;
+ for (pIPAddr = &pAdapter->IpAddressList;
pIPAddr;
pIPAddr = pIPAddr->Next)
{
@@ -586,8 +596,12 @@
pgm_debug ("name:%s IPv4 index:%lu",
pAdapter->AdapterName, pAdapter->Index);
ift->_ifa.ifa_name = ift->_name;
+#ifdef _MSC_VER
+ strncpy_s (ift->_ifa.ifa_name, IF_NAMESIZE, pAdapter->AdapterName, _TRUNCATE);
+#else
strncpy (ift->_ifa.ifa_name, pAdapter->AdapterName, IF_NAMESIZE);
ift->_ifa.ifa_name[IF_NAMESIZE - 1] = 0;
+#endif
/* flags: assume up, broadcast and multicast */
ift->_ifa.ifa_flags = IFF_UP | IFF_BROADCAST | IFF_MULTICAST;
@@ -604,11 +618,14 @@
ift = (struct _pgm_ifaddrs_t*)(ift->_ifa.ifa_next);
}
}
+ }
}
if (pAdapterInfo)
free (pAdapterInfo);
*ifap = (struct pgm_ifaddrs_t*)ifa;
+ }
+ }
return TRUE;
}
@@ -625,7 +642,9 @@
/* loop to handle interfaces coming online causing a buffer overflow
* between first call to list buffer length and second call to enumerate.
*/
- for (unsigned i = MAX_TRIES; i; i--)
+ {
+ unsigned i;
+ for (i = MAX_TRIES; i; i--)
{
pgm_debug ("IP_ADAPTER_ADDRESSES buffer length %lu bytes.", dwSize);
pAdapterAddresses = (IP_ADAPTER_ADDRESSES*)_pgm_heap_alloc (dwSize);
@@ -645,6 +664,7 @@
break;
}
}
+ }
switch (dwRet) {
case ERROR_SUCCESS:
@@ -669,12 +689,15 @@
}
/* count valid adapters */
+ {
int n = 0, k = 0;
for (adapter = pAdapterAddresses;
adapter;
adapter = adapter->Next)
{
- for (IP_ADAPTER_UNICAST_ADDRESS *unicast = adapter->FirstUnicastAddress;
+ {
+ IP_ADAPTER_UNICAST_ADDRESS *unicast;
+ for (unicast = adapter->FirstUnicastAddress;
unicast;
unicast = unicast->Next)
{
@@ -687,9 +710,11 @@
++n;
}
+ }
}
/* contiguous block for adapter list */
+ {
struct _pgm_ifaddrs_t* ifa = pgm_new0 (struct _pgm_ifaddrs_t, n);
struct _pgm_ifaddrs_t* ift = ifa;
@@ -699,7 +724,9 @@
adapter = adapter->Next)
{
int unicastIndex = 0;
- for (IP_ADAPTER_UNICAST_ADDRESS *unicast = adapter->FirstUnicastAddress;
+ {
+ IP_ADAPTER_UNICAST_ADDRESS *unicast;
+ for (unicast = adapter->FirstUnicastAddress;
unicast;
unicast = unicast->Next, ++unicastIndex)
{
@@ -718,8 +745,12 @@
pgm_debug ("name:%s IPv4 index:%lu IPv6 index:%lu",
adapter->AdapterName, adapter->IfIndex, adapter->Ipv6IfIndex);
ift->_ifa.ifa_name = ift->_name;
+#ifdef _MSC_VER
+ strncpy_s (ift->_ifa.ifa_name, IF_NAMESIZE, adapter->AdapterName, _TRUNCATE);
+#else
strncpy (ift->_ifa.ifa_name, adapter->AdapterName, IF_NAMESIZE);
ift->_ifa.ifa_name[IF_NAMESIZE - 1] = 0;
+#endif
/* flags */
ift->_ifa.ifa_flags = 0;
@@ -734,9 +765,12 @@
ift->_ifa.ifa_netmask = (void*)&ift->_netmask;
/* pre-Vista must hunt for matching prefix in linked list, otherwise use OnLinkPrefixLength */
+ {
int prefixIndex = 0;
ULONG prefixLength = 0;
- for (IP_ADAPTER_PREFIX *prefix = adapter->FirstPrefix;
+ {
+ IP_ADAPTER_PREFIX *prefix;
+ for (prefix = adapter->FirstPrefix;
prefix;
prefix = prefix->Next, ++prefixIndex)
{
@@ -745,6 +779,7 @@
break;
}
}
+ }
/* map prefix to netmask */
ift->_ifa.ifa_netmask->sa_family = unicast->Address.lpSockaddr->sa_family;
@@ -762,12 +797,16 @@
pgm_warn (_("IPv6 adapter %s prefix length is 0, overriding to 128."), adapter->AdapterName);
prefixLength = 128;
}
- for (ULONG i = prefixLength, j = 0; i > 0; i -= 8, ++j)
+ {
+ ULONG i, j;
+ for (i = prefixLength, j = 0; i > 0; i -= 8, ++j)
{
((struct sockaddr_in6*)ift->_ifa.ifa_netmask)->sin6_addr.s6_addr[ j ] = i >= 8 ? 0xff : (ULONG)(( 0xffU << ( 8 - i ) ) & 0xffU );
}
+ }
break;
}
+ }
/* next */
if (k++ < (n - 1)) {
@@ -775,11 +814,14 @@
ift = (struct _pgm_ifaddrs_t*)(ift->_ifa.ifa_next);
}
}
+ }
}
if (pAdapterAddresses)
free (pAdapterAddresses);
*ifap = (struct pgm_ifaddrs_t*)ifa;
+ }
+ }
return TRUE;
}
#endif /* _WIN32 */
|
