Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/inet_common.c
- Timestamp:
- Jan 1, 2014, 12:47:38 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mindi-busybox/libbb/inet_common.c
r2725 r3232 98 98 #ifdef DEBUG 99 99 bb_error_msg("rresolve: unsupported address family %d!", 100 100 s_in->sin_family); 101 101 #endif 102 102 errno = EAFNOSUPPORT; … … 165 165 int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6) 166 166 { 167 struct addrinfo req, *ai ;167 struct addrinfo req, *ai = NULL; 168 168 int s; 169 169 170 memset(&req, '\0', sizeof req);170 memset(&req, 0, sizeof(req)); 171 171 req.ai_family = AF_INET6; 172 172 s = getaddrinfo(name, NULL, &req, &ai); 173 if (s ) {173 if (s != 0) { 174 174 bb_error_msg("getaddrinfo: %s: %d", name, s); 175 175 return -1; 176 176 } 177 memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6)); 178 freeaddrinfo(ai); 177 memcpy(sin6, ai->ai_addr, sizeof(*sin6)); 178 if (ai) 179 freeaddrinfo(ai); 179 180 return 0; 180 181 } … … 195 196 #ifdef DEBUG 196 197 bb_error_msg("rresolve: unsupported address family %d!", 197 198 sin6->sin6_family); 198 199 #endif 199 200 errno = EAFNOSUPPORT; … … 210 211 } 211 212 212 s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), 213 name, sizeof(name), NULL, 0, 0); 214 if (s) { 213 s = getnameinfo((struct sockaddr *) sin6, sizeof(*sin6), 214 name, sizeof(name), 215 /*serv,servlen:*/ NULL, 0, 216 0); 217 if (s != 0) { 215 218 bb_error_msg("getnameinfo failed"); 216 219 return NULL;
Note:
See TracChangeset
for help on using the changeset viewer.