Overview
| Comment: | resolver.h: Rename private to private_ for C++ |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
dfd8e1456734d15704748dd610f7eb2d |
| User & Date: | js on 2014-01-29 09:54:56 |
| Other Links: | manifest | tags |
Context
|
2014-01-29
| ||
| 15:54 | Generalize OFKernelEventObserver check-in: c694569d86 user: js tags: trunk | |
| 09:54 | resolver.h: Rename private to private_ for C++ check-in: dfd8e14567 user: js tags: trunk | |
|
2014-01-28
| ||
| 22:50 | Rename OFStreamObserver -> OFKernelEventObserver check-in: 96e20b8093 user: js tags: trunk | |
Changes
Modified src/resolver.h from [a012300f05] to [2514a83524].
| ︙ | ︙ | |||
23 24 25 26 27 28 29 |
/*!
* @brief A struct representing one result from the resolver.
*/
typedef struct of_resolver_result_t {
int family, type, protocol;
struct sockaddr *address;
socklen_t addressLength;
| | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
/*!
* @brief A struct representing one result from the resolver.
*/
typedef struct of_resolver_result_t {
int family, type, protocol;
struct sockaddr *address;
socklen_t addressLength;
void *private_;
} of_resolver_result_t;
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief Resolves the specified host.
|
| ︙ | ︙ |
Modified src/resolver.m from [de483104d4] to [03983c4b06].
| ︙ | ︙ | |||
91 92 93 94 95 96 97 |
for (retIter = ret, resultsIter = results, res = res0;
res != NULL; retIter++, resultsIter++, res = res->ai_next) {
resultsIter->family = res->ai_family;
resultsIter->type = res->ai_socktype;
resultsIter->protocol = res->ai_protocol;
resultsIter->address = res->ai_addr;
resultsIter->addressLength = res->ai_addrlen;
| < | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 |
for (retIter = ret, resultsIter = results, res = res0;
res != NULL; retIter++, resultsIter++, res = res->ai_next) {
resultsIter->family = res->ai_family;
resultsIter->type = res->ai_socktype;
resultsIter->protocol = res->ai_protocol;
resultsIter->address = res->ai_addr;
resultsIter->addressLength = res->ai_addrlen;
*retIter = resultsIter;
}
*retIter = NULL;
ret[0]->private_ = res0;
#else
struct hostent *he;
in_addr_t s_addr;
char **ip;
struct sockaddr_in *addrs, *addrsIter;
/*
|
| ︙ | ︙ | |||
268 269 270 271 272 273 274 |
#endif
}
void
of_resolver_free(of_resolver_result_t **results)
{
#ifdef HAVE_THREADSAFE_GETADDRINFO
| | | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
#endif
}
void
of_resolver_free(of_resolver_result_t **results)
{
#ifdef HAVE_THREADSAFE_GETADDRINFO
freeaddrinfo(results[0]->private_);
#else
free(results[0]->address);
#endif
free(results[0]);
free(results);
}
|